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

Merged in release/2022-01-07 (pull request #337)

Browse Source 
release/2022-01-07

Approved-by: Patrick Fic
This commit is contained in:
Patrick Fic
2022-01-07 18:01:34 +00:00
parent 25b236072e adc48f50d7
commit 675ccff3ce
3 changed files with 51 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
client/src/redux/application/application.sagas.js
View File

@@ -76,17 +76,35 @@ export function* calculateScheduleLoad({ payload: end }) {
let problemJobs = []; let problemJobs = [];
compJobs.forEach((item) => { compJobs.forEach((item) => {
if (!item.scheduled_completion) if (!(item.actual_completion || item.scheduled_completion))
console.log("JOB HAS NO SCHEDULED COMPLETION DATE.", item); console.log("JOB HAS NO COMPLETION DATE.", item);
const inProdJobs = prodJobs.find((p) => p.id === item.id); const inProdJobs = prodJobs.find((p) => p.id === item.id);
const inArrJobs = arrJobs.find((p) => p.id === item.id); const inArrJobs = arrJobs.find((p) => p.id === item.id);
if ( if (!(inProdJobs || inArrJobs)) {
!(inProdJobs || inArrJobs) && //Job isn't found in production or coming in.
!moment(item.scheduled_completion).isSame(moment(), "day") //is it going today or scheduled to go today?
) { if (
// NOT FOUND! moment(item.actual_completion || item.scheduled_completion).isSame(
moment(),
"day"
)
) {
console.log("Job is going today anyways, ignore it.", item);
return;
}
if (
moment(item.actual_completion || item.scheduled_completion).isBefore(
moment(),
"day"
)
) {
console.log("Job should have already gone. Ignoring it.", item);
return;
}
problemJobs.push({ problemJobs.push({
...item, ...item,
code: "Job is scheduled for completion, but it is not marked in production nor is it an arriving job in this period. Check the scheduled in and completion dates", code: "Job is scheduled for completion, but it is not marked in production nor is it an arriving job in this period. Check the scheduled in and completion dates",
@@ -94,7 +112,9 @@ export function* calculateScheduleLoad({ payload: end }) {
return; return;
} }
const itemDate = moment(item.scheduled_completion).format("yyyy-MM-DD"); const itemDate = moment(
item.actual_completion || item.scheduled_completion
).format("yyyy-MM-DD");
if (!!load[itemDate]) { if (!!load[itemDate]) {
load[itemDate].hoursOut = load[itemDate].hoursOut =
(load[itemDate].hoursOut || 0) + (load[itemDate].hoursOut || 0) +

2
server/cdk/cdk-calculate-allocations.js
View File

@@ -89,7 +89,7 @@ exports.default = async function (socket, jobid) {
acc[val.profitcenter_part] = acc[val.profitcenter_part] =
acc[val.profitcenter_part].add(DineroAmount); acc[val.profitcenter_part].add(DineroAmount);
} }
if (val.profitcenter_labor) { if (val.profitcenter_labor && val.mod_lbr_ty) {
//Check the Labor Assignment. //Check the Labor Assignment.
if (!acc[val.profitcenter_labor]) if (!acc[val.profitcenter_labor])

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

@@ -96,14 +96,28 @@ exports.job = async (req, res) => {
const inProdJobs = filteredProdJobsList.find((p) => p.id === item.id); const inProdJobs = filteredProdJobsList.find((p) => p.id === item.id);
const inArrJobs = filteredArrJobs.find((p) => p.id === item.id); const inArrJobs = filteredArrJobs.find((p) => p.id === item.id);
if ( if (!(inProdJobs || inArrJobs)) {
!(inProdJobs || inArrJobs) && //Job isn't found in production or coming in.
!moment(item.actual_completion || item.scheduled_completion).isSame( //is it going today or scheduled to go today?
moment(), if (
"day" moment(item.actual_completion || item.scheduled_completion).isSame(
) moment(),
) { "day"
// NOT FOUND! )
) {
console.log("Job is going today anyways, ignore it.", item);
return;
}
if (
moment(item.actual_completion || item.scheduled_completion).isBefore(
moment(),
"day"
)
) {
console.log("Job should have already gone. Ignoring it.", item);
return;
}
console.log("PROBLEM JOB", item); console.log("PROBLEM JOB", item);
problemJobs.push({ problemJobs.push({
...item, ...item,