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

Resolve null displays of vehicle names.

Browse Source
This commit is contained in:
Patrick Fic
2023-02-06 12:45:19 -08:00
parent 02a6ccd481
commit e0eb4657d2
2 changed files with 21 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -34,7 +34,9 @@ function OwnerDetailJobsComponent({ bodyshop, owner }) {
render: (text, record) => render: (text, record) =>
record.vehicleid ? ( record.vehicleid ? (
<Link to={`/manage/vehicles/${record.vehicleid}`}> <Link to={`/manage/vehicles/${record.vehicleid}`}>
{`${record.v_model_yr} ${record.v_make_desc} ${record.v_model_desc}`} {`${record.v_model_yr || ""} ${record.v_make_desc || ""} ${
record.v_model_desc || ""
}`.trim()}
</Link> </Link>
) : ( ) : (
t("jobs.errors.novehicle") t("jobs.errors.novehicle")

23
client/src/pages/vehicles-detail/vehicles-detail.page.container.jsx
View File

@@ -39,9 +39,11 @@ export function VehicleDetailContainer({
document.title = t("titles.vehicledetail", { document.title = t("titles.vehicledetail", {
vehicle: vehicle:
data && data.vehicles_by_pk data && data.vehicles_by_pk
? `${data.vehicles_by_pk && data.vehicles_by_pk.v_model_yr} ${ ? `${(data.vehicles_by_pk && data.vehicles_by_pk.v_model_yr) || ""} ${
data.vehicles_by_pk && data.vehicles_by_pk.v_make_desc (data.vehicles_by_pk && data.vehicles_by_pk.v_make_desc) || ""
} ${data.vehicles_by_pk && data.vehicles_by_pk.v_model_desc}` } ${
(data.vehicles_by_pk && data.vehicles_by_pk.v_model_desc) || ""
}`
: "", : "",
}); });
setSelectedHeader("vehicles"); setSelectedHeader("vehicles");
@@ -53,7 +55,14 @@ export function VehicleDetailContainer({
label: t("titles.bc.vehicle-details", { label: t("titles.bc.vehicle-details", {
vehicle: vehicle:
data && data.vehicles_by_pk data && data.vehicles_by_pk
? `${data.vehicles_by_pk.v_model_yr} ${data.vehicles_by_pk.v_make_desc} ${data.vehicles_by_pk.v_model_desc}` ? `${
(data.vehicles_by_pk && data.vehicles_by_pk.v_model_yr) || ""
} ${
(data.vehicles_by_pk && data.vehicles_by_pk.v_make_desc) || ""
} ${
(data.vehicles_by_pk && data.vehicles_by_pk.v_model_desc) ||
""
}`
: "", : "",
}), }),
}, },
@@ -64,7 +73,11 @@ export function VehicleDetailContainer({
CreateRecentItem( CreateRecentItem(
vehId, vehId,
"vehicle", "vehicle",
`${data.vehicles_by_pk.v_vin} | ${data.vehicles_by_pk.v_model_yr} ${data.vehicles_by_pk.v_make_desc} ${data.vehicles_by_pk.v_model_desc}`, `${data.vehicles_by_pk.v_vin || "N/A"} | ${
data.vehicles_by_pk.v_model_yr || ""
} ${data.vehicles_by_pk.v_make_desc || ""} ${
data.vehicles_by_pk.v_model_desc || ""
}`.trim(),
`/manage/vehicles/${vehId}` `/manage/vehicles/${vehId}`
) )
); );