admin/bodyshop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Resolved manual job creation IO-487

Browse Source
This commit is contained in:
Patrick Fic
2021-02-01 14:53:43 -08:00
parent be190b907e
commit 8796cac651
2 changed files with 15 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
client/src/components/jobs-create-jobs-info/jobs-create-jobs-info.component.jsx
View File

@@ -7,7 +7,9 @@ import { selectBodyshop } from "../../redux/user/user.selectors";
import FormDatePicker from "../form-date-picker/form-date-picker.component"; import FormDatePicker from "../form-date-picker/form-date-picker.component";
import InputNumberCalculator from "../form-input-number-calculator/form-input-number-calculator.component"; import InputNumberCalculator from "../form-input-number-calculator/form-input-number-calculator.component";
import FormItemEmail from "../form-items-formatted/email-form-item.component"; import FormItemEmail from "../form-items-formatted/email-form-item.component";
import FormItemPhone, {PhoneItemFormatterValidation} from "../form-items-formatted/phone-form-item.component"; import FormItemPhone, {
PhoneItemFormatterValidation
} from "../form-items-formatted/phone-form-item.component";
import LayoutFormRow from "../layout-form-row/layout-form-row.component"; import LayoutFormRow from "../layout-form-row/layout-form-row.component";
const mapStateToProps = createStructuredSelector({ const mapStateToProps = createStructuredSelector({
@@ -62,11 +64,14 @@ export function JobsCreateJobsInfo({ bodyshop, form, selected }) {
<Form.Item label={t("jobs.fields.ins_ct_fn")} name="ins_ct_fn"> <Form.Item label={t("jobs.fields.ins_ct_fn")} name="ins_ct_fn">
<Input /> <Input />
</Form.Item> </Form.Item>
<Form.Item label={t("jobs.fields.ins_ph1")} name="ins_ph1" <Form.Item
rules={[ label={t("jobs.fields.ins_ph1")}
({ getFieldValue }) => name="ins_ph1"
PhoneItemFormatterValidation(getFieldValue, "ins_ph1"), rules={[
]}> ({ getFieldValue }) =>
PhoneItemFormatterValidation(getFieldValue, "ins_ph1"),
]}
>
<FormItemPhone customInput={Input} /> <FormItemPhone customInput={Input} />
</Form.Item> </Form.Item>
<Form.Item <Form.Item
@@ -85,28 +90,10 @@ export function JobsCreateJobsInfo({ bodyshop, form, selected }) {
<Form.Item label={t("jobs.fields.est_co_nm")} name="est_co_nm"> <Form.Item label={t("jobs.fields.est_co_nm")} name="est_co_nm">
<Input /> <Input />
</Form.Item> </Form.Item>
<Form.Item <Form.Item label={t("jobs.fields.est_ct_fn")} name="est_ct_fn">
label={t("jobs.fields.est_ct_fn")}
name="est_ct_fn"
rules={[
{
required: selected && true,
message: t("general.validation.required"),
},
]}
>
<Input /> <Input />
</Form.Item> </Form.Item>
<Form.Item <Form.Item label={t("jobs.fields.est_ct_ln")} name="est_ct_ln">
label={t("jobs.fields.est_ct_ln")}
name="est_ct_ln"
rules={[
{
required: selected && true,
message: t("general.validation.required"),
},
]}
>
<Input /> <Input />
</Form.Item> </Form.Item>
<Form.Item label={t("jobs.fields.pay_date")} name="pay_date"> <Form.Item label={t("jobs.fields.pay_date")} name="pay_date">

3
client/src/pages/jobs-create/jobs-create.container.jsx
View File

@@ -1,3 +1,4 @@
import _ from 'lodash';
import { useLazyQuery, useMutation } from "@apollo/react-hooks"; import { useLazyQuery, useMutation } from "@apollo/react-hooks";
import { Form, notification } from "antd"; import { Form, notification } from "antd";
import React, { useEffect, useState } from "react"; import React, { useEffect, useState } from "react";
@@ -105,7 +106,7 @@ function JobsCreateContainer({ bodyshop, setBreadcrumbs, setSelectedHeader }) {
delete ownerData.preferred_contact; delete ownerData.preferred_contact;
delete job.ownerid; delete job.ownerid;
} else { } else {
ownerData = RemoteOwnerData.data.owners_by_pk; ownerData = _.cloneDeep(RemoteOwnerData.data.owners_by_pk);
delete ownerData.id; delete ownerData.id;
delete ownerData.__typename; delete ownerData.__typename;
} }