From 53930925423756e73f93dd448b8470109d4b3eba Mon Sep 17 00:00:00 2001 From: Paolo Arena Date: Thu, 7 Nov 2019 18:57:41 +0100 Subject: [PATCH] - Using CEventsCalendar also for show a Single Event, with his button edit/add/duplicate... --- .../CEventsCalendar/CEventsCalendar.ts | 17 +- .../CEventsCalendar/CEventsCalendar.vue | 942 +++++++++--------- .../CMySingleEvent/CMySingleEvent.scss | 86 ++ .../CMySingleEvent/CMySingleEvent.ts | 85 ++ .../CMySingleEvent/CMySingleEvent.vue | 172 ++++ src/components/CMySingleEvent/index.ts | 1 + src/components/index.ts | 1 + src/store/Modules/UserStore.ts | 1 + 8 files changed, 845 insertions(+), 460 deletions(-) create mode 100644 src/components/CMySingleEvent/CMySingleEvent.scss create mode 100644 src/components/CMySingleEvent/CMySingleEvent.ts create mode 100644 src/components/CMySingleEvent/CMySingleEvent.vue create mode 100644 src/components/CMySingleEvent/index.ts diff --git a/src/components/CEventsCalendar/CEventsCalendar.ts b/src/components/CEventsCalendar/CEventsCalendar.ts index c4c5fd9..afd6f96 100644 --- a/src/components/CEventsCalendar/CEventsCalendar.ts +++ b/src/components/CEventsCalendar/CEventsCalendar.ts @@ -35,13 +35,15 @@ import MixinOperator from '../../mixins/mixin-operator' import MixinEvents from '../../mixins/mixin-events' import { CDateTime } from '../CDateTime' import { CMyAvatar } from '../CMyAvatar' +import { CMySingleEvent } from '../CMySingleEvent' @Component({ mixins: [MixinOperator, MixinUsers, MixinEvents], name: 'CEventsCalendar', - components: { Logo, Footer, CTitle, CImgText, QDateTimeScroller, QDateScroller, CMySelect, CMyEditor, CDateTime, CMyAvatar } + components: { Logo, Footer, CTitle, CImgText, QDateTimeScroller, QDateScroller, CMySelect, CMyEditor, CDateTime, CMyAvatar, CMySingleEvent } }) export default class CEventsCalendar extends MixinEvents { + @Prop ({required: false, default: null}) public mysingleevent: IEvents public $q public $t: any public calendarView = 'month' @@ -191,6 +193,10 @@ export default class CEventsCalendar extends MixinEvents { // } // ] + get visuAllCal() { + return this.mysingleevent === null + } + get title_cal() { if (this.titleFormatter && this.locale) { const mydate = new Date(this.selectedDate) @@ -986,6 +992,15 @@ export default class CEventsCalendar extends MixinEvents { return eventsloc } + public isEventEnabled(myevent) { + // check if event is in the past + const datenow = tools.addDays(tools.getDateNow(), -1) + + // console.log('datenow', datenow, 'end', myevent.dateTimeEnd) + + return (new Date(myevent.dateTimeEnd) >= datenow) + } + public getTitleEv(event: IEvents) { return (!!event.short_tit) ? event.short_tit : event.title } diff --git a/src/components/CEventsCalendar/CEventsCalendar.vue b/src/components/CEventsCalendar/CEventsCalendar.vue index 52d7f79..c03a801 100644 --- a/src/components/CEventsCalendar/CEventsCalendar.vue +++ b/src/components/CEventsCalendar/CEventsCalendar.vue @@ -1,59 +1,59 @@ + + diff --git a/src/components/CMySingleEvent/index.ts b/src/components/CMySingleEvent/index.ts new file mode 100644 index 0000000..002c163 --- /dev/null +++ b/src/components/CMySingleEvent/index.ts @@ -0,0 +1 @@ +export {default as CMySingleEvent} from './CMySingleEvent.vue' diff --git a/src/components/index.ts b/src/components/index.ts index e091501..67b5583 100644 --- a/src/components/index.ts +++ b/src/components/index.ts @@ -18,6 +18,7 @@ export * from './CPreloadImages' export * from './CSignIn' export * from './CSignUp' export * from './CEventsCalendar' +export * from './CMySingleEvent' export * from './CDate' export * from './CDateTime' export * from './BannerCookies' diff --git a/src/store/Modules/UserStore.ts b/src/store/Modules/UserStore.ts index 6280707..5eda16a 100644 --- a/src/store/Modules/UserStore.ts +++ b/src/store/Modules/UserStore.ts @@ -658,6 +658,7 @@ namespace Actions { await Projects.actions.dbLoad({ checkPending: true, onlyiffirsttime: true }) GlobalStore.state.finishLoading = true + console.log('finishLoading', GlobalStore.state.finishLoading) return true // console.log('setGlobal: END')