diff --git a/src/common/shared_vuejs.ts b/src/common/shared_vuejs.ts index 49718ec..edccfd1 100644 --- a/src/common/shared_vuejs.ts +++ b/src/common/shared_vuejs.ts @@ -4,17 +4,20 @@ export const shared_consts = { Admin: { value: 1, label: 'pages.Admin', - icon: 'fas fa-user-shield' + icon: 'fas fa-user-shield', + color: 'red' }, Manager: { value: 2, label: 'otherpages.manage.manager', - icon: 'fas fa-tools' + icon: 'fas fa-tools', + color: 'green' }, Teacher: { value: 4, label: 'event.teacher', - icon: 'fas fa-user-tie' + icon: 'fas fa-user-tie', + color: 'blue' } }, diff --git a/src/components/CDateTime/CDateTime.scss b/src/components/CDateTime/CDateTime.scss index 7dfc793..830259d 100644 --- a/src/components/CDateTime/CDateTime.scss +++ b/src/components/CDateTime/CDateTime.scss @@ -4,3 +4,7 @@ max-width: 400px; } } + +.calendar_comp { + vertical-align: center; +} diff --git a/src/components/CDateTime/CDateTime.ts b/src/components/CDateTime/CDateTime.ts index 1da8a3e..acc5288 100644 --- a/src/components/CDateTime/CDateTime.ts +++ b/src/components/CDateTime/CDateTime.ts @@ -5,18 +5,20 @@ import { toolsext } from '@src/store/Modules/toolsext' import { date } from 'quasar' import { CalendarStore } from '../../store/Modules' +import MixinBase from '../../mixins/mixin-base' @Component({ - name: 'CDateTime' + name: 'CDateTime', + mixins: [MixinBase] }) export default class CDateTime extends Vue { public $q public $t @Prop() public value!: Date - @Prop({ required: false, default: '' }) public label: string + @Prop({ required: true, default: 'Val:' }) public label: string @Prop({ required: false, default: '' }) public data_class!: string - @Prop({ required: false, default: false }) public readonly!: boolean + @Prop({ required: false, default: true }) public canEdit!: boolean @Prop({ required: false, default: false }) public disable!: boolean @Prop({ required: false, default: '' }) public bgcolor!: string @Prop({ required: false, default: false }) public dense: boolean @@ -74,10 +76,18 @@ export default class CDateTime extends Vue { public mounted() { this.myvalue = this.value + console.log('myvalue', this.myvalue) } public changeval(newval) { // console.log('changeval', newval) this.$emit('update:value', newval) } + + public mystyle() { + if (this.label !== '') + return '' + else + return '' + } } diff --git a/src/components/CDateTime/CDateTime.vue b/src/components/CDateTime/CDateTime.vue index 0238e01..10b4909 100644 --- a/src/components/CDateTime/CDateTime.vue +++ b/src/components/CDateTime/CDateTime.vue @@ -1,41 +1,65 @@