IO-2753 Parts Order/Return Quantity restrict to above 0

Signed-off-by: Allan Carr <allan.carr@thinkimex.com>

client/src/components/parts-order-modal/parts-order-modal.component.jsx

@@ -1,17 +1,17 @@
-import { DeleteFilled, WarningFilled, DownOutlined } from "@ant-design/icons";
+import { DeleteFilled, DownOutlined, WarningFilled } from "@ant-design/icons";
 import { useTreatments } from "@splitsoftware/splitio-react";
 import {
+  Checkbox,
   Divider,
+  Dropdown,
   Form,
   Input,
   InputNumber,
+  Menu,
   Radio,
+  Select,
   Space,
   Tag,
-  Select,
-  Menu,
-  Dropdown,
-  Checkbox,
 } from "antd";
 import React from "react";
 import { useTranslation } from "react-i18next";
@@ -255,7 +255,7 @@ export function PartsOrderModalComponent({
                           },
                         ]}
                       >
-                        <InputNumber />
+                        <InputNumber min={1} />
                       </Form.Item>
                       <Form.Item
                         label={t("parts_orders.fields.act_price")}

client/src/components/schedule-calendar-wrapper/schedule-calendar-header.component.js

@@ -1,5 +1,5 @@
 import Icon from "@ant-design/icons";
-import { Popover, Space } from "antd";
+import { Popover } from "antd";
 import _ from "lodash";
 import moment from "moment";
 import React, { useMemo } from "react";
@@ -69,22 +69,19 @@ export function ScheduleCalendarHeaderComponent({
           {loadData && loadData.allJobsOut ? (
             loadData.allJobsOut.map((j) => (
               <tr key={j.id}>
-                <td style={{ padding: "2.5px" }}>
-                  <Link to={`/manage/jobs/${j.id}`}>{j.ro_number}</Link> (
-                  {j.status})
+                <td>
+                  <Link to={`/manage/jobs/${j.id}`}>{j.ro_number}</Link>
                 </td>
-                <td style={{ padding: "2.5px" }}>
+                <td>
                   <OwnerNameDisplay ownerObject={j} />
                 </td>
-                <td style={{ padding: "2.5px" }}>
-                  {`(${j.labhrs.aggregate.sum.mod_lb_hrs.toFixed(
-                    1
-                  )}/${j.larhrs.aggregate.sum.mod_lb_hrs.toFixed(1)}/${(
+                <td>
+                  {`(${(
                     j.labhrs.aggregate.sum.mod_lb_hrs +
                     j.larhrs.aggregate.sum.mod_lb_hrs
                   ).toFixed(1)} ${t("general.labels.hours")})`}
                 </td>
-                <td style={{ padding: "2.5px" }}>
+                <td>
                   <DateTimeFormatter>
                     {j.scheduled_completion}
                   </DateTimeFormatter>
@@ -93,9 +90,7 @@ export function ScheduleCalendarHeaderComponent({
             ))
           ) : (
             <tr>
-              <td style={{ padding: "2.5px" }}>
-                {t("appointments.labels.nocompletingjobs")}
-              </td>
+              <td>{t("appointments.labels.nocompletingjobs")}</td>
             </tr>
           )}
         </tbody>
@@ -110,30 +105,27 @@ export function ScheduleCalendarHeaderComponent({
           {loadData && loadData.allJobsIn ? (
             loadData.allJobsIn.map((j) => (
               <tr key={j.id}>
-                <td style={{ padding: "2.5px" }}>
+                <td>
                   <Link to={`/manage/jobs/${j.id}`}>{j.ro_number}</Link>
+                  {j.status}
                 </td>
-                <td style={{ padding: "2.5px" }}>
+                <td>
                   <OwnerNameDisplay ownerObject={j} />
                 </td>
-                <td style={{ padding: "2.5px" }}>
-                  {`(${j.labhrs.aggregate.sum.mod_lb_hrs.toFixed(
-                    1
-                  )}/${j.larhrs.aggregate.sum.mod_lb_hrs.toFixed(1)}/${(
+                <td>
+                  {`(${(
                     j.labhrs.aggregate.sum.mod_lb_hrs +
                     j.larhrs.aggregate.sum.mod_lb_hrs
                   ).toFixed(1)} ${t("general.labels.hours")})`}
                 </td>
-                <td style={{ padding: "2.5px" }}>
+                <td>
                   <DateTimeFormatter>{j.scheduled_in}</DateTimeFormatter>
                 </td>
               </tr>
             ))
           ) : (
             <tr>
-              <td style={{ padding: "2.5px" }}>
-                {t("appointments.labels.noarrivingjobs")}
-              </td>
+              <td>{t("appointments.labels.noarrivingjobs")}</td>
             </tr>
           )}
         </tbody>
@@ -144,32 +136,25 @@ export function ScheduleCalendarHeaderComponent({
   const LoadComponent = loadData ? (
     <div>
       <div className="imex-flex-row imex-flex-row__flex-space-around">
-        <Space>
-          <Popover
-            placement={"bottom"}
-            content={jobsInPopup}
-            trigger="hover"
-            title={t("appointments.labels.arrivingjobs")}
-          >
-            <Icon component={MdFileDownload} style={{ color: "green" }} />
-            {(loadData.allHoursInBody || 0) &&
-              loadData.allHoursInBody.toFixed(1)}
-            /
-            {(loadData.allHoursInRefinish || 0) &&
-              loadData.allHoursInRefinish.toFixed(1)}
-            /{(loadData.allHoursIn || 0) && loadData.allHoursIn.toFixed(1)}
-          </Popover>
-          <Popover
-            placement={"bottom"}
-            content={jobsOutPopup}
-            trigger="hover"
-            title={t("appointments.labels.completingjobs")}
-          >
-            <Icon component={MdFileUpload} style={{ color: "red" }} />
-            {(loadData.allHoursOut || 0) && loadData.allHoursOut.toFixed(1)}
-          </Popover>
-          <ScheduleCalendarHeaderGraph loadData={loadData} />
-        </Space>
+        <Popover
+          placement={"bottom"}
+          content={jobsInPopup}
+          trigger="hover"
+          title={t("appointments.labels.arrivingjobs")}
+        >
+          <Icon component={MdFileDownload} style={{ color: "green" }} />
+          {(loadData.allHoursIn || 0) && loadData.allHoursIn.toFixed(2)}
+        </Popover>
+        <Popover
+          placement={"bottom"}
+          content={jobsOutPopup}
+          trigger="hover"
+          title={t("appointments.labels.completingjobs")}
+        >
+          <Icon component={MdFileUpload} style={{ color: "red" }} />
+          {(loadData.allHoursOut || 0) && loadData.allHoursOut.toFixed(2)}
+        </Popover>
+        <ScheduleCalendarHeaderGraph loadData={loadData} />
       </div>
       <div>
         <ul style={{ listStyleType: "none", columns: "2 auto", padding: 0 }}>

client/src/redux/application/application.sagas.js

@@ -131,12 +131,7 @@ 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.
@@ -147,12 +142,6 @@ 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].hoursInBody =
-            (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] = {
@@ -163,18 +152,10 @@ 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,
         };
       }
     });
@@ -198,12 +179,6 @@ 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);
@@ -214,12 +189,6 @@ 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] = {
@@ -232,8 +201,6 @@ 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,
         };
       }
     });