Merged in master (pull request #677)

Integrate master into USA branch.

client/src/components/job-lines-preset-button/job-lines-preset-button.component.jsx

@@ -22,9 +22,20 @@ export function JoblinePresetButton({ bodyshop, form }) {
   };
 
   const menu = (
-    <Menu>
+    <Menu
+      style={{
+        columnCount: Math.max(
+          Math.floor(bodyshop.md_jobline_presets.length / 15),
+          1
+        ),
+      }}
+    >
       {bodyshop.md_jobline_presets.map((i, idx) => (
-        <Menu.Item onClick={() => handleSelect(i)}  key={idx}>
+        <Menu.Item
+          onClick={() => handleSelect(i)}
+          key={idx}
+          style={{ breakInside: "avoid" }}
+        >
           {i.label}
         </Menu.Item>
       ))}

client/src/components/owner-detail-jobs/owner-detail-jobs.component.jsx

@@ -34,7 +34,9 @@ function OwnerDetailJobsComponent({ bodyshop, owner }) {
       render: (text, record) =>
         record.vehicleid ? (
           <Link to={`/manage/vehicles/${record.vehicleid}`}>
-            {`${record.v_model_yr} ${record.v_make_desc} ${record.v_model_desc}`}
+            {`${record.v_model_yr || ""} ${record.v_make_desc || ""} ${
+              record.v_model_desc || ""
+            }`.trim()}
           </Link>
         ) : (
           t("jobs.errors.novehicle")

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

@@ -22,10 +22,6 @@ const mapDispatchToProps = (dispatch) => ({
 });
 
 export function ScheduleCalendarHeaderGraph({ bodyshop, loadData }) {
-  console.log(
-    "🚀 ~ file: schedule-calendar-header-graph.component.js:23 ~ ScheduleCalendarHeaderGraph ~ loadData",
-    loadData
-  );
   const { ssbuckets } = bodyshop;
   const { t } = useTranslation();
   const data = useMemo(() => {

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

@@ -66,8 +66,8 @@ export function ScheduleCalendarHeaderComponent({
     <div onClick={(e) => e.stopPropagation()}>
       <table>
         <tbody>
-          {loadData && loadData.jobsOut ? (
-            loadData.jobsOut.map((j) => (
+          {loadData && loadData.allJobsOut ? (
+            loadData.allJobsOut.map((j) => (
               <tr key={j.id}>
                 <td>
                   <Link to={`/manage/jobs/${j.id}`}>{j.ro_number}</Link>
@@ -102,11 +102,12 @@ export function ScheduleCalendarHeaderComponent({
     <div onClick={(e) => e.stopPropagation()}>
       <table>
         <tbody>
-          {loadData && loadData.jobsIn ? (
-            loadData.jobsIn.map((j) => (
+          {loadData && loadData.allJobsIn ? (
+            loadData.allJobsIn.map((j) => (
               <tr key={j.id}>
                 <td>
                   <Link to={`/manage/jobs/${j.id}`}>{j.ro_number}</Link>
+                  {j.status}
                 </td>
                 <td>
                   <OwnerNameDisplay ownerObject={j} />
@@ -142,7 +143,7 @@ export function ScheduleCalendarHeaderComponent({
           title={t("appointments.labels.arrivingjobs")}
         >
           <Icon component={MdFileDownload} style={{ color: "green" }} />
-          {(loadData.hoursIn || 0) && loadData.hoursIn.toFixed(2)}
+          {(loadData.allHoursIn || 0) && loadData.allHoursIn.toFixed(2)}
         </Popover>
         <Popover
           placement={"bottom"}
@@ -151,7 +152,7 @@ export function ScheduleCalendarHeaderComponent({
           title={t("appointments.labels.completingjobs")}
         >
           <Icon component={MdFileUpload} style={{ color: "red" }} />
-          {(loadData.hoursOut || 0) && loadData.hoursOut.toFixed(2)}
+          {(loadData.allHoursOut || 0) && loadData.allHoursOut.toFixed(2)}
         </Popover>
         <ScheduleCalendarHeaderGraph loadData={loadData} />
       </div>

client/src/components/schedule-calendar-wrapper/scheduler-calendar-wrapper.component.jsx

@@ -11,7 +11,7 @@ import HeaderComponent from "./schedule-calendar-header.component";
 import "./schedule-calendar.styles.scss";
 import JobDetailCards from "../job-detail-cards/job-detail-cards.component";
 import { selectProblemJobs } from "../../redux/application/application.selectors";
-import { Alert } from "antd";
+import { Alert, Collapse } from "antd";
 import { useTranslation } from "react-i18next";
 
 const mapStateToProps = createStructuredSelector({
@@ -53,7 +53,28 @@ export function ScheduleCalendarWrapperComponent({
   return (
     <>
       <JobDetailCards />
-      {problemJobs &&
+      {problemJobs && problemJobs.length > 2 ? (
+        <Collapse>
+          <Collapse.Panel
+            header={
+              <span style={{ color: "tomato" }}>
+                {t("appointments.labels.severalerrorsfound")}
+              </span>
+            }
+          >
+            {problemJobs.map((problem) => (
+              <Alert
+                key={problem.id}
+                type="error"
+                message={t("appointments.labels.dataconsistency", {
+                  ro_number: problem.ro_number,
+                  code: problem.code,
+                })}
+              />
+            ))}
+          </Collapse.Panel>
+        </Collapse>
+      ) : (
         problemJobs.map((problem) => (
           <Alert
             key={problem.id}
@@ -63,7 +84,8 @@ export function ScheduleCalendarWrapperComponent({
               code: problem.code,
             })}
           />
-        ))}
+        ))
+      )}
 
       <Calendar
         events={data}

client/src/components/schedule-job-modal/schedule-job-modal.component.jsx

@@ -15,6 +15,7 @@ import React, { useState } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
+import { calculateScheduleLoad } from "../../redux/application/application.actions";
 import { selectBodyshop } from "../../redux/user/user.selectors";
 import { DateFormatter } from "../../utils/DateFormatter";
 import DateTimePicker from "../form-date-time-picker/form-date-time-picker.component";
@@ -28,6 +29,7 @@ const mapStateToProps = createStructuredSelector({
 });
 const mapDispatchToProps = (dispatch) => ({
   //setUserLanguage: language => dispatch(setUserLanguage(language))
+  calculateScheduleLoad: (endDate) => dispatch(calculateScheduleLoad(endDate)),
 });
 
 export function ScheduleJobModalComponent({
@@ -36,6 +38,7 @@ export function ScheduleJobModalComponent({
   existingAppointments,
   lbrHrsData,
   jobId,
+  calculateScheduleLoad,
 }) {
   const { t } = useTranslation();
   const [loading, setLoading] = useState(false);
@@ -57,6 +60,7 @@ export function ScheduleJobModalComponent({
 
   const handleDateBlur = () => {
     const values = form.getFieldsValue();
+
     if (lbrHrsData) {
       const totalHours =
         lbrHrsData.jobs_by_pk.labhrs.aggregate.sum.mod_lb_hrs +
@@ -130,7 +134,12 @@ export function ScheduleJobModalComponent({
               className="imex-flex-row__margin"
               key={idx}
               onClick={() => {
-                form.setFieldsValue({ start: new moment(d).add(8, "hours") });
+                const ssDate = moment(d);
+                if (ssDate.isBefore(moment())) {
+                  form.setFieldsValue({ start: moment() });
+                } else {
+                  form.setFieldsValue({ start: moment(d).add(8, "hours") });
+                }
                 handleDateBlur();
               }}
             >
@@ -191,6 +200,9 @@ export function ScheduleJobModalComponent({
         <Form.Item shouldUpdate={(prev, cur) => prev.start !== cur.start}>
           {() => {
             const values = form.getFieldsValue();
+            if (values.start) {
+              calculateScheduleLoad(moment(values.start).add(3, "days"));
+            }
             return (
               <div className="schedule-job-modal">
                 <ScheduleDayViewContainer day={values.start} />

client/src/components/schedule-job-modal/schedule-job-modal.scss

@@ -1,5 +1,6 @@
 .schedule-job-modal {
   height: 70vh;
+  overflow-y: auto;
   .rbc-calendar {
     .rbc-toolbar {
       .rbc-btn-group {