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

Merge branch 'master' of framagit.org:/les/gancio into feat/allowgeoloc

Browse Source
This commit is contained in:
sedum
2022-10-18 16:45:42 +02:00
parent 0fb39b2c07 720ae7ed18
commit dfd9a3d3b9
21 changed files with 920 additions and 933 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pages/index.vue
View File

@@ -91,7 +91,7 @@ export default {
if (this.selectedDay) {
const min = dayjs.tz(this.selectedDay).startOf('day').unix()
const max = dayjs.tz(this.selectedDay).endOf('day').unix()
return this.events.filter(e => (e.start_datetime <= max && e.end_datetime >= min) && (this.show_recurrent || !e.parentId))
return this.events.filter(e => (e.start_datetime <= max && (e.end_datetime || e.start_datetime) >= min) && (this.show_recurrent || !e.parentId))
} else if (this.isCurrentMonth) {
return this.events.filter(e => ((e.end_datetime ? e.end_datetime > now : e.start_datetime + 2 * 60 * 60 > now) && (this.show_recurrent || !e.parentId)))
} else {