diff --git a/src/components/CBook/CBook.vue b/src/components/CBook/CBook.vue index f290c2e..a36cb57 100644 --- a/src/components/CBook/CBook.vue +++ b/src/components/CBook/CBook.vue @@ -9,7 +9,7 @@ - + diff --git a/src/components/CCard/CCard.vue b/src/components/CCard/CCard.vue index f850d68..caaf301 100644 --- a/src/components/CCard/CCard.vue +++ b/src/components/CCard/CCard.vue @@ -9,7 +9,7 @@ - + diff --git a/src/components/CCardDiscipline/CCardDiscipline.scss b/src/components/CCardDiscipline/CCardDiscipline.scss index ae21da2..27b34db 100644 --- a/src/components/CCardDiscipline/CCardDiscipline.scss +++ b/src/components/CCardDiscipline/CCardDiscipline.scss @@ -25,15 +25,33 @@ $grayshadow: #555; width: 100%; max-width: 350px; min-width: 300px; - padding: 1rem 1rem; + padding: 0; box-shadow: none; - border-radius: 20px; - margin: 1rem 1rem; + border-radius: 30px; +} + +.my-card-shadow { + width: 100%; + max-width: 350px; + min-width: 300px; + padding-bottom: 20px; + margin-left: 0; + margin-right: 0; + margin-top: 1rem; + margin-bottom: 1rem; + border-radius: 30px; + transition: transform .2s ease-out; } -.my-card-discipline:hover { +.yes_shadow { + -webkit-box-shadow: 0 0 24px 0 rgba(0, 0, 0, 0.16); + box-shadow: 0 0 24px 0 rgba(0, 0, 0, 0.16); +} + + +.my-card-shadow:hover { transition: transform .2s ease-in; transform: scale(1.03); } @@ -73,8 +91,8 @@ $grayshadow: #555; } .myimg { + height: 200px; border-radius: 30px !important; - margin: 30px auto 10px; } .q-img { diff --git a/src/components/CCardDiscipline/CCardDiscipline.ts b/src/components/CCardDiscipline/CCardDiscipline.ts index cf2cc2a..99a4f25 100644 --- a/src/components/CCardDiscipline/CCardDiscipline.ts +++ b/src/components/CCardDiscipline/CCardDiscipline.ts @@ -3,19 +3,53 @@ import { Component, Prop, Watch } from 'vue-property-decorator' import { tools } from '../../store/Modules/tools' import { toolsext } from '@src/store/Modules/toolsext' -import { IDiscipline } from '../../model' +import { IDiscipline, IEvents } from '../../model' import MixinBase from '../../mixins/mixin-base' +import MixinOperator from '../../mixins/mixin-operator' +import MixinUsers from '../../mixins/mixin-users' +import { CMyTeacher } from '../CMyTeacher' +import { CalendarStore } from '../../store/Modules' @Component({ - mixins: [MixinBase], - name: 'CCardDiscipline' + mixins: [MixinBase, MixinOperator, MixinUsers], + name: 'CCardDiscipline', + components: { CMyTeacher } }) export default class CCardDiscipline extends Vue { @Prop({ required: true }) public discipline: IDiscipline + @Prop({ required: false, default: '' }) public mystyle: string + @Prop({ required: false, default: false }) public autoplay: boolean + + public nextlesson: IEvents + + @Watch('discipline') + public disciplinechanged(value) { + this.nextlesson = this.getNextLesson(value.typol_code) + // console.log('nextlesson', this.nextlesson) + } public getNextLesson(typol) { // Get next lesson - return '' + const datenow = tools.addDays(tools.getDateNow(), -1) + return CalendarStore.state.eventlist.find((myevent) => (myevent.typol === typol) && (new Date(myevent.dateTimeEnd) >= datenow)) + // return CalendarStore.state.eventlist.find((myevent) => (myevent.typol === typol)) } + + public ExistLesson() { + return !!this.nextlesson + } + + public NextEventDate() { + return tools.getstrDateTimeEventSimple(this, this.nextlesson) + } + + get getLinkEvent() { + return `event/${this.nextlesson.typol}/${this.nextlesson._id}` + } + + public created() { + this.disciplinechanged(this.discipline) + } + } diff --git a/src/components/CCardDiscipline/CCardDiscipline.vue b/src/components/CCardDiscipline/CCardDiscipline.vue index 60a4072..3ba2d2c 100644 --- a/src/components/CCardDiscipline/CCardDiscipline.vue +++ b/src/components/CCardDiscipline/CCardDiscipline.vue @@ -1,30 +1,43 @@