Stuttgarter Termine haben jetzt nur ende wenn an Konstruktor übergeben
This commit is contained in:
parent
a89539c9bb
commit
f64ac02ec3
21
app.js
21
app.js
@ -193,23 +193,22 @@ var app = new Vue({
|
|||||||
day = moment(element.C);
|
day = moment(element.C);
|
||||||
}
|
}
|
||||||
if (element.hasOwnProperty('D') && moment(element.D, "HH:mm").isValid()) {
|
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 = {
|
var termin = {
|
||||||
datum: day.clone().hour(time.hour()).minute(time.minute()),
|
|
||||||
ende: end ? end.format("HH:mm"): null,
|
|
||||||
ort: element.H ? element.H.trim() : "",
|
ort: element.H ? element.H.trim() : "",
|
||||||
art: element.E ? element.E.trim() : "",
|
art: element.E ? element.E.trim() : "",
|
||||||
beschreibung: element.H ? element.H.trim(): "",
|
beschreibung: element.H ? element.H.trim(): "",
|
||||||
name: element.F ? element.F.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));
|
vm.addShift(new Shift(termin));
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user