admin/bodyshop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

IO-1446 Smart Schedule Blocked Day Fixes

Browse Source
This commit is contained in:
Patrick Fic
2021-10-21 11:42:05 -07:00
parent da08fc74f1
commit 6bcb5f2af5
1 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
server/scheduling/scheduling-job.js
View File

@@ -87,7 +87,10 @@ exports.job = async (req, res) => {
} else { } else {
//remove the date from the possible list. //remove the date from the possible list.
const appDate = moment(appointment.start).format("yyyy-MM-DD"); const appDate = moment(appointment.start).format("yyyy-MM-DD");
delete bucketMatrix[appDate]; bucketMatrix[appDate] = {
...bucketMatrix[appDate],
blocked: true,
};
} }
}); });
@@ -125,7 +128,9 @@ exports.job = async (req, res) => {
const possibleDates = []; const possibleDates = [];
const bucketMatrixKeys = Object.keys(bucketMatrix); const bucketMatrixKeys = Object.keys(bucketMatrix);
bucketMatrixKeys.forEach((bmkey) => { bucketMatrixKeys.forEach((bmkey) => {
const isShopOpen = workingdays[dayOfWeekMapper(moment(bmkey).day())]; const isShopOpen =
workingdays[dayOfWeekMapper(moment(bmkey).day())] &&
!bucketMatrix[bmkey].blocked;
if ( if (
JobBucket.target > bucketMatrix[bmkey].in - bucketMatrix[bmkey].out && JobBucket.target > bucketMatrix[bmkey].in - bucketMatrix[bmkey].out &&
@@ -134,7 +139,11 @@ exports.job = async (req, res) => {
possibleDates.push(new Date(bmkey).toISOString().substr(0, 10)); possibleDates.push(new Date(bmkey).toISOString().substr(0, 10));
}); });
res.json(possibleDates); if (possibleDates.length < 6) {
res.json(possibleDates);
} else {
res.json(possibleDates.slice(0, 5));
}
} catch (error) { } catch (error) {
logger.log("smart-scheduling-error", "ERROR", req.user.email, jobId, { logger.log("smart-scheduling-error", "ERROR", req.user.email, jobId, {
error, error,