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

Merged in release/2023-02-03 (pull request #664)

Browse Source 
release/2023-02-03

Approved-by: Patrick Fic
This commit is contained in:
Patrick Fic
2023-02-02 18:42:40 +00:00
parent 599f4e143c 20e84668a5
commit 5371657aa4
1 changed files with 2 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -112,12 +112,7 @@ export function* calculateScheduleLoad({ payload: end }) {
"yyyy-MM-DD"
);
const AddJobForSchedulingCalc =
!item.inproduction &&
!moment(item.actual_completion || item.scheduled_completion).isSame(
moment(item.actual_in || item.scheduled_in),
"day"
);
const AddJobForSchedulingCalc = !item.inproduction;
if (!!load[itemDate]) {
load[itemDate].allHoursIn =
@@ -160,13 +155,7 @@ export function* calculateScheduleLoad({ payload: end }) {
const inProdJobs = prodJobs.find((p) => p.id === item.id);
const inArrJobs = arrJobs.find((p) => p.id === item.id);
const AddJobForSchedulingCalc =
item.inproduction &&
!moment(item.actual_completion || item.scheduled_completion).isSame(
moment(item.scheduled_in),
"day"
) &&
(inProdJobs || inArrJobs);
const AddJobForSchedulingCalc = inProdJobs || inArrJobs;
const itemDate = moment(
item.actual_completion || item.scheduled_completion