From f64ac02ec396d3a3718a88c5fe894aba19781ec0 Mon Sep 17 00:00:00 2001 From: Christian Seyfferth Date: Wed, 16 Jan 2019 11:06:18 +0100 Subject: [PATCH] =?UTF-8?q?Stuttgarter=20Termine=20haben=20jetzt=20nur=20e?= =?UTF-8?q?nde=20wenn=20an=20Konstruktor=20=C3=BCbergeben?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app.js | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/app.js b/app.js index 14dd4e8..0c67038 100644 --- a/app.js +++ b/app.js @@ -193,23 +193,22 @@ var app = new Vue({ day = moment(element.C); } if (element.hasOwnProperty('D') && moment(element.D, "HH:mm").isValid()) { - var time = day.clone(); - var end = null; - if (typeof(element.D) === "object") { - time = moment(element.D); - } else if(element.D.indexOf("-") > -1 ) { - var tArray = element.D.split(" - "); - time = moment(tArray[0],"HH:mm"); - end = moment(tArray[1], "HH:mm"); - } var termin = { - datum: day.clone().hour(time.hour()).minute(time.minute()), - ende: end ? end.format("HH:mm"): null, ort: element.H ? element.H.trim() : "", art: element.E ? element.E.trim() : "", beschreibung: element.H ? element.H.trim(): "", name: element.F ? element.F.trim() : "" } + var time = day.clone(); + if (typeof(element.D) === "object") { + time = moment(element.D); + termin.datum = day.clone().hour(time.hour()).minute(time.minute()); + } else if(element.D.indexOf("-") > -1 ) { + var tArray = element.D.split(" - "); + time = moment(tArray[0],"HH:mm"); + termin.datum = day.clone().hour(time.hour()).minute(time.minute()); + termin.ende = moment(tArray[1], "HH:mm").format("HH:mm"); + } vm.addShift(new Shift(termin)); }