fix end_datetime
This commit is contained in:
@@ -83,7 +83,10 @@ export default {
|
||||
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))
|
||||
} 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 => {
|
||||
const max_datetime = Math.max(e.start_datetime, e.end_datetime)
|
||||
return (e.end_datetime ? max_datetime >= now : e.start_datetime + 3 * 60 * 60 >= now) && (this.filter.show_recurrent || !e.parentId)
|
||||
})
|
||||
} else {
|
||||
return this.events.filter(e => this.filter.show_recurrent || !e.parentId)
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user