diff --git a/client/src/components/schedule-calendar-wrapper/schedule-calendar-header.component.js b/client/src/components/schedule-calendar-wrapper/schedule-calendar-header.component.js
index 732bcc2c2..96ef73a56 100644
--- a/client/src/components/schedule-calendar-wrapper/schedule-calendar-header.component.js
+++ b/client/src/components/schedule-calendar-wrapper/schedule-calendar-header.component.js
@@ -1,5 +1,5 @@
import Icon from "@ant-design/icons";
-import { Popover } from "antd";
+import { Popover, Space } from "antd";
import _ from "lodash";
import moment from "moment";
import React, { useMemo } from "react";
@@ -69,19 +69,22 @@ export function ScheduleCalendarHeaderComponent({
{loadData && loadData.allJobsOut ? (
loadData.allJobsOut.map((j) => (
- |
- {j.ro_number}
+ |
+ {j.ro_number} (
+ {j.status})
|
-
+ |
|
-
- {`(${(
+ |
+ {`(${j.labhrs.aggregate.sum.mod_lb_hrs.toFixed(
+ 1
+ )}/${j.larhrs.aggregate.sum.mod_lb_hrs.toFixed(1)}/${(
j.labhrs.aggregate.sum.mod_lb_hrs +
j.larhrs.aggregate.sum.mod_lb_hrs
).toFixed(1)} ${t("general.labels.hours")})`}
|
-
+ |
{j.scheduled_completion}
@@ -90,7 +93,9 @@ export function ScheduleCalendarHeaderComponent({
))
) : (
|
- | {t("appointments.labels.nocompletingjobs")} |
+
+ {t("appointments.labels.nocompletingjobs")}
+ |
)}
@@ -105,27 +110,30 @@ export function ScheduleCalendarHeaderComponent({
{loadData && loadData.allJobsIn ? (
loadData.allJobsIn.map((j) => (
- |
+ |
{j.ro_number}
- {j.status}
|
-
+ |
|
-
- {`(${(
+ |
+ {`(${j.labhrs.aggregate.sum.mod_lb_hrs.toFixed(
+ 1
+ )}/${j.larhrs.aggregate.sum.mod_lb_hrs.toFixed(1)}/${(
j.labhrs.aggregate.sum.mod_lb_hrs +
j.larhrs.aggregate.sum.mod_lb_hrs
).toFixed(1)} ${t("general.labels.hours")})`}
|
-
+ |
{j.scheduled_in}
|
))
) : (
- | {t("appointments.labels.noarrivingjobs")} |
+
+ {t("appointments.labels.noarrivingjobs")}
+ |
)}
@@ -136,25 +144,32 @@ export function ScheduleCalendarHeaderComponent({
const LoadComponent = loadData ? (
-
-
- {(loadData.allHoursIn || 0) && loadData.allHoursIn.toFixed(2)}
-
-
-
- {(loadData.allHoursOut || 0) && loadData.allHoursOut.toFixed(2)}
-
-
+
+
+
+ {(loadData.allHoursInBody || 0) &&
+ loadData.allHoursInBody.toFixed(1)}
+ /
+ {(loadData.allHoursInRefinish || 0) &&
+ loadData.allHoursInRefinish.toFixed(1)}
+ /{(loadData.allHoursIn || 0) && loadData.allHoursIn.toFixed(1)}
+
+
+
+ {(loadData.allHoursOut || 0) && loadData.allHoursOut.toFixed(1)}
+
+
+
diff --git a/client/src/redux/application/application.sagas.js b/client/src/redux/application/application.sagas.js
index dc907da74..ff6cb91b0 100644
--- a/client/src/redux/application/application.sagas.js
+++ b/client/src/redux/application/application.sagas.js
@@ -131,7 +131,12 @@ export function* calculateScheduleLoad({ payload: end }) {
(load[itemDate].allHoursIn || 0) +
item.labhrs.aggregate.sum.mod_lb_hrs +
item.larhrs.aggregate.sum.mod_lb_hrs;
-
+ load[itemDate].allHoursInBody =
+ (load[itemDate].allHoursInBody || 0) +
+ item.labhrs.aggregate.sum.mod_lb_hrs;
+ load[itemDate].allHoursInRefinish =
+ (load[itemDate].allHoursInRefinish || 0) +
+ item.larhrs.aggregate.sum.mod_lb_hrs;
//If the job hasn't already arrived, add it to the jobs in list.
// Make sure it also hasn't already been completed, or isn't an in and out job.
//This prevents the duplicate counting.
@@ -142,6 +147,12 @@ export function* calculateScheduleLoad({ payload: end }) {
(load[itemDate].hoursIn || 0) +
item.labhrs.aggregate.sum.mod_lb_hrs +
item.larhrs.aggregate.sum.mod_lb_hrs;
+ load[itemDate].hoursInBoyd =
+ (load[itemDate].hoursInBody || 0) +
+ item.labhrs.aggregate.sum.mod_lb_hrs;
+ load[itemDate].hoursInRefinish =
+ (load[itemDate].hoursInRefinish || 0) +
+ item.larhrs.aggregate.sum.mod_lb_hrs;
}
} else {
load[itemDate] = {
@@ -152,10 +163,18 @@ export function* calculateScheduleLoad({ payload: end }) {
allHoursIn:
item.labhrs.aggregate.sum.mod_lb_hrs +
item.larhrs.aggregate.sum.mod_lb_hrs,
+ allHoursInBody: item.labhrs.aggregate.sum.mod_lb_hrs,
+ allHoursInRefinish: item.larhrs.aggregate.sum.mod_lb_hrs,
hoursIn: AddJobForSchedulingCalc
? item.labhrs.aggregate.sum.mod_lb_hrs +
item.larhrs.aggregate.sum.mod_lb_hrs
: 0,
+ hoursInBody: AddJobForSchedulingCalc
+ ? item.labhrs.aggregate.sum.mod_lb_hrs
+ : 0,
+ hoursInRefinish: AddJobForSchedulingCalc
+ ? item.larhrs.aggregate.sum.mod_lb_hrs
+ : 0,
};
}
});
@@ -179,6 +198,12 @@ export function* calculateScheduleLoad({ payload: end }) {
(load[itemDate].allHoursOut || 0) +
item.labhrs.aggregate.sum.mod_lb_hrs +
item.larhrs.aggregate.sum.mod_lb_hrs;
+ load[itemDate].allHoursOutBody =
+ (load[itemDate].allHoursOutBody || 0) +
+ item.labhrs.aggregate.sum.mod_lb_hrs;
+ load[itemDate].allHoursOutRefinish =
+ (load[itemDate].allHoursOutRefinish || 0) +
+ item.larhrs.aggregate.sum.mod_lb_hrs;
//Add only the jobs that are still in production to get rid of.
//If it's not in production, we'd subtract unnecessarily.
load[itemDate].allJobsOut.push(item);
@@ -189,6 +214,12 @@ export function* calculateScheduleLoad({ payload: end }) {
(load[itemDate].hoursOut || 0) +
item.labhrs.aggregate.sum.mod_lb_hrs +
item.larhrs.aggregate.sum.mod_lb_hrs;
+ load[itemDate].hoursOutBody =
+ (load[itemDate].hoursOutBody || 0) +
+ item.labhrs.aggregate.sum.mod_lb_hrs;
+ load[itemDate].hoursOutRefinish =
+ (load[itemDate].hoursOutRefinish || 0) +
+ item.larhrs.aggregate.sum.mod_lb_hrs;
}
} else {
load[itemDate] = {
@@ -201,6 +232,8 @@ export function* calculateScheduleLoad({ payload: end }) {
allHoursOut:
item.labhrs.aggregate.sum.mod_lb_hrs +
item.larhrs.aggregate.sum.mod_lb_hrs,
+ allHoursOutBody: item.labhrs.aggregate.sum.mod_lb_hrs,
+ allHoursOutRefinish: item.larhrs.aggregate.sum.mod_lb_hrs,
};
}
});