BUGFIX: scheduling multiple jobs after each other with the same time did not schedule correct
This commit is contained in:
parent
fed13e6ffb
commit
f361a71f73
|
@ -31,10 +31,11 @@ function initDeleteButtons() {
|
||||||
}
|
}
|
||||||
|
|
||||||
var selecttimedatepicker;
|
var selecttimedatepicker;
|
||||||
|
var datepickeroptions
|
||||||
function initTimepicker() {
|
function initTimepicker() {
|
||||||
extend(customDateFormat);
|
extend(customDateFormat);
|
||||||
let modal = document.querySelector('#run_selecttime');
|
let modal = document.querySelector('#run_selecttime');
|
||||||
let datepickeroptions = Utils.timepickerOptions;
|
datepickeroptions = Utils.timepickerOptions;
|
||||||
datepickeroptions.display.inline = true;
|
datepickeroptions.display.inline = true;
|
||||||
datepickeroptions.display.sideBySide = true;
|
datepickeroptions.display.sideBySide = true;
|
||||||
datepickeroptions.restrictions = {
|
datepickeroptions.restrictions = {
|
||||||
|
@ -55,18 +56,22 @@ function initRunButtons() {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
if(selecttimedatepicker.dates.lastPicked > maxdate) {
|
||||||
|
selecttimedatepicker.dispose();
|
||||||
|
selecttimedatepicker = new TempusDominus(document.querySelector('#selecttime_datepicker'), datepickeroptions);
|
||||||
|
}
|
||||||
selecttimedatepicker.updateOptions({
|
selecttimedatepicker.updateOptions({
|
||||||
restrictions: {
|
restrictions: {
|
||||||
maxDate: maxdate
|
maxDate: maxdate
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
selecttimedatepicker.viewDate = new DateTime();
|
|
||||||
var bsModal = new Modal('#run_selecttime');
|
var bsModal = new Modal('#run_selecttime');
|
||||||
bsModal.show();
|
bsModal.show();
|
||||||
|
|
||||||
let schedulefn = event => {
|
let schedulefn = event => {
|
||||||
bsModal.hide();
|
bsModal.hide();
|
||||||
let time = Math.floor(selecttimedatepicker.viewDate / 1000);
|
let time = Math.floor(selecttimedatepicker.dates.lastPicked / 1000);
|
||||||
run(me, time);
|
run(me, time);
|
||||||
}
|
}
|
||||||
let runnowfn = event => {
|
let runnowfn = event => {
|
||||||
|
|
Loading…
Reference in New Issue