From 3defe7201f810357354d98261218e8d830c0f93d Mon Sep 17 00:00:00 2001
From: Patrick Fic <patrick@thinkimex.com>
Date: Wed, 19 Jul 2023 16:11:26 -0700
Subject: [PATCH 1/2] Add compelted tasks to jobs table.

---
 hasura/metadata/tables.yaml                                   | 3 +++
 .../down.sql                                                  | 4 ++++
 .../up.sql                                                    | 2 ++
 3 files changed, 9 insertions(+)
 create mode 100644 hasura/migrations/1689808180226_alter_table_public_jobs_add_column_completed_tasks/down.sql
 create mode 100644 hasura/migrations/1689808180226_alter_table_public_jobs_add_column_completed_tasks/up.sql

diff --git a/hasura/metadata/tables.yaml b/hasura/metadata/tables.yaml
index 1ce055244..ee39e05c3 100644
--- a/hasura/metadata/tables.yaml
+++ b/hasura/metadata/tables.yaml
@@ -3300,6 +3300,7 @@
           - clm_total
           - clm_zip
           - comment
+          - completed_tasks
           - converted
           - created_at
           - cust_pr
@@ -3564,6 +3565,7 @@
           - clm_total
           - clm_zip
           - comment
+          - completed_tasks
           - converted
           - created_at
           - cust_pr
@@ -3839,6 +3841,7 @@
           - clm_total
           - clm_zip
           - comment
+          - completed_tasks
           - converted
           - created_at
           - cust_pr
diff --git a/hasura/migrations/1689808180226_alter_table_public_jobs_add_column_completed_tasks/down.sql b/hasura/migrations/1689808180226_alter_table_public_jobs_add_column_completed_tasks/down.sql
new file mode 100644
index 000000000..a15ccb965
--- /dev/null
+++ b/hasura/migrations/1689808180226_alter_table_public_jobs_add_column_completed_tasks/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 "completed_tasks" jsonb
+--  null default jsonb_build_array();
diff --git a/hasura/migrations/1689808180226_alter_table_public_jobs_add_column_completed_tasks/up.sql b/hasura/migrations/1689808180226_alter_table_public_jobs_add_column_completed_tasks/up.sql
new file mode 100644
index 000000000..430669277
--- /dev/null
+++ b/hasura/migrations/1689808180226_alter_table_public_jobs_add_column_completed_tasks/up.sql
@@ -0,0 +1,2 @@
+alter table "public"."jobs" add column "completed_tasks" jsonb
+ null default jsonb_build_array();

From 6f58528de24ea9caea2c7cbbdd010ed6c053d102 Mon Sep 17 00:00:00 2001
From: Allan Carr <allan.carr@thinkimex.com>
Date: Fri, 21 Jul 2023 09:54:20 -0700
Subject: [PATCH 2/2] IO-2354 Add Color to Available C/C Table

---
 .../contract-cars/contract-cars.component.jsx         | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/client/src/components/contract-cars/contract-cars.component.jsx b/client/src/components/contract-cars/contract-cars.component.jsx
index c66ff9faa..541d6d7c3 100644
--- a/client/src/components/contract-cars/contract-cars.component.jsx
+++ b/client/src/components/contract-cars/contract-cars.component.jsx
@@ -59,6 +59,14 @@ export default function ContractsCarsComponent({
       sortOrder:
         state.sortedInfo.columnKey === "model" && state.sortedInfo.order,
     },
+    {
+      title: t("courtesycars.fields.color"),
+      dataIndex: "color",
+      key: "color",
+      sorter: (a, b) => alphaSort(a.color, b.color),
+      sortOrder:
+        state.sortedInfo.columnKey === "color" && state.sortedInfo.order,
+    },
     {
       title: t("courtesycars.fields.plate"),
       dataIndex: "plate",
@@ -93,6 +101,9 @@ export default function ContractsCarsComponent({
             (cc.model || "")
               .toLowerCase()
               .includes(state.search.toLowerCase()) ||
+            (cc.color || "")
+              .toLowerCase()
+              .includes(state.search.toLowerCase()) ||
             (cc.plate || "").toLowerCase().includes(state.search.toLowerCase())
         );