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

BOD-59 Added vehicle fields to job and updated wherever appropriate to use Job fields instead.

Browse Source
This commit is contained in:
Patrick Fic
2020-03-30 10:14:13 -07:00
parent d1148974ee
commit 50ffa863bc
19 changed files with 1600 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
client/src/components/invoice-enter-modal/invoice-enter-modal.component.jsx
View File

@@ -75,9 +75,9 @@ export default function InvoiceEnterModalComponent({
>
{`${
o.ro_number ? o.ro_number : o.est_number
} | ${o.ownr_ln || ""} ${o.ownr_fn || ""} | ${o.vehicle
.v_model_yr || ""} ${o.vehicle.v_make_desc || ""} ${o
.vehicle.v_model_desc || ""}`}
} | ${o.ownr_ln || ""} ${o.ownr_fn ||
""} | ${o.v_model_yr || ""} ${o.v_make_desc ||
""} ${o.v_model_desc || ""}`}
</Select.Option>
))
: null}

9
client/src/components/job-detail-cards/job-detail-cards.customer.component.jsx
View File

@@ -11,7 +11,8 @@ export default function JobDetailCardsCustomerComponent({ loading, data }) {
<CardTemplate
loading={loading}
title={t("jobs.labels.cards.customer")}
extraLink={data && data.owner ? `/manage/owners/${data.owner.id}` : null}>
extraLink={data && data.owner ? `/manage/owners/${data.owner.id}` : null}
>
{data ? (
<span>
<div>
@@ -35,9 +36,9 @@ export default function JobDetailCardsCustomerComponent({ loading, data }) {
</div>
<div>{`${(data.owner && data.owner.preferred_contact) || ""}`}</div>
{data.vehicle ? (
<Link to={`/manage/vehicles/${data.vehicle.id}`}>
{`${data.vehicle.v_model_yr || ""} ${data.vehicle.v_make_desc ||
""} ${data.vehicle.v_model_desc || ""}`}
<Link to={`/manage/vehicles/${data.vehicleid}`}>
{`${data.v_model_yr || ""} ${data.v_make_desc ||
""} ${data.v_model_desc || ""}`}
</Link>
) : (
<span>{t("jobs.errors.novehicle")}</span>

12
client/src/components/jobs-create-vehicle-info/jobs-create-vehicle-info.search.component.jsx
View File

@@ -82,7 +82,12 @@ export default function JobsCreateVehicleInfoSearchComponent({
onSelect: props => {
setState({
...state,
vehicle: { ...state.vehicle, new: false, selectedid: props.id }
vehicle: {
...state.vehicle,
new: false,
selectedid: props.id,
vehicleObj: props
}
});
},
type: "radio",
@@ -98,7 +103,8 @@ export default function JobsCreateVehicleInfoSearchComponent({
vehicle: {
...state.vehicle,
new: false,
selectedid: record.id
selectedid: record.id,
vehicleObj: record
}
});
@@ -107,7 +113,7 @@ export default function JobsCreateVehicleInfoSearchComponent({
}
setState({
...state,
vehicle: { ...state.vehicle, selectedid: null }
vehicle: { ...state.vehicle, selectedid: null, vehicleObj: null }
});
}
};

24
client/src/components/jobs-detail-header/jobs-detail-header.component.jsx
View File

@@ -114,15 +114,23 @@ export default connect(
{job.status ? <Tag color="blue">{job.status}</Tag> : null}
<OwnerTagPopoverComponent job={job} />
<Tag color="green">
{job.vehicle ? (
<Link to={`/manage/vehicles/${job.vehicle.id}`}>
{job.vehicle.v_model_yr || t("general.labels.na")}{" "}
{job.vehicle.v_make_desc || t("general.labels.na")}{" "}
{job.vehicle.v_model_desc || t("general.labels.na")} |{" "}
{job.vehicle.plate_no || t("general.labels.na")} |{" "}
{job.vehicle.v_vin || t("general.labels.na")}
{job.vehicleid ? (
<Link to={`/manage/vehicles/${job.vehicleid}`}>
{`${job.v_model_yr || t("general.labels.na")}
${job.v_make_desc || t("general.labels.na")}
${job.v_model_desc || t("general.labels.na")} |
${job.plate_no || t("general.labels.na")} |
${job.v_vin || t("general.labels.na")}`}
</Link>
) : null}
) : (
<span>
{`${job.v_model_yr || t("general.labels.na")}
${job.v_make_desc || t("general.labels.na")}
${job.v_model_desc || t("general.labels.na")} |
${job.plate_no || t("general.labels.na")} |
${job.v_vin || t("general.labels.na")}`}
</span>
)}
</Tag>
<BarcodePopup value={job.id} />
</span>

6
client/src/components/jobs-find-modal/jobs-find-modal.component.jsx
View File

@@ -81,9 +81,9 @@ export default function JobsFindModalComponent({
ellipsis: true,
render: (text, record) => {
return record.vehicle ? (
<Link to={"/manage/vehicles/" + record.vehicle.id}>
{record.vehicle.v_model_yr} {record.vehicle.v_make_desc}{" "}
{record.vehicle.v_model_desc}
<Link to={"/manage/vehicles/" + record.vehicleid}>
{`${record.v_model_yr || ""} ${record.v_make_desc ||
""} ${record.v_model_desc || ""}`}
</Link>
) : (
t("jobs.errors.novehicle")

6
client/src/components/jobs-list/jobs-list.component.jsx
View File

@@ -108,9 +108,9 @@ export default withRouter(function JobsList({
ellipsis: true,
render: (text, record) => {
return record.vehicle ? (
<Link to={"/manage/vehicles/" + record.vehicle.id}>
{record.vehicle.v_model_yr} {record.vehicle.v_make_desc}{" "}
{record.vehicle.v_model_desc}
<Link to={"/manage/vehicles/" + record.vehicleid}>
{`${record.v_model_yr || ""} ${record.v_make_desc ||
""} ${record.v_model_desc || ""}`}
</Link>
) : (
t("jobs.errors.novehicle")

10
client/src/components/owner-detail-jobs/owner-detail-jobs.component.jsx
View File

@@ -29,11 +29,11 @@ function OwnerDetailJobsComponent({ bodyshop, owner }) {
},
{
title: t("jobs.fields.vehicle"),
dataIndex: "owner",
key: "owner",
dataIndex: "vehicleid",
key: "vehicleid",
render: (text, record) => (
<Link to={`/manage/vehicles/${record.vehicle.id}`}>
{`${record.vehicle.v_model_yr} ${record.vehicle.v_make_desc} ${record.vehicle.v_model_desc}`}
<Link to={`/manage/vehicles/${record.vehicleid}`}>
{`${record.v_model_yr} ${record.v_make_desc} ${record.v_model_desc}`}
</Link>
)
},
@@ -71,7 +71,7 @@ function OwnerDetailJobsComponent({ bodyshop, owner }) {
)}
pagination={{ position: "bottom" }}
columns={columns.map(item => ({ ...item }))}
rowKey='id'
rowKey="id"
dataSource={owner.jobs}
rowSelection={{
onSelect: (record, selected, selectedRows) => {

12
client/src/components/schedule-event/schedule-event.component.jsx
View File

@@ -17,9 +17,9 @@ export default function ScheduleEventComponent({ event, handleCancel }) {
event.job.ownr_ln) ||
""}`}</strong>
<span style={{ margin: 4 }}>
{`${(event.job && event.job.vehicle.v_model_yr) ||
""} ${(event.job && event.job.vehicle.v_make_desc) ||
""} ${(event.job && event.job.vehicle.v_model_desc) || ""}`}
{`${(event.job && event.job.v_model_yr) ||
""} ${(event.job && event.job.v_make_desc) ||
""} ${(event.job && event.job.v_model_desc) || ""}`}
</span>
</div>
)}
@@ -85,9 +85,9 @@ export default function ScheduleEventComponent({ event, handleCancel }) {
event.job.ownr_ln) ||
""}`}</strong>
<span style={{ margin: 4 }}>
{`${(event.job && event.job.vehicle.v_model_yr) ||
""} ${(event.job && event.job.vehicle.v_make_desc) ||
""} ${(event.job && event.job.vehicle.v_model_desc) || ""}`}
{`${(event.job && event.job.v_model_yr) ||
""} ${(event.job && event.job.v_make_desc) ||
""} ${(event.job && event.job.v_model_desc) || ""}`}
</span>
</div>
) : (

78
client/src/graphql/jobs.queries.js
View File

@@ -12,14 +12,14 @@ export const QUERY_ALL_ACTIVE_JOBS = gql`
allow_text_message
preferred_contact
}
vehicle {
id
v_model_yr
v_make_desc
v_model_desc
v_color
plate_no
}
plate_no
plate_st
v_vin
v_model_yr
v_model_desc
v_make_desc
v_color
vehicleid
actual_completion
actual_delivery
actual_in
@@ -45,15 +45,7 @@ export const QUERY_ALL_ACTIVE_JOBS = gql`
status
updated_at
ded_amt
vehicle {
id
plate_no
v_vin
v_model_yr
v_model_desc
v_make_desc
v_color
}
vehicleid
}
}
`;
@@ -109,15 +101,13 @@ export const GET_JOB_BY_PK = gql`
est_number
ro_number
clm_total
vehicle {
id
plate_no
v_vin
v_model_yr
v_model_desc
v_make_desc
v_color
}
vehicleid
plate_no
v_vin
v_model_yr
v_model_desc
v_make_desc
v_color
ins_co_id
policy_no
loss_date
@@ -249,14 +239,13 @@ export const QUERY_JOB_CARD_DETAILS = gql`
allow_text_message
preferred_contact
}
vehicle {
id
v_model_yr
v_make_desc
v_model_desc
v_color
plate_no
}
vehicleid
v_model_yr
v_make_desc
v_model_desc
v_color
plate_no
actual_completion
actual_delivery
actual_in
@@ -294,15 +283,6 @@ export const QUERY_JOB_CARD_DETAILS = gql`
id
thumb_url
}
vehicle {
id
plate_no
v_vin
v_model_yr
v_model_desc
v_make_desc
v_color
}
}
}
`;
@@ -324,8 +304,6 @@ export const UPDATE_JOBS = gql`
update_jobs(where: { id: { _in: $jobIds } }, _set: $fields) {
returning {
id
est_ph1
est_ea
}
}
}
@@ -372,12 +350,10 @@ export const ACTIVE_JOBS_FOR_AUTOCOMPLETE = gql`
ownr_ln
ro_number
est_number
vehicle {
id
v_make_desc
v_model_desc
v_model_yr
}
vehicleid
v_make_desc
v_model_desc
v_model_yr
}
}
`;

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

@@ -18,7 +18,7 @@ export default connect(mapStateToProps, null)(JobsCreateContainer);
function JobsCreateContainer({ bodyshop }) {
const { t } = useTranslation();
const contextState = useState({
vehicle: { new: false, search: "", selectedid: null },
vehicle: { new: false, search: "", selectedid: null, vehicleObj: null },
owner: { new: false, search: "", selectedid: null },
job: null,
created: false,
@@ -97,6 +97,23 @@ function JobsCreateContainer({ bodyshop }) {
if (!!job.vehicle) {
delete job.vehicleid;
job.vehicle.data.shopid = bodyshop.id;
job.plate_no = job.vehicle.data.plate_no;
job.plate_st = job.vehicle.data.plate_st;
job.v_vin = job.vehicle.data.v_vin;
job.v_model_yr = job.vehicle.data.v_model_yr;
job.v_model_desc = job.vehicle.data.v_model_desc;
job.v_make_desc = job.vehicle.data.v_make_desc;
job.v_color = job.vehicle.data.v_color;
} else {
//Vehicle selected.
job.vehicle.data.shopid = bodyshop.id;
job.plate_no = state.vehicle.vehicleObj.plate_no;
job.plate_st = state.vehicle.vehicleObj.plate_st;
job.v_vin = state.vehicle.vehicleObj.v_vin;
job.v_model_yr = state.vehicle.vehicleObj.v_model_yr;
job.v_model_desc = state.vehicle.vehicleObj.v_model_desc;
job.v_make_desc = state.vehicle.vehicleObj.v_make_desc;
job.v_color = state.vehicle.vehicleObj.v_color;
}
job = { ...job, ...ownerData };

6
client/src/pages/jobs/jobs.page.jsx
View File

@@ -66,13 +66,13 @@ export default connect(
(j.clm_no || "")
.toLowerCase()
.includes(searchText.toLowerCase()) ||
(j.vehicle.plate_no || "")
(j.plate_no || "")
.toLowerCase()
.includes(searchText.toLowerCase()) ||
(j.vehicle.v_model_desc || "")
(j.v_model_desc || "")
.toLowerCase()
.includes(searchText.toLowerCase()) ||
(j.vehicle.v_make_desc || "")
(j.v_make_desc || "")
.toLowerCase()
.includes(searchText.toLowerCase())
)