From f361a71f73a9f516d1edee932dfa88af6265c7fd Mon Sep 17 00:00:00 2001 From: Jeroen De Meerleer Date: Mon, 22 May 2023 11:46:40 +0200 Subject: [PATCH] BUGFIX: scheduling multiple jobs after each other with the same time did not schedule correct --- assets/js/job/index.js | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/assets/js/job/index.js b/assets/js/job/index.js index c38048d..2f7b52e 100644 --- a/assets/js/job/index.js +++ b/assets/js/job/index.js @@ -31,10 +31,11 @@ function initDeleteButtons() { } var selecttimedatepicker; +var datepickeroptions function initTimepicker() { extend(customDateFormat); let modal = document.querySelector('#run_selecttime'); - let datepickeroptions = Utils.timepickerOptions; + datepickeroptions = Utils.timepickerOptions; datepickeroptions.display.inline = true; datepickeroptions.display.sideBySide = true; datepickeroptions.restrictions = { @@ -55,18 +56,22 @@ function initRunButtons() { return; } } + if(selecttimedatepicker.dates.lastPicked > maxdate) { + selecttimedatepicker.dispose(); + selecttimedatepicker = new TempusDominus(document.querySelector('#selecttime_datepicker'), datepickeroptions); + } selecttimedatepicker.updateOptions({ restrictions: { maxDate: maxdate } }) - selecttimedatepicker.viewDate = new DateTime(); + var bsModal = new Modal('#run_selecttime'); bsModal.show(); let schedulefn = event => { bsModal.hide(); - let time = Math.floor(selecttimedatepicker.viewDate / 1000); + let time = Math.floor(selecttimedatepicker.dates.lastPicked / 1000); run(me, time); } let runnowfn = event => {