From 92f14d6fa5ed5510ac8c74dda50ed7a431f34193 Mon Sep 17 00:00:00 2001
From: Patrick Fic <snaptsoft@gmail.com>
Date: Mon, 14 Mar 2022 13:25:13 -0700
Subject: [PATCH] IO-1750 Add towin and rent resp date fields.

---
 bodyshop_translations.babel                   | 44 ++++++++++++++++++-
 .../jobs-admin-dates.component.jsx            |  9 ++++
 .../jobs-detail-dates.component.jsx           |  6 +++
 client/src/graphql/jobs.queries.js            |  2 +
 client/src/translations/en_us/common.json     |  2 +
 client/src/translations/es/common.json        |  2 +
 client/src/translations/fr/common.json        |  2 +
 hasura/metadata/tables.yaml                   |  6 +++
 .../down.sql                                  |  4 ++
 .../up.sql                                    |  2 +
 .../down.sql                                  |  1 +
 .../up.sql                                    |  1 +
 .../down.sql                                  |  4 ++
 .../up.sql                                    |  2 +
 14 files changed, 86 insertions(+), 1 deletion(-)
 create mode 100644 hasura/migrations/1647288645478_alter_table_public_jobs_add_column_towin_date/down.sql
 create mode 100644 hasura/migrations/1647288645478_alter_table_public_jobs_add_column_towin_date/up.sql
 create mode 100644 hasura/migrations/1647288669678_alter_table_public_jobs_alter_column_towin_date/down.sql
 create mode 100644 hasura/migrations/1647288669678_alter_table_public_jobs_alter_column_towin_date/up.sql
 create mode 100644 hasura/migrations/1647288692067_alter_table_public_jobs_add_column_date_rentalresp/down.sql
 create mode 100644 hasura/migrations/1647288692067_alter_table_public_jobs_add_column_date_rentalresp/up.sql

diff --git a/bodyshop_translations.babel b/bodyshop_translations.babel
index cba8bc5d9..d82244e68 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
@@ -20581,6 +20581,27 @@
                                             </translation>
                                         </translations>
                                     </concept_node>
+                                    <concept_node>
+                                        <name>date_rentalresp</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_scheduled</name>
                                         <definition_loaded>false</definition_loaded>
@@ -20602,6 +20623,27 @@
                                             </translation>
                                         </translations>
                                     </concept_node>
+                                    <concept_node>
+                                        <name>date_towin</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>ded_amt</name>
                                         <definition_loaded>false</definition_loaded>
diff --git a/client/src/components/jobs-admin-dates/jobs-admin-dates.component.jsx b/client/src/components/jobs-admin-dates/jobs-admin-dates.component.jsx
index e708cb268..28cc4595e 100644
--- a/client/src/components/jobs-admin-dates/jobs-admin-dates.component.jsx
+++ b/client/src/components/jobs-admin-dates/jobs-admin-dates.component.jsx
@@ -58,6 +58,15 @@ export default function JobsAdminDatesChange({ job }) {
           >
             <FormDatePicker format="MM/DD/YYYY" />
           </Form.Item>
+          <Form.Item label={t("jobs.fields.date_towin")} name="date_towin">
+            <DateTimePicker />
+          </Form.Item>
+          <Form.Item
+            label={t("jobs.fields.date_rentalresp")}
+            name="date_rentalresp"
+          >
+            <DateTimePicker />
+          </Form.Item>
           <Form.Item label={t("jobs.fields.date_open")} name="date_open">
             <DateTimePicker />
           </Form.Item>
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 ec2c9bcef..d4b4848c3 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
@@ -39,6 +39,12 @@ export function JobsDetailDatesComponent({ jobRO, job, bodyshop }) {
         <Form.Item label={t("jobs.fields.date_open")} name="date_open">
           <DateTimePicker disabled={jobRO} />
         </Form.Item>
+        <Form.Item label={t("jobs.fields.date_towin")} name="date_towin">
+          <DateTimePicker disabled={jobRO} />
+        </Form.Item>
+        <Form.Item label={t("jobs.fields.date_rentalresp")} name="date_rentalresp">
+          <DateTimePicker disabled={jobRO} />
+        </Form.Item>
       </FormRow>
 
       <FormRow header={t("jobs.forms.scheddates")}>
diff --git a/client/src/graphql/jobs.queries.js b/client/src/graphql/jobs.queries.js
index 2309217d5..0fcc56a0f 100644
--- a/client/src/graphql/jobs.queries.js
+++ b/client/src/graphql/jobs.queries.js
@@ -650,6 +650,8 @@ export const GET_JOB_BY_PK = gql`
       date_invoiced
       date_last_contacted
       date_next_contact
+      date_towin
+      date_rentalresp 
       date_exported
       status
       owner_owing
diff --git a/client/src/translations/en_us/common.json b/client/src/translations/en_us/common.json
index 8bbb259f2..e8cb5b900 100644
--- a/client/src/translations/en_us/common.json
+++ b/client/src/translations/en_us/common.json
@@ -1254,7 +1254,9 @@
 				"date_last_contacted": "Last Contacted Date",
 				"date_next_contact": "Next Contact Date",
 				"date_open": "Open",
+				"date_rentalresp": "Shop Rental Responsibility Start",
 				"date_scheduled": "Scheduled",
+				"date_towin": "Towed In",
 				"ded_amt": "Deductible",
 				"ded_note": "Deductible Note",
 				"ded_status": "Deductible Status",
diff --git a/client/src/translations/es/common.json b/client/src/translations/es/common.json
index 79a10d0aa..e00010111 100644
--- a/client/src/translations/es/common.json
+++ b/client/src/translations/es/common.json
@@ -1254,7 +1254,9 @@
 				"date_last_contacted": "",
 				"date_next_contact": "",
 				"date_open": "Abierto",
+				"date_rentalresp": "",
 				"date_scheduled": "Programado",
+				"date_towin": "",
 				"ded_amt": "Deducible",
 				"ded_note": "",
 				"ded_status": "Estado deducible",
diff --git a/client/src/translations/fr/common.json b/client/src/translations/fr/common.json
index 2f9978e34..99306174b 100644
--- a/client/src/translations/fr/common.json
+++ b/client/src/translations/fr/common.json
@@ -1254,7 +1254,9 @@
 				"date_last_contacted": "",
 				"date_next_contact": "",
 				"date_open": "Ouvrir",
+				"date_rentalresp": "",
 				"date_scheduled": "Prévu",
+				"date_towin": "",
 				"ded_amt": "Déductible",
 				"ded_note": "",
 				"ded_status": "Statut de franchise",
diff --git a/hasura/metadata/tables.yaml b/hasura/metadata/tables.yaml
index abc366257..c91b048fc 100644
--- a/hasura/metadata/tables.yaml
+++ b/hasura/metadata/tables.yaml
@@ -2721,7 +2721,9 @@
       - date_last_contacted
       - date_next_contact
       - date_open
+      - date_rentalresp
       - date_scheduled
+      - date_towin
       - ded_amt
       - ded_note
       - ded_status
@@ -2979,7 +2981,9 @@
       - date_last_contacted
       - date_next_contact
       - date_open
+      - date_rentalresp
       - date_scheduled
+      - date_towin
       - ded_amt
       - ded_note
       - ded_status
@@ -3247,7 +3251,9 @@
       - date_last_contacted
       - date_next_contact
       - date_open
+      - date_rentalresp
       - date_scheduled
+      - date_towin
       - ded_amt
       - ded_note
       - ded_status
diff --git a/hasura/migrations/1647288645478_alter_table_public_jobs_add_column_towin_date/down.sql b/hasura/migrations/1647288645478_alter_table_public_jobs_add_column_towin_date/down.sql
new file mode 100644
index 000000000..7c44f678f
--- /dev/null
+++ b/hasura/migrations/1647288645478_alter_table_public_jobs_add_column_towin_date/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 "towin_date" timestamptz
+--  null;
diff --git a/hasura/migrations/1647288645478_alter_table_public_jobs_add_column_towin_date/up.sql b/hasura/migrations/1647288645478_alter_table_public_jobs_add_column_towin_date/up.sql
new file mode 100644
index 000000000..12268c70f
--- /dev/null
+++ b/hasura/migrations/1647288645478_alter_table_public_jobs_add_column_towin_date/up.sql
@@ -0,0 +1,2 @@
+alter table "public"."jobs" add column "towin_date" timestamptz
+ null;
diff --git a/hasura/migrations/1647288669678_alter_table_public_jobs_alter_column_towin_date/down.sql b/hasura/migrations/1647288669678_alter_table_public_jobs_alter_column_towin_date/down.sql
new file mode 100644
index 000000000..fa9e05495
--- /dev/null
+++ b/hasura/migrations/1647288669678_alter_table_public_jobs_alter_column_towin_date/down.sql
@@ -0,0 +1 @@
+alter table "public"."jobs" rename column "date_towin" to "towin_date";
diff --git a/hasura/migrations/1647288669678_alter_table_public_jobs_alter_column_towin_date/up.sql b/hasura/migrations/1647288669678_alter_table_public_jobs_alter_column_towin_date/up.sql
new file mode 100644
index 000000000..74de863b3
--- /dev/null
+++ b/hasura/migrations/1647288669678_alter_table_public_jobs_alter_column_towin_date/up.sql
@@ -0,0 +1 @@
+alter table "public"."jobs" rename column "towin_date" to "date_towin";
diff --git a/hasura/migrations/1647288692067_alter_table_public_jobs_add_column_date_rentalresp/down.sql b/hasura/migrations/1647288692067_alter_table_public_jobs_add_column_date_rentalresp/down.sql
new file mode 100644
index 000000000..09117d3d4
--- /dev/null
+++ b/hasura/migrations/1647288692067_alter_table_public_jobs_add_column_date_rentalresp/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_rentalresp" timestamptz
+--  null;
diff --git a/hasura/migrations/1647288692067_alter_table_public_jobs_add_column_date_rentalresp/up.sql b/hasura/migrations/1647288692067_alter_table_public_jobs_add_column_date_rentalresp/up.sql
new file mode 100644
index 000000000..0d6edf459
--- /dev/null
+++ b/hasura/migrations/1647288692067_alter_table_public_jobs_add_column_date_rentalresp/up.sql
@@ -0,0 +1,2 @@
+alter table "public"."jobs" add column "date_rentalresp" timestamptz
+ null;