From fc023367ccb31bdd9328dfe7bf836d69931af053 Mon Sep 17 00:00:00 2001
From: Patrick Fic <>
Date: Mon, 3 Jan 2022 13:05:47 -0800
Subject: [PATCH 1/2] IO-1608 Remove first name from parts order.

---
 client/src/utils/TemplateConstants.js | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/client/src/utils/TemplateConstants.js b/client/src/utils/TemplateConstants.js
index 5feba4d62..d43395e19 100644
--- a/client/src/utils/TemplateConstants.js
+++ b/client/src/utils/TemplateConstants.js
@@ -509,11 +509,11 @@ export const TemplateList = (type, context) => {
             key: "parts_order",
             subject: i18n.t("printcenter.subjects.jobs.parts_order", {
               ro_number: context && context.job && context.job.ro_number,
-              name: `${(context && context.job && context.job.ownr_fn) || ""} ${
-                (context && context.job && context.job.ownr_ln) || ""
-              } ${
-                (context && context.job && context.job.ownr_co_nm) || ""
-              }`.trim(),
+              name: (
+                (context && context.job && context.job.ownr_ln) ||
+                (context && context.job && context.job.ownr_co_nm) ||
+                ""
+              ).trim(),
             }),
             disabled: false,
           },

From 6457acc61e0a4aa93ffff510bd41c303db11c4b9 Mon Sep 17 00:00:00 2001
From: Patrick Fic <>
Date: Tue, 4 Jan 2022 12:33:20 -0800
Subject: [PATCH 2/2] IO-1613 add suspended days to jobs.

---
 bodyshop_translations.babel                   | 65 ++++++++++++++++++-
 .../jobs-detail-header-actions.component.jsx  | 19 +++++-
 .../jobs-detail-header.component.jsx          |  9 ++-
 .../jobs-list/jobs-list.component.jsx         |  9 ++-
 ...production-board-kanban-card.component.jsx |  9 ++-
 .../production-list-columns.data.js           | 14 +++-
 .../schedule-day-view.container.jsx           |  1 +
 .../schedule-job-modal.component.jsx          |  4 +-
 client/src/graphql/appointments.queries.js    | 22 +++++--
 client/src/graphql/jobs.queries.js            |  5 ++
 client/src/translations/en_us/common.json     |  5 +-
 client/src/translations/es/common.json        |  5 +-
 client/src/translations/fr/common.json        |  5 +-
 hasura/metadata/tables.yaml                   |  3 +
 .../down.sql                                  |  4 ++
 .../up.sql                                    |  2 +
 server/graphql-client/queries.js              | 12 ++--
 server/scheduling/scheduling-job.js           |  1 +
 18 files changed, 170 insertions(+), 24 deletions(-)
 create mode 100644 hasura/migrations/1641322435174_alter_table_public_jobs_add_column_suspended/down.sql
 create mode 100644 hasura/migrations/1641322435174_alter_table_public_jobs_add_column_suspended/up.sql

diff --git a/bodyshop_translations.babel b/bodyshop_translations.babel
index f992575cc..d6c6d4c7f 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
@@ -26904,6 +26904,27 @@
                                             </translation>
                                         </translations>
                                     </concept_node>
+                                    <concept_node>
+                                        <name>suspended</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>suspense</name>
                                         <definition_loaded>false</definition_loaded>
@@ -35564,6 +35585,48 @@
                                             </translation>
                                         </translations>
                                     </concept_node>
+                                    <concept_node>
+                                        <name>suspend</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>unsuspend</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>
                                 </children>
                             </folder_node>
                             <folder_node>
diff --git a/client/src/components/jobs-detail-header-actions/jobs-detail-header-actions.component.jsx b/client/src/components/jobs-detail-header-actions/jobs-detail-header-actions.component.jsx
index e637fa93f..015e0113c 100644
--- a/client/src/components/jobs-detail-header-actions/jobs-detail-header-actions.component.jsx
+++ b/client/src/components/jobs-detail-header-actions/jobs-detail-header-actions.component.jsx
@@ -89,6 +89,19 @@ export function JobsDetailHeaderActions({
     });
   };
 
+  const handleSuspend = (e) => {
+    logImEXEvent("production_toggle_alert");
+    //e.stopPropagation();
+    updateJob({
+      variables: {
+        jobId: job.id,
+        job: {
+          suspended: !job.suspended,
+        },
+      },
+    });
+  };
+
   const statusmenu = (
     <Menu key="popovermenu">
       <Menu.Item
@@ -199,7 +212,11 @@ export function JobsDetailHeaderActions({
           {t("jobs.actions.addtoproduction")}
         </Menu.Item>
       )}
-
+      <Menu.Item key="togglesuspend" onClick={handleSuspend}>
+        {job.suspended
+          ? t("production.actions.unsuspend")
+          : t("production.actions.suspend")}
+      </Menu.Item>
       <Menu.Item key="toggleAlert" onClick={handleAlertToggle}>
         {job.production_vars && job.production_vars.alert
           ? t("production.labels.alertoff")
diff --git a/client/src/components/jobs-detail-header/jobs-detail-header.component.jsx b/client/src/components/jobs-detail-header/jobs-detail-header.component.jsx
index 32bf610d5..86fbde089 100644
--- a/client/src/components/jobs-detail-header/jobs-detail-header.component.jsx
+++ b/client/src/components/jobs-detail-header/jobs-detail-header.component.jsx
@@ -1,5 +1,9 @@
 import { Card, Col, Row, Space, Tag } from "antd";
-import { WarningFilled, ExclamationCircleFilled } from "@ant-design/icons";
+import {
+  WarningFilled,
+  ExclamationCircleFilled,
+  PauseCircleOutlined,
+} from "@ant-design/icons";
 import React, { useMemo } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
@@ -68,6 +72,9 @@ export function JobsDetailHeader({ job, bodyshop, disabled }) {
                     {t("jobs.labels.inproduction")}
                   </Tag>
                 )}
+                {job.suspended && (
+                  <PauseCircleOutlined style={{ color: "orangered" }} />
+                )}
                 {job.production_vars && job.production_vars.alert ? (
                   <ExclamationCircleFilled className="production-alert" />
                 ) : null}
diff --git a/client/src/components/jobs-list/jobs-list.component.jsx b/client/src/components/jobs-list/jobs-list.component.jsx
index 49f8a61f0..51b646c1c 100644
--- a/client/src/components/jobs-list/jobs-list.component.jsx
+++ b/client/src/components/jobs-list/jobs-list.component.jsx
@@ -1,4 +1,8 @@
-import { SyncOutlined, ExclamationCircleFilled } from "@ant-design/icons";
+import {
+  SyncOutlined,
+  ExclamationCircleFilled,
+  PauseCircleOutlined,
+} from "@ant-design/icons";
 import { useQuery } from "@apollo/client";
 import { Button, Card, Grid, Input, Space, Table } from "antd";
 import queryString from "query-string";
@@ -111,6 +115,9 @@ export function JobsList({ bodyshop }) {
             {record.production_vars && record.production_vars.alert ? (
               <ExclamationCircleFilled className="production-alert" />
             ) : null}
+            {record.suspended && (
+              <PauseCircleOutlined style={{ color: "orangered" }} />
+            )}
           </Space>
         </Link>
       ),
diff --git a/client/src/components/production-board-kanban-card/production-board-kanban-card.component.jsx b/client/src/components/production-board-kanban-card/production-board-kanban-card.component.jsx
index 952c23b44..817627ec8 100644
--- a/client/src/components/production-board-kanban-card/production-board-kanban-card.component.jsx
+++ b/client/src/components/production-board-kanban-card/production-board-kanban-card.component.jsx
@@ -1,4 +1,8 @@
-import { CalendarOutlined, EyeFilled } from "@ant-design/icons";
+import {
+  CalendarOutlined,
+  EyeFilled,
+  PauseCircleOutlined,
+} from "@ant-design/icons";
 import { Card, Col, Row, Space } from "antd";
 import React from "react";
 import { useTranslation } from "react-i18next";
@@ -40,6 +44,9 @@ export default function ProductionBoardCard(
       title={
         <Space>
           <ProductionAlert record={card} key="alert" />
+          {card.suspended && (
+            <PauseCircleOutlined style={{ color: "orangered" }} />
+          )}
           <span style={{ fontWeight: "bolder" }}>
             {card.ro_number || t("general.labels.na")}
           </span>
diff --git a/client/src/components/production-list-columns/production-list-columns.data.js b/client/src/components/production-list-columns/production-list-columns.data.js
index 0072c0ca5..7c3751b03 100644
--- a/client/src/components/production-list-columns/production-list-columns.data.js
+++ b/client/src/components/production-list-columns/production-list-columns.data.js
@@ -1,3 +1,5 @@
+import { PauseCircleOutlined } from "@ant-design/icons";
+import { Space } from "antd";
 import i18n from "i18next";
 import moment from "moment";
 import React from "react";
@@ -43,9 +45,19 @@ const r = ({ technician, state, activeStatuses, bodyshop }) => {
         technician ? (
           <Link to={`/tech/joblookup?selected=${record.id}`}>
             {record.ro_number}
+            {record.suspended && (
+              <PauseCircleOutlined style={{ color: "orangered" }} />
+            )}
           </Link>
         ) : (
-          <Link to={`/manage/jobs/${record.id}`}>{record.ro_number}</Link>
+          <Link to={`/manage/jobs/${record.id}`}>
+            <Space>
+              {record.ro_number}
+              {record.suspended && (
+                <PauseCircleOutlined style={{ color: "orangered" }} />
+              )}
+            </Space>
+          </Link>
         ),
     },
     {
diff --git a/client/src/components/schedule-day-view/schedule-day-view.container.jsx b/client/src/components/schedule-day-view/schedule-day-view.container.jsx
index e48240e59..3a55f2908 100644
--- a/client/src/components/schedule-day-view/schedule-day-view.container.jsx
+++ b/client/src/components/schedule-day-view/schedule-day-view.container.jsx
@@ -5,6 +5,7 @@ import { QUERY_APPOINTMENT_BY_DATE } from "../../graphql/appointments.queries";
 import LoadingSkeleton from "../loading-skeleton/loading-skeleton.component";
 import moment from "moment";
 import { useTranslation } from "react-i18next";
+
 export default function ScheduleDayViewContainer({ day }) {
   const { loading, error, data } = useQuery(QUERY_APPOINTMENT_BY_DATE, {
     variables: {
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 2e986adda..b31682f89 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
@@ -188,10 +188,10 @@ export function ScheduleJobModalComponent({
         />
       </Col>
       <Col span={12}>
-        <Form.Item shouldUpdate>
+        <Form.Item shouldUpdate={(prev, cur) => prev.start !== cur.start}>
           {() => {
+            console.log("render");
             const values = form.getFieldsValue();
-
             return (
               <div className="schedule-job-modal">
                 <ScheduleDayViewContainer day={values.start} />
diff --git a/client/src/graphql/appointments.queries.js b/client/src/graphql/appointments.queries.js
index 529cf68a7..3f9a4144d 100644
--- a/client/src/graphql/appointments.queries.js
+++ b/client/src/graphql/appointments.queries.js
@@ -212,7 +212,9 @@ export const QUERY_APPOINTMENTS_BY_JOBID = gql`
 `;
 export const QUERY_SCHEDULE_LOAD_DATA = gql`
   query QUERY_SCHEDULE_LOAD_DATA($start: timestamptz!, $end: timestamptz!) {
-    prodJobs: jobs(where: { inproduction: { _eq: true } }) {
+    prodJobs: jobs(
+      where: { inproduction: { _eq: true }, suspended: { _eq: false } }
+    ) {
       id
       labhrs: joblines_aggregate(
         where: { mod_lbr_ty: { _neq: "LAR" }, removed: { _eq: false } }
@@ -235,9 +237,14 @@ export const QUERY_SCHEDULE_LOAD_DATA = gql`
     }
     compJobs: jobs(
       where: {
-        _or: [
-          { scheduled_completion: { _gte: $start, _lte: $end } }
-          { actual_completion: { _gte: $start, _lte: $end } }
+        _and: [
+          { suspended: { _eq: false } }
+          {
+            _or: [
+              { scheduled_completion: { _gte: $start, _lte: $end } }
+              { actual_completion: { _gte: $start, _lte: $end } }
+            ]
+          }
         ]
       }
     ) {
@@ -264,7 +271,12 @@ export const QUERY_SCHEDULE_LOAD_DATA = gql`
         }
       }
     }
-    arrJobs: jobs(where: { scheduled_in: { _gte: $start, _lte: $end } }) {
+    arrJobs: jobs(
+      where: {
+        scheduled_in: { _gte: $start, _lte: $end }
+        suspended: { _eq: false }
+      }
+    ) {
       id
       scheduled_in
       ro_number
diff --git a/client/src/graphql/jobs.queries.js b/client/src/graphql/jobs.queries.js
index 95641e936..2218ed820 100644
--- a/client/src/graphql/jobs.queries.js
+++ b/client/src/graphql/jobs.queries.js
@@ -42,6 +42,7 @@ export const QUERY_ALL_ACTIVE_JOBS = gql`
       status
       updated_at
       ded_amt
+      suspended
     }
   }
 `;
@@ -290,6 +291,7 @@ export const QUERY_JOBS_IN_PRODUCTION = gql`
       employee_refinish
       employee_prep
       employee_csr
+      suspended
       labhrs: joblines_aggregate(
         where: {
           _and: [{ mod_lbr_ty: { _neq: "LAR" } }, { removed: { _eq: false } }]
@@ -654,6 +656,7 @@ export const GET_JOB_BY_PK = gql`
       voided
       ca_bc_pvrt
       ca_customer_gst
+      suspended
       joblines(where: { removed: { _eq: false } }, order_by: { line_no: asc }) {
         id
         alt_partm
@@ -828,6 +831,7 @@ export const QUERY_JOB_CARD_DETAILS = gql`
       ca_gst_registrant
       owner_owing
       special_coverage_policy
+      suspended
       available_jobs {
         id
       }
@@ -1034,6 +1038,7 @@ export const UPDATE_JOB = gql`
         ro_number
         production_vars
         lbr_adjustments
+        suspended
       }
     }
   }
diff --git a/client/src/translations/en_us/common.json b/client/src/translations/en_us/common.json
index d59aa91b2..1282f1643 100644
--- a/client/src/translations/en_us/common.json
+++ b/client/src/translations/en_us/common.json
@@ -1578,6 +1578,7 @@
 				"subletstotal": "Sublets Total",
 				"subtotal": "Subtotal",
 				"supplementnote": "The job had a supplement imported.",
+				"suspended": "SUSPENDED",
 				"suspense": "Suspense",
 				"total_cost": "Total Cost",
 				"total_cust_payable": "Total Customer Amount Payable",
@@ -2118,7 +2119,9 @@
 				"paintpriority-set": "Set Paint Priority",
 				"remove": "Remove from Production",
 				"removecolumn": "Remove Column",
-				"saveconfig": "Save Configuration"
+				"saveconfig": "Save Configuration",
+				"suspend": "Suspend",
+				"unsuspend": "Unsuspend"
 			},
 			"errors": {
 				"boardupdate": "Error encountered updating job. {{message}}",
diff --git a/client/src/translations/es/common.json b/client/src/translations/es/common.json
index f7074b2da..c2ee5c268 100644
--- a/client/src/translations/es/common.json
+++ b/client/src/translations/es/common.json
@@ -1578,6 +1578,7 @@
 				"subletstotal": "",
 				"subtotal": "",
 				"supplementnote": "",
+				"suspended": "",
 				"suspense": "",
 				"total_cost": "",
 				"total_cust_payable": "",
@@ -2118,7 +2119,9 @@
 				"paintpriority-set": "",
 				"remove": "",
 				"removecolumn": "",
-				"saveconfig": ""
+				"saveconfig": "",
+				"suspend": "",
+				"unsuspend": ""
 			},
 			"errors": {
 				"boardupdate": "",
diff --git a/client/src/translations/fr/common.json b/client/src/translations/fr/common.json
index a9578c2e2..27772896c 100644
--- a/client/src/translations/fr/common.json
+++ b/client/src/translations/fr/common.json
@@ -1578,6 +1578,7 @@
 				"subletstotal": "",
 				"subtotal": "",
 				"supplementnote": "",
+				"suspended": "",
 				"suspense": "",
 				"total_cost": "",
 				"total_cust_payable": "",
@@ -2118,7 +2119,9 @@
 				"paintpriority-set": "",
 				"remove": "",
 				"removecolumn": "",
-				"saveconfig": ""
+				"saveconfig": "",
+				"suspend": "",
+				"unsuspend": ""
 			},
 			"errors": {
 				"boardupdate": "",
diff --git a/hasura/metadata/tables.yaml b/hasura/metadata/tables.yaml
index b1100630e..490c97131 100644
--- a/hasura/metadata/tables.yaml
+++ b/hasura/metadata/tables.yaml
@@ -2780,6 +2780,7 @@
       - state_tax_rate
       - status
       - storage_payable
+      - suspended
       - tax_lbr_rt
       - tax_levies_rt
       - tax_paint_mat_rt
@@ -3035,6 +3036,7 @@
       - state_tax_rate
       - status
       - storage_payable
+      - suspended
       - tax_lbr_rt
       - tax_levies_rt
       - tax_paint_mat_rt
@@ -3300,6 +3302,7 @@
       - state_tax_rate
       - status
       - storage_payable
+      - suspended
       - tax_lbr_rt
       - tax_levies_rt
       - tax_paint_mat_rt
diff --git a/hasura/migrations/1641322435174_alter_table_public_jobs_add_column_suspended/down.sql b/hasura/migrations/1641322435174_alter_table_public_jobs_add_column_suspended/down.sql
new file mode 100644
index 000000000..31892f49f
--- /dev/null
+++ b/hasura/migrations/1641322435174_alter_table_public_jobs_add_column_suspended/down.sql
@@ -0,0 +1,4 @@
+-- Could not auto-generate a down migration.
+-- Please write an appropriate down migration for the SQL below:
+-- alter table "public"."jobs" add column "suspended" boolean
+--  not null default 'false';
diff --git a/hasura/migrations/1641322435174_alter_table_public_jobs_add_column_suspended/up.sql b/hasura/migrations/1641322435174_alter_table_public_jobs_add_column_suspended/up.sql
new file mode 100644
index 000000000..e34b681af
--- /dev/null
+++ b/hasura/migrations/1641322435174_alter_table_public_jobs_add_column_suspended/up.sql
@@ -0,0 +1,2 @@
+alter table "public"."jobs" add column "suspended" boolean
+ not null default 'false';
diff --git a/server/graphql-client/queries.js b/server/graphql-client/queries.js
index a7cf85be8..3ed050f80 100644
--- a/server/graphql-client/queries.js
+++ b/server/graphql-client/queries.js
@@ -473,7 +473,7 @@ exports.QUERY_UPCOMING_APPOINTMENTS = `query QUERY_UPCOMING_APPOINTMENTS($now: t
     start
     block
   }
-  arrJobs: jobs(where: {scheduled_in: {_gte: $now}}) {
+  arrJobs: jobs(where: {scheduled_in: {_gte: $now}, suspended: {_eq: false}}) {
     id
     scheduled_in
     ro_number
@@ -492,7 +492,7 @@ exports.QUERY_UPCOMING_APPOINTMENTS = `query QUERY_UPCOMING_APPOINTMENTS($now: t
       }
     }
   }
-  compJobs: jobs(where: {_or: [{scheduled_completion: {_gte: $now}}, {actual_completion: {_gte: $now}}]}) {
+  compJobs: jobs(where: {_and: [{suspended: {_eq: false}}, {_or: [{scheduled_completion: {_gte: $now}}, {actual_completion: {_gte: $now}}]}]}) {
     id
     ro_number
     scheduled_completion
@@ -512,7 +512,7 @@ exports.QUERY_UPCOMING_APPOINTMENTS = `query QUERY_UPCOMING_APPOINTMENTS($now: t
       }
     }
   }
-  prodJobs: jobs(where: {inproduction: {_eq: true}}) {
+  prodJobs: jobs(where: {inproduction: {_eq: true}, suspended: {_eq: false}}) {
     id
     scheduled_completion
     labhrs: joblines_aggregate(where: {_and: [{mod_lbr_ty: {_neq: "LAR"}}, {removed: {_eq: false}}]}) {
@@ -530,11 +530,7 @@ 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 8c06b5345..54bad6919 100644
--- a/server/scheduling/scheduling-job.js
+++ b/server/scheduling/scheduling-job.js
@@ -140,6 +140,7 @@ exports.job = async (req, res) => {
       ...filteredCompJobs
         .map((p) => moment(p.actual_completion || p.scheduled_completion))
         .filter((p) => p.isValid() && p.isAfter(yesterday)),
+      moment().add(5, "days"),
     ]);
     const range = Math.round(moment.duration(end.diff(today)).asDays());
     for (var day = 0; day < range; day++) {