diff --git a/server/scheduling/scheduling-job.js b/server/scheduling/scheduling-job.js index 24b5577b0..95091e8e7 100644 --- a/server/scheduling/scheduling-job.js +++ b/server/scheduling/scheduling-job.js @@ -111,10 +111,9 @@ exports.job = async (req, res) => { } if ( - moment(item.actual_completion || item.scheduled_completion).tz(timezone).isBefore( - moment().tz(timezone), - "day" - ) + moment(item.actual_completion || item.scheduled_completion) + .tz(timezone) + .isBefore(moment().tz(timezone), "day") ) { console.log("Job should have already gone. Ignoring it.", item); return; @@ -128,7 +127,9 @@ exports.job = async (req, res) => { } else { const itemDate = moment( item.actual_completion || item.scheduled_completion - ).tz(timezone).format("yyyy-MM-DD"); + ) + .tz(timezone) + .format("yyyy-MM-DD"); if (!!load[itemDate]) { load[itemDate].hoursOut = (load[itemDate].hoursOut || 0) + @@ -153,14 +154,20 @@ exports.job = async (req, res) => { const end = moment.max([ ...filteredArrJobs.map((a) => moment(a.scheduled_in).tz(timezone)), ...filteredCompJobs - .map((p) => moment(p.actual_completion || p.scheduled_completion).tz(timezone)) + .map((p) => + moment(p.actual_completion || p.scheduled_completion).tz(timezone) + ) .filter((p) => p.isValid() && p.isAfter(yesterday)), moment().tz(timezone).add(15, "days"), ]); const range = Math.round(moment.duration(end.diff(today)).asDays()); for (var day = 0; day < range; day++) { - const current = moment(today).tz(timezone).add(day, "days").format("yyyy-MM-DD"); - const prev = moment(today).tz(timezone) + const current = moment(today) + .tz(timezone) + .add(day, "days") + .format("yyyy-MM-DD"); + const prev = moment(today) + .tz(timezone) .add(day - 1, "days") .format("yyyy-MM-DD"); if (!!!load[current]) { @@ -204,7 +211,7 @@ exports.job = async (req, res) => { loadKeys.forEach((loadKey) => { const isShopOpen = - (workingdays[dayOfWeekMapper(moment(loadKey).tz(timezone).day())] || false) && + (workingdays[dayOfWeekMapper(moment(loadKey).day())] || false) && !load[loadKey].blocked; if (