From 81f94eac6c1cd0a69a2d07c190c65d3058ec88ed Mon Sep 17 00:00:00 2001 From: Patrick Fic Date: Mon, 15 Apr 2024 13:47:19 -0700 Subject: [PATCH 1/2] Resolve schedule header display. --- .../schedule-calendar-header.component.js | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/client/src/components/schedule-calendar-wrapper/schedule-calendar-header.component.js b/client/src/components/schedule-calendar-wrapper/schedule-calendar-header.component.js index 96ef73a56..e8dc92c68 100644 --- a/client/src/components/schedule-calendar-wrapper/schedule-calendar-header.component.js +++ b/client/src/components/schedule-calendar-wrapper/schedule-calendar-header.component.js @@ -77,11 +77,11 @@ export function ScheduleCalendarHeaderComponent({ - {`(${j.labhrs.aggregate.sum.mod_lb_hrs.toFixed( - 1 - )}/${j.larhrs.aggregate.sum.mod_lb_hrs.toFixed(1)}/${( - j.labhrs.aggregate.sum.mod_lb_hrs + - j.larhrs.aggregate.sum.mod_lb_hrs + {`(${j.labhrs?.aggregate?.sum?.mod_lb_hrs?.toFixed(1) || 0}/${ + j.larhrs?.aggregate?.sum?.mod_lb_hrs?.toFixed(1) || 0 + }/${( + j.labhrs.aggregate?.sum?.mod_lb_hrs + + j.larhrs.aggregate?.sum?.mod_lb_hrs ).toFixed(1)} ${t("general.labels.hours")})`} @@ -117,11 +117,11 @@ export function ScheduleCalendarHeaderComponent({ - {`(${j.labhrs.aggregate.sum.mod_lb_hrs.toFixed( - 1 - )}/${j.larhrs.aggregate.sum.mod_lb_hrs.toFixed(1)}/${( - j.labhrs.aggregate.sum.mod_lb_hrs + - j.larhrs.aggregate.sum.mod_lb_hrs + {`(${j.labhrs?.aggregate?.sum.mod_lb_hrs?.toFixed(1) || 0}/${ + j.larhrs?.aggregate?.sum?.mod_lb_hrs?.toFixed(1) || 0 + }/${( + j.labhrs?.aggregate?.sum?.mod_lb_hrs + + j.larhrs?.aggregate?.sum?.mod_lb_hrs ).toFixed(1)} ${t("general.labels.hours")})`} From c8f8a86a98ee4e9f7e02ee13a2d53f90b3e0cf67 Mon Sep 17 00:00:00 2001 From: Dave Richer Date: Tue, 16 Apr 2024 15:45:56 -0400 Subject: [PATCH 2/2] - Migrations for remind_at_sent Signed-off-by: Dave Richer --- .../down.sql | 4 ++++ .../up.sql | 2 ++ 2 files changed, 6 insertions(+) create mode 100644 hasura/migrations/1712675814937_alter_table_public_tasks_add_column_remind_at_sent/down.sql create mode 100644 hasura/migrations/1712675814937_alter_table_public_tasks_add_column_remind_at_sent/up.sql diff --git a/hasura/migrations/1712675814937_alter_table_public_tasks_add_column_remind_at_sent/down.sql b/hasura/migrations/1712675814937_alter_table_public_tasks_add_column_remind_at_sent/down.sql new file mode 100644 index 000000000..e99e3e8d7 --- /dev/null +++ b/hasura/migrations/1712675814937_alter_table_public_tasks_add_column_remind_at_sent/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"."tasks" add column "remind_at_sent" timestamptz +-- null; diff --git a/hasura/migrations/1712675814937_alter_table_public_tasks_add_column_remind_at_sent/up.sql b/hasura/migrations/1712675814937_alter_table_public_tasks_add_column_remind_at_sent/up.sql new file mode 100644 index 000000000..601b9d8b5 --- /dev/null +++ b/hasura/migrations/1712675814937_alter_table_public_tasks_add_column_remind_at_sent/up.sql @@ -0,0 +1,2 @@ +alter table "public"."tasks" add column "remind_at_sent" timestamptz + null;