encrypt/gancio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

start multidays intersection check

Browse Source
This commit is contained in:
lesion
2019-06-14 23:27:56 +02:00
parent f04012d1ce
commit f77e6b1ed6
1 changed files with 19 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
pages/add/_edit.vue
View File

@@ -187,13 +187,25 @@ export default {
events: state => state.events events: state => state.events
}), }),
todayEvents () { todayEvents () {
const date = moment(this.date) if (this.event.multidate) {
return this.events.filter(e => if (!this.date || !this.date.start) return
!e.multidate ? const date_start = moment(this.date.start)
date.isSame(moment(e.start_datetime), 'day') : const date_end = moment(this.date.end)
moment(e.start_datetime).isSame(date, 'day') || return this.events.filter(e =>
moment(e.start_datetime).isBefore(date) && moment(e.end_datetime).isAfter(date) !e.multidate ?
) date_start.isSame(e.start_datetime, 'day') ||
date_start.isBefore(e.start_datime) && date_end.isAfter(e.start_datetime) :
date_start.isSame(e.start_datetime, 'day') || date_start.isSame(e.end_datetime) ||
date_start.isAfter(e.start_datetime) && date_start.isBefore(e.end_datetime))
} else {
const date = moment(this.date)
return this.events.filter(e =>
!e.multidate ?
date.isSame(moment(e.start_datetime), 'day') :
moment(e.start_datetime).isSame(date, 'day') ||
moment(e.start_datetime).isBefore(date) && moment(e.end_datetime).isAfter(date)
)
}
}, },
...mapGetters(['filteredEvents']), ...mapGetters(['filteredEvents']),
attributes () { attributes () {