diff --git a/client/src/components/schedule-calendar-wrapper/schedule-calendar-header.component.jsx b/client/src/components/schedule-calendar-wrapper/schedule-calendar-header.component.jsx index fd0d6cb2f..9a83f7cae 100644 --- a/client/src/components/schedule-calendar-wrapper/schedule-calendar-header.component.jsx +++ b/client/src/components/schedule-calendar-wrapper/schedule-calendar-header.component.jsx @@ -67,11 +67,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")})`} @@ -107,11 +107,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")})`} 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;