NoLog.cz/gancio
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity

fix end_datetime

Browse source
This commit is contained in:
lesion 2023-05-11 22:28:15 +02:00
parent 184896bff8
commit 10d8eb0107
No known key found for this signature in database
GPG key ID: 352918250B012177
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pages/add/_edit.vue
View file

@ -249,7 +249,7 @@ export default {
if (!!this.date.multidate) {
formData.append('end_datetime', this.$time.fromDateInput(this.date.due, this.date.dueHour || '23:59'))
} else if (this.date.dueHour) {
formData.append('end_datetime', this.$time.fromDateInput(this.date.from, this.date.dueHour))
formData.append('end_datetime', this.$time.fromDateInput(this.date.due, this.date.dueHour))
}
if (this.edit) {

5
pages/index.vue
View file

@ -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)
}