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

fix 'same day events'

Browse Source
This commit is contained in:
lesion
2022-03-07 13:23:15 +01:00
parent bcaf27eb3b
commit 0e2f4d10f7
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pages/add/DateInput.vue
View File

@@ -78,7 +78,7 @@ export default {
todayEvents () { todayEvents () {
const start = dayjs(this.value.from).startOf('day').unix() const start = dayjs(this.value.from).startOf('day').unix()
const end = dayjs(this.value.from).endOf('day').unix() const end = dayjs(this.value.from).endOf('day').unix()
const events = this.events.filter(e => (this.event.id && e.id !== this.event.id) && e.start_datetime >= start && e.start_datetime <= end) const events = this.events.filter(e => e.start_datetime >= start && e.start_datetime <= end)
return events return events
}, },
attributes () { attributes () {
@@ -161,8 +161,10 @@ export default {
this.type = 'normal' this.type = 'normal'
} }
this.events = await this.$api.getEvents({ this.events = await this.$api.getEvents({
start: dayjs().unix() start: dayjs().unix(),
show_recurrent: true
}) })
this.events = this.events.filter(e => e.id !== this.event.id)
}, },
methods: { methods: {
updateRecurrent (value) { updateRecurrent (value) {