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

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

Browse Source 
IO-2162 Resolve display issues on scheduling modal .

Approved-by: Patrick Fic
This commit is contained in:
Patrick Fic
2023-02-06 18:09:14 +00:00
parent bb8024ba9c 8d22248f4b
commit 79e75a5e73
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
client/src/components/schedule-job-modal/schedule-job-modal.component.jsx
View File

@@ -201,7 +201,7 @@ export function ScheduleJobModalComponent({
{() => { {() => {
const values = form.getFieldsValue(); const values = form.getFieldsValue();
if (values.start) { if (values.start) {
calculateScheduleLoad(values.start); calculateScheduleLoad(moment(values.start).add(3, "days"));
} }
return ( return (
<div className="schedule-job-modal"> <div className="schedule-job-modal">

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

@@ -92,7 +92,7 @@ export function* calculateScheduleLoad({ payload: end }) {
code: "Job has no scheduled in date", code: "Job has no scheduled in date",
}); });
} }
if(!item.actual_completion && item.actual_in && !item.inproduction){ if (!item.actual_completion && item.actual_in && !item.inproduction) {
problemJobs.push({ problemJobs.push({
...item, ...item,
code: "Job has an actual in date, but no actual completion date and is not marked as in production", code: "Job has an actual in date, but no actual completion date and is not marked as in production",
@@ -207,7 +207,7 @@ export function* calculateScheduleLoad({ payload: end }) {
//Propagate the expected load to each day. //Propagate the expected load to each day.
const range = Math.round(moment.duration(end.diff(today)).asDays()); const range = Math.round(moment.duration(end.diff(today)).asDays()) + 1;
for (var day = 0; day < range; day++) { for (var day = 0; day < range; day++) {
const current = moment(today).add(day, "days").format("yyyy-MM-DD"); const current = moment(today).add(day, "days").format("yyyy-MM-DD");
const prev = moment(today) const prev = moment(today)