mirror of
https://framagit.org/les/gancio.git
synced 2025-01-31 16:42:22 +01:00
minor with events starting or ending at 00:00
This commit is contained in:
parent
359d8d6245
commit
14f3ea9fda
1 changed files with 2 additions and 2 deletions
|
@ -81,9 +81,9 @@ export default {
|
||||||
if (this.selectedDay) {
|
if (this.selectedDay) {
|
||||||
const min = this.selectedDay.startOf('day').toUnixInteger()
|
const min = this.selectedDay.startOf('day').toUnixInteger()
|
||||||
const max = this.selectedDay.endOf('day').toUnixInteger()
|
const max = this.selectedDay.endOf('day').toUnixInteger()
|
||||||
return this.events.filter(e => (e.start_datetime < max && (e.end_datetime || e.start_datetime) > min) && (this.filter.show_recurrent || !e.parentId))
|
return this.events.filter(e => (e.start_datetime <= max && (e.end_datetime || e.start_datetime) >= min) && (this.filter.show_recurrent || !e.parentId))
|
||||||
} else if (this.isCurrentMonth && !this.filter.query) {
|
} else if (this.isCurrentMonth && !this.filter.query) {
|
||||||
return this.events.filter(e => ((e.end_datetime ? e.end_datetime > now : e.start_datetime + 3 * 60 * 60 > now) && (this.filter.show_recurrent || !e.parentId)))
|
return this.events.filter(e => ((e.end_datetime ? e.end_datetime >= now : e.start_datetime + 3 * 60 * 60 >= now) && (this.filter.show_recurrent || !e.parentId)))
|
||||||
} else {
|
} else {
|
||||||
return this.events.filter(e => this.filter.show_recurrent || !e.parentId)
|
return this.events.filter(e => this.filter.show_recurrent || !e.parentId)
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue