Merged in release/2023-07-28 (pull request #912)

Release/2023 07 28

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 +
+              dayAcc.sales + dayVal.job.job_totals.totals.subtotal.amount / 100,
-              dayVal.job.job_totals.totals.subtotal.amount / 100 +
-              2500,
           };
         },
         { bodyhrs: 0, painthrs: 0, sales: 0 }

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:

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;

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;