- merge

Signed-off-by: Dave Richer <dave@imexsystems.ca>

client/src/components/job-create-iou/job-create-iou.component.jsx

@@ -9,17 +9,20 @@ import {createStructuredSelector} from "reselect";
 import {UPDATE_JOB_LINES_IOU} from "../../graphql/jobs-lines.queries";
 import {selectBodyshop, selectCurrentUser,} from "../../redux/user/user.selectors";
 import {CreateIouForJob} from "../jobs-detail-header-actions/jobs-detail-header-actions.duplicate.util";
+import {selectTechnician} from "../../redux/tech/tech.selectors";
 
 const mapStateToProps = createStructuredSelector({
     bodyshop: selectBodyshop,
     currentUser: selectCurrentUser,
+    technician: selectTechnician,
 });
+
 const mapDispatchToProps = (dispatch) => ({
     //setUserLanguage: language => dispatch(setUserLanguage(language))
 });
 export default connect(mapStateToProps, mapDispatchToProps)(JobCreateIOU);
 
-export function JobCreateIOU({bodyshop, currentUser, job, selectedJobLines}) {
+export function JobCreateIOU({bodyshop, currentUser, job, selectedJobLines, technician}) {
     const {t} = useTranslation();
     const [loading, setLoading] = useState(false);
     const client = useApolloClient();
@@ -79,13 +82,13 @@ export function JobCreateIOU({bodyshop, currentUser, job, selectedJobLines}) {
             title={t("jobs.labels.createiouwarning")}
             onConfirm={handleCreateIou}
             disabled={
-                !selectedJobLines || selectedJobLines.length === 0 || !job.converted
+                !selectedJobLines || selectedJobLines.length === 0 || !job.converted || technician
             }
         >
             <Button
                 loading={loading}
                 disabled={
-                    !selectedJobLines || selectedJobLines.length === 0 || !job.converted
+                    !selectedJobLines || selectedJobLines.length === 0 || !job.converted || technician
                 }
             >
                 {t("jobs.actions.createiou")}

client/src/components/shop-employees/shop-employees-list.component.jsx

@@ -1,13 +1,20 @@
 import {Button, Table} from "antd";
 import queryString from "query-string";
-import React from "react";
+import React, {useState} from "react";
 import {useTranslation} from "react-i18next";
 import {useLocation, useNavigate} from "react-router-dom";
+import {alphaSort} from "../../utils/sorters";
 
 export default function ShopEmployeesListComponent({loading, employees}) {
     const {t} = useTranslation();
     const history = useNavigate();
     const search = queryString.parse(useLocation().search);
+
+    const [state, setState] = useState({
+        sortedInfo: {},
+        filteredInfo: {text: ""},
+    });
+
     const handleOnRowClick = (record) => {
         if (record) {
             search.employeeId = record.id;
@@ -17,32 +24,80 @@ export default function ShopEmployeesListComponent({loading, employees}) {
             history({search: queryString.stringify(search)});
         }
     };
+    const handleTableChange = (pagination, filters, sorter) => {
+        setState({...state, filteredInfo: filters, sortedInfo: sorter});
+    };
     const columns = [
         {
             title: t("employees.fields.employee_number"),
             dataIndex: "employee_number",
             key: "employee_number",
+            sorter: (a, b) => alphaSort(a.employee_number, b.employee_number),
+            sortOrder:
+                state.sortedInfo.columnKey === "employee_number" &&
+                state.sortedInfo.order,
         },
         {
-            title: t("employees.fields.first_name"),
-            dataIndex: "first_name",
-            key: "first_name",
+            title: t("employees.labels.name"),
+            dataIndex: "employee_name",
+            key: "employee_name",
+            sorter: (a, b) =>
+                alphaSort(
+                    `${a.first_name || ""} ${a.last_name || ""}`.trim(),
+                    `${b.first_name || ""} ${b.last_name || ""}`.trim()
+                ),
+            sortOrder:
+                state.sortedInfo.columnKey === "employee_name" &&
+                state.sortedInfo.order,
+            render: (text, record) =>
+                `${record.first_name || ""} ${record.last_name || ""}`.trim(),
         },
-        {
-            title: t("employees.fields.last_name"),
-            dataIndex: "last_name",
-            key: "last_name",
-        },
-
         {
             title: t("employees.labels.rate_type"),
             dataIndex: "rate_type",
             key: "rate_type",
+            sorter: (a, b) => Number(a.flat_rate) - Number(b.flat_rate),
+            sortOrder:
+                state.sortedInfo.columnKey === "rate_type" && state.sortedInfo.order,
+            filters: [
+                {
+                    text: t("employees.labels.flat_rate"),
+                    value: true,
+                },
+                {
+                    text: t("employees.labels.straight_time"),
+                    value: false,
+                },
+            ],
+            onFilter: (value, record) => value === record.flate_rate,
             render: (text, record) =>
                 record.flat_rate
                     ? t("employees.labels.flat_rate")
                     : t("employees.labels.straight_time"),
         },
+        {
+            title: t("employees.labels.status"),
+            dataIndex: "active",
+            key: "active",
+            sorter: (a, b) => Number(a.active) - Number(b.active),
+            sortOrder:
+                state.sortedInfo.columnKey === "active" && state.sortedInfo.order,
+            filters: [
+                {
+                    text: t("employees.labels.active"),
+                    value: true,
+                },
+                {
+                    text: t("employees.labels.inactive"),
+                    value: false,
+                },
+            ],
+            onFilter: (value, record) => value === record.active,
+            render: (text, record) =>
+                record.active
+                    ? t("employees.labels.active")
+                    : t("employees.labels.inactive"),
+        },
     ];
     return (
         <div>
@@ -73,6 +128,7 @@ export default function ShopEmployeesListComponent({loading, employees}) {
                     type: "radio",
                     selectedRowKeys: [search.employeeId],
                 }}
+                onChange={handleTableChange}
                 onRow={(record, rowIndex) => {
                     return {
                         onClick: (event) => {