mirror of
https://framagit.org/les/gancio.git
synced 2025-02-01 00:52:01 +01:00
fix 'same day events'
This commit is contained in:
parent
bcaf27eb3b
commit
0e2f4d10f7
1 changed files with 4 additions and 2 deletions
|
@ -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) {
|
||||||
|
|
Loading…
Reference in a new issue