IO-2384 Extend to Vehicle Related ROs

Release/2023 08 11

client/src/components/owner-detail-jobs/owner-detail-jobs.component.jsx

@@ -6,6 +6,7 @@ import { Link } from "react-router-dom";
 import { createStructuredSelector } from "reselect";
 import { selectBodyshop } from "../../redux/user/user.selectors";
 import CurrencyFormatter from "../../utils/CurrencyFormatter";
+import { alphaSort, statusSort } from "../../utils/sorters";
 import OwnerDetailUpdateJobsComponent from "../owner-detail-update-jobs/owner-detail-update-jobs.component";
 
 const mapStateToProps = createStructuredSelector({
@@ -15,6 +16,15 @@ const mapStateToProps = createStructuredSelector({
 function OwnerDetailJobsComponent({ bodyshop, owner }) {
   const { t } = useTranslation();
   const [selectedJobs, setSelectedJobs] = useState([]);
+  const [state, setState] = useState({
+    sortedInfo: {},
+    filteredInfo: { text: "" },
+  });
+
+  const handleTableChange = (pagination, filters, sorter) => {
+    setState({ ...state, filteredInfo: filters, sortedInfo: sorter });
+  };
+  
   const columns = [
     {
       title: t("jobs.fields.ro_number"),
@@ -26,6 +36,9 @@ function OwnerDetailJobsComponent({ bodyshop, owner }) {
           {record.ro_number || t("general.labels.na")}
         </Link>
       ),
+      sorter: (a, b) => alphaSort(a.ro_number, b.ro_number),
+      sortOrder:
+        state.sortedInfo.columnKey === "ro_number" && state.sortedInfo.order,
     },
     {
       title: t("jobs.fields.vehicle"),
@@ -46,11 +59,17 @@ function OwnerDetailJobsComponent({ bodyshop, owner }) {
       title: t("jobs.fields.clm_no"),
       dataIndex: "clm_no",
       key: "clm_no",
+      sorter: (a, b) => alphaSort(a.clm_no, b.clm_no),
+      sortOrder:
+        state.sortedInfo.columnKey === "clm_no" && state.sortedInfo.order,
     },
     {
       title: t("jobs.fields.status"),
       dataIndex: "status",
       key: "status",
+      sorter: (a, b) => statusSort(a.status, b.status, bodyshop.md_ro_statuses.statuses),
+      sortOrder:
+        state.sortedInfo.columnKey === "status" && state.sortedInfo.order,
     },
 
     {
@@ -60,6 +79,9 @@ function OwnerDetailJobsComponent({ bodyshop, owner }) {
       render: (text, record) => (
         <CurrencyFormatter>{record.clm_total}</CurrencyFormatter>
       ),
+      sorter: (a, b) => a.clm_total - b.clm_total,
+      sortOrder:
+        state.sortedInfo.columnKey === "clm_total" && state.sortedInfo.order,
     },
   ];
 
@@ -80,6 +102,7 @@ function OwnerDetailJobsComponent({ bodyshop, owner }) {
         scroll={{ x: true }}
         rowKey="id"
         dataSource={owner.jobs}
+        onChange={handleTableChange}
         rowSelection={{
           onSelect: (record, selected, selectedRows) => {
             setSelectedJobs(selectedRows ? selectedRows.map((i) => i.id) : []);

client/src/components/vehicle-detail-jobs/vehicle-detail-jobs.component.jsx

@@ -6,8 +6,9 @@ import { Link } from "react-router-dom";
 import { createStructuredSelector } from "reselect";
 import { selectBodyshop } from "../../redux/user/user.selectors";
 import CurrencyFormatter from "../../utils/CurrencyFormatter";
-import VehicleDetailUpdateJobsComponent from "../vehicle-detail-update-jobs/vehicle-detail-update-jobs.component";
+import { alphaSort, statusSort } from "../../utils/sorters";
 import OwnerNameDisplay from "../owner-name-display/owner-name-display.component";
+import VehicleDetailUpdateJobsComponent from "../vehicle-detail-update-jobs/vehicle-detail-update-jobs.component";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
@@ -16,6 +17,14 @@ const mapStateToProps = createStructuredSelector({
 export function VehicleDetailJobsComponent({ vehicle, bodyshop }) {
   const { t } = useTranslation();
   const [selectedJobs, setSelectedJobs] = useState([]);
+  const [state, setState] = useState({
+    sortedInfo: {},
+    filteredInfo: { text: "" },
+  });
+
+  const handleTableChange = (pagination, filters, sorter) => {
+    setState({ ...state, filteredInfo: filters, sortedInfo: sorter });
+  };
 
   const columns = [
     {
@@ -28,6 +37,9 @@ export function VehicleDetailJobsComponent({ vehicle, bodyshop }) {
           {record.ro_number || t("general.labels.na")}
         </Link>
       ),
+      sorter: (a, b) => alphaSort(a.ro_number, b.ro_number),
+      sortOrder:
+        state.sortedInfo.columnKey === "ro_number" && state.sortedInfo.order,
     },
     {
       title: t("jobs.fields.owner"),
@@ -43,11 +55,17 @@ export function VehicleDetailJobsComponent({ vehicle, bodyshop }) {
       title: t("jobs.fields.clm_no"),
       dataIndex: "clm_no",
       key: "clm_no",
+      sorter: (a, b) => alphaSort(a.clm_no, b.clm_no),
+      sortOrder:
+        state.sortedInfo.columnKey === "clm_no" && state.sortedInfo.order,
     },
     {
       title: t("jobs.fields.status"),
       dataIndex: "status",
       key: "status",
+      sorter: (a, b) => statusSort(a.status, b.status, bodyshop.md_ro_statuses.statuses),
+      sortOrder:
+        state.sortedInfo.columnKey === "status" && state.sortedInfo.order,
     },
 
     {
@@ -57,6 +75,9 @@ export function VehicleDetailJobsComponent({ vehicle, bodyshop }) {
       render: (text, record) => (
         <CurrencyFormatter>{record.clm_total}</CurrencyFormatter>
       ),
+      sorter: (a, b) => a.clm_total - b.clm_total,
+      sortOrder:
+        state.sortedInfo.columnKey === "clm_total" && state.sortedInfo.order,
     },
   ];
 
@@ -76,6 +97,7 @@ export function VehicleDetailJobsComponent({ vehicle, bodyshop }) {
         rowKey="id"
         scroll={{ x: true }}
         dataSource={vehicle.jobs}
+        onChange={handleTableChange}
         rowSelection={{
           onSelect: (record, selected, selectedRows) => {
             setSelectedJobs(selectedRows ? selectedRows.map((i) => i.id) : []);

client/src/graphql/owners.queries.js

@@ -69,7 +69,7 @@ export const QUERY_OWNER_BY_ID = gql`
       preferred_contact
       note
       tax_number
-      jobs {
+      jobs(order_by: { date_open: desc }) {
         id
         ro_number
         clm_no

client/src/graphql/vehicles.queries.js

@@ -28,11 +28,10 @@ export const QUERY_VEHICLE_BY_ID = gql`
       updated_at
       trim_color
       notes
-      jobs {
+      jobs(order_by: { date_open: desc }) {
         id
         ro_number
         ownr_fn
-
         ownr_ln
         owner {
           id

client/src/utils/TemplateConstants.js

@@ -1040,7 +1040,7 @@ export const TemplateList = (type, context) => {
             disabled: false,
             rangeFilter: {
               object: i18n.t("reportcenter.labels.objects.jobs"),
-              field: i18n.t("jobs.fields.date_open"),
+              field: i18n.t("jobs.fields.date_invoiced"),
             },
             group: "jobs",
           },

hasura/migrations/1691177401095_create_index_parts_dispatch_employeeid/down.sql

@@ -0,0 +1 @@
+DROP INDEX IF EXISTS "public"."parts_dispatch_employeeid";

hasura/migrations/1691177401095_create_index_parts_dispatch_employeeid/up.sql

@@ -0,0 +1,2 @@
+CREATE  INDEX "parts_dispatch_employeeid" on
+  "public"."parts_dispatch" using btree ("employeeid");

hasura/migrations/1691177452060_create_index_parts_dispatch_dispatchid/down.sql

@@ -0,0 +1 @@
+DROP INDEX IF EXISTS "public"."parts_dispatch_dispatchid";

hasura/migrations/1691177452060_create_index_parts_dispatch_dispatchid/up.sql

@@ -0,0 +1,2 @@
+CREATE  INDEX "parts_dispatch_dispatchid" on
+  "public"."parts_dispatch_lines" using btree ("partsdispatchid");

hasura/migrations/1691177467690_create_index_parts_dispatch_line_accepted_at/down.sql

@@ -0,0 +1 @@
+DROP INDEX IF EXISTS "public"."parts_dispatch_line_accepted_at";

hasura/migrations/1691177467690_create_index_parts_dispatch_line_accepted_at/up.sql

@@ -0,0 +1,2 @@
+CREATE  INDEX "parts_dispatch_line_accepted_at" on
+  "public"."parts_dispatch_lines" using btree ("accepted_at");

server/graphql-client/queries.js

@@ -620,6 +620,7 @@ exports.QUERY_EMPLOYEE_PIN = `query QUERY_EMPLOYEE_PIN($shopId: uuid!, $employee
     employee_number
     id
     pin
+    active
   }
 }`;
 

server/tech/tech.js

@@ -23,7 +23,7 @@ exports.techLogin = async (req, res) => {
     let technician;
     if (result.employees && result.employees[0]) {
       const dbRecord = result.employees[0];
-      if (dbRecord.pin === pin) {
+      if (dbRecord.pin === pin && dbRecord.active === true) {
         valid = true;
         delete dbRecord.pin;
         technician = dbRecord;