From 07c307e17b8e748313e56c1a8d3ceb3476f5b39e Mon Sep 17 00:00:00 2001
From: Patrick Fic <snaptsoft@gmail.com>
Date: Thu, 2 Feb 2023 10:04:11 -0800
Subject: [PATCH 01/13] IO-2162 Updated smart schedule graph logic.

---
 bodyshop_translations.babel                   |   2 +-
 ...chedule-calendar-header-graph.component.js |   4 -
 .../schedule-calendar-header.component.js     |  13 +-
 client/src/graphql/appointments.queries.js    |  14 ++
 .../redux/application/application.sagas.js    | 158 +++++++++++++-----
 client/src/translations/en_us/common.json     |   2 +-
 server/email/sendemail.js                     |   1 +
 7 files changed, 138 insertions(+), 56 deletions(-)

diff --git a/bodyshop_translations.babel b/bodyshop_translations.babel
index 3a852e2e8..31b23d3e4 100644
--- a/bodyshop_translations.babel
+++ b/bodyshop_translations.babel
@@ -1,4 +1,4 @@
-<babeledit_project be_version="2.7.1" version="1.2">
+<babeledit_project version="1.2" be_version="2.7.1">
     <!--
 
     BabelEdit project file
diff --git a/client/src/components/schedule-calendar-wrapper/schedule-calendar-header-graph.component.js b/client/src/components/schedule-calendar-wrapper/schedule-calendar-header-graph.component.js
index 4d8887128..82d1c9281 100644
--- a/client/src/components/schedule-calendar-wrapper/schedule-calendar-header-graph.component.js
+++ b/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(() => {
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 e312ebe03..732bcc2c2 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
@@ -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>
diff --git a/client/src/graphql/appointments.queries.js b/client/src/graphql/appointments.queries.js
index 6a95864d8..01399b81a 100644
--- a/client/src/graphql/appointments.queries.js
+++ b/client/src/graphql/appointments.queries.js
@@ -294,6 +294,12 @@ export const QUERY_SCHEDULE_LOAD_DATA = gql`
       where: { inproduction: { _eq: true }, suspended: { _eq: false } }
     ) {
       id
+      actual_in
+      scheduled_in
+      actual_completion
+      scheduled_completion
+      inproduction
+      ro_number
       labhrs: joblines_aggregate(
         where: { mod_lbr_ty: { _neq: "LAR" }, removed: { _eq: false } }
       ) {
@@ -327,12 +333,15 @@ export const QUERY_SCHEDULE_LOAD_DATA = gql`
       }
     ) {
       id
+      status
       ro_number
       scheduled_completion
       actual_completion
+      scheduled_in
       ownr_fn
       ownr_ln
       ownr_co_nm
+      inproduction
       labhrs: joblines_aggregate(
         where: { mod_lbr_ty: { _neq: "LAR" }, removed: { _eq: false } }
       ) {
@@ -360,11 +369,16 @@ export const QUERY_SCHEDULE_LOAD_DATA = gql`
     ) {
       id
       scheduled_in
+      actual_in
+      scheduled_completion
       ro_number
       ownr_fn
       ownr_ln
       ownr_co_nm
       alt_transport
+      actual_completion
+      inproduction
+      status
       labhrs: joblines_aggregate(
         where: { mod_lbr_ty: { _neq: "LAR" }, removed: { _eq: false } }
       ) {
diff --git a/client/src/redux/application/application.sagas.js b/client/src/redux/application/application.sagas.js
index a768b3b93..e2dc607df 100644
--- a/client/src/redux/application/application.sagas.js
+++ b/client/src/redux/application/application.sagas.js
@@ -37,7 +37,7 @@ export function* calculateScheduleLoad({ payload: end }) {
       productionTotal: {},
       productionHours: 0,
     };
-
+    let problemJobs = [];
     //Set the current load.
     buckets.forEach((bucket) => {
       load.productionTotal[bucket.id] = { count: 0, label: bucket.label };
@@ -45,6 +45,32 @@ export function* calculateScheduleLoad({ payload: end }) {
 
     prodJobs.forEach((item) => {
       //Add all of the jobs currently in production to the buckets so that we have a starting point.
+      if (
+        !item.actual_completion &&
+        moment(item.scheduled_completion).isBefore(moment().startOf("day"))
+      ) {
+        problemJobs.push({
+          ...item,
+          code: "Job was scheduled to go, but it has not been completed. Update the scheduled completion date to correct projections",
+        });
+      }
+
+      if (
+        item.actual_completion &&
+        moment(item.actual_completion).isBefore(moment().startOf("day"))
+      ) {
+        problemJobs.push({
+          ...item,
+          code: "Job is already marked as completed, but it is still in production. This job should be removed from production",
+        });
+      }
+      if (!(item.actual_completion || item.scheduled_completion)) {
+        problemJobs.push({
+          ...item,
+          code: "Job does not have a scheduled or actual completion date. Update the scheduled or actual completion dates to correct projections",
+        });
+      }
+
       const bucketId = CheckJobBucket(buckets, item);
       load.productionHours =
         load.productionHours +
@@ -59,77 +85,119 @@ export function* calculateScheduleLoad({ payload: end }) {
     });
 
     arrJobs.forEach((item) => {
-      if (!item.scheduled_in)
+      if (!item.scheduled_in) {
         console.log("JOB HAS NO SCHEDULED IN DATE.", item);
-      const itemDate = moment(item.scheduled_in).format("yyyy-MM-DD");
+        problemJobs.push({
+          ...item,
+          code: "Job has no scheduled in date",
+        });
+      }
+      if (
+        item.actual_completion &&
+        moment(item.actual_completion).isAfter(moment())
+      ) {
+        problemJobs.push({
+          ...item,
+          code: "Job has an actual completion date set in the future",
+        });
+      }
+      if (item.actual_completion && item.inproduction) {
+        problemJobs.push({
+          ...item,
+          code: "Job has an actual completion date but it is still marked in production",
+        });
+      }
+
+      const itemDate = moment(item.actual_in || item.scheduled_in).format(
+        "yyyy-MM-DD"
+      );
+
+      const AddJobForSchedulingCalc =
+        !item.inproduction &&
+        !moment(item.actual_completion || item.scheduled_completion).isSame(
+          moment(item.actual_in || item.scheduled_in),
+          "day"
+        );
+
       if (!!load[itemDate]) {
-        load[itemDate].hoursIn =
-          (load[itemDate].hoursIn || 0) +
+        load[itemDate].allHoursIn =
+          (load[itemDate].allHoursIn || 0) +
           item.labhrs.aggregate.sum.mod_lb_hrs +
           item.larhrs.aggregate.sum.mod_lb_hrs;
-        load[itemDate].jobsIn.push(item);
+
+        //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.
+        load[itemDate].allJobsIn.push(item);
+        if (AddJobForSchedulingCalc) {
+          load[itemDate].jobsIn.push(item);
+          load[itemDate].hoursIn =
+            (load[itemDate].hoursIn || 0) +
+            item.labhrs.aggregate.sum.mod_lb_hrs +
+            item.larhrs.aggregate.sum.mod_lb_hrs;
+        }
       } else {
         load[itemDate] = {
-          jobsIn: [item],
+          allJobsIn: [item],
+          jobsIn: AddJobForSchedulingCalc ? [item] : [], //Same as above, only add it if it isn't already in production.
           jobsOut: [],
-          hoursIn:
+          allJobsOut: [],
+          allHoursIn:
             item.labhrs.aggregate.sum.mod_lb_hrs +
             item.larhrs.aggregate.sum.mod_lb_hrs,
+          hoursIn: AddJobForSchedulingCalc
+            ? item.labhrs.aggregate.sum.mod_lb_hrs +
+              item.larhrs.aggregate.sum.mod_lb_hrs
+            : 0,
         };
       }
     });
 
-    let problemJobs = [];
     compJobs.forEach((item) => {
       if (!(item.actual_completion || item.scheduled_completion))
-        console.log("JOB HAS NO COMPLETION DATE.", item);
+        console.warn("JOB HAS NO COMPLETION DATE.", item);
 
       const inProdJobs = prodJobs.find((p) => p.id === item.id);
       const inArrJobs = arrJobs.find((p) => p.id === item.id);
 
-      if (!(inProdJobs || inArrJobs)) {
-        //Job isn't found in production or coming in.
-        //is it going today or scheduled to go today?
-        if (
-          moment(item.actual_completion || item.scheduled_completion).isSame(
-            moment(),
-            "day"
-          )
-        ) {
-          console.log("Job is going today anyways, ignore it.", item);
-          return;
-        }
-
-        if (
-          moment(item.actual_completion || item.scheduled_completion).isBefore(
-            moment(),
-            "day"
-          )
-        ) {
-          console.log("Job should have already gone. Ignoring it.", item);
-          return;
-        }
-
-        problemJobs.push({
-          ...item,
-          code: "Job is scheduled for completion, but it is not marked in production nor is it an arriving job in this period. Check the scheduled in and completion dates",
-        });
-        return;
-      }
+      const AddJobForSchedulingCalc =
+        item.inproduction &&
+        !moment(item.actual_completion || item.scheduled_completion).isSame(
+          moment(item.scheduled_in),
+          "day"
+        ) &&
+        (inProdJobs || inArrJobs);
 
       const itemDate = moment(
         item.actual_completion || item.scheduled_completion
       ).format("yyyy-MM-DD");
+      //Skip it, it's already completed.
+
       if (!!load[itemDate]) {
-        load[itemDate].hoursOut =
-          (load[itemDate].hoursOut || 0) +
+        load[itemDate].allHoursOut =
+          (load[itemDate].allHoursOut || 0) +
           item.labhrs.aggregate.sum.mod_lb_hrs +
           item.larhrs.aggregate.sum.mod_lb_hrs;
-        load[itemDate].jobsOut.push(item);
+        //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);
+
+        if (AddJobForSchedulingCalc) {
+          load[itemDate].jobsOut.push(item);
+          load[itemDate].hoursOut =
+            (load[itemDate].hoursOut || 0) +
+            item.labhrs.aggregate.sum.mod_lb_hrs +
+            item.larhrs.aggregate.sum.mod_lb_hrs;
+        }
       } else {
         load[itemDate] = {
-          jobsOut: [item],
-          hoursOut:
+          allJobsOut: [item],
+          jobsOut: AddJobForSchedulingCalc ? [item] : [], //Same as above.
+          hoursOut: AddJobForSchedulingCalc
+            ? item.labhrs.aggregate.sum.mod_lb_hrs +
+              item.larhrs.aggregate.sum.mod_lb_hrs
+            : 0,
+          allHoursOut:
             item.labhrs.aggregate.sum.mod_lb_hrs +
             item.larhrs.aggregate.sum.mod_lb_hrs,
         };
@@ -137,6 +205,7 @@ export function* calculateScheduleLoad({ payload: end }) {
     });
 
     //Propagate the expected load to each day.
+
     const range = Math.round(moment.duration(end.diff(today)).asDays());
     for (var day = 0; day < range; day++) {
       const current = moment(today).add(day, "days").format("yyyy-MM-DD");
@@ -146,6 +215,7 @@ export function* calculateScheduleLoad({ payload: end }) {
       if (!!!load[current]) {
         load[current] = {};
       }
+
       if (day === 0) {
         //Starting on day 1. The load is current.
         load[current].expectedLoad = CalculateLoad(
diff --git a/client/src/translations/en_us/common.json b/client/src/translations/en_us/common.json
index d8e7bc391..8d25b3339 100644
--- a/client/src/translations/en_us/common.json
+++ b/client/src/translations/en_us/common.json
@@ -49,7 +49,7 @@
 				"blocked": "Blocked",
 				"cancelledappointment": "Canceled appointment for: ",
 				"completingjobs": "Completing Jobs",
-				"dataconsistency": "{{ro_number}} has a data consistency issue. It has been excluded for scheduling purposes. CODE: {{code}}.",
+				"dataconsistency": "{{ro_number}} has a data consistency issue. It may have been excluded for scheduling purposes. CODE: {{code}}.",
 				"expectedjobs": "Expected Jobs in Production: ",
 				"expectedprodhrs": "Expected Production Hours:",
 				"history": "History",
diff --git a/server/email/sendemail.js b/server/email/sendemail.js
index 68c57a38d..28c0adf5d 100644
--- a/server/email/sendemail.js
+++ b/server/email/sendemail.js
@@ -23,6 +23,7 @@ let transporter = nodemailer.createTransport({
 });
 
 exports.sendServerEmail = async function ({ subject, text }) {
+  if (process.env.NODE_ENV === undefined) return;
   try {
     transporter.sendMail(
       {

From 2e40583d3122550a05f61257a2c8ae4f69d63394 Mon Sep 17 00:00:00 2001
From: Patrick Fic <snaptsoft@gmail.com>
Date: Thu, 2 Feb 2023 10:08:55 -0800
Subject: [PATCH 02/13] IO-2164 IO-2163 Additional GSR reports.

---
 bodyshop_translations.babel               | 44 ++++++++++++++++++++++-
 client/src/translations/en_us/common.json |  2 ++
 client/src/translations/es/common.json    |  2 ++
 client/src/translations/fr/common.json    |  2 ++
 client/src/utils/TemplateConstants.js     | 26 ++++++++++++++
 5 files changed, 75 insertions(+), 1 deletion(-)

diff --git a/bodyshop_translations.babel b/bodyshop_translations.babel
index 31b23d3e4..6c65bd587 100644
--- a/bodyshop_translations.babel
+++ b/bodyshop_translations.babel
@@ -1,4 +1,4 @@
-<babeledit_project version="1.2" be_version="2.7.1">
+<babeledit_project be_version="2.7.1" version="1.2">
     <!--
 
     BabelEdit project file
@@ -40880,6 +40880,48 @@
                                             </translation>
                                         </translations>
                                     </concept_node>
+                                    <concept_node>
+                                        <name>gsr_by_atp</name>
+                                        <definition_loaded>false</definition_loaded>
+                                        <description></description>
+                                        <comment></comment>
+                                        <default_text></default_text>
+                                        <translations>
+                                            <translation>
+                                                <language>en-US</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>es-MX</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>fr-CA</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                        </translations>
+                                    </concept_node>
+                                    <concept_node>
+                                        <name>gsr_by_category</name>
+                                        <definition_loaded>false</definition_loaded>
+                                        <description></description>
+                                        <comment></comment>
+                                        <default_text></default_text>
+                                        <translations>
+                                            <translation>
+                                                <language>en-US</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>es-MX</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>fr-CA</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                        </translations>
+                                    </concept_node>
                                     <concept_node>
                                         <name>gsr_by_csr</name>
                                         <definition_loaded>false</definition_loaded>
diff --git a/client/src/translations/en_us/common.json b/client/src/translations/en_us/common.json
index 8d25b3339..23f24f79d 100644
--- a/client/src/translations/en_us/common.json
+++ b/client/src/translations/en_us/common.json
@@ -2425,6 +2425,8 @@
 				"export_payables": "Export Log - Payables",
 				"export_payments": "Export Log - Payments",
 				"export_receivables": "Export Log - Receivables",
+				"gsr_by_atp": "Gross Sales by ATP",
+				"gsr_by_category": "Gross Sales by Category",
 				"gsr_by_csr": "Gross Sales by CSR",
 				"gsr_by_delivery_date": "Gross Sales by Delivery Date",
 				"gsr_by_estimator": "Gross Sales by Estimator",
diff --git a/client/src/translations/es/common.json b/client/src/translations/es/common.json
index 359d844a2..10385ab2e 100644
--- a/client/src/translations/es/common.json
+++ b/client/src/translations/es/common.json
@@ -2425,6 +2425,8 @@
 				"export_payables": "",
 				"export_payments": "",
 				"export_receivables": "",
+				"gsr_by_atp": "",
+				"gsr_by_category": "",
 				"gsr_by_csr": "",
 				"gsr_by_delivery_date": "",
 				"gsr_by_estimator": "",
diff --git a/client/src/translations/fr/common.json b/client/src/translations/fr/common.json
index 78f2d8777..ee9ffb395 100644
--- a/client/src/translations/fr/common.json
+++ b/client/src/translations/fr/common.json
@@ -2425,6 +2425,8 @@
 				"export_payables": "",
 				"export_payments": "",
 				"export_receivables": "",
+				"gsr_by_atp": "",
+				"gsr_by_category": "",
 				"gsr_by_csr": "",
 				"gsr_by_delivery_date": "",
 				"gsr_by_estimator": "",
diff --git a/client/src/utils/TemplateConstants.js b/client/src/utils/TemplateConstants.js
index a53040f0f..8869a5b2c 100644
--- a/client/src/utils/TemplateConstants.js
+++ b/client/src/utils/TemplateConstants.js
@@ -1343,6 +1343,32 @@ export const TemplateList = (type, context) => {
             },
             group: "sales",
           },
+          gsr_by_category: {
+            title: i18n.t("reportcenter.templates.gsr_by_category"),
+            description: "",
+            subject: i18n.t("reportcenter.templates.gsr_by_category"),
+            key: "gsr_by_category",
+            //idtype: "vendor",
+            disabled: false,
+            rangeFilter: {
+              object: i18n.t("reportcenter.labels.objects.jobs"),
+              field: i18n.t("jobs.fields.date_invoiced"),
+            },
+            group: "sales",
+          },
+          gsr_by_atp: {
+            title: i18n.t("reportcenter.templates.gsr_by_atp"),
+            description: "",
+            subject: i18n.t("reportcenter.templates.gsr_by_atp"),
+            key: "gsr_by_atp",
+            //idtype: "vendor",
+            disabled: false,
+            rangeFilter: {
+              object: i18n.t("reportcenter.labels.objects.jobs"),
+              field: i18n.t("jobs.fields.date_invoiced"),
+            },
+            group: "sales",
+          },
           gsr_labor_only: {
             title: i18n.t("reportcenter.templates.gsr_labor_only"),
             description: "",

From 20e84668a500375dd7cee456e160556b6ea6acd7 Mon Sep 17 00:00:00 2001
From: Patrick Fic <snaptsoft@gmail.com>
Date: Thu, 2 Feb 2023 10:42:16 -0800
Subject: [PATCH 03/13] IO-2162 remove unnecessary conditions.

---
 client/src/redux/application/application.sagas.js | 15 ++-------------
 1 file changed, 2 insertions(+), 13 deletions(-)

diff --git a/client/src/redux/application/application.sagas.js b/client/src/redux/application/application.sagas.js
index e2dc607df..8a9a4d588 100644
--- a/client/src/redux/application/application.sagas.js
+++ b/client/src/redux/application/application.sagas.js
@@ -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

From c04a690dc34e53260fadb8502c2c1bcf38a344b3 Mon Sep 17 00:00:00 2001
From: Patrick Fic <snaptsoft@gmail.com>
Date: Thu, 2 Feb 2023 11:06:05 -0800
Subject: [PATCH 04/13] IO-2162 Update smart scheduling server side.

---
 server/graphql-client/queries.js    |  27 +++++++-
 server/scheduling/scheduling-job.js | 103 +++++++++-------------------
 2 files changed, 56 insertions(+), 74 deletions(-)

diff --git a/server/graphql-client/queries.js b/server/graphql-client/queries.js
index 14bd8cd17..88ff022ac 100644
--- a/server/graphql-client/queries.js
+++ b/server/graphql-client/queries.js
@@ -536,7 +536,16 @@ exports.QUERY_UPCOMING_APPOINTMENTS = `query QUERY_UPCOMING_APPOINTMENTS($now: t
   arrJobs: jobs(where: {scheduled_in: {_gte: $now}, suspended: {_eq: false}}) {
     id
     scheduled_in
+    actual_in
+    scheduled_completion
     ro_number
+    ownr_fn
+    ownr_ln
+    ownr_co_nm
+    alt_transport
+    actual_completion
+    inproduction
+    status
     labhrs: joblines_aggregate(where: {mod_lbr_ty: {_neq: "LAR"}, removed: {_eq: false}}) {
       aggregate {
         sum {
@@ -554,9 +563,15 @@ exports.QUERY_UPCOMING_APPOINTMENTS = `query QUERY_UPCOMING_APPOINTMENTS($now: t
   }
   compJobs: jobs(where: {_and: [{suspended: {_eq: false}}, {_or: [{scheduled_completion: {_gte: $now}}, {actual_completion: {_gte: $now}}]}]}) {
     id
+    status
     ro_number
     scheduled_completion
     actual_completion
+    scheduled_in
+    ownr_fn
+    ownr_ln
+    ownr_co_nm
+    inproduction
     labhrs: joblines_aggregate(where: {mod_lbr_ty: {_neq: "LAR"}, removed: {_eq: false}}) {
       aggregate {
         sum {
@@ -574,15 +589,20 @@ exports.QUERY_UPCOMING_APPOINTMENTS = `query QUERY_UPCOMING_APPOINTMENTS($now: t
   }
   prodJobs: jobs(where: {inproduction: {_eq: true}, suspended: {_eq: false}}) {
     id
+    actual_in
+    scheduled_in
+    actual_completion
     scheduled_completion
-    labhrs: joblines_aggregate(where: {_and: [{mod_lbr_ty: {_neq: "LAR"}}, {removed: {_eq: false}}]}) {
+    inproduction
+    ro_number
+    labhrs: joblines_aggregate(where: {mod_lbr_ty: {_neq: "LAR"}, removed: {_eq: false}}) {
       aggregate {
         sum {
           mod_lb_hrs
         }
       }
     }
-    larhrs: joblines_aggregate(where: {_and: [{mod_lbr_ty: {_eq: "LAR"}}, {removed: {_eq: false}}]}) {
+    larhrs: joblines_aggregate(where: {mod_lbr_ty: {_eq: "LAR"}, removed: {_eq: false}}) {
       aggregate {
         sum {
           mod_lb_hrs
@@ -590,7 +610,8 @@ exports.QUERY_UPCOMING_APPOINTMENTS = `query QUERY_UPCOMING_APPOINTMENTS($now: t
       }
     }
   }
-}`;
+}
+`;
 
 exports.QUERY_EMPLOYEE_PIN = `query QUERY_EMPLOYEE_PIN($shopId: uuid!, $employeeId: String!) {
   employees(where: {_and: {shopid: {_eq: $shopId}, employee_number: {_eq: $employeeId}}}) {
diff --git a/server/scheduling/scheduling-job.js b/server/scheduling/scheduling-job.js
index dc26046dd..e906c866e 100644
--- a/server/scheduling/scheduling-job.js
+++ b/server/scheduling/scheduling-job.js
@@ -41,9 +41,9 @@ exports.job = async (req, res) => {
       (bucket) =>
         bucket.gte <= jobHrs && (!!bucket.lt ? bucket.lt > jobHrs : true)
     )[0];
-
     const load = {
       productionTotal: {},
+      productionHours: 0,
     };
     //Set the current load.
     ssbuckets.forEach((bucket) => {
@@ -70,27 +70,6 @@ exports.job = async (req, res) => {
     // );
     const filteredArrJobs = [];
 
-    // filteredArrJobs.forEach((item) => {
-    //   const itemDate = moment(item.scheduled_in)
-    //     .tz(timezone)
-    //     .format("yyyy-MM-DD");
-    //   if (!!load[itemDate]) {
-    //     load[itemDate].hoursIn =
-    //       (load[itemDate].hoursIn || 0) +
-    //       item.labhrs.aggregate.sum.mod_lb_hrs +
-    //       item.larhrs.aggregate.sum.mod_lb_hrs;
-    //     load[itemDate].jobsIn.push(item);
-    //   } else {
-    //     load[itemDate] = {
-    //       jobsIn: [item],
-    //       jobsOut: [],
-    //       hoursIn:
-    //         item.labhrs.aggregate.sum.mod_lb_hrs +
-    //         item.larhrs.aggregate.sum.mod_lb_hrs,
-    //     };
-    //   }
-    // });
-
     arrJobs.forEach((item) => {
       let isSameBucket = false;
       if (JobBucket.id === CheckJobBucket(ssbuckets, item)) {
@@ -102,21 +81,27 @@ exports.job = async (req, res) => {
         item.labhrs.aggregate.sum.mod_lb_hrs +
         item.larhrs.aggregate.sum.mod_lb_hrs;
 
-      const itemDate = moment(item.scheduled_in)
+      const AddJobForSchedulingCalc = !item.inproduction;
+
+      const itemDate = moment(item.actual_in || item.scheduled_in)
         .tz(timezone)
         .format("yyyy-MM-DD");
       if (isSameBucket) {
         if (!!load[itemDate]) {
-          load[itemDate].hoursIn = (load[itemDate].hoursIn || 0) + jobHours;
-          load[itemDate].jobsIn.push(item);
+          load[itemDate].hoursIn =
+            (load[itemDate].hoursIn || 0) + AddJobForSchedulingCalc
+              ? jobHours
+              : 0;
+          if (AddJobForSchedulingCalc) load[itemDate].jobsIn.push(item);
         } else {
           load[itemDate] = {
-            jobsIn: [item],
+            jobsIn: AddJobForSchedulingCalc ? [item] : [],
             jobsOut: [],
-            hoursIn: jobHours,
+            hoursIn: AddJobForSchedulingCalc ? jobHours : 0,
           };
         }
       }
+
       if (!load[itemDate]) {
         load[itemDate] = {
           jobsIn: [],
@@ -139,52 +124,28 @@ exports.job = async (req, res) => {
       const inProdJobs = filteredProdJobsList.find((p) => p.id === item.id);
       const inArrJobs = filteredArrJobs.find((p) => p.id === item.id);
 
-      if (!(inProdJobs || inArrJobs)) {
-        //Job isn't found in production or coming in.
-        //is it going today or scheduled to go today?
-        if (
-          moment(item.actual_completion || item.scheduled_completion)
-            .tz(timezone)
-            .isSame(moment().tz(timezone), "day")
-        ) {
-          console.log("Job is going today anyways, ignore it.", item);
-          return;
-        }
+      const AddJobForSchedulingCalc = inProdJobs || inArrJobs;
 
-        if (
-          moment(item.actual_completion || item.scheduled_completion)
-            .tz(timezone)
-            .isBefore(moment().tz(timezone), "day")
-        ) {
-          console.log("Job should have already gone. Ignoring it.", item);
-          return;
-        }
-        console.log("PROBLEM JOB", item);
-        problemJobs.push({
-          ...item,
-          code: "Job is scheduled for completion, but it is not marked in production nor is it an arriving job in this period. Check the scheduled in and completion dates",
-        });
-        return;
+      const itemDate = moment(
+        item.actual_completion || item.scheduled_completion
+      )
+        .tz(timezone)
+        .format("yyyy-MM-DD");
+      if (!!load[itemDate]) {
+        load[itemDate].hoursOut =
+          (load[itemDate].hoursOut || 0) + AddJobForSchedulingCalc
+            ? item.labhrs.aggregate.sum.mod_lb_hrs +
+              item.larhrs.aggregate.sum.mod_lb_hrs
+            : 0;
+        if (AddJobForSchedulingCalc) load[itemDate].jobsOut.push(item);
       } else {
-        const itemDate = moment(
-          item.actual_completion || item.scheduled_completion
-        )
-          .tz(timezone)
-          .format("yyyy-MM-DD");
-        if (!!load[itemDate]) {
-          load[itemDate].hoursOut =
-            (load[itemDate].hoursOut || 0) +
-            item.labhrs.aggregate.sum.mod_lb_hrs +
-            item.larhrs.aggregate.sum.mod_lb_hrs;
-          load[itemDate].jobsOut.push(item);
-        } else {
-          load[itemDate] = {
-            jobsOut: [item],
-            hoursOut:
-              item.labhrs.aggregate.sum.mod_lb_hrs +
-              item.larhrs.aggregate.sum.mod_lb_hrs,
-          };
-        }
+        load[itemDate] = {
+          jobsOut: AddJobForSchedulingCalc ? [item] : [],
+          hoursOut: AddJobForSchedulingCalc
+            ? item.labhrs.aggregate.sum.mod_lb_hrs +
+              item.larhrs.aggregate.sum.mod_lb_hrs
+            : 0,
+        };
       }
     });
 

From 2108a4e96c24dfa7eac0fa178a52e234930bbe59 Mon Sep 17 00:00:00 2001
From: Patrick Fic <snaptsoft@gmail.com>
Date: Thu, 2 Feb 2023 13:47:28 -0800
Subject: [PATCH 05/13] IO-2163 Revise report key.

---
 client/src/translations/en_us/common.json | 2 +-
 client/src/translations/es/common.json    | 2 +-
 client/src/translations/fr/common.json    | 2 +-
 client/src/utils/TemplateConstants.js     | 8 ++++----
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/client/src/translations/en_us/common.json b/client/src/translations/en_us/common.json
index 23f24f79d..e1ace1a22 100644
--- a/client/src/translations/en_us/common.json
+++ b/client/src/translations/en_us/common.json
@@ -2425,7 +2425,7 @@
 				"export_payables": "Export Log - Payables",
 				"export_payments": "Export Log - Payments",
 				"export_receivables": "Export Log - Receivables",
-				"gsr_by_atp": "Gross Sales by ATP",
+				"gsr_by_ats": "Gross Sales by ATS",
 				"gsr_by_category": "Gross Sales by Category",
 				"gsr_by_csr": "Gross Sales by CSR",
 				"gsr_by_delivery_date": "Gross Sales by Delivery Date",
diff --git a/client/src/translations/es/common.json b/client/src/translations/es/common.json
index 10385ab2e..7391723ee 100644
--- a/client/src/translations/es/common.json
+++ b/client/src/translations/es/common.json
@@ -2425,7 +2425,7 @@
 				"export_payables": "",
 				"export_payments": "",
 				"export_receivables": "",
-				"gsr_by_atp": "",
+				"gsr_by_ats": "",
 				"gsr_by_category": "",
 				"gsr_by_csr": "",
 				"gsr_by_delivery_date": "",
diff --git a/client/src/translations/fr/common.json b/client/src/translations/fr/common.json
index ee9ffb395..5d3f9b604 100644
--- a/client/src/translations/fr/common.json
+++ b/client/src/translations/fr/common.json
@@ -2425,7 +2425,7 @@
 				"export_payables": "",
 				"export_payments": "",
 				"export_receivables": "",
-				"gsr_by_atp": "",
+				"gsr_by_ats": "",
 				"gsr_by_category": "",
 				"gsr_by_csr": "",
 				"gsr_by_delivery_date": "",
diff --git a/client/src/utils/TemplateConstants.js b/client/src/utils/TemplateConstants.js
index 8869a5b2c..9ae638b2f 100644
--- a/client/src/utils/TemplateConstants.js
+++ b/client/src/utils/TemplateConstants.js
@@ -1356,11 +1356,11 @@ export const TemplateList = (type, context) => {
             },
             group: "sales",
           },
-          gsr_by_atp: {
-            title: i18n.t("reportcenter.templates.gsr_by_atp"),
+          gsr_by_ats: {
+            title: i18n.t("reportcenter.templates.gsr_by_ats"),
             description: "",
-            subject: i18n.t("reportcenter.templates.gsr_by_atp"),
-            key: "gsr_by_atp",
+            subject: i18n.t("reportcenter.templates.gsr_by_ats"),
+            key: "gsr_by_ats",
             //idtype: "vendor",
             disabled: false,
             rangeFilter: {

From 563c1d24022e85151d455b466ff7fccfbc104025 Mon Sep 17 00:00:00 2001
From: Patrick Fic <snaptsoft@gmail.com>
Date: Fri, 3 Feb 2023 11:48:07 -0800
Subject: [PATCH 06/13] IO-2162 Resolve smart scheduling issues.

---
 .../schedule-job-modal.component.jsx                 |  6 ++++++
 .../schedule-job-modal/schedule-job-modal.scss       |  1 +
 client/src/redux/application/application.sagas.js    | 12 ++++++++++++
 3 files changed, 19 insertions(+)

diff --git a/client/src/components/schedule-job-modal/schedule-job-modal.component.jsx b/client/src/components/schedule-job-modal/schedule-job-modal.component.jsx
index 121291c89..2afb79bc4 100644
--- a/client/src/components/schedule-job-modal/schedule-job-modal.component.jsx
+++ b/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,9 @@ export function ScheduleJobModalComponent({
 
   const handleDateBlur = () => {
     const values = form.getFieldsValue();
+    if (values.start) {
+      calculateScheduleLoad(values.start);
+    }
     if (lbrHrsData) {
       const totalHours =
         lbrHrsData.jobs_by_pk.labhrs.aggregate.sum.mod_lb_hrs +
diff --git a/client/src/components/schedule-job-modal/schedule-job-modal.scss b/client/src/components/schedule-job-modal/schedule-job-modal.scss
index 40c831662..6c2c42694 100644
--- a/client/src/components/schedule-job-modal/schedule-job-modal.scss
+++ b/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 {
diff --git a/client/src/redux/application/application.sagas.js b/client/src/redux/application/application.sagas.js
index 8a9a4d588..02e86c6cc 100644
--- a/client/src/redux/application/application.sagas.js
+++ b/client/src/redux/application/application.sagas.js
@@ -92,6 +92,18 @@ export function* calculateScheduleLoad({ payload: end }) {
           code: "Job has no scheduled in date",
         });
       }
+      if(!item.actual_completion && item.actual_in && !item.inproduction){
+        problemJobs.push({
+          ...item,
+          code: "Job has an actual in date, but no actual completion date and is not marked as in production",
+        });
+      }
+      if (item.actual_in && moment(item.actual_in).isAfter(moment())) {
+        problemJobs.push({
+          ...item,
+          code: "Job has an actual in date set in the future",
+        });
+      }
       if (
         item.actual_completion &&
         moment(item.actual_completion).isAfter(moment())

From 3be50b5067d71d27e059d03264bf17ae1a5d1461 Mon Sep 17 00:00:00 2001
From: Patrick Fic <snaptsoft@gmail.com>
Date: Fri, 3 Feb 2023 13:48:49 -0800
Subject: [PATCH 07/13] IO-2162 Improved UI for scheduled problem jobs.

---
 bodyshop_translations.babel                   | 42 +++++++++++++++++++
 .../scheduler-calendar-wrapper.component.jsx  | 28 +++++++++++--
 .../schedule-job-modal.component.jsx          |  7 ++--
 client/src/translations/en_us/common.json     |  2 +
 client/src/translations/es/common.json        |  2 +
 client/src/translations/fr/common.json        |  2 +
 6 files changed, 77 insertions(+), 6 deletions(-)

diff --git a/bodyshop_translations.babel b/bodyshop_translations.babel
index 6c65bd587..57c7a23e9 100644
--- a/bodyshop_translations.babel
+++ b/bodyshop_translations.babel
@@ -967,6 +967,27 @@
                                             </translation>
                                         </translations>
                                     </concept_node>
+                                    <concept_node>
+                                        <name>severalerrorsfound</name>
+                                        <definition_loaded>false</definition_loaded>
+                                        <description></description>
+                                        <comment></comment>
+                                        <default_text></default_text>
+                                        <translations>
+                                            <translation>
+                                                <language>en-US</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>es-MX</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>fr-CA</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                        </translations>
+                                    </concept_node>
                                     <concept_node>
                                         <name>smartscheduling</name>
                                         <definition_loaded>false</definition_loaded>
@@ -40901,6 +40922,27 @@
                                             </translation>
                                         </translations>
                                     </concept_node>
+                                    <concept_node>
+                                        <name>gsr_by_ats</name>
+                                        <definition_loaded>false</definition_loaded>
+                                        <description></description>
+                                        <comment></comment>
+                                        <default_text></default_text>
+                                        <translations>
+                                            <translation>
+                                                <language>en-US</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>es-MX</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>fr-CA</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                        </translations>
+                                    </concept_node>
                                     <concept_node>
                                         <name>gsr_by_category</name>
                                         <definition_loaded>false</definition_loaded>
diff --git a/client/src/components/schedule-calendar-wrapper/scheduler-calendar-wrapper.component.jsx b/client/src/components/schedule-calendar-wrapper/scheduler-calendar-wrapper.component.jsx
index 95f825c6e..837f5cbbe 100644
--- a/client/src/components/schedule-calendar-wrapper/scheduler-calendar-wrapper.component.jsx
+++ b/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}
diff --git a/client/src/components/schedule-job-modal/schedule-job-modal.component.jsx b/client/src/components/schedule-job-modal/schedule-job-modal.component.jsx
index 2afb79bc4..c3a9b41c2 100644
--- a/client/src/components/schedule-job-modal/schedule-job-modal.component.jsx
+++ b/client/src/components/schedule-job-modal/schedule-job-modal.component.jsx
@@ -60,9 +60,7 @@ export function ScheduleJobModalComponent({
 
   const handleDateBlur = () => {
     const values = form.getFieldsValue();
-    if (values.start) {
-      calculateScheduleLoad(values.start);
-    }
+
     if (lbrHrsData) {
       const totalHours =
         lbrHrsData.jobs_by_pk.labhrs.aggregate.sum.mod_lb_hrs +
@@ -197,6 +195,9 @@ export function ScheduleJobModalComponent({
         <Form.Item shouldUpdate={(prev, cur) => prev.start !== cur.start}>
           {() => {
             const values = form.getFieldsValue();
+            if (values.start) {
+              calculateScheduleLoad(values.start);
+            }
             return (
               <div className="schedule-job-modal">
                 <ScheduleDayViewContainer day={values.start} />
diff --git a/client/src/translations/en_us/common.json b/client/src/translations/en_us/common.json
index e1ace1a22..332f350fd 100644
--- a/client/src/translations/en_us/common.json
+++ b/client/src/translations/en_us/common.json
@@ -61,6 +61,7 @@
 				"priorappointments": "Previous Appointments",
 				"reminder": "This is {{shopname}} reminding you about an appointment on {{date}} at {{time}}. Please let us know if you are not able to make the appointment. We look forward to seeing you soon. ",
 				"scheduledfor": "Scheduled appointment for: ",
+				"severalerrorsfound": "Several jobs have issues which may prevent accurate smart scheduling. Click to expand.",
 				"smartscheduling": "Smart Scheduling",
 				"suggesteddates": "Suggested Dates"
 			},
@@ -2425,6 +2426,7 @@
 				"export_payables": "Export Log - Payables",
 				"export_payments": "Export Log - Payments",
 				"export_receivables": "Export Log - Receivables",
+				"gsr_by_atp": "",
 				"gsr_by_ats": "Gross Sales by ATS",
 				"gsr_by_category": "Gross Sales by Category",
 				"gsr_by_csr": "Gross Sales by CSR",
diff --git a/client/src/translations/es/common.json b/client/src/translations/es/common.json
index 7391723ee..2b7c7391b 100644
--- a/client/src/translations/es/common.json
+++ b/client/src/translations/es/common.json
@@ -61,6 +61,7 @@
 				"priorappointments": "Nombramientos previos",
 				"reminder": "",
 				"scheduledfor": "Cita programada para:",
+				"severalerrorsfound": "",
 				"smartscheduling": "",
 				"suggesteddates": ""
 			},
@@ -2425,6 +2426,7 @@
 				"export_payables": "",
 				"export_payments": "",
 				"export_receivables": "",
+				"gsr_by_atp": "",
 				"gsr_by_ats": "",
 				"gsr_by_category": "",
 				"gsr_by_csr": "",
diff --git a/client/src/translations/fr/common.json b/client/src/translations/fr/common.json
index 5d3f9b604..381fe267b 100644
--- a/client/src/translations/fr/common.json
+++ b/client/src/translations/fr/common.json
@@ -61,6 +61,7 @@
 				"priorappointments": "Rendez-vous précédents",
 				"reminder": "",
 				"scheduledfor": "Rendez-vous prévu pour:",
+				"severalerrorsfound": "",
 				"smartscheduling": "",
 				"suggesteddates": ""
 			},
@@ -2425,6 +2426,7 @@
 				"export_payables": "",
 				"export_payments": "",
 				"export_receivables": "",
+				"gsr_by_atp": "",
 				"gsr_by_ats": "",
 				"gsr_by_category": "",
 				"gsr_by_csr": "",

From a960963e3683ff1511a0f76b2702bc90fa95f937 Mon Sep 17 00:00:00 2001
From: Patrick Fic <snaptsoft@gmail.com>
Date: Fri, 3 Feb 2023 17:19:30 -0800
Subject: [PATCH 08/13] IO-2162 Smart Scheduling updates.

---
 .../schedule-job-modal/schedule-job-modal.component.jsx    | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/client/src/components/schedule-job-modal/schedule-job-modal.component.jsx b/client/src/components/schedule-job-modal/schedule-job-modal.component.jsx
index c3a9b41c2..dbbc52569 100644
--- a/client/src/components/schedule-job-modal/schedule-job-modal.component.jsx
+++ b/client/src/components/schedule-job-modal/schedule-job-modal.component.jsx
@@ -134,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();
               }}
             >

From 8d22248f4be74539f66593d20570d290a8e1ef45 Mon Sep 17 00:00:00 2001
From: Patrick Fic <snaptsoft@gmail.com>
Date: Mon, 6 Feb 2023 09:02:33 -0800
Subject: [PATCH 09/13] IO-2162 Resolve display issues on scheduling modal .

---
 .../schedule-job-modal/schedule-job-modal.component.jsx       | 2 +-
 client/src/redux/application/application.sagas.js             | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/client/src/components/schedule-job-modal/schedule-job-modal.component.jsx b/client/src/components/schedule-job-modal/schedule-job-modal.component.jsx
index dbbc52569..fdfb9932c 100644
--- a/client/src/components/schedule-job-modal/schedule-job-modal.component.jsx
+++ b/client/src/components/schedule-job-modal/schedule-job-modal.component.jsx
@@ -201,7 +201,7 @@ export function ScheduleJobModalComponent({
           {() => {
             const values = form.getFieldsValue();
             if (values.start) {
-              calculateScheduleLoad(values.start);
+              calculateScheduleLoad(moment(values.start).add(3, "days"));
             }
             return (
               <div className="schedule-job-modal">
diff --git a/client/src/redux/application/application.sagas.js b/client/src/redux/application/application.sagas.js
index 02e86c6cc..447fed0e6 100644
--- a/client/src/redux/application/application.sagas.js
+++ b/client/src/redux/application/application.sagas.js
@@ -92,7 +92,7 @@ export function* calculateScheduleLoad({ payload: end }) {
           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({
           ...item,
           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.
 
-    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++) {
       const current = moment(today).add(day, "days").format("yyyy-MM-DD");
       const prev = moment(today)

From 02a6ccd48124060e683dfad0ab2c77064b74fc58 Mon Sep 17 00:00:00 2001
From: Patrick Fic <snaptsoft@gmail.com>
Date: Mon, 6 Feb 2023 10:39:47 -0800
Subject: [PATCH 10/13] Add indexes to export logs.

---
 .../1675708520823_create_index_exportlog_billid/down.sql        | 1 +
 .../1675708520823_create_index_exportlog_billid/up.sql          | 2 ++
 .../1675708547556_create_index_exportlog_jobid/down.sql         | 1 +
 .../1675708547556_create_index_exportlog_jobid/up.sql           | 2 ++
 .../1675708579618_create_index_exportlog_payments/down.sql      | 1 +
 .../1675708579618_create_index_exportlog_payments/up.sql        | 2 ++
 6 files changed, 9 insertions(+)
 create mode 100644 hasura/migrations/1675708520823_create_index_exportlog_billid/down.sql
 create mode 100644 hasura/migrations/1675708520823_create_index_exportlog_billid/up.sql
 create mode 100644 hasura/migrations/1675708547556_create_index_exportlog_jobid/down.sql
 create mode 100644 hasura/migrations/1675708547556_create_index_exportlog_jobid/up.sql
 create mode 100644 hasura/migrations/1675708579618_create_index_exportlog_payments/down.sql
 create mode 100644 hasura/migrations/1675708579618_create_index_exportlog_payments/up.sql

diff --git a/hasura/migrations/1675708520823_create_index_exportlog_billid/down.sql b/hasura/migrations/1675708520823_create_index_exportlog_billid/down.sql
new file mode 100644
index 000000000..95fda734b
--- /dev/null
+++ b/hasura/migrations/1675708520823_create_index_exportlog_billid/down.sql
@@ -0,0 +1 @@
+DROP INDEX IF EXISTS "public"."exportlog_billid";
diff --git a/hasura/migrations/1675708520823_create_index_exportlog_billid/up.sql b/hasura/migrations/1675708520823_create_index_exportlog_billid/up.sql
new file mode 100644
index 000000000..688820e5c
--- /dev/null
+++ b/hasura/migrations/1675708520823_create_index_exportlog_billid/up.sql
@@ -0,0 +1,2 @@
+CREATE  INDEX "exportlog_billid" on
+  "public"."exportlog" using btree ("billid");
diff --git a/hasura/migrations/1675708547556_create_index_exportlog_jobid/down.sql b/hasura/migrations/1675708547556_create_index_exportlog_jobid/down.sql
new file mode 100644
index 000000000..897febadc
--- /dev/null
+++ b/hasura/migrations/1675708547556_create_index_exportlog_jobid/down.sql
@@ -0,0 +1 @@
+DROP INDEX IF EXISTS "public"."exportlog_jobid";
diff --git a/hasura/migrations/1675708547556_create_index_exportlog_jobid/up.sql b/hasura/migrations/1675708547556_create_index_exportlog_jobid/up.sql
new file mode 100644
index 000000000..3eb318294
--- /dev/null
+++ b/hasura/migrations/1675708547556_create_index_exportlog_jobid/up.sql
@@ -0,0 +1,2 @@
+CREATE  INDEX "exportlog_jobid" on
+  "public"."exportlog" using btree ("jobid");
diff --git a/hasura/migrations/1675708579618_create_index_exportlog_payments/down.sql b/hasura/migrations/1675708579618_create_index_exportlog_payments/down.sql
new file mode 100644
index 000000000..8417b5a29
--- /dev/null
+++ b/hasura/migrations/1675708579618_create_index_exportlog_payments/down.sql
@@ -0,0 +1 @@
+DROP INDEX IF EXISTS "public"."exportlog_payments";
diff --git a/hasura/migrations/1675708579618_create_index_exportlog_payments/up.sql b/hasura/migrations/1675708579618_create_index_exportlog_payments/up.sql
new file mode 100644
index 000000000..1a41704ec
--- /dev/null
+++ b/hasura/migrations/1675708579618_create_index_exportlog_payments/up.sql
@@ -0,0 +1,2 @@
+CREATE  INDEX "exportlog_payments" on
+  "public"."exportlog" using btree ("paymentid");

From e0eb4657d2f25cd6b5d1d6bb2e611c6ca084b07f Mon Sep 17 00:00:00 2001
From: Patrick Fic <snaptsoft@gmail.com>
Date: Mon, 6 Feb 2023 12:45:19 -0800
Subject: [PATCH 11/13] Resolve null displays of vehicle names.

---
 .../owner-detail-jobs.component.jsx           |  4 +++-
 .../vehicles-detail.page.container.jsx        | 23 +++++++++++++++----
 2 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/client/src/components/owner-detail-jobs/owner-detail-jobs.component.jsx b/client/src/components/owner-detail-jobs/owner-detail-jobs.component.jsx
index e6553e1ab..c69712a0b 100644
--- a/client/src/components/owner-detail-jobs/owner-detail-jobs.component.jsx
+++ b/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")
diff --git a/client/src/pages/vehicles-detail/vehicles-detail.page.container.jsx b/client/src/pages/vehicles-detail/vehicles-detail.page.container.jsx
index 9165cb3f6..77baa7bfd 100644
--- a/client/src/pages/vehicles-detail/vehicles-detail.page.container.jsx
+++ b/client/src/pages/vehicles-detail/vehicles-detail.page.container.jsx
@@ -39,9 +39,11 @@ export function VehicleDetailContainer({
     document.title = t("titles.vehicledetail", {
       vehicle:
         data && data.vehicles_by_pk
-          ? `${data.vehicles_by_pk && data.vehicles_by_pk.v_model_yr} ${
-              data.vehicles_by_pk && data.vehicles_by_pk.v_make_desc
-            } ${data.vehicles_by_pk && data.vehicles_by_pk.v_model_desc}`
+          ? `${(data.vehicles_by_pk && data.vehicles_by_pk.v_model_yr) || ""} ${
+              (data.vehicles_by_pk && data.vehicles_by_pk.v_make_desc) || ""
+            } ${
+              (data.vehicles_by_pk && data.vehicles_by_pk.v_model_desc) || ""
+            }`
           : "",
     });
     setSelectedHeader("vehicles");
@@ -53,7 +55,14 @@ export function VehicleDetailContainer({
         label: t("titles.bc.vehicle-details", {
           vehicle:
             data && data.vehicles_by_pk
-              ? `${data.vehicles_by_pk.v_model_yr} ${data.vehicles_by_pk.v_make_desc} ${data.vehicles_by_pk.v_model_desc}`
+              ? `${
+                  (data.vehicles_by_pk && data.vehicles_by_pk.v_model_yr) || ""
+                } ${
+                  (data.vehicles_by_pk && data.vehicles_by_pk.v_make_desc) || ""
+                } ${
+                  (data.vehicles_by_pk && data.vehicles_by_pk.v_model_desc) ||
+                  ""
+                }`
               : "",
         }),
       },
@@ -64,7 +73,11 @@ export function VehicleDetailContainer({
         CreateRecentItem(
           vehId,
           "vehicle",
-          `${data.vehicles_by_pk.v_vin} | ${data.vehicles_by_pk.v_model_yr} ${data.vehicles_by_pk.v_make_desc} ${data.vehicles_by_pk.v_model_desc}`,
+          `${data.vehicles_by_pk.v_vin || "N/A"} | ${
+            data.vehicles_by_pk.v_model_yr || ""
+          } ${data.vehicles_by_pk.v_make_desc || ""} ${
+            data.vehicles_by_pk.v_model_desc || ""
+          }`.trim(),
           `/manage/vehicles/${vehId}`
         )
       );

From 038aaf249efddd3c85f9aa51dbd099d9a2edd094 Mon Sep 17 00:00:00 2001
From: Allan Carr <allan@typhooncarr.com>
Date: Wed, 8 Feb 2023 18:37:10 -0800
Subject: [PATCH 12/13] IO-2160 Purchase & Return Ratio by Vendor Reports

---
 client/src/translations/en_us/common.json |  2 ++
 client/src/translations/es/common.json    |  2 ++
 client/src/translations/fr/common.json    |  2 ++
 client/src/utils/TemplateConstants.js     | 28 +++++++++++++++++++++++
 4 files changed, 34 insertions(+)

diff --git a/client/src/translations/en_us/common.json b/client/src/translations/en_us/common.json
index 332f350fd..8561cd2a7 100644
--- a/client/src/translations/en_us/common.json
+++ b/client/src/translations/en_us/common.json
@@ -2486,6 +2486,8 @@
 				"production_by_technician": "Production by Technician",
 				"production_by_technician_one": "Production filtered by Technician",
 				"psr_by_make": "Percent of Sales by Vehicle Make",
+				"purchase_return_ratio_grouped_by_vendor_detail": "Purchase & Return Ratio by Vendor (Detail)",
+				"purchase_return_ratio_grouped_by_vendor_summary": "Purchase & Return Ratio by Vendor (Summary)",
 				"purchases_by_cost_center_detail": "Purchases by Cost Center (Detail)",
 				"purchases_by_cost_center_summary": "Purchases by Cost Center (Summary)",
 				"purchases_by_date_range_detail": "Purchases by Date - Detail",
diff --git a/client/src/translations/es/common.json b/client/src/translations/es/common.json
index 2b7c7391b..27525eff9 100644
--- a/client/src/translations/es/common.json
+++ b/client/src/translations/es/common.json
@@ -2486,6 +2486,8 @@
 				"production_by_technician": "",
 				"production_by_technician_one": "",
 				"psr_by_make": "",
+				"purchase_return_ratio_grouped_by_vendor_detail": "",
+				"purchase_return_ratio_grouped_by_vendor_summary": "",
 				"purchases_by_cost_center_detail": "",
 				"purchases_by_cost_center_summary": "",
 				"purchases_by_date_range_detail": "",
diff --git a/client/src/translations/fr/common.json b/client/src/translations/fr/common.json
index 381fe267b..5fdda7707 100644
--- a/client/src/translations/fr/common.json
+++ b/client/src/translations/fr/common.json
@@ -2486,6 +2486,8 @@
 				"production_by_technician": "",
 				"production_by_technician_one": "",
 				"psr_by_make": "",
+				"purchase_return_ratio_grouped_by_vendor_detail": "",
+				"purchase_return_ratio_grouped_by_vendor_summary": "",
 				"purchases_by_cost_center_detail": "",
 				"purchases_by_cost_center_summary": "",
 				"purchases_by_date_range_detail": "",
diff --git a/client/src/utils/TemplateConstants.js b/client/src/utils/TemplateConstants.js
index 9ae638b2f..6c72e8fa4 100644
--- a/client/src/utils/TemplateConstants.js
+++ b/client/src/utils/TemplateConstants.js
@@ -1813,6 +1813,34 @@ export const TemplateList = (type, context) => {
             },
             group: "jobs",
           },
+          purchase_return_ratio_grouped_by_vendor_detail: {
+            title: i18n.t("reportcenter.templates.purchase_return_ratio_grouped_by_vendor_detail"),
+            subject: i18n.t(
+              "reportcenter.templates.purchase_return_ratio_grouped_by_vendor_detail"
+            ),
+            key: "purchase_return_ratio_grouped_by_vendor_detail",
+            //idtype: "vendor",
+            disabled: false,
+            rangeFilter: {
+              object: i18n.t("reportcenter.labels.objects.bills"),
+              field: i18n.t("bills.fields.date"),
+            },
+            group: "purchases",
+          },
+          purchase_return_ratio_grouped_by_vendor_summary: {
+            title: i18n.t("reportcenter.templates.purchase_return_ratio_grouped_by_vendor_summary"),
+            subject: i18n.t(
+              "reportcenter.templates.purchase_return_ratio_grouped_by_vendor_summary"
+            ),
+            key: "purchase_return_ratio_grouped_by_vendor_summary",
+            //idtype: "vendor",
+            disabled: false,
+            rangeFilter: {
+              object: i18n.t("reportcenter.labels.objects.bills"),
+              field: i18n.t("bills.fields.date"),
+            },
+            group: "purchases",
+          },
         }
       : {}),
     ...(!type || type === "courtesycarcontract"

From 739265ee6a0003eeb49063a9ffcf168735ed4244 Mon Sep 17 00:00:00 2001
From: Patrick Fic <snaptsoft@gmail.com>
Date: Fri, 10 Feb 2023 09:08:39 -0800
Subject: [PATCH 13/13] Improve display of job lines preset display.

---
 .../job-lines-preset-button.component.jsx         | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/client/src/components/job-lines-preset-button/job-lines-preset-button.component.jsx b/client/src/components/job-lines-preset-button/job-lines-preset-button.component.jsx
index 60272786b..f805ece5a 100644
--- a/client/src/components/job-lines-preset-button/job-lines-preset-button.component.jsx
+++ b/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>
       ))}