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

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())
)