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

Merged in feature/IO-2888-Production-Employee-Sort-Enhancment (pull request #1646)

Browse Source 
IO-2888 Production List Employee Sort Enhacement

Approved-by: Dave Richer
This commit is contained in:
Allan Carr
2024-08-21 20:50:51 +00:00
committed by Dave Richer
parent fd4dbdfb3a ad1ce7b220
commit 24ebfbfbf5
1 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
client/src/components/production-list-columns/production-list-columns.data.jsx
View File

@@ -28,6 +28,11 @@ import ProductionListColumnCategory from "./production-list-columns.status.categ
import ProductionListColumnStatus from "./production-list-columns.status.component"; import ProductionListColumnStatus from "./production-list-columns.status.component";
import ProductionListColumnTouchTime from "./prodution-list-columns.touchtime.component"; import ProductionListColumnTouchTime from "./prodution-list-columns.touchtime.component";
const getEmployeeName = (employeeId, employees) => {
const employee = employees.find((e) => e.id === employeeId);
return employee ? `${employee.first_name} ${employee.last_name}` : "";
};
const r = ({ technician, state, activeStatuses, data, bodyshop, refetch, treatments }) => { const r = ({ technician, state, activeStatuses, data, bodyshop, refetch, treatments }) => {
const { Enhanced_Payroll } = treatments; const { Enhanced_Payroll } = treatments;
return [ return [
@@ -426,8 +431,8 @@ const r = ({ technician, state, activeStatuses, data, bodyshop, refetch, treatme
sortOrder: state.sortedInfo.columnKey === "employee_body" && state.sortedInfo.order, sortOrder: state.sortedInfo.columnKey === "employee_body" && state.sortedInfo.order,
sorter: (a, b) => sorter: (a, b) =>
alphaSort( alphaSort(
bodyshop.employees?.find((e) => e.id === a.employee_body)?.first_name, getEmployeeName(a.employee_body, bodyshop.employees),
bodyshop.employees?.find((e) => e.id === b.employee_body)?.first_name getEmployeeName(b.employee_body, bodyshop.employees)
), ),
render: (text, record) => ( render: (text, record) => (
<ProductionListEmployeeAssignment refetch={refetch} record={record} type="employee_body" /> <ProductionListEmployeeAssignment refetch={refetch} record={record} type="employee_body" />
@@ -440,8 +445,8 @@ const r = ({ technician, state, activeStatuses, data, bodyshop, refetch, treatme
sortOrder: state.sortedInfo.columnKey === "employee_prep" && state.sortedInfo.order, sortOrder: state.sortedInfo.columnKey === "employee_prep" && state.sortedInfo.order,
sorter: (a, b) => sorter: (a, b) =>
alphaSort( alphaSort(
bodyshop.employees?.find((e) => e.id === a.employee_prep)?.first_name, getEmployeeName(a.employee_prep, bodyshop.employees),
bodyshop.employees?.find((e) => e.id === b.employee_prep)?.first_name getEmployeeName(b.employee_prep, bodyshop.employees)
), ),
render: (text, record) => ( render: (text, record) => (
<ProductionListEmployeeAssignment record={record} refetch={refetch} type="employee_prep" /> <ProductionListEmployeeAssignment record={record} refetch={refetch} type="employee_prep" />
@@ -460,8 +465,8 @@ const r = ({ technician, state, activeStatuses, data, bodyshop, refetch, treatme
sortOrder: state.sortedInfo.columnKey === "employee_csr" && state.sortedInfo.order, sortOrder: state.sortedInfo.columnKey === "employee_csr" && state.sortedInfo.order,
sorter: (a, b) => sorter: (a, b) =>
alphaSort( alphaSort(
bodyshop.employees?.find((e) => e.id === a.employee_csr)?.first_name, getEmployeeName(a.employee_csr, bodyshop.employees),
bodyshop.employees?.find((e) => e.id === b.employee_csr)?.first_name getEmployeeName(b.employee_csr, bodyshop.employees)
), ),
render: (text, record) => ( render: (text, record) => (
<ProductionListEmployeeAssignment refetch={refetch} record={record} type="employee_csr" /> <ProductionListEmployeeAssignment refetch={refetch} record={record} type="employee_csr" />
@@ -474,8 +479,8 @@ const r = ({ technician, state, activeStatuses, data, bodyshop, refetch, treatme
sortOrder: state.sortedInfo.columnKey === "employee_refinish" && state.sortedInfo.order, sortOrder: state.sortedInfo.columnKey === "employee_refinish" && state.sortedInfo.order,
sorter: (a, b) => sorter: (a, b) =>
alphaSort( alphaSort(
bodyshop.employees?.find((e) => e.id === a.employee_refinish)?.first_name, getEmployeeName(a.employee_refinish, bodyshop.employees),
bodyshop.employees?.find((e) => e.id === b.employee_refinish)?.first_name getEmployeeName(b.employee_refinish, bodyshop.employees)
), ),
render: (text, record) => ( render: (text, record) => (
<ProductionListEmployeeAssignment record={record} refetch={refetch} type="employee_refinish" /> <ProductionListEmployeeAssignment record={record} refetch={refetch} type="employee_refinish" />