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

Resolved blocked day scheduling issue in smart scheduling IO-478

Browse Source
This commit is contained in:
Patrick Fic
2020-12-16 21:35:44 -08:00
parent 42e519bd7e
commit eaf66a06b2
2 changed files with 20 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
server/graphql-client/queries.js
View File

@@ -198,6 +198,7 @@ query QUERY_UPCOMING_APPOINTMENTS($now: timestamptz!, $jobId: uuid!) {
start start
isintake isintake
id id
block
job { job {
joblines_aggregate { joblines_aggregate {
aggregate { aggregate {

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

@@ -68,20 +68,26 @@ exports.job = async (req, res) => {
//Populate the jobs scheduled to come in. //Populate the jobs scheduled to come in.
appointments.forEach((appointment) => { appointments.forEach((appointment) => {
const jobHrs = if (!appointment.block) {
appointment.job.joblines_aggregate.aggregate.sum.mod_lb_hrs; const jobHrs =
//Is the job in the same bucket? appointment.job.joblines_aggregate.aggregate.sum.mod_lb_hrs;
const appointmentBucket = ssbuckets.filter( //Is the job in the same bucket?
(bucket) => const appointmentBucket = ssbuckets.filter(
bucket.gte <= jobHrs && (!!bucket.lt ? bucket.lt > jobHrs : true) (bucket) =>
)[0]; bucket.gte <= jobHrs && (!!bucket.lt ? bucket.lt > jobHrs : true)
if (appointmentBucket.id === JobBucket.id) { )[0];
//Theyre the same classification. Add it to the matrix. if (appointmentBucket.id === JobBucket.id) {
//Theyre the same classification. Add it to the matrix.
const appDate = moment(appointment.start).format("yyyy-MM-DD");
bucketMatrix[appDate] = {
...bucketMatrix[appDate],
in: bucketMatrix[appDate].in + 1,
};
}
} else {
//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");
bucketMatrix[appDate] = { delete bucketMatrix[appDate];
...bucketMatrix[appDate],
in: bucketMatrix[appDate].in + 1,
};
} }
}); });
@@ -123,15 +129,6 @@ exports.job = async (req, res) => {
possibleDates.push(new Date(bmkey).toISOString().substr(0, 10)); possibleDates.push(new Date(bmkey).toISOString().substr(0, 10));
}); });
//Temp
// possibleDates.push(new Date());
// possibleDates.push(new Date());
// possibleDates.push(new Date());
// possibleDates.push(new Date());
// possibleDates.push(new Date());
//Get a list of upcoming appointments
//Get the config for each day
res.json(possibleDates); res.json(possibleDates);
} catch (error) { } catch (error) {
console.log("error", error); console.log("error", error);