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

fix recurrent events

Browse Source
This commit is contained in:
lesion
2022-08-14 14:40:41 +02:00
parent cc464d9e2c
commit e75d68321f
2 changed files with 20 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pages/export.vue
View File

@@ -113,7 +113,7 @@ export default {
theme: $store.state.settings['theme.is_dark'] ? 'dark' : 'light', theme: $store.state.settings['theme.is_dark'] ? 'dark' : 'light',
sidebar: 'true' sidebar: 'true'
}, },
filters: { tags: [], places: [], show_recurrent: false }, filters: { tags: [], places: [], show_recurrent: $store.state.settings.recurrent_event_visible },
events: [] events: []
} }
}, },

27
pages/index.vue
View File

@@ -16,7 +16,17 @@ v-container.pa-0
.col.pt-0.pt-md-2.mt-4.ma-md-0.pb-0 .col.pt-0.pt-md-2.mt-4.ma-md-0.pb-0
//- v-btn(to='/search' color='primary' ) {{$t('common.search')}} //- v-btn(to='/search' color='primary' ) {{$t('common.search')}}
v-form(to='/search' action='/search' method='GET') v-form(to='/search' action='/search' method='GET')
v-text-field(name='search' :label='$t("common.search")' outlined rounded hide-details :append-icon='mdiMagnify') v-col(cols=12)
v-switch(
v-if='settings.allow_recurrent_event'
v-model='show_recurrent'
inset color='primary'
hide-details
:label="$t('event.show_recurrent')")
v-col.mb-4(cols=12)
v-text-field(name='search' :label='$t("common.search")' outlined rounded hide-details :append-icon='mdiMagnify')
v-chip(v-if='selectedDay' close :close-icon='mdiCloseCircle' @click:close='dayChange()') {{selectedDay}}
//- Events //- Events
#events.mb-2.mt-1.pl-1.pl-sm-2 #events.mb-2.mt-1.pl-1.pl-sm-2
@@ -29,7 +39,7 @@ import dayjs from 'dayjs'
import Event from '@/components/Event' import Event from '@/components/Event'
import Announcement from '@/components/Announcement' import Announcement from '@/components/Announcement'
import Calendar from '@/components/Calendar' import Calendar from '@/components/Calendar'
import { mdiMagnify } from '@mdi/js' import { mdiMagnify, mdiCloseCircle } from '@mdi/js'
export default { export default {
name: 'Index', name: 'Index',
@@ -43,9 +53,9 @@ export default {
}) })
return { events } return { events }
}, },
data () { data ({ $store }) {
return { return {
mdiMagnify, mdiMagnify, mdiCloseCircle,
first: true, first: true,
isCurrentMonth: true, isCurrentMonth: true,
now: dayjs().unix(), now: dayjs().unix(),
@@ -53,7 +63,8 @@ export default {
events: [], events: [],
start: dayjs().startOf('month').unix(), start: dayjs().startOf('month').unix(),
end: null, end: null,
selectedDay: null selectedDay: null,
show_recurrent: $store.state.settings.recurrent_event_visible
} }
}, },
head () { head () {
@@ -80,11 +91,11 @@ export default {
if (this.selectedDay) { if (this.selectedDay) {
const min = dayjs.tz(this.selectedDay).startOf('day').unix() const min = dayjs.tz(this.selectedDay).startOf('day').unix()
const max = dayjs.tz(this.selectedDay).endOf('day').unix() const max = dayjs.tz(this.selectedDay).endOf('day').unix()
return this.events.filter(e => (e.start_datetime <= max && e.end_datetime >= min)) return this.events.filter(e => (e.start_datetime <= max && e.end_datetime >= min) && (this.show_recurrent || !e.parentId))
} else if (this.isCurrentMonth) { } else if (this.isCurrentMonth) {
return this.events.filter(e => e.end_datetime ? e.end_datetime > now : e.start_datetime + 2 * 60 * 60 > now) 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 { } else {
return this.events return this.events.filter(e => this.show_recurrent || !e.parentId)
} }
} }
}, },