This commit is contained in:
lesion
2023-02-18 00:04:28 +01:00
parent 80d2dbd06b
commit bb9f7cca47
4 changed files with 15 additions and 15 deletions

View File

@@ -74,7 +74,6 @@ import dayjs from 'dayjs'
import { mdiFileImport, mdiFormatTitle, mdiTagMultiple, mdiCloseCircle } from '@mdi/js'
import List from '@/components/List'
import Editor from '@/components/Editor'
import ImportDialog from '@/components/ImportDialog'
import MediaInput from '@/components/MediaInput'
@@ -84,7 +83,6 @@ import DateInput from '@/components/DateInput'
export default {
name: 'NewEvent',
components: {
List,
Editor,
ImportDialog,
MediaInput,
@@ -125,8 +123,8 @@ export default {
data.event.place.name = event.place.name
data.event.place.address = event.place.address || ''
const from = dayjs.unix(event.start_datetime)
const due = event.end_datetime && dayjs.unix(event.end_datetime)
const from = dayjs.unix(event.start_datetime).tz()
const due = event.end_datetime && dayjs.unix(event.end_datetime).tz()
data.date = {
recurrent: event.recurrent,
from: from.toDate(),
@@ -161,7 +159,6 @@ export default {
},
tags: [],
page: { month, year },
fileList: [],
id: null,
date: { from: null, due: null, recurrent: null },
edit: false,
@@ -240,12 +237,12 @@ export default {
formData.append('description', this.event.description)
formData.append('multidate', !!this.date.multidate)
let [hour, minute] = this.date.fromHour.split(':')
formData.append('start_datetime', dayjs(this.date.from).hour(Number(hour)).minute(Number(minute)).second(0).unix())
formData.append('start_datetime', dayjs(this.date.from).hour(Number(hour)).minute(Number(minute)).second(0).tz().unix())
if (this.date.dueHour) {
[hour, minute] = this.date.dueHour.split(':')
formData.append('end_datetime', dayjs(this.date.due).hour(Number(hour)).minute(Number(minute)).second(0).unix())
formData.append('end_datetime', dayjs(this.date.due).hour(Number(hour)).minute(Number(minute)).second(0).tz().unix())
} else if (!!this.date.multidate) {
formData.append('end_datetime', dayjs(this.date.due).hour(24).minute(0).second(0).unix())
formData.append('end_datetime', dayjs(this.date.due).hour(24).minute(0).second(0).tz().unix())
}
if (this.edit) {