Allow time ticket entry for RO jobs IO-741

This commit is contained in:
Patrick Fic
2021-03-04 09:28:04 -08:00
parent 17cb3d11eb
commit 92ee548713
5 changed files with 26 additions and 21 deletions

View File

@@ -28,6 +28,8 @@ const mapDispatchToProps = (dispatch) => ({
dispatch(setModalContext({ context: context, modal: "payment" })), dispatch(setModalContext({ context: context, modal: "payment" })),
setJobCostingContext: (context) => setJobCostingContext: (context) =>
dispatch(setModalContext({ context: context, modal: "jobCosting" })), dispatch(setModalContext({ context: context, modal: "jobCosting" })),
setTimeTicketContext: (context) =>
dispatch(setModalContext({ context: context, modal: "timeTicket" })),
}); });
export function JobsDetailHeaderActions({ export function JobsDetailHeaderActions({
@@ -39,6 +41,7 @@ export function JobsDetailHeaderActions({
setPaymentContext, setPaymentContext,
setJobCostingContext, setJobCostingContext,
jobRO, jobRO,
setTimeTicketContext,
}) { }) {
const { t } = useTranslation(); const { t } = useTranslation();
const client = useApolloClient(); const client = useApolloClient();
@@ -110,6 +113,19 @@ export function JobsDetailHeaderActions({
{t("jobs.actions.viewchecklist")} {t("jobs.actions.viewchecklist")}
</Link> </Link>
</Menu.Item> </Menu.Item>
<Menu.Item
key="entertimetickets"
onClick={() => {
logImEXEvent("job_header_enter_time_ticekts");
setTimeTicketContext({
actions: {},
context: { jobId: job.id },
});
}}
>
{t("timetickets.actions.enter")}
</Menu.Item>
<Menu.Item <Menu.Item
key="enterpayments" key="enterpayments"
disabled={jobRO} disabled={jobRO}

View File

@@ -27,11 +27,7 @@ export function JobsDetailLaborContainer({
return ( return (
<div> <div>
{techConsole ? null : ( {techConsole ? null : (
<TimeTicketEnterButton <TimeTicketEnterButton actions={{ refetch }} context={{ jobId: jobId }}>
disabled={jobRO}
actions={{ refetch }}
context={{ jobId: jobId }}
>
{t("timetickets.actions.enter")} {t("timetickets.actions.enter")}
</TimeTicketEnterButton> </TimeTicketEnterButton>
)} )}

View File

@@ -86,17 +86,13 @@ export default function JobsFindModalComponent({
key: "vehicle", key: "vehicle",
width: "15%", width: "15%",
ellipsis: true, ellipsis: true,
render: (text, record) => { render: (text, record) => (
return record.vehicle ? ( <Link to={"/manage/vehicles/" + record.vehicleid}>
<Link to={"/manage/vehicles/" + record.vehicleid}> {`${record.v_model_yr || ""} ${record.v_make_desc || ""} ${
{`${record.v_model_yr || ""} ${record.v_make_desc || ""} ${ record.v_model_desc || ""
record.v_model_desc || "" }`}
}`} </Link>
</Link> ),
) : (
t("jobs.errors.novehicle")
);
},
}, },
{ {
title: t("vehicles.fields.plate_no"), title: t("vehicles.fields.plate_no"),

View File

@@ -13,10 +13,8 @@ import TimeTicketList from "../time-ticket-list/time-ticket-list.component";
export default function TimeTicketModalComponent({ export default function TimeTicketModalComponent({
form, form,
roAutoCompleteOptions,
employeeAutoCompleteOptions, employeeAutoCompleteOptions,
loadLineTicketData,
lineTicketData,
}) { }) {
const { t } = useTranslation(); const { t } = useTranslation();
@@ -33,7 +31,7 @@ export default function TimeTicketModalComponent({
}, },
]} ]}
> >
<JobSearchSelect options={roAutoCompleteOptions} /> <JobSearchSelect convertedOnly notExported={false} />
</Form.Item> </Form.Item>
<Form.Item <Form.Item
label={t("timetickets.fields.date")} label={t("timetickets.fields.date")}

View File

@@ -828,7 +828,6 @@ export const SEARCH_JOBS_FOR_AUTOCOMPLETE = gql`
search_jobs( search_jobs(
args: { search: $search } args: { search: $search }
limit: 50 limit: 50
order_by: { ro_number: desc_nulls_last }
where: { where: {
_and: { _and: {
converted: { _eq: $isConverted } converted: { _eq: $isConverted }