From 7140d541d5750d7c2d9a5ee2886fcb4d04ae14ee Mon Sep 17 00:00:00 2001 From: Patrick Fic Date: Wed, 16 Sep 2020 14:08:28 -0700 Subject: [PATCH] Added paint and body hours to schedule BOD-394 --- .../schedule-event.component.jsx | 17 +++++++---- client/src/graphql/appointments.queries.js | 28 +++++++++++++++++++ 2 files changed, 40 insertions(+), 5 deletions(-) diff --git a/client/src/components/schedule-event/schedule-event.component.jsx b/client/src/components/schedule-event/schedule-event.component.jsx index 082973c7b..53f1f71d0 100644 --- a/client/src/components/schedule-event/schedule-event.component.jsx +++ b/client/src/components/schedule-event/schedule-event.component.jsx @@ -105,15 +105,22 @@ export function ScheduleEventComponent({ ); const RegularEvent = event.isintake ? ( -
- {`${(event.job && event.job.ownr_fn) || ""} ${ - (event.job && event.job.ownr_ln) || "" - } ${(event.job && event.job.ownr_co_nm) || ""}`} -
+
+ {`${ + (event.job && event.job.ownr_fn) || "" + } ${(event.job && event.job.ownr_ln) || ""} ${ + (event.job && event.job.ownr_co_nm) || "" + }`} +
{`${(event.job && event.job.v_model_yr) || ""} ${ (event.job && event.job.v_make_desc) || "" } ${(event.job && event.job.v_model_desc) || ""}`}
+
+ {`(${ + (event.job && event.job.labhrs.aggregate.sum.mod_lb_hrs) || "" + } / ${(event.job && event.job.larhrs.aggregate.sum.mod_lb_hrs) || ""})`} +
) : (
diff --git a/client/src/graphql/appointments.queries.js b/client/src/graphql/appointments.queries.js index a1981fddc..294610764 100644 --- a/client/src/graphql/appointments.queries.js +++ b/client/src/graphql/appointments.queries.js @@ -33,6 +33,20 @@ export const QUERY_ALL_ACTIVE_APPOINTMENTS = gql` v_model_yr v_make_desc v_model_desc + labhrs: joblines_aggregate(where: { mod_lbr_ty: { _eq: "LAB" } }) { + aggregate { + sum { + mod_lb_hrs + } + } + } + larhrs: joblines_aggregate(where: { mod_lbr_ty: { _eq: "LAR" } }) { + aggregate { + sum { + mod_lb_hrs + } + } + } } } } @@ -79,6 +93,20 @@ export const QUERY_APPOINTMENT_BY_DATE = gql` v_make_desc v_model_desc } + labhrs: joblines_aggregate(where: { mod_lbr_ty: { _eq: "LAB" } }) { + aggregate { + sum { + mod_lb_hrs + } + } + } + larhrs: joblines_aggregate(where: { mod_lbr_ty: { _eq: "LAR" } }) { + aggregate { + sum { + mod_lb_hrs + } + } + } } } }