From 89af6d23e82b477fd24cc6ba27e32efa2360a52d Mon Sep 17 00:00:00 2001
From: Patrick Fic <snaptsoft@gmail.com>
Date: Wed, 10 Nov 2021 16:22:52 -0800
Subject: [PATCH] IO-1513 Added next contact date.

---
 bodyshop_translations.babel                   | 23 +++++++++++++++-
 .../jobs-detail-dates.component.jsx           |  6 +++++
 .../production-list-columns.data.js           | 26 ++++++++++++++++++-
 ...n-list-columns.lastcontacted.component.jsx | 18 +++++++++++--
 client/src/graphql/jobs.queries.js            |  4 +++
 client/src/translations/en_us/common.json     |  1 +
 client/src/translations/es/common.json        |  1 +
 client/src/translations/fr/common.json        |  1 +
 hasura/metadata/tables.yaml                   |  3 +++
 .../down.sql                                  |  4 +++
 .../up.sql                                    |  2 ++
 .../down.sql                                  |  2 ++
 .../up.sql                                    |  1 +
 .../down.sql                                  |  4 +++
 .../up.sql                                    |  2 ++
 15 files changed, 94 insertions(+), 4 deletions(-)
 create mode 100644 hasura/migrations/1636587357661_alter_table_public_jobs_add_column_date_next_contact/down.sql
 create mode 100644 hasura/migrations/1636587357661_alter_table_public_jobs_add_column_date_next_contact/up.sql
 create mode 100644 hasura/migrations/1636589196038_alter_table_public_jobs_drop_column_date_next_contact/down.sql
 create mode 100644 hasura/migrations/1636589196038_alter_table_public_jobs_drop_column_date_next_contact/up.sql
 create mode 100644 hasura/migrations/1636589211585_alter_table_public_jobs_add_column_date_next_contact/down.sql
 create mode 100644 hasura/migrations/1636589211585_alter_table_public_jobs_add_column_date_next_contact/up.sql

diff --git a/bodyshop_translations.babel b/bodyshop_translations.babel
index c6ab7bc49..62a2bc141 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
@@ -19779,6 +19779,27 @@
                                             </translation>
                                         </translations>
                                     </concept_node>
+                                    <concept_node>
+                                        <name>date_next_contact</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>date_open</name>
                                         <definition_loaded>false</definition_loaded>
diff --git a/client/src/components/jobs-detail-dates/jobs-detail-dates.component.jsx b/client/src/components/jobs-detail-dates/jobs-detail-dates.component.jsx
index cf1366612..b54783f98 100644
--- a/client/src/components/jobs-detail-dates/jobs-detail-dates.component.jsx
+++ b/client/src/components/jobs-detail-dates/jobs-detail-dates.component.jsx
@@ -75,6 +75,12 @@ export function JobsDetailDatesComponent({ jobRO, job, bodyshop }) {
         >
           <DateTimePicker />
         </Form.Item>
+        <Form.Item
+          label={t("jobs.fields.date_next_contact")}
+          name="date_next_contact"
+        >
+          <DateTimePicker />
+        </Form.Item>
         <Form.Item
           label={t("jobs.fields.scheduled_completion")}
           name="scheduled_completion"
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 3dfae0c47..26ef004ae 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,4 +1,5 @@
 import i18n from "i18next";
+import moment from "moment";
 import React from "react";
 import { Link } from "react-router-dom";
 import CurrencyFormatter from "../../utils/CurrencyFormatter";
@@ -11,11 +12,11 @@ import ProductionListColumnBodyPriority from "./production-list-columns.bodyprio
 import ProductionListDate from "./production-list-columns.date.component";
 import ProductionListColumnDetailPriority from "./production-list-columns.detailpriority.component";
 import ProductionListEmployeeAssignment from "./production-list-columns.empassignment.component";
+import ProductionListLastContacted from "./production-list-columns.lastcontacted.component";
 import ProductionListColumnPaintPriority from "./production-list-columns.paintpriority.component";
 import ProductionListColumnNote from "./production-list-columns.productionnote.component";
 import ProductionListColumnStatus from "./production-list-columns.status.component";
 import ProductionlistColumnTouchTime from "./prodution-list-columns.touchtime.component";
-import ProductionListLastContacted from "./production-list-columns.lastcontacted.component";
 
 const r = ({ technician, state, activeStatuses }) => {
   return [
@@ -109,6 +110,29 @@ const r = ({ technician, state, activeStatuses }) => {
         state.sortedInfo.order,
       render: (text, record) => <ProductionListLastContacted record={record} />,
     },
+    {
+      title: i18n.t("jobs.fields.date_next_contact"),
+      dataIndex: "date_next_contact",
+      key: "date_next_contact",
+      ellipsis: true,
+      sorter: (a, b) => dateSort(a.date_next_contact, b.date_next_contact),
+      sortOrder:
+        state.sortedInfo.columnKey === "date_next_contact" &&
+        state.sortedInfo.order,
+      render: (text, record) => (
+        <span
+          style={{
+            color:
+              record.date_next_contact &&
+              moment(record.date_next_contact).isBefore(moment())
+                ? "red"
+                : "",
+          }}
+        >
+          <ProductionListDate record={record} field="date_next_contact" time/>
+        </span>
+      ),
+    },
     {
       title: i18n.t("jobs.fields.scheduled_delivery"),
       dataIndex: "scheduled_delivery",
diff --git a/client/src/components/production-list-columns/production-list-columns.lastcontacted.component.jsx b/client/src/components/production-list-columns/production-list-columns.lastcontacted.component.jsx
index 94c68674b..95532e0a3 100644
--- a/client/src/components/production-list-columns/production-list-columns.lastcontacted.component.jsx
+++ b/client/src/components/production-list-columns/production-list-columns.lastcontacted.component.jsx
@@ -29,7 +29,11 @@ export function ProductionLastContacted({ currentUser, record }) {
   const [visible, setVisible] = useState(false);
   const { t } = useTranslation();
   const [form] = Form.useForm();
-  const handleFinish = async ({ date_last_contacted, note }) => {
+  const handleFinish = async ({
+    date_last_contacted,
+    date_next_contact,
+    note,
+  }) => {
     logImEXEvent("production_last_contacted");
 
     //e.stopPropagation();
@@ -38,6 +42,7 @@ export function ProductionLastContacted({ currentUser, record }) {
         jobId: record.id,
         job: {
           date_last_contacted,
+          ...(date_next_contact ? { date_next_contact } : {}),
         },
       },
     });
@@ -98,7 +103,16 @@ export function ProductionLastContacted({ currentUser, record }) {
             onClick={(e) => e.stopPropagation()}
           >
             <Form form={form} onFinish={handleFinish} layout="vertical">
-              <Form.Item name="date_last_contacted">
+              <Form.Item
+                name="date_last_contacted"
+                label={t("jobs.fields.date_last_contacted")}
+              >
+                <FormDateTimePickerComponent />
+              </Form.Item>
+              <Form.Item
+                name="date_next_contact"
+                label={t("jobs.fields.date_next_contact")}
+              >
                 <FormDateTimePickerComponent />
               </Form.Item>
               <Form.Item label={t("notes.labels.notetoadd")} name="note">
diff --git a/client/src/graphql/jobs.queries.js b/client/src/graphql/jobs.queries.js
index 160eae870..2203d9401 100644
--- a/client/src/graphql/jobs.queries.js
+++ b/client/src/graphql/jobs.queries.js
@@ -125,6 +125,7 @@ export const SUBSCRIPTION_JOBS_IN_PRODUCTION = gql`
       scheduled_completion
       scheduled_delivery
       date_last_contacted
+      date_next_contact 
       ins_co_nm
       clm_total
       ownr_ph1
@@ -519,6 +520,7 @@ export const GET_JOB_BY_PK = gql`
       date_scheduled
       date_invoiced
       date_last_contacted
+      date_next_contact
       date_exported
       status
       owner_owing
@@ -762,6 +764,7 @@ export const QUERY_JOB_CARD_DETAILS = gql`
       scheduled_delivery
       date_invoiced
       date_last_contacted
+      date_next_contact
       date_open
       date_exported
 
@@ -848,6 +851,7 @@ export const QUERY_TECH_JOB_DETAILS = gql`
       scheduled_delivery
       date_invoiced
       date_last_contacted
+      date_next_contact
       date_open
       date_exported
       voided
diff --git a/client/src/translations/en_us/common.json b/client/src/translations/en_us/common.json
index fbb2e7b75..d7e380572 100644
--- a/client/src/translations/en_us/common.json
+++ b/client/src/translations/en_us/common.json
@@ -1207,6 +1207,7 @@
 				"date_exported": "Exported",
 				"date_invoiced": "Invoiced",
 				"date_last_contacted": "Last Contacted Date",
+				"date_next_contact": "Next Contact Date",
 				"date_open": "Open",
 				"date_scheduled": "Scheduled",
 				"ded_amt": "Deductible",
diff --git a/client/src/translations/es/common.json b/client/src/translations/es/common.json
index fb36a8bf6..f35270f2f 100644
--- a/client/src/translations/es/common.json
+++ b/client/src/translations/es/common.json
@@ -1207,6 +1207,7 @@
 				"date_exported": "Exportado",
 				"date_invoiced": "Facturado",
 				"date_last_contacted": "",
+				"date_next_contact": "",
 				"date_open": "Abierto",
 				"date_scheduled": "Programado",
 				"ded_amt": "Deducible",
diff --git a/client/src/translations/fr/common.json b/client/src/translations/fr/common.json
index 9d582c0c4..acd355305 100644
--- a/client/src/translations/fr/common.json
+++ b/client/src/translations/fr/common.json
@@ -1207,6 +1207,7 @@
 				"date_exported": "Exportés",
 				"date_invoiced": "Facturé",
 				"date_last_contacted": "",
+				"date_next_contact": "",
 				"date_open": "Ouvrir",
 				"date_scheduled": "Prévu",
 				"ded_amt": "Déductible",
diff --git a/hasura/metadata/tables.yaml b/hasura/metadata/tables.yaml
index 96c7835f8..3ba629fe1 100644
--- a/hasura/metadata/tables.yaml
+++ b/hasura/metadata/tables.yaml
@@ -2592,6 +2592,7 @@
       - date_exported
       - date_invoiced
       - date_last_contacted
+      - date_next_contact
       - date_open
       - date_scheduled
       - ded_amt
@@ -2843,6 +2844,7 @@
       - date_exported
       - date_invoiced
       - date_last_contacted
+      - date_next_contact
       - date_open
       - date_scheduled
       - ded_amt
@@ -3104,6 +3106,7 @@
       - date_exported
       - date_invoiced
       - date_last_contacted
+      - date_next_contact
       - date_open
       - date_scheduled
       - ded_amt
diff --git a/hasura/migrations/1636587357661_alter_table_public_jobs_add_column_date_next_contact/down.sql b/hasura/migrations/1636587357661_alter_table_public_jobs_add_column_date_next_contact/down.sql
new file mode 100644
index 000000000..ea6cbc1ca
--- /dev/null
+++ b/hasura/migrations/1636587357661_alter_table_public_jobs_add_column_date_next_contact/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 "date_next_contact" timestamptz
+--  null;
diff --git a/hasura/migrations/1636587357661_alter_table_public_jobs_add_column_date_next_contact/up.sql b/hasura/migrations/1636587357661_alter_table_public_jobs_add_column_date_next_contact/up.sql
new file mode 100644
index 000000000..1d7710aa1
--- /dev/null
+++ b/hasura/migrations/1636587357661_alter_table_public_jobs_add_column_date_next_contact/up.sql
@@ -0,0 +1,2 @@
+alter table "public"."jobs" add column "date_next_contact" timestamptz
+ null;
diff --git a/hasura/migrations/1636589196038_alter_table_public_jobs_drop_column_date_next_contact/down.sql b/hasura/migrations/1636589196038_alter_table_public_jobs_drop_column_date_next_contact/down.sql
new file mode 100644
index 000000000..32652468b
--- /dev/null
+++ b/hasura/migrations/1636589196038_alter_table_public_jobs_drop_column_date_next_contact/down.sql
@@ -0,0 +1,2 @@
+alter table "public"."jobs" alter column "date_next_contact" drop not null;
+alter table "public"."jobs" add column "date_next_contact" timestamptz;
diff --git a/hasura/migrations/1636589196038_alter_table_public_jobs_drop_column_date_next_contact/up.sql b/hasura/migrations/1636589196038_alter_table_public_jobs_drop_column_date_next_contact/up.sql
new file mode 100644
index 000000000..80aa159a9
--- /dev/null
+++ b/hasura/migrations/1636589196038_alter_table_public_jobs_drop_column_date_next_contact/up.sql
@@ -0,0 +1 @@
+alter table "public"."jobs" drop column "date_next_contact" cascade;
diff --git a/hasura/migrations/1636589211585_alter_table_public_jobs_add_column_date_next_contact/down.sql b/hasura/migrations/1636589211585_alter_table_public_jobs_add_column_date_next_contact/down.sql
new file mode 100644
index 000000000..ea6cbc1ca
--- /dev/null
+++ b/hasura/migrations/1636589211585_alter_table_public_jobs_add_column_date_next_contact/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 "date_next_contact" timestamptz
+--  null;
diff --git a/hasura/migrations/1636589211585_alter_table_public_jobs_add_column_date_next_contact/up.sql b/hasura/migrations/1636589211585_alter_table_public_jobs_add_column_date_next_contact/up.sql
new file mode 100644
index 000000000..1d7710aa1
--- /dev/null
+++ b/hasura/migrations/1636589211585_alter_table_public_jobs_add_column_date_next_contact/up.sql
@@ -0,0 +1,2 @@
+alter table "public"."jobs" add column "date_next_contact" timestamptz
+ null;