From 92ee548713763a99382647c645b2b8c693164459 Mon Sep 17 00:00:00 2001 From: Patrick Fic <> Date: Thu, 4 Mar 2021 09:28:04 -0800 Subject: [PATCH] Allow time ticket entry for RO jobs IO-741 --- .../jobs-detail-header-actions.component.jsx | 16 ++++++++++++++++ .../jobs-detail-labor.component.jsx | 6 +----- .../jobs-find-modal.component.jsx | 18 +++++++----------- .../time-ticket-modal.component.jsx | 6 ++---- client/src/graphql/jobs.queries.js | 1 - 5 files changed, 26 insertions(+), 21 deletions(-) diff --git a/client/src/components/jobs-detail-header-actions/jobs-detail-header-actions.component.jsx b/client/src/components/jobs-detail-header-actions/jobs-detail-header-actions.component.jsx index 219dc6cc5..2e06b48a4 100644 --- a/client/src/components/jobs-detail-header-actions/jobs-detail-header-actions.component.jsx +++ b/client/src/components/jobs-detail-header-actions/jobs-detail-header-actions.component.jsx @@ -28,6 +28,8 @@ const mapDispatchToProps = (dispatch) => ({ dispatch(setModalContext({ context: context, modal: "payment" })), setJobCostingContext: (context) => dispatch(setModalContext({ context: context, modal: "jobCosting" })), + setTimeTicketContext: (context) => + dispatch(setModalContext({ context: context, modal: "timeTicket" })), }); export function JobsDetailHeaderActions({ @@ -39,6 +41,7 @@ export function JobsDetailHeaderActions({ setPaymentContext, setJobCostingContext, jobRO, + setTimeTicketContext, }) { const { t } = useTranslation(); const client = useApolloClient(); @@ -110,6 +113,19 @@ export function JobsDetailHeaderActions({ {t("jobs.actions.viewchecklist")} + { + logImEXEvent("job_header_enter_time_ticekts"); + + setTimeTicketContext({ + actions: {}, + context: { jobId: job.id }, + }); + }} + > + {t("timetickets.actions.enter")} + {techConsole ? null : ( - + {t("timetickets.actions.enter")} )} diff --git a/client/src/components/jobs-find-modal/jobs-find-modal.component.jsx b/client/src/components/jobs-find-modal/jobs-find-modal.component.jsx index c770590f1..ce3106117 100644 --- a/client/src/components/jobs-find-modal/jobs-find-modal.component.jsx +++ b/client/src/components/jobs-find-modal/jobs-find-modal.component.jsx @@ -86,17 +86,13 @@ export default function JobsFindModalComponent({ key: "vehicle", width: "15%", ellipsis: true, - render: (text, record) => { - return record.vehicle ? ( - - {`${record.v_model_yr || ""} ${record.v_make_desc || ""} ${ - record.v_model_desc || "" - }`} - - ) : ( - t("jobs.errors.novehicle") - ); - }, + render: (text, record) => ( + + {`${record.v_model_yr || ""} ${record.v_make_desc || ""} ${ + record.v_model_desc || "" + }`} + + ), }, { title: t("vehicles.fields.plate_no"), diff --git a/client/src/components/time-ticket-modal/time-ticket-modal.component.jsx b/client/src/components/time-ticket-modal/time-ticket-modal.component.jsx index 8be13a059..cb5859a54 100644 --- a/client/src/components/time-ticket-modal/time-ticket-modal.component.jsx +++ b/client/src/components/time-ticket-modal/time-ticket-modal.component.jsx @@ -13,10 +13,8 @@ import TimeTicketList from "../time-ticket-list/time-ticket-list.component"; export default function TimeTicketModalComponent({ form, - roAutoCompleteOptions, + employeeAutoCompleteOptions, - loadLineTicketData, - lineTicketData, }) { const { t } = useTranslation(); @@ -33,7 +31,7 @@ export default function TimeTicketModalComponent({ }, ]} > - +