From a7ad18fae25c50f418fcc5df78224d33cb1c4611 Mon Sep 17 00:00:00 2001
From: Patrick Fic <patrick@thinkimex.com>
Date: Thu, 27 Jul 2023 11:23:44 -0700
Subject: [PATCH 1/2] Timeticket schema update to include task_name

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

diff --git a/hasura/metadata/tables.yaml b/hasura/metadata/tables.yaml
index 12664c718..cf189ea3f 100644
--- a/hasura/metadata/tables.yaml
+++ b/hasura/metadata/tables.yaml
@@ -5562,6 +5562,7 @@
           - memo
           - productivehrs
           - rate
+          - task_name
           - ttapprovalqueueid
           - updated_at
   select_permissions:
@@ -5585,6 +5586,7 @@
           - memo
           - productivehrs
           - rate
+          - task_name
           - ttapprovalqueueid
           - updated_at
         filter:
@@ -5617,6 +5619,7 @@
           - memo
           - productivehrs
           - rate
+          - task_name
           - ttapprovalqueueid
           - updated_at
         filter:
diff --git a/hasura/migrations/1690482057097_alter_table_public_timetickets_add_column_task_name/down.sql b/hasura/migrations/1690482057097_alter_table_public_timetickets_add_column_task_name/down.sql
new file mode 100644
index 000000000..9335d1ce8
--- /dev/null
+++ b/hasura/migrations/1690482057097_alter_table_public_timetickets_add_column_task_name/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"."timetickets" add column "task_name" text
+--  null;
diff --git a/hasura/migrations/1690482057097_alter_table_public_timetickets_add_column_task_name/up.sql b/hasura/migrations/1690482057097_alter_table_public_timetickets_add_column_task_name/up.sql
new file mode 100644
index 000000000..e88d3a79b
--- /dev/null
+++ b/hasura/migrations/1690482057097_alter_table_public_timetickets_add_column_task_name/up.sql
@@ -0,0 +1,2 @@
+alter table "public"."timetickets" add column "task_name" text
+ null;

From 6e21b1bdf63626019ab51392ec681e7b009f952b Mon Sep 17 00:00:00 2001
From: Allan Carr <allan.carr@thinkimex.com>
Date: Fri, 28 Jul 2023 12:59:10 -0700
Subject: [PATCH 2/2] IO-2366 Scoreboard Sales Calculation correction of
 formula

---
 .../scoreboard-chart/scoreboard-chart.component.jsx           | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/client/src/components/scoreboard-chart/scoreboard-chart.component.jsx b/client/src/components/scoreboard-chart/scoreboard-chart.component.jsx
index 545030397..4e9aa85d0 100644
--- a/client/src/components/scoreboard-chart/scoreboard-chart.component.jsx
+++ b/client/src/components/scoreboard-chart/scoreboard-chart.component.jsx
@@ -47,9 +47,7 @@ export function ScoreboardChart({ sbEntriesByDate, bodyshop }) {
             bodyhrs: dayAcc.bodyhrs + dayVal.bodyhrs,
             painthrs: dayAcc.painthrs + dayVal.painthrs,
             sales:
-              dayAcc.painthrs +
-              dayVal.job.job_totals.totals.subtotal.amount / 100 +
-              2500,
+              dayAcc.sales + dayVal.job.job_totals.totals.subtotal.amount / 100,
           };
         },
         { bodyhrs: 0, painthrs: 0, sales: 0 }