- Migrations for remind_at_sent

Signed-off-by: Dave Richer <dave@imexsystems.ca>
Merged in release/2024-04-19 (pull request #1414 )
2024-04-16 15:45:56 -04:00 · 2024-04-15 20:47:48 +00:00 · 2024-04-15 13:47:19 -07:00 · 2024-04-12 17:08:21 +00:00
3 changed files with 16 additions and 10 deletions
--- 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({
                  <OwnerNameDisplay ownerObject={j} />
                </td>
                <td style={{ padding: "2.5px" }}>
-                  {`(${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")})`}
                </td>
                <td style={{ padding: "2.5px" }}>
@@ -117,11 +117,11 @@ export function ScheduleCalendarHeaderComponent({
                  <OwnerNameDisplay ownerObject={j} />
                </td>
                <td style={{ padding: "2.5px" }}>
-                  {`(${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")})`}
                </td>
                <td style={{ padding: "2.5px" }}>
--- 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
@@ -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;
--- 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
@@ -0,0 +1,2 @@
+alter table "public"."tasks" add column "remind_at_sent" timestamptz
+ null;
Author	SHA1	Message	Date
Dave Richer	c8f8a86a98	- Migrations for remind_at_sent Signed-off-by: Dave Richer <dave@imexsystems.ca>	2024-04-16 15:45:56 -04:00
Patrick Fic	1620b94a7b	Merged in release/2024-04-19 (pull request #1414 ) Resolve schedule header display.	2024-04-15 20:47:48 +00:00
Patrick Fic	81f94eac6c	Resolve schedule header display.	2024-04-15 13:47:19 -07:00
Allan Carr	ec7509670d	Merged in release/2024-04-12 (pull request #1413 ) Release/2024 04 12 Approved-by: Dave Richer	2024-04-12 17:08:21 +00:00