From aa123eea63124a268be43254f5298428c92af895 Mon Sep 17 00:00:00 2001 From: Christian Hofmaier Date: Fri, 19 Apr 2019 13:20:43 +0000 Subject: [eventmanager + configloader] safe time string instead of unix timestamp --- webapp/src/components/EventModuleEdit.vue | 52 ++++++++++++++----------------- 1 file changed, 24 insertions(+), 28 deletions(-) (limited to 'webapp') diff --git a/webapp/src/components/EventModuleEdit.vue b/webapp/src/components/EventModuleEdit.vue index 207b378..b2c1f8a 100644 --- a/webapp/src/components/EventModuleEdit.vue +++ b/webapp/src/components/EventModuleEdit.vue @@ -476,22 +476,24 @@ export default { this.times = value.info.times ? JSON.parse(value.info.times) : {} this.repetitiveEvent = this.times.repetitive || false + var start + var end if (this.repetitiveEvent) { // edit of repetitive event - this.startDate = new Date(this.times.startDate * 1000) - this.startDate = this.formatDate(this.startDate, { time: false }) - this.endDate = new Date(this.times.endDate * 1000) - this.endDate = this.formatDate(this.endDate, { time: false }) - this.startTime = this.times.startTime - this.endTime = this.times.endTime + start = this.times.start.split(' ') + end = this.times.end.split(' ') + this.startDate = start[0] + this.endDate = end[0] + this.startTime = start[1] + this.endTime = end[1] } else if (value.info.times) { // edit of non repetitive event - var start = new Date(this.times.start * 1000) - var end = new Date(this.times.end * 1000) - this.startDate = this.formatDate(start, { time: false }) - this.endDate = this.formatDate(end, { time: false }) - this.startTime = this.formatDate(start, { date: false, seconds: false }) - this.endTime = this.formatDate(end, { date: false, seconds: false }) + start = this.times.start.split(' ') + end = this.times.end.split(' ') + this.startDate = start[0] + this.endDate = end[0] + this.startTime = start[1] + this.endTime = end[1] } else { // create new event this.startDate = this.formatDate(new Date(), { time: false }) @@ -561,33 +563,27 @@ export default { async submit (event) { if (this.$refs.form.validate()) { // Build times object + var start + var end if (this.repetitiveEvent) { - var startD = new Date(this.startDate) - var endD = new Date(this.endDate) + start = this.startDate + ' ' + this.startTime + end = this.endDate + ' ' + this.endTime this.times = { 'repetitive': true, - 'startDate': (startD.getTime() / 1000), - 'endDate': (endD.getTime() / 1000), - 'startTime': this.startTime, - 'endTime': this.endTime, + 'start': start, + 'end': end, 'dayMap': this.dayMap, 'monthMap': this.monthMap, 'interval': this.interval, 'intervalType': this.intervalType } } else { - var start = new Date(this.startDate) - var startSplit = this.startTime.split(':') - start.setHours(startSplit[0]) - start.setMinutes(startSplit[1]) - var end = new Date(this.endDate) - var endSplit = this.endTime.split(':') - end.setHours(endSplit[0]) - end.setMinutes(endSplit[1]) + start = this.startDate + ' ' + this.startTime + end = this.endDate + ' ' + this.endTime this.times = { 'repetitive': false, - 'start': (start.getTime() / 1000), - 'end': (end.getTime() / 1000) + 'start': start, + 'end': end } } await this.loadChilds() -- cgit v1.2.3-55-g7522