IO-2705 Insurance Co Id and correct Select Insurance and Layout for concistency

Signed-off-by: Allan Carr <allan.carr@thinkimex.com>

_reference/reportFiltersAndSorters.md

@@ -59,7 +59,7 @@ Filters can make use of reflection to pre-fill select boxes, the following is an
         "type": "internal",
         "name": "special.job_statuses"
       }
-    },
+    }
 ```
 
 in this example, a reflector with the type 'internal' (all types at the moment require this, and it is used for future functionality), with a name of `special.job_statuses`
@@ -74,9 +74,13 @@ The following cases are available
 - `special.employees` - This will reflect the employees `bodyshop.employees`
 - `special.first_names` - This will reflect the first names `bodyshop.employees`
 - `special.last_names` - This will reflect the last names `bodyshop.employees`
-- `special.referral_sources` - This will reflect the referral sources `bodyshop.md_referral_sources
+- `special.referral_sources` - This will reflect the referral sources `bodyshop.md_referral_sources`
 - `special.class`- This will reflect the class `bodyshop.md_classes`
--
+- `special.lost_sale_reasons` - This will reflect the lost sale reasons `bodyshop.md_lost_sale_reasons`
+- `special.alt_transports` - This will reflect the alternative transports `bodyshop.appt_alt_transport`
+- `special.payment_types` - This will reflect the payment types `bodyshop.md_payment_types`
+- `special.payment_payers` - This is a special case with a key value set of [Customer, Insurance]
+
 ### Path without brackets, multi level
 
 `"name": "jobs.joblines.mod_lb_hrs",`
@@ -156,6 +160,7 @@ query gendoc_hours_sold_detail_open($starttz: timestamptz!, $endtz: timestamptz!
 - Do not add the ability to filter things that are already filtered as part of the original query, this would be
   redundant and could cause issues.
 - Do not add the ability to filter on things like FK constraints, must like the above example.
+- *INHERITANCE CAVEAT* If you have a filters file on a parent report that has a child that you do not want the filters inherited from, you must place a blank filters file (valid json so {}) on the child report level. This will than fetch the child filters, which are empty and move along, versus inheriting the parent filters.
 
 ## Sorters
 

client/src/components/accounting-payables-table/accounting-payables-table.component.jsx

@@ -1,21 +1,21 @@
-import { Input, Table, Checkbox, Card, Space } from "antd";
+import { Card, Checkbox, Input, Space, Table } from "antd";
+import queryString from "query-string";
 import React, { useState } from "react";
 import { useTranslation } from "react-i18next";
-import { Link } from "react-router-dom";
-import CurrencyFormatter from "../../utils/CurrencyFormatter";
-import { alphaSort, dateSort } from "../../utils/sorters";
-import PayableExportButton from "../payable-export-button/payable-export-button.component";
-import PayableExportAll from "../payable-export-all-button/payable-export-all-button.component";
-import { DateFormatter } from "../../utils/DateFormatter";
-import queryString from "query-string";
-import { logImEXEvent } from "../../firebase/firebase.utils";
-import QboAuthorizeComponent from "../qbo-authorize/qbo-authorize.component";
 import { connect } from "react-redux";
+import { Link } from "react-router-dom";
 import { createStructuredSelector } from "reselect";
+import { logImEXEvent } from "../../firebase/firebase.utils";
 import { selectBodyshop } from "../../redux/user/user.selectors";
+import CurrencyFormatter from "../../utils/CurrencyFormatter";
+import { DateFormatter } from "../../utils/DateFormatter";
+import { pageLimit } from "../../utils/config";
+import { alphaSort, dateSort } from "../../utils/sorters";
 import ExportLogsCountDisplay from "../export-logs-count-display/export-logs-count-display.component";
+import PayableExportAll from "../payable-export-all-button/payable-export-all-button.component";
+import PayableExportButton from "../payable-export-button/payable-export-button.component";
 import BillMarkSelectedExported from "../payable-mark-selected-exported/payable-mark-selected-exported.component";
-import {pageLimit} from "../../utils/config";
+import QboAuthorizeComponent from "../qbo-authorize/qbo-authorize.component";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
@@ -138,7 +138,6 @@ export function AccountingPayablesTableComponent({
       title: t("exportlogs.labels.attempts"),
       dataIndex: "attempts",
       key: "attempts",
-
       render: (text, record) => (
         <ExportLogsCountDisplay logs={record.exportlogs} />
       ),
@@ -147,8 +146,6 @@ export function AccountingPayablesTableComponent({
       title: t("general.labels.actions"),
       dataIndex: "actions",
       key: "actions",
-      sorter: (a, b) => a.clm_total - b.clm_total,
-
       render: (text, record) => (
         <PayableExportButton
           billId={record.id}

client/src/components/accounting-payments-table/accounting-payments-table.component.jsx

@@ -8,14 +8,16 @@ import { logImEXEvent } from "../../firebase/firebase.utils";
 import { selectBodyshop } from "../../redux/user/user.selectors";
 import CurrencyFormatter from "../../utils/CurrencyFormatter";
 import { DateFormatter, DateTimeFormatter } from "../../utils/DateFormatter";
+import { pageLimit } from "../../utils/config";
 import { alphaSort, dateSort } from "../../utils/sorters";
 import ExportLogsCountDisplay from "../export-logs-count-display/export-logs-count-display.component";
-import OwnerNameDisplay from "../owner-name-display/owner-name-display.component";
+import OwnerNameDisplay, {
+  OwnerNameDisplayFunction,
+} from "../owner-name-display/owner-name-display.component";
 import PaymentExportButton from "../payment-export-button/payment-export-button.component";
 import PaymentMarkSelectedExported from "../payment-mark-selected-exported/payment-mark-selected-exported.component";
 import PaymentsExportAllButton from "../payments-export-all-button/payments-export-all-button.component";
 import QboAuthorizeComponent from "../qbo-authorize/qbo-authorize.component";
-import {pageLimit} from "../../utils/config";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
@@ -75,7 +77,11 @@ export function AccountingPayablesTableComponent({
       dataIndex: "owner",
       key: "owner",
       ellipsis: true,
-      sorter: (a, b) => alphaSort(a.job.ownr_ln, b.job.ownr_ln),
+      sorter: (a, b) =>
+        alphaSort(
+          OwnerNameDisplayFunction(a.job),
+          OwnerNameDisplayFunction(b.job)
+        ),
       sortOrder:
         state.sortedInfo.columnKey === "owner" && state.sortedInfo.order,
       render: (text, record) => {
@@ -94,6 +100,9 @@ export function AccountingPayablesTableComponent({
       title: t("payments.fields.amount"),
       dataIndex: "amount",
       key: "amount",
+      sorter: (a, b) => a.amount - b.amount,
+      sortOrder:
+        state.sortedInfo.columnKey === "amount" && state.sortedInfo.order,
       render: (text, record) => (
         <CurrencyFormatter>{record.amount}</CurrencyFormatter>
       ),
@@ -112,18 +121,21 @@ export function AccountingPayablesTableComponent({
       title: t("payments.fields.created_at"),
       dataIndex: "created_at",
       key: "created_at",
+      sorter: (a, b) => dateSort(a.created_at, b.created_at),
+      sortOrder:
+        state.sortedInfo.columnKey === "created_at" && state.sortedInfo.order,
       render: (text, record) => (
         <DateTimeFormatter>{record.created_at}</DateTimeFormatter>
       ),
     },
-    {
-      title: t("payments.fields.exportedat"),
-      dataIndex: "exportedat",
-      key: "exportedat",
-      render: (text, record) => (
-        <DateTimeFormatter>{record.exportedat}</DateTimeFormatter>
-      ),
-    },
+    // {
+    //   title: t("payments.fields.exportedat"),
+    //   dataIndex: "exportedat",
+    //   key: "exportedat",
+    //   render: (text, record) => (
+    //     <DateTimeFormatter>{record.exportedat}</DateTimeFormatter>
+    //   ),
+    // },
     {
       title: t("exportlogs.labels.attempts"),
       dataIndex: "attempts",
@@ -137,8 +149,6 @@ export function AccountingPayablesTableComponent({
       title: t("general.labels.actions"),
       dataIndex: "actions",
       key: "actions",
-      sorter: (a, b) => a.clm_total - b.clm_total,
-
       render: (text, record) => (
         <PaymentExportButton
           paymentId={record.id}

client/src/components/accounting-receivables-table/accounting-receivables-table.component.jsx

@@ -4,17 +4,19 @@ import { useTranslation } from "react-i18next";
 import { Link } from "react-router-dom";
 import { logImEXEvent } from "../../firebase/firebase.utils";
 import CurrencyFormatter from "../../utils/CurrencyFormatter";
-import { alphaSort, dateSort } from "../../utils/sorters";
+import { alphaSort, dateSort, statusSort } from "../../utils/sorters";
 import JobExportButton from "../jobs-close-export-button/jobs-close-export-button.component";
 import JobsExportAllButton from "../jobs-export-all-button/jobs-export-all-button.component";
 
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
 import { selectBodyshop } from "../../redux/user/user.selectors";
-import QboAuthorizeComponent from "../qbo-authorize/qbo-authorize.component";
 import { DateFormatter } from "../../utils/DateFormatter";
-import OwnerNameDisplay from "../owner-name-display/owner-name-display.component";
 import ExportLogsCountDisplay from "../export-logs-count-display/export-logs-count-display.component";
+import OwnerNameDisplay, {
+  OwnerNameDisplayFunction,
+} from "../owner-name-display/owner-name-display.component";
+import QboAuthorizeComponent from "../qbo-authorize/qbo-authorize.component";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
@@ -63,7 +65,7 @@ export function AccountingReceivablesTableComponent({
       title: t("jobs.fields.status"),
       dataIndex: "status",
       key: "status",
-      sorter: (a, b) => a.status - b.status,
+      sorter: (a, b) => statusSort(a, b, bodyshop.md_ro_statuses.statuses),
       sortOrder:
         state.sortedInfo.columnKey === "status" && state.sortedInfo.order,
     },
@@ -83,7 +85,8 @@ export function AccountingReceivablesTableComponent({
       title: t("jobs.fields.owner"),
       dataIndex: "owner",
       key: "owner",
-      sorter: (a, b) => alphaSort(a.ownr_ln, b.ownr_ln),
+      sorter: (a, b) =>
+        alphaSort(OwnerNameDisplayFunction(a), OwnerNameDisplayFunction(b)),
       sortOrder:
         state.sortedInfo.columnKey === "owner" && state.sortedInfo.order,
       render: (text, record) => {
@@ -103,6 +106,15 @@ export function AccountingReceivablesTableComponent({
       dataIndex: "vehicle",
       key: "vehicle",
       ellipsis: true,
+      sorter: (a, b) =>
+        alphaSort(
+          `${a.v_model_yr || ""} ${a.v_make_desc || ""} ${
+            a.v_model_desc || ""
+          }`,
+          `${b.v_model_yr || ""} ${b.v_make_desc || ""} ${b.v_model_desc || ""}`
+        ),
+      sortOrder:
+        state.sortedInfo.columnKey === "vehicle" && state.sortedInfo.order,
       render: (text, record) => {
         return record.vehicleid ? (
           <Link to={"/manage/vehicles/" + record.vehicleid}>

client/src/components/bill-delete-button/bill-delete-button.component.jsx

@@ -12,8 +12,8 @@ import RbacWrapper from "../rbac-wrapper/rbac-wrapper.component";
 
 const mapStateToProps = createStructuredSelector({});
 const mapDispatchToProps = (dispatch) => ({
-  insertAuditTrail: ({ jobid, operation }) =>
-    dispatch(insertAuditTrail({ jobid, operation })),
+  insertAuditTrail: ({ jobid, operation, type }) =>
+    dispatch(insertAuditTrail({ jobid, operation, type })),
 });
 
 export default connect(mapStateToProps, mapDispatchToProps)(BillDeleteButton);
@@ -51,6 +51,7 @@ export function BillDeleteButton({ bill, jobid, callback, insertAuditTrail }) {
       insertAuditTrail({
         jobid: jobid,
         operation: AuditTrailMapping.billdeleted(bill.invoice_number),
+        type: "billdeleted",
       });
 
       if (callback && typeof callback === "function") callback(bill.id);

client/src/components/bill-detail-edit/bill-detail-edit-component.jsx

@@ -1,5 +1,5 @@
 import { useMutation, useQuery } from "@apollo/client";
-import { Button, Form, PageHeader, Popconfirm, Space } from "antd";
+import { Button, Divider, Form, PageHeader, Popconfirm, Space } from "antd";
 import moment from "moment";
 import queryString from "query-string";
 import React, { useState } from "react";
@@ -33,8 +33,8 @@ const mapStateToProps = createStructuredSelector({
 const mapDispatchToProps = (dispatch) => ({
   setPartsOrderContext: (context) =>
     dispatch(setModalContext({ context: context, modal: "partsOrder" })),
-  insertAuditTrail: ({ jobid, operation }) =>
-    dispatch(insertAuditTrail({ jobid, operation })),
+  insertAuditTrail: ({ jobid, operation, type }) =>
+    dispatch(insertAuditTrail({ jobid, operation, type })),
 });
 
 export default connect(
@@ -150,6 +150,7 @@ export function BillDetailEditcontainer({
       jobid: bill.jobid,
       billid: search.billid,
       operation: AuditTrailMapping.billupdated(bill.invoice_number),
+      type: "billupdated",
     });
 
     await refetch();
@@ -207,7 +208,7 @@ export function BillDetailEditcontainer({
             layout="vertical"
           >
             <BillFormContainer form={form} billEdit disabled={exported} />
-
+            <Divider orientation="left">{t("general.labels.media")}</Divider>
             {bodyshop.uselocalmediaserver ? (
               <JobsDocumentsLocalGallery
                 job={{ id: data ? data.bills_by_pk.jobid : null }}

client/src/components/bill-detail-edit/bill-detail-edit-return.component.jsx

@@ -16,8 +16,8 @@ const mapStateToProps = createStructuredSelector({
 const mapDispatchToProps = (dispatch) => ({
   setPartsOrderContext: (context) =>
     dispatch(setModalContext({ context: context, modal: "partsOrder" })),
-  insertAuditTrail: ({ jobid, operation }) =>
-    dispatch(insertAuditTrail({ jobid, operation })),
+  insertAuditTrail: ({ jobid, operation, type }) =>
+    dispatch(insertAuditTrail({ jobid, operation, type })),
 });
 
 export default connect(
@@ -173,7 +173,11 @@ export function BillDetailEditReturn({
         </Form>
       </Modal>
       <Button
-        disabled={data.bills_by_pk.is_credit_memo || disabled}
+        disabled={
+          data.bills_by_pk.is_credit_memo ||
+          data.bills_by_pk.isinhouse ||
+          disabled
+        }
         onClick={() => {
           setVisible(true);
         }}

client/src/components/bill-enter-modal/bill-enter-modal.container.jsx

@@ -37,8 +37,8 @@ const mapStateToProps = createStructuredSelector({
 });
 const mapDispatchToProps = (dispatch) => ({
   toggleModalVisible: () => dispatch(toggleModalVisible("billEnter")),
-  insertAuditTrail: ({ jobid, billid, operation }) =>
-    dispatch(insertAuditTrail({ jobid, billid, operation })),
+  insertAuditTrail: ({ jobid, billid, operation, type }) =>
+    dispatch(insertAuditTrail({ jobid, billid, operation, type })),
 });
 
 const Templates = TemplateList("job_special");
@@ -171,6 +171,7 @@ function BillEnterModalContainer({
             mod_lbr_ty: key,
             hours: adjustmentsToInsert[key].toFixed(1),
           }),
+          type: "jobmodifylbradj",
         });
       });
 
@@ -320,6 +321,7 @@ function BillEnterModalContainer({
       operation: AuditTrailMapping.billposted(
         r1.data.insert_bills.returning[0].invoice_number
       ),
+      type: "billposted",
     });
 
     if (enterAgain) {

client/src/components/bill-form/bill-form.component.jsx

@@ -504,10 +504,11 @@ export function BillFormComponent({
           billEdit={billEdit}
         />
       )}
-
+      <Divider orientation="left" style={{ display: billEdit ? "none" : null }}>
+        {t("documents.labels.upload")}
+      </Divider>
       <Form.Item
         name="upload"
-        label="Upload"
         style={{ display: billEdit ? "none" : null }}
         valuePropName="fileList"
         getValueFromEvent={(e) => {

client/src/components/card-payment-modal/card-payment-modal.component..jsx

@@ -37,8 +37,8 @@ const mapStateToProps = createStructuredSelector({
 });
 
 const mapDispatchToProps = (dispatch) => ({
-  insertAuditTrail: ({ jobid, operation }) =>
-    dispatch(insertAuditTrail({ jobid, operation })),
+  insertAuditTrail: ({ jobid, operation, type }) =>
+    dispatch(insertAuditTrail({ jobid, operation, type })),
   toggleModalVisible: () => dispatch(toggleModalVisible("cardPayment")),
 });
 
@@ -102,6 +102,7 @@ const CardPaymentModalComponent = ({
         insertAuditTrail({
           jobid: payment.jobid,
           operation: AuditTrailMapping.failedpayment(),
+          type: "failedpayment",
         })
       );
     });

client/src/components/courtesy-cars-list/courtesy-cars-list.component.jsx

@@ -61,6 +61,10 @@ export default function CourtesyCarsList({ loading, courtesycars, refetch }) {
           text: t("courtesycars.status.in"),
           value: "courtesycars.status.in",
         },
+        {
+          text: t("courtesycars.status.inservice"),
+          value: "courtesycars.status.inservice",
+        },
         {
           text: t("courtesycars.status.out"),
           value: "courtesycars.status.out",
@@ -74,7 +78,7 @@ export default function CourtesyCarsList({ loading, courtesycars, refetch }) {
           value: "courtesycars.status.leasereturn",
         },
       ],
-      onFilter: (value, record) => value.includes(record.status),
+      onFilter: (value, record) => record.status === value,
       sortOrder:
         state.sortedInfo.columnKey === "status" && state.sortedInfo.order,
       render: (text, record) => {
@@ -178,7 +182,7 @@ export default function CourtesyCarsList({ loading, courtesycars, refetch }) {
       title: t("courtesycars.fields.fuel"),
       dataIndex: "fuel",
       key: "fuel",
-      sorter: (a, b) => alphaSort(a.fuel, b.fuel),
+      sorter: (a, b) => a.fuel - b.fuel,
       sortOrder:
         state.sortedInfo.columnKey === "fuel" && state.sortedInfo.order,
       render: (text, record) => {
@@ -187,12 +191,14 @@ export default function CourtesyCarsList({ loading, courtesycars, refetch }) {
             return t("courtesycars.labels.fuel.full");
           case 88:
             return t("courtesycars.labels.fuel.78");
+          case 75:
+            return t("courtesycars.labels.fuel.34");
           case 63:
             return t("courtesycars.labels.fuel.58");
           case 50:
             return t("courtesycars.labels.fuel.12");
           case 38:
-            return t("courtesycars.labels.fuel.34");
+            return t("courtesycars.labels.fuel.38");
           case 25:
             return t("courtesycars.labels.fuel.14");
           case 13:

client/src/components/dashboard-components/job-lifecycle/job-lifecycle-dashboard.component.jsx

@@ -0,0 +1,169 @@
+import {Card, Table, Tag} from "antd";
+import LoadingSkeleton from "../../loading-skeleton/loading-skeleton.component";
+import {useTranslation} from "react-i18next";
+import React, {useEffect, useState} from "react";
+import moment from "moment";
+import DashboardRefreshRequired from "../refresh-required.component";
+import axios from "axios";
+
+const fortyFiveDaysAgo = () => moment().subtract(45, 'days').toLocaleString();
+
+export default function JobLifecycleDashboardComponent({data, bodyshop, ...cardProps}) {
+    const {t} = useTranslation();
+    const [loading, setLoading] = useState(false);
+    const [lifecycleData, setLifecycleData] = useState(null);
+
+    useEffect(() => {
+        async function getLifecycleData() {
+            if (data && data.job_lifecycle) {
+                setLoading(true);
+                const response = await axios.post("/job/lifecycle", {
+                    jobids: data.job_lifecycle.map(x => x.id),
+                    statuses: bodyshop.md_ro_statuses
+                });
+                setLifecycleData(response.data.durations);
+                setLoading(false);
+            }
+        }
+
+        getLifecycleData().catch(e => {
+            console.error(`Error in getLifecycleData: ${e}`);
+        })
+    }, [data, bodyshop]);
+
+    const columns = [
+        {
+            title: t('job_lifecycle.columns.status'),
+            dataIndex: 'status',
+            bgColor: 'red',
+            key: 'status',
+            render: (text, record) => {
+                return <Tag color={record.color}>{record.status}</Tag>
+            }
+        },
+        {
+            title: t('job_lifecycle.columns.human_readable'),
+            dataIndex: 'humanReadable',
+            key: 'humanReadable',
+        },
+        {
+            title: t('job_lifecycle.columns.status_count'),
+            key: 'statusCount',
+            render: (text, record) => {
+                return lifecycleData.statusCounts[record.status];
+            }
+        },
+        {
+            title: t('job_lifecycle.columns.percentage'),
+            dataIndex: 'percentage',
+            key: 'percentage',
+            render: (text, record) => {
+                return record.percentage.toFixed(2) + '%';
+            }
+        },
+    ];
+
+    if (!data) return null;
+
+    if (!data.job_lifecycle || !lifecycleData) return <DashboardRefreshRequired {...cardProps} />;
+
+    const extra = `${t('job_lifecycle.content.calculated_based_on')} ${lifecycleData.jobs} ${t('job_lifecycle.content.jobs_in_since')} ${fortyFiveDaysAgo()}`
+
+    return (
+        <Card title={t("job_lifecycle.titles.dashboard")} {...cardProps}>
+            <LoadingSkeleton loading={loading}>
+                <div style={{overflow: 'scroll', height: "100%"}}>
+                    <div id="bar-container" style={{
+                        display: 'flex',
+                        width: '100%',
+                        height: '100px',
+                        textAlign: 'center',
+                        borderRadius: '5px',
+                        borderWidth: '5px',
+                        borderStyle: 'solid',
+                        borderColor: '#f0f2f5',
+                        margin: 0,
+                        padding: 0
+                    }}>
+                        {lifecycleData.summations.map((key, index, array) => {
+                            const isFirst = index === 0;
+                            const isLast = index === array.length - 1;
+                            return (
+                                <div key={key.status} style={{
+                                    overflow: 'hidden',
+                                    display: 'flex',
+                                    flexDirection: 'column',
+                                    justifyContent: 'center',
+                                    alignItems: 'center',
+                                    margin: 0,
+                                    padding: 0,
+
+                                    borderTop: '1px solid #f0f2f5',
+                                    borderBottom: '1px solid #f0f2f5',
+                                    borderLeft: isFirst ? '1px solid #f0f2f5' : undefined,
+                                    borderRight: isLast ? '1px solid #f0f2f5' : undefined,
+
+                                    backgroundColor: key.color,
+                                    width: `${key.percentage}%`
+                                }}
+                                     aria-label={`${key.status} | ${key.roundedPercentage} | ${key.humanReadable}`}
+                                     title={`${key.status} | ${key.roundedPercentage} | ${key.humanReadable}`}
+                                >
+
+                                    {key.percentage > 15 ?
+                                        <>
+                                            <div>{key.roundedPercentage}</div>
+                                            <div style={{
+                                                backgroundColor: '#f0f2f5',
+                                                borderRadius: '5px',
+                                                paddingRight: '2px',
+                                                paddingLeft: '2px',
+                                                fontSize: '0.8rem',
+                                            }}>
+                                                {key.status}
+                                            </div>
+                                        </>
+                                        : null}
+                                </div>
+                            );
+                        })}
+                    </div>
+                    <Card extra={extra} type='inner' title={t('job_lifecycle.content.legend_title')}
+                          style={{marginTop: '10px'}}>
+                        <div>
+                            {lifecycleData.summations.map((key) => (
+                                <Tag color={key.color} style={{width: '13vh', padding: '4px', margin: '4px'}}>
+                                    <div
+                                        aria-label={`${key.status} | ${key.roundedPercentage} | ${key.humanReadable}`}
+                                        title={`${key.status} | ${key.roundedPercentage} | ${key.humanReadable}`}
+                                        style={{
+                                            backgroundColor: '#f0f2f5',
+                                            color: '#000',
+                                            padding: '4px',
+                                            textAlign: 'center'
+                                        }}>
+                                        {key.status} [{lifecycleData.statusCounts[key.status]}] ({key.roundedPercentage})
+                                    </div>
+                                </Tag>
+                            ))}
+                        </div>
+                    </Card>
+                    <Card style={{marginTop: "5px"}} type='inner' title={t("job_lifecycle.titles.top_durations")}>
+                        <Table size="small" pagination={false} columns={columns}
+                               dataSource={lifecycleData.summations.sort((a, b) => b.value - a.value).slice(0, 3)}/>
+                    </Card>
+                </div>
+            </LoadingSkeleton>
+        </Card>
+    );
+}
+
+export const JobLifecycleDashboardGQL = `
+job_lifecycle: jobs(where: {
+    actual_in: {
+        _gte: "${moment().subtract(45, 'days').toISOString()}"
+    }
+}) {
+    id
+    actual_in
+} `;

client/src/components/dashboard-grid/dashboard-grid.component.jsx

@@ -1,380 +1,391 @@
-import Icon, { SyncOutlined } from "@ant-design/icons";
-import { gql, useMutation, useQuery } from "@apollo/client";
-import { Button, Dropdown, Menu, PageHeader, Space, notification } from "antd";
+import Icon, {SyncOutlined} from "@ant-design/icons";
+import {gql, useMutation, useQuery} from "@apollo/client";
+import {Button, Dropdown, Menu, notification, PageHeader, Space} from "antd";
 import i18next from "i18next";
 import _ from "lodash";
 import moment from "moment";
-import React, { useState } from "react";
-import { Responsive, WidthProvider } from "react-grid-layout";
-import { useTranslation } from "react-i18next";
-import { MdClose } from "react-icons/md";
-import { connect } from "react-redux";
-import { createStructuredSelector } from "reselect";
-import { logImEXEvent } from "../../firebase/firebase.utils";
-import { UPDATE_DASHBOARD_LAYOUT } from "../../graphql/user.queries";
-import {
-  selectBodyshop,
-  selectCurrentUser,
-} from "../../redux/user/user.selectors";
+import React, {useState} from "react";
+import {Responsive, WidthProvider} from "react-grid-layout";
+import {useTranslation} from "react-i18next";
+import {MdClose} from "react-icons/md";
+import {connect} from "react-redux";
+import {createStructuredSelector} from "reselect";
+import {logImEXEvent} from "../../firebase/firebase.utils";
+import {UPDATE_DASHBOARD_LAYOUT} from "../../graphql/user.queries";
+import {selectBodyshop, selectCurrentUser,} from "../../redux/user/user.selectors";
 import AlertComponent from "../alert/alert.component";
 import DashboardMonthlyEmployeeEfficiency, {
-  DashboardMonthlyEmployeeEfficiencyGql,
+    DashboardMonthlyEmployeeEfficiencyGql,
 } from "../dashboard-components/monthly-employee-efficiency/monthly-employee-efficiency.component";
 import DashboardMonthlyJobCosting from "../dashboard-components/monthly-job-costing/monthly-job-costing.component";
 import DashboardMonthlyLaborSales from "../dashboard-components/monthly-labor-sales/monthly-labor-sales.component";
 import DashboardMonthlyPartsSales from "../dashboard-components/monthly-parts-sales/monthly-parts-sales.component";
 import DashboardMonthlyRevenueGraph, {
-  DashboardMonthlyRevenueGraphGql,
+    DashboardMonthlyRevenueGraphGql,
 } from "../dashboard-components/monthly-revenue-graph/monthly-revenue-graph.component";
 import DashboardProjectedMonthlySales, {
-  DashboardProjectedMonthlySalesGql,
+    DashboardProjectedMonthlySalesGql,
 } from "../dashboard-components/pojected-monthly-sales/projected-monthly-sales.component";
-import DashboardTotalProductionDollars from "../dashboard-components/total-production-dollars/total-production-dollars.component";
+import DashboardTotalProductionDollars
+    from "../dashboard-components/total-production-dollars/total-production-dollars.component";
 import DashboardTotalProductionHours, {
-  DashboardTotalProductionHoursGql,
+    DashboardTotalProductionHoursGql,
 } from "../dashboard-components/total-production-hours/total-production-hours.component";
 import LoadingSkeleton from "../loading-skeleton/loading-skeleton.component";
 //Combination of the following:
 // /node_modules/react-grid-layout/css/styles.css
 // /node_modules/react-resizable/css/styles.css
 import DashboardScheduledInToday, {
-  DashboardScheduledInTodayGql,
+    DashboardScheduledInTodayGql,
 } from "../dashboard-components/scheduled-in-today/scheduled-in-today.component";
 import DashboardScheduledOutToday, {
-  DashboardScheduledOutTodayGql,
+    DashboardScheduledOutTodayGql,
 } from "../dashboard-components/scheduled-out-today/scheduled-out-today.component";
+import JobLifecycleDashboardComponent, {
+    JobLifecycleDashboardGQL
+} from "../dashboard-components/job-lifecycle/job-lifecycle-dashboard.component";
 import "./dashboard-grid.styles.scss";
-import { GenerateDashboardData } from "./dashboard-grid.utils";
+import {GenerateDashboardData} from "./dashboard-grid.utils";
 
 const ResponsiveReactGridLayout = WidthProvider(Responsive);
 
 const mapStateToProps = createStructuredSelector({
-  currentUser: selectCurrentUser,
-  bodyshop: selectBodyshop,
+    currentUser: selectCurrentUser,
+    bodyshop: selectBodyshop,
 });
 const mapDispatchToProps = (dispatch) => ({
-  //setUserLanguage: language => dispatch(setUserLanguage(language))
+    //setUserLanguage: language => dispatch(setUserLanguage(language))
 });
 
-export function DashboardGridComponent({ currentUser, bodyshop }) {
-  const { t } = useTranslation();
-  const [state, setState] = useState({
-    ...(bodyshop.associations[0].user.dashboardlayout
-      ? bodyshop.associations[0].user.dashboardlayout
-      : { items: [], layout: {}, layouts: [] }),
-  });
-
-  const { loading, error, data, refetch } = useQuery(
-    createDashboardQuery(state),
-    { fetchPolicy: "network-only", nextFetchPolicy: "network-only" }
-  );
-
-  const [updateLayout] = useMutation(UPDATE_DASHBOARD_LAYOUT);
-
-  const handleLayoutChange = async (layout, layouts) => {
-    logImEXEvent("dashboard_change_layout");
-
-    setState({ ...state, layout, layouts });
-
-    const result = await updateLayout({
-      variables: {
-        email: currentUser.email,
-        layout: { ...state, layout, layouts },
-      },
+export function DashboardGridComponent({currentUser, bodyshop}) {
+    const {t} = useTranslation();
+    const [state, setState] = useState({
+        ...(bodyshop.associations[0].user.dashboardlayout
+            ? bodyshop.associations[0].user.dashboardlayout
+            : {items: [], layout: {}, layouts: []}),
     });
-    if (!!result.errors) {
-      notification["error"]({
-        message: t("dashboard.errors.updatinglayout", {
-          message: JSON.stringify(result.errors),
-        }),
-      });
-    }
-  };
-  const handleRemoveComponent = (key) => {
-    logImEXEvent("dashboard_remove_component", { name: key });
-    const idxToRemove = state.items.findIndex((i) => i.i === key);
 
-    const items = _.cloneDeep(state.items);
+    const {loading, error, data, refetch} = useQuery(
+        createDashboardQuery(state),
+        {fetchPolicy: "network-only", nextFetchPolicy: "network-only"}
+    );
 
-    items.splice(idxToRemove, 1);
-    setState({ ...state, items });
-  };
+    const [updateLayout] = useMutation(UPDATE_DASHBOARD_LAYOUT);
 
-  const handleAddComponent = (e) => {
-    logImEXEvent("dashboard_add_component", { name: e });
-    setState({
-      ...state,
-      items: [
-        ...state.items,
-        {
-          i: e.key,
-          x: (state.items.length * 2) % (state.cols || 12),
-          y: 99, // puts it at the bottom
-          w: componentList[e.key].w || 2,
-          h: componentList[e.key].h || 2,
-        },
-      ],
-    });
-  };
+    const handleLayoutChange = async (layout, layouts) => {
+        logImEXEvent("dashboard_change_layout");
 
-  const dashboarddata = React.useMemo(
-    () => GenerateDashboardData(data),
-    [data]
-  );
-  const existingLayoutKeys = state.items.map((i) => i.i);
-  const addComponentOverlay = (
-    <Menu onClick={handleAddComponent}>
-      {Object.keys(componentList).map((key) => (
-        <Menu.Item
-          key={key}
-          value={key}
-          disabled={existingLayoutKeys.includes(key)}
-        >
-          {componentList[key].label}
-        </Menu.Item>
-      ))}
-    </Menu>
-  );
+        setState({...state, layout, layouts});
 
-  if (error) return <AlertComponent message={error.message} type="error" />;
-
-  return (
-    <div>
-      <PageHeader
-        extra={
-          <Space>
-            <Button onClick={() => refetch()}>
-              <SyncOutlined />
-            </Button>
-            <Dropdown overlay={addComponentOverlay} trigger={["click"]}>
-              <Button>{t("dashboard.actions.addcomponent")}</Button>
-            </Dropdown>
-          </Space>
+        const result = await updateLayout({
+            variables: {
+                email: currentUser.email,
+                layout: {...state, layout, layouts},
+            },
+        });
+        if (!!result.errors) {
+            notification["error"]({
+                message: t("dashboard.errors.updatinglayout", {
+                    message: JSON.stringify(result.errors),
+                }),
+            });
         }
-      />
+    };
+    const handleRemoveComponent = (key) => {
+        logImEXEvent("dashboard_remove_component", {name: key});
+        const idxToRemove = state.items.findIndex((i) => i.i === key);
 
-      <ResponsiveReactGridLayout
-        className="layout"
-        breakpoints={{ lg: 1200, md: 996, sm: 768, xs: 480, xxs: 0 }}
-        cols={{ lg: 12, md: 10, sm: 6, xs: 4, xxs: 2 }}
-        width="100%"
-        layouts={state.layouts}
-        onLayoutChange={handleLayoutChange}
-        //   onBreakpointChange={onBreakpointChange}
-      >
-        {state.items.map((item, index) => {
-          const TheComponent = componentList[item.i].component;
-          return (
-            <div
-              key={item.i}
-              data-grid={{
-                ...item,
-                minH: componentList[item.i].minH || 1,
-                minW: componentList[item.i].minW || 1,
-              }}
+        const items = _.cloneDeep(state.items);
+
+        items.splice(idxToRemove, 1);
+        setState({...state, items});
+    };
+
+    const handleAddComponent = (e) => {
+        logImEXEvent("dashboard_add_component", {name: e});
+        setState({
+            ...state,
+            items: [
+                ...state.items,
+                {
+                    i: e.key,
+                    x: (state.items.length * 2) % (state.cols || 12),
+                    y: 99, // puts it at the bottom
+                    w: componentList[e.key].w || 2,
+                    h: componentList[e.key].h || 2,
+                },
+            ],
+        });
+    };
+
+    const dashboarddata = React.useMemo(
+        () => GenerateDashboardData(data),
+        [data]
+    );
+    const existingLayoutKeys = state.items.map((i) => i.i);
+    const addComponentOverlay = (
+        <Menu onClick={handleAddComponent}>
+            {Object.keys(componentList).map((key) => (
+                <Menu.Item
+                    key={key}
+                    value={key}
+                    disabled={existingLayoutKeys.includes(key)}
+                >
+                    {componentList[key].label}
+                </Menu.Item>
+            ))}
+        </Menu>
+    );
+
+    if (error) return <AlertComponent message={error.message} type="error"/>;
+
+    return (
+        <div>
+            <PageHeader
+                extra={
+                    <Space>
+                        <Button onClick={() => refetch()}>
+                            <SyncOutlined/>
+                        </Button>
+                        <Dropdown overlay={addComponentOverlay} trigger={["click"]}>
+                            <Button>{t("dashboard.actions.addcomponent")}</Button>
+                        </Dropdown>
+                    </Space>
+                }
+            />
+
+            <ResponsiveReactGridLayout
+                className="layout"
+                breakpoints={{lg: 1200, md: 996, sm: 768, xs: 480, xxs: 0}}
+                cols={{lg: 12, md: 10, sm: 6, xs: 4, xxs: 2}}
+                width="100%"
+                layouts={state.layouts}
+                onLayoutChange={handleLayoutChange}
+                //   onBreakpointChange={onBreakpointChange}
             >
-              <LoadingSkeleton loading={loading}>
-                <Icon
-                  component={MdClose}
-                  key={item.i}
-                  style={{
-                    position: "absolute",
-                    zIndex: "2",
-                    right: ".25rem",
-                    top: ".25rem",
-                    cursor: "pointer",
-                  }}
-                  onClick={() => handleRemoveComponent(item.i)}
-                />
-                <TheComponent className="dashboard-card" data={dashboarddata} />
-              </LoadingSkeleton>
-            </div>
-          );
-        })}
-      </ResponsiveReactGridLayout>
-    </div>
-  );
+                {state.items.map((item, index) => {
+                    const TheComponent = componentList[item.i].component;
+                    return (
+                        <div
+                            key={item.i}
+                            data-grid={{
+                                ...item,
+                                minH: componentList[item.i].minH || 1,
+                                minW: componentList[item.i].minW || 1,
+                            }}
+                        >
+                            <LoadingSkeleton loading={loading}>
+                                <Icon
+                                    component={MdClose}
+                                    key={item.i}
+                                    style={{
+                                        position: "absolute",
+                                        zIndex: "2",
+                                        right: ".25rem",
+                                        top: ".25rem",
+                                        cursor: "pointer",
+                                    }}
+                                    onClick={() => handleRemoveComponent(item.i)}
+                                />
+                                <TheComponent className="dashboard-card" bodyshop={bodyshop} data={dashboarddata}/>
+                            </LoadingSkeleton>
+                        </div>
+                    );
+                })}
+            </ResponsiveReactGridLayout>
+        </div>
+    );
 }
 
 export default connect(
-  mapStateToProps,
-  mapDispatchToProps
+    mapStateToProps,
+    mapDispatchToProps
 )(DashboardGridComponent);
 
 const componentList = {
-  ProductionDollars: {
-    label: i18next.t("dashboard.titles.productiondollars"),
-    component: DashboardTotalProductionDollars,
-    gqlFragment: null,
-    w: 1,
-    h: 1,
-    minW: 2,
-    minH: 1,
-  },
-  ProductionHours: {
-    label: i18next.t("dashboard.titles.productionhours"),
-    component: DashboardTotalProductionHours,
-    gqlFragment: DashboardTotalProductionHoursGql,
-    w: 3,
-    h: 1,
-    minW: 3,
-    minH: 1,
-  },
-  ProjectedMonthlySales: {
-    label: i18next.t("dashboard.titles.projectedmonthlysales"),
-    component: DashboardProjectedMonthlySales,
-    gqlFragment: DashboardProjectedMonthlySalesGql,
-    w: 2,
-    h: 1,
-    minW: 2,
-    minH: 1,
-  },
-  MonthlyRevenueGraph: {
-    label: i18next.t("dashboard.titles.monthlyrevenuegraph"),
-    component: DashboardMonthlyRevenueGraph,
-    gqlFragment: DashboardMonthlyRevenueGraphGql,
-    w: 4,
-    h: 2,
-    minW: 4,
-    minH: 2,
-  },
-  MonthlyJobCosting: {
-    label: i18next.t("dashboard.titles.monthlyjobcosting"),
-    component: DashboardMonthlyJobCosting,
-    gqlFragment: null,
-    minW: 6,
-    minH: 3,
-    w: 6,
-    h: 3,
-  },
-  MonthlyPartsSales: {
-    label: i18next.t("dashboard.titles.monthlypartssales"),
-    component: DashboardMonthlyPartsSales,
-    gqlFragment: null,
-    minW: 2,
-    minH: 2,
-    w: 2,
-    h: 2,
-  },
-  MonthlyLaborSales: {
-    label: i18next.t("dashboard.titles.monthlylaborsales"),
-    component: DashboardMonthlyLaborSales,
-    gqlFragment: null,
-    minW: 2,
-    minH: 2,
-    w: 2,
-    h: 2,
-  },
-  MonthlyEmployeeEfficency: {
-    label: i18next.t("dashboard.titles.monthlyemployeeefficiency"),
-    component: DashboardMonthlyEmployeeEfficiency,
-    gqlFragment: DashboardMonthlyEmployeeEfficiencyGql,
-    minW: 2,
-    minH: 2,
-    w: 2,
-    h: 2,
-  },
-  ScheduleInToday: {
-    label: i18next.t("dashboard.titles.scheduledintoday"),
-    component: DashboardScheduledInToday,
-    gqlFragment: DashboardScheduledInTodayGql,
-    minW: 6,
-    minH: 2,
-    w: 10,
-    h: 3,
-  },
-  ScheduleOutToday: {
-    label: i18next.t("dashboard.titles.scheduledouttoday"),
-    component: DashboardScheduledOutToday,
-    gqlFragment: DashboardScheduledOutTodayGql,
-    minW: 6,
-    minH: 2,
-    w: 10,
-    h: 3,
-  },
+    ProductionDollars: {
+        label: i18next.t("dashboard.titles.productiondollars"),
+        component: DashboardTotalProductionDollars,
+        gqlFragment: null,
+        w: 1,
+        h: 1,
+        minW: 2,
+        minH: 1,
+    },
+    ProductionHours: {
+        label: i18next.t("dashboard.titles.productionhours"),
+        component: DashboardTotalProductionHours,
+        gqlFragment: DashboardTotalProductionHoursGql,
+        w: 3,
+        h: 1,
+        minW: 3,
+        minH: 1,
+    },
+    ProjectedMonthlySales: {
+        label: i18next.t("dashboard.titles.projectedmonthlysales"),
+        component: DashboardProjectedMonthlySales,
+        gqlFragment: DashboardProjectedMonthlySalesGql,
+        w: 2,
+        h: 1,
+        minW: 2,
+        minH: 1,
+    },
+    MonthlyRevenueGraph: {
+        label: i18next.t("dashboard.titles.monthlyrevenuegraph"),
+        component: DashboardMonthlyRevenueGraph,
+        gqlFragment: DashboardMonthlyRevenueGraphGql,
+        w: 4,
+        h: 2,
+        minW: 4,
+        minH: 2,
+    },
+    MonthlyJobCosting: {
+        label: i18next.t("dashboard.titles.monthlyjobcosting"),
+        component: DashboardMonthlyJobCosting,
+        gqlFragment: null,
+        minW: 6,
+        minH: 3,
+        w: 6,
+        h: 3,
+    },
+    MonthlyPartsSales: {
+        label: i18next.t("dashboard.titles.monthlypartssales"),
+        component: DashboardMonthlyPartsSales,
+        gqlFragment: null,
+        minW: 2,
+        minH: 2,
+        w: 2,
+        h: 2,
+    },
+    MonthlyLaborSales: {
+        label: i18next.t("dashboard.titles.monthlylaborsales"),
+        component: DashboardMonthlyLaborSales,
+        gqlFragment: null,
+        minW: 2,
+        minH: 2,
+        w: 2,
+        h: 2,
+    },
+    // Typo in Efficency should be Efficiency, but changing it would reset users dashboard settings
+    MonthlyEmployeeEfficency: {
+        label: i18next.t("dashboard.titles.monthlyemployeeefficiency"),
+        component: DashboardMonthlyEmployeeEfficiency,
+        gqlFragment: DashboardMonthlyEmployeeEfficiencyGql,
+        minW: 2,
+        minH: 2,
+        w: 2,
+        h: 2,
+    },
+    ScheduleInToday: {
+        label: i18next.t("dashboard.titles.scheduledintoday"),
+        component: DashboardScheduledInToday,
+        gqlFragment: DashboardScheduledInTodayGql,
+        minW: 6,
+        minH: 2,
+        w: 10,
+        h: 3,
+    },
+    ScheduleOutToday: {
+        label: i18next.t("dashboard.titles.scheduledouttoday"),
+        component: DashboardScheduledOutToday,
+        gqlFragment: DashboardScheduledOutTodayGql,
+        minW: 6,
+        minH: 2,
+        w: 10,
+        h: 3,
+    },
+    JobLifecycle: {
+        label: i18next.t("dashboard.titles.joblifecycle"),
+        component: JobLifecycleDashboardComponent,
+        gqlFragment: JobLifecycleDashboardGQL,
+        minW: 6,
+        minH: 3,
+        w: 6,
+        h: 3,
+    },
 };
 
 const createDashboardQuery = (state) => {
-  const componentBasedAdditions =
-    state &&
-    Array.isArray(state.layout) &&
-    state.layout
-      .map((item, index) => componentList[item.i].gqlFragment || "")
-      .join("");
-  return gql`
-    query QUERY_DASHBOARD_DETAILS { ${componentBasedAdditions || ""} 
-      monthly_sales: jobs(where: {_and: [
-        { voided: {_eq: false}},
-        {date_invoiced: {_gte: "${moment()
+    const componentBasedAdditions =
+        state &&
+        Array.isArray(state.layout) &&
+        state.layout
+            .map((item, index) => componentList[item.i].gqlFragment || "")
+            .join("");
+    return gql`
+        query QUERY_DASHBOARD_DETAILS { ${componentBasedAdditions || ""}
+            monthly_sales: jobs(where: {_and: [
+                { voided: {_eq: false}},
+                {date_invoiced: {_gte: "${moment()
           .startOf("month")
-          .startOf("day")
-          .toISOString()}"}}, {date_invoiced: {_lte: "${moment()
+                .startOf("day")
+                .toISOString()}"}}, {date_invoiced: {_lte: "${moment()
     .endOf("month")
     .endOf("day")
     .toISOString()}"}}]}) {
       id
-      ro_number
-      date_invoiced
-      job_totals
-      rate_la1
-      rate_la2
-      rate_la3
-      rate_la4
-      rate_laa
-      rate_lab
-      rate_lad
-      rate_lae
-      rate_laf
-      rate_lag
-      rate_lam
-      rate_lar
-      rate_las
-      rate_lau
-      rate_ma2s
-      rate_ma2t
-      rate_ma3s
-      rate_mabl
-      rate_macs
-      rate_mahw
-      rate_mapa
-      rate_mash
-      rate_matd
-      joblines(where: { removed: { _eq: false } }) {
-        id
-        mod_lbr_ty
-        mod_lb_hrs
-        act_price
-        part_qty
-        part_type
-      }
-    }
-    production_jobs: jobs(where: { inproduction: { _eq: true } }) {
-      id
-      ro_number
-      ins_co_nm
-      job_totals
-      joblines(where: { removed: { _eq: false } }) {
-        id
-        mod_lbr_ty
-        mod_lb_hrs
-        act_price
-        part_qty
-        part_type
-      }
-      labhrs: joblines_aggregate(where: { mod_lbr_ty: { _neq: "LAR" }, removed: { _eq: false } }) {
-        aggregate {
-          sum {
-            mod_lb_hrs
-          }
-        }
-      }
-      larhrs: joblines_aggregate(where: { mod_lbr_ty: { _eq: "LAR" }, removed: { _eq: false } }) {
-        aggregate {
-          sum {
-            mod_lb_hrs
-          }
-        }
-      }
-    }
-  }`;
+                ro_number
+                date_invoiced
+                job_totals
+                rate_la1
+                rate_la2
+                rate_la3
+                rate_la4
+                rate_laa
+                rate_lab
+                rate_lad
+                rate_lae
+                rate_laf
+                rate_lag
+                rate_lam
+                rate_lar
+                rate_las
+                rate_lau
+                rate_ma2s
+                rate_ma2t
+                rate_ma3s
+                rate_mabl
+                rate_macs
+                rate_mahw
+                rate_mapa
+                rate_mash
+                rate_matd
+                joblines(where: { removed: { _eq: false } }) {
+                    id
+                    mod_lbr_ty
+                    mod_lb_hrs
+                    act_price
+                    part_qty
+                    part_type
+                }
+                }
+                production_jobs: jobs(where: { inproduction: { _eq: true } }) {
+                    id
+                    ro_number
+                    ins_co_nm
+                    job_totals
+                    joblines(where: { removed: { _eq: false } }) {
+                    id
+                    mod_lbr_ty
+                    mod_lb_hrs
+                    act_price
+                    part_qty
+                    part_type
+                }
+                labhrs: joblines_aggregate(where: { mod_lbr_ty: { _neq: "LAR" }, removed: { _eq: false } }) {
+                    aggregate {
+                        sum {
+                            mod_lb_hrs
+                        }
+                    }
+                }
+                larhrs: joblines_aggregate(where: { mod_lbr_ty: { _eq: "LAR" }, removed: { _eq: false } }) {
+                    aggregate {
+                        sum {
+                            mod_lb_hrs
+                        }
+                    }
+                }
+                }
+            }`;
 };

client/src/components/job-at-change/schedule-event.container.jsx

@@ -53,6 +53,7 @@ export default function ScheduleEventContainer({ bodyshop, event, refetch }) {
           insertAuditTrail({
             jobid: event.job.id,
             operation: AuditTrailMapping.appointmentcancel(lost_sale_reason),
+            type: "appointmentcancel",
           })
         );
       }

client/src/components/job-checklist/components/job-checklist-form/job-checklist-form.component.jsx

@@ -28,8 +28,8 @@ const mapStateToProps = createStructuredSelector({
   currentUser: selectCurrentUser,
 });
 const mapDispatchToProps = (dispatch) => ({
-  insertAuditTrail: ({ jobid, operation }) =>
-    dispatch(insertAuditTrail({ jobid, operation })),
+  insertAuditTrail: ({ jobid, operation, type }) =>
+    dispatch(insertAuditTrail({ jobid, operation, type })),
 });
 
 export function JobChecklistForm({
@@ -183,6 +183,7 @@ export function JobChecklistForm({
           (type === "intake" && bodyshop.md_ro_statuses.default_arrived) ||
             (type === "deliver" && bodyshop.md_ro_statuses.default_delivered)
         ),
+        type: "jobchecklist",
       });
     } else {
       notification["error"]({

client/src/components/job-detail-cards/job-detail-cards.totals.component.jsx

@@ -18,10 +18,8 @@ export default function JobDetailCardsTotalsComponent({ loading, data }) {
           />
           <Statistic
             className="imex-flex-row__margin-large"
-            title={t("jobs.fields.ded_amt")}
-            value={Dinero({
-              amount: Math.round((data.ded_amt || 0) * 100),
-            }).toFormat()}
+            title={t("jobs.fields.customerowing")}
+            value={Dinero(data.job_totals.totals.custPayable.total).toFormat()}
           />
           <Statistic
             className="imex-flex-row__margin-large"

client/src/components/job-employee-assignments/job-employee-assignments.component.jsx

@@ -23,7 +23,6 @@ export function JobEmployeeAssignments({
   jobRO,
   body,
   refinish,
-
   prep,
   csr,
   handleAdd,
@@ -78,7 +77,7 @@ export function JobEmployeeAssignments({
               setVisibility(false);
             }}
           >
-            Assign
+            {t("allocations.actions.assign")}
           </Button>
           <Button onClick={() => setVisibility(false)}>Close</Button>
         </Space>

client/src/components/job-employee-assignments/job-employee-assignments.container.jsx

@@ -14,8 +14,8 @@ const mapStateToProps = createStructuredSelector({
   //currentUser: selectCurrentUser
 });
 const mapDispatchToProps = (dispatch) => ({
-  insertAuditTrail: ({ jobid, operation }) =>
-    dispatch(insertAuditTrail({ jobid, operation })),
+  insertAuditTrail: ({ jobid, operation, type }) =>
+    dispatch(insertAuditTrail({ jobid, operation, type })),
 });
 export default connect(
   mapStateToProps,
@@ -43,12 +43,13 @@ export function JobEmployeeAssignmentsContainer({
     });
     if (refetch) refetch();
 
-    insertAuditTrail({
-      jobid: job.id,
-      operation: AuditTrailMapping.jobassignmentchange(operation, name),
-    });
-
-    if (!!result.errors) {
+    if (!!!result.errors) {
+      insertAuditTrail({
+        jobid: job.id,
+        operation: AuditTrailMapping.jobassignmentchange(operation, name),
+        type: "jobassignmentchange",
+      });
+    } else {
       notification["error"]({
         message: t("jobs.errors.assigning", {
           message: JSON.stringify(result.errors),
@@ -66,17 +67,19 @@ export function JobEmployeeAssignmentsContainer({
       variables: { jobId: job.id, job: { [empAssignment]: null } },
     });
 
-    if (!!result.errors) {
+    if (!!!result.errors) {
+      insertAuditTrail({
+        jobid: job.id,
+        operation: AuditTrailMapping.jobassignmentremoved(operation),
+        type: "jobassignmentremoved",
+      });
+    } else {
       notification["error"]({
         message: t("jobs.errors.assigning", {
           message: JSON.stringify(result.errors),
         }),
       });
     }
-    insertAuditTrail({
-      jobid: job.id,
-      operation: AuditTrailMapping.jobassignmentremoved(operation),
-    });
     setLoading(false);
   };
 

client/src/components/job-line-convert-to-labor/job-line-convert-to-labor.component.jsx

@@ -28,8 +28,8 @@ const mapStateToProps = createStructuredSelector({
   //currentUser: selectCurrentUser
 });
 const mapDispatchToProps = (dispatch) => ({
-  insertAuditTrail: ({ jobid, operation }) =>
-    dispatch(insertAuditTrail({ jobid, operation })),
+  insertAuditTrail: ({ jobid, operation, type }) =>
+    dispatch(insertAuditTrail({ jobid, operation, type })),
 });
 export default connect(
   mapStateToProps,
@@ -113,6 +113,7 @@ export function JobLineConvertToLabor({
         hours: calculateAdjustment({ mod_lbr_ty, job, jobline }).toFixed(1),
         mod_lbr_ty,
       }),
+      type: "jobmodifylbradj",
     });
     setLoading(false);
     setVisibility(false);

client/src/components/job-reconciliation-bills-table/job-reconciliation-bills-table.component.jsx

@@ -82,7 +82,7 @@ export default function JobReconciliationBillsTable({
         state.sortedInfo.order,
 
       render: (text, record) => (
-        <Checkbox disabled checked={record.bill.is_credit_memo} />
+        <Checkbox checked={record.bill.is_credit_memo} />
       ),
     },
   ];

client/src/components/jobs-admin-change-status/jobs-admin-change.status.component.jsx

@@ -14,8 +14,8 @@ const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
 });
 const mapDispatchToProps = (dispatch) => ({
-  insertAuditTrail: ({ jobid, operation }) =>
-    dispatch(insertAuditTrail({ jobid, operation })),
+  insertAuditTrail: ({ jobid, operation, type }) =>
+    dispatch(insertAuditTrail({ jobid, operation, type })),
 });
 export default connect(mapStateToProps, mapDispatchToProps)(JobsAdminStatus);
 
@@ -32,6 +32,7 @@ export function JobsAdminStatus({ insertAuditTrail, bodyshop, job }) {
         insertAuditTrail({
           jobid: job.id,
           operation: AuditTrailMapping.admin_jobstatuschange(status),
+          type: "admin_jobstatuschange",
         });
         // refetch();
       })

client/src/components/jobs-admin-dates/jobs-admin-dates.component.jsx

@@ -20,8 +20,8 @@ const mapStateToProps = createStructuredSelector({
 });
 
 const mapDispatchToProps = (dispatch) => ({
-  insertAuditTrail: ({ jobid, operation }) =>
-    dispatch(insertAuditTrail({ jobid, operation })),
+  insertAuditTrail: ({ jobid, operation, type }) =>
+    dispatch(insertAuditTrail({ jobid, operation, type })),
 });
 
 export default connect(
@@ -57,6 +57,7 @@ export function JobsAdminDatesChange({ insertAuditTrail, job }) {
             ? DateTimeFormat(changedAuditFields[key])
             : changedAuditFields[key]
         ),
+        type: "admin_jobfieldchange",
       });
     });
 

client/src/components/jobs-admin-mark-reexport/jobs-admin-mark-reexport.component.jsx

@@ -23,8 +23,8 @@ const mapStateToProps = createStructuredSelector({
   currentUser: selectCurrentUser,
 });
 const mapDispatchToProps = (dispatch) => ({
-  insertAuditTrail: ({ jobid, operation }) =>
-    dispatch(insertAuditTrail({ jobid, operation })),
+  insertAuditTrail: ({ jobid, operation, type }) =>
+    dispatch(insertAuditTrail({ jobid, operation, type })),
 });
 export default connect(
   mapStateToProps,
@@ -59,6 +59,7 @@ export function JobAdminMarkReexport({
       insertAuditTrail({
         jobid: job.id,
         operation: AuditTrailMapping.admin_jobmarkforreexport(),
+        type: "admin_jobmarkforreexport",
       });
     } else {
       notification["error"]({
@@ -99,6 +100,7 @@ export function JobAdminMarkReexport({
       insertAuditTrail({
         jobid: job.id,
         operation: AuditTrailMapping.admin_jobmarkexported(),
+        type: "admin_jobmarkexported",
       });
     } else {
       notification["error"]({
@@ -124,6 +126,7 @@ export function JobAdminMarkReexport({
       insertAuditTrail({
         jobid: job.id,
         operation: AuditTrailMapping.admin_jobuninvoice(),
+        type: "admin_jobuninvoice",
       });
     } else {
       notification["error"]({

client/src/components/jobs-admin-remove-ar/jobs-admin-remove-ar.component.jsx

@@ -10,8 +10,8 @@ import AuditTrailMapping from "../../utils/AuditTrailMappings";
 
 const mapStateToProps = createStructuredSelector({});
 const mapDispatchToProps = (dispatch) => ({
-  insertAuditTrail: ({ jobid, operation }) =>
-    dispatch(insertAuditTrail({ jobid, operation })),
+  insertAuditTrail: ({ jobid, operation, type }) =>
+    dispatch(insertAuditTrail({ jobid, operation, type })),
 });
 
 export default connect(mapStateToProps, mapDispatchToProps)(JobsAdminRemoveAR);
@@ -34,6 +34,7 @@ export function JobsAdminRemoveAR({ insertAuditTrail, job }) {
       insertAuditTrail({
         jobid: job.id,
         operation: AuditTrailMapping.admin_job_remove_from_ar(value),
+        type: "admin_job_remove_from_ar",
       });
       setSwitchValue(value);
     } else {

client/src/components/jobs-admin-unvoid/jobs-admin-unvoid.component.jsx

@@ -17,8 +17,8 @@ const mapStateToProps = createStructuredSelector({
   currentUser: selectCurrentUser,
 });
 const mapDispatchToProps = (dispatch) => ({
-  insertAuditTrail: ({ jobid, operation }) =>
-    dispatch(insertAuditTrail({ jobid, operation })),
+  insertAuditTrail: ({ jobid, operation, type }) =>
+    dispatch(insertAuditTrail({ jobid, operation, type })),
 });
 export default connect(mapStateToProps, mapDispatchToProps)(JobsAdminUnvoid);
 
@@ -49,6 +49,7 @@ export function JobsAdminUnvoid({
       insertAuditTrail({
         jobid: job.id,
         operation: AuditTrailMapping.admin_jobunvoid(),
+        type: "admin_jobunvoid",
       });
     } else {
       notification["error"]({

client/src/components/jobs-available-table/jobs-available-table.container.jsx

@@ -47,8 +47,8 @@ const mapStateToProps = createStructuredSelector({
   currentUser: selectCurrentUser,
 });
 const mapDispatchToProps = (dispatch) => ({
-  insertAuditTrail: ({ jobid, operation }) =>
-    dispatch(insertAuditTrail({ jobid, operation })),
+  insertAuditTrail: ({ jobid, operation, type }) =>
+    dispatch(insertAuditTrail({ jobid, operation, type })),
 });
 export function JobsAvailableContainer({
   bodyshop,
@@ -190,6 +190,7 @@ export function JobsAvailableContainer({
       insertAuditTrail({
         jobid: r.data.insert_jobs.returning[0].id,
         operation: AuditTrailMapping.jobimported(),
+        type: "jobimported",
       });
 
       deleteJob({
@@ -350,6 +351,7 @@ export function JobsAvailableContainer({
       insertAuditTrail({
         jobid: selectedJob,
         operation: AuditTrailMapping.jobsupplement(),
+        type: "jobsupplement",
       });
     }
   };

client/src/components/jobs-change-status/jobs-change-status.component.jsx

@@ -16,8 +16,8 @@ const mapStateToProps = createStructuredSelector({
   jobRO: selectJobReadOnly,
 });
 const mapDispatchToProps = (dispatch) => ({
-  insertAuditTrail: ({ jobid, operation }) =>
-    dispatch(insertAuditTrail({ jobid, operation })),
+  insertAuditTrail: ({ jobid, operation, type }) =>
+    dispatch(insertAuditTrail({ jobid, operation, type })),
 });
 
 export function JobsChangeStatus({ job, bodyshop, jobRO, insertAuditTrail }) {
@@ -35,6 +35,7 @@ export function JobsChangeStatus({ job, bodyshop, jobRO, insertAuditTrail }) {
         insertAuditTrail({
           jobid: job.id,
           operation: AuditTrailMapping.jobstatuschange(status),
+          type: "jobstatuschange",
         });
         // refetch();
       })

client/src/components/jobs-close-export-button/jobs-close-export-button.component.jsx

@@ -23,8 +23,8 @@ const mapStateToProps = createStructuredSelector({
 });
 
 const mapDispatchToProps = (dispatch) => ({
-  insertAuditTrail: ({ jobid, operation }) =>
-    dispatch(insertAuditTrail({ jobid, operation })),
+  insertAuditTrail: ({ jobid, operation, type }) =>
+    dispatch(insertAuditTrail({ jobid, operation, type })),
 });
 
 function updateJobCache(items) {
@@ -192,6 +192,7 @@ export function JobsCloseExportButton({
           insertAuditTrail({
             jobid: jobId,
             operation: AuditTrailMapping.jobexported(),
+            type: "jobexported",
           });
           updateJobCache(
             jobUpdateResponse.data.update_jobs.returning.map((job) => job.id)
@@ -217,6 +218,7 @@ export function JobsCloseExportButton({
         insertAuditTrail({
           jobid: jobId,
           operation: AuditTrailMapping.jobexported(),
+          type: "jobexported",
         });
         updateJobCache([
           ...new Set(

client/src/components/jobs-convert-button/jobs-convert-button.component.jsx

@@ -25,8 +25,8 @@ const mapStateToProps = createStructuredSelector({
   jobRO: selectJobReadOnly,
 });
 const mapDispatchToProps = (dispatch) => ({
-  insertAuditTrail: ({ jobid, operation }) =>
-    dispatch(insertAuditTrail({ jobid, operation })),
+  insertAuditTrail: ({ jobid, operation, type }) =>
+    dispatch(insertAuditTrail({ jobid, operation, type })),
 });
 
 export function JobsConvertButton({
@@ -78,6 +78,7 @@ export function JobsConvertButton({
         operation: AuditTrailMapping.jobconverted(
           res.data.update_jobs.returning[0].ro_number
         ),
+        type: "jobconverted",
       });
 
       setVisible(false);

client/src/components/jobs-create-jobs-info/jobs-create-jobs-info.component.jsx

@@ -1,4 +1,12 @@
-import { Collapse, Form, Input, InputNumber, Select, Switch } from "antd";
+import {
+  Collapse,
+  Form,
+  Input,
+  InputNumber,
+  Select,
+  Space,
+  Switch,
+} from "antd";
 import React from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
@@ -10,6 +18,8 @@ import FormItemEmail from "../form-items-formatted/email-form-item.component";
 import FormItemPhone, {
   PhoneItemFormatterValidation,
 } from "../form-items-formatted/phone-form-item.component";
+import JobsDetailChangeEstimator from "../jobs-detail-change-estimator/jobs-detail-change-estimator.component";
+import JobsDetailChangeFilehandler from "../jobs-detail-change-filehandler/jobs-detail-change-filehandler.component";
 import JobsDetailRatesChangeButton from "../jobs-detail-rates-change-button/jobs-detail-rates-change-button.component";
 import JobsDetailRatesParts from "../jobs-detail-rates/jobs-detail-rates.parts.component";
 import JobsMarkPstExempt from "../jobs-mark-pst-exempt/jobs-mark-pst-exempt.component";
@@ -25,6 +35,15 @@ const mapDispatchToProps = (dispatch) => ({
 export function JobsCreateJobsInfo({ bodyshop, form, selected }) {
   const { t } = useTranslation();
   const { getFieldValue } = form;
+
+  const handleInsCoChange = (value) => {
+    const selectedCompany = bodyshop.md_ins_cos.find((s) => s.name === value);
+    if (selectedCompany) {
+      form.setFieldValue("ins_addr1", selectedCompany.street1);
+      form.setFieldValue("ins_city", selectedCompany.city);
+    }
+  };
+
   return (
     <div>
       <Collapse defaultActiveKey="insurance">
@@ -34,26 +53,20 @@ export function JobsCreateJobsInfo({ bodyshop, form, selected }) {
           forceRender
         >
           <LayoutFormRow>
-            <Form.Item label={t("jobs.fields.ins_co_id")} name="ins_co_id">
+            <Form.Item label={t("jobs.fields.clm_no")} name="clm_no">
               <Input />
             </Form.Item>
             <Form.Item label={t("jobs.fields.policy_no")} name="policy_no">
               <Input />
             </Form.Item>
-            <Form.Item label={t("jobs.fields.clm_no")} name="clm_no">
-              <Input />
-            </Form.Item>
             <Form.Item
               label={t("jobs.fields.regie_number")}
               name="regie_number"
             >
               <Input />
             </Form.Item>
-            <Form.Item label={t("jobs.fields.loss_date")} name="loss_date">
-              <FormDatePicker />
-            </Form.Item>
             <Form.Item label={t("jobs.fields.ins_co_nm")} name="ins_co_nm">
-              <Select>
+              <Select onChange={handleInsCoChange}>
                 {bodyshop.md_ins_cos.map((s) => (
                   <Select.Option key={s.name} value={s.name}>
                     {s.name}
@@ -67,7 +80,15 @@ export function JobsCreateJobsInfo({ bodyshop, form, selected }) {
             <Form.Item label={t("jobs.fields.ins_city")} name="ins_city">
               <Input />
             </Form.Item>
-            <Form.Item label={t("jobs.fields.ins_ct_ln")} name="ins_ct_ln">
+            <Form.Item
+              label={
+                <Space>
+                  {t("jobs.fields.ins_ct_ln")}
+                  <JobsDetailChangeFilehandler form={form} />
+                </Space>
+              }
+              name="ins_ct_ln"
+            >
               <Input />
             </Form.Item>
             <Form.Item label={t("jobs.fields.ins_ct_fn")} name="ins_ct_fn">
@@ -95,11 +116,24 @@ export function JobsCreateJobsInfo({ bodyshop, form, selected }) {
             >
               <FormItemEmail email={getFieldValue("ins_ea")} />
             </Form.Item>
-
+            <Form.Item label={t("jobs.fields.loss_date")} name="loss_date">
+              <FormDatePicker />
+            </Form.Item>
+            <Form.Item label={t("jobs.fields.kmin")} name="kmin">
+              <Input />
+            </Form.Item>
             <Form.Item label={t("jobs.fields.est_co_nm")} name="est_co_nm">
               <Input />
             </Form.Item>
-            <Form.Item label={t("jobs.fields.est_ct_fn")} name="est_ct_fn">
+            <Form.Item
+              label={
+                <Space>
+                  {t("jobs.fields.est_ct_fn")}
+                  <JobsDetailChangeEstimator form={form} />
+                </Space>
+              }
+              name="est_ct_fn"
+            >
               <Input />
             </Form.Item>
             <Form.Item label={t("jobs.fields.est_ct_ln")} name="est_ct_ln">

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

@@ -37,6 +37,15 @@ const lossColDamage = { sm: { span: 24 }, md: { span: 6 }, lg: { span: 4 } };
 export function JobsDetailGeneral({ bodyshop, jobRO, job, form }) {
   const { getFieldValue } = form;
   const { t } = useTranslation();
+
+  const handleInsCoChange = (value) => {
+    const selectedCompany = bodyshop.md_ins_cos.find((s) => s.name === value);
+    if (selectedCompany) {
+      form.setFieldValue("ins_addr1", selectedCompany.street1);
+      form.setFieldValue("ins_city", selectedCompany.city);
+    }
+  };
+
   return (
     <div>
       <FormRow header={t("jobs.forms.claiminfo")}>
@@ -71,7 +80,7 @@ export function JobsDetailGeneral({ bodyshop, jobRO, job, form }) {
         </Form.Item>
 
         <Form.Item label={t("jobs.fields.ins_co_nm")} name="ins_co_nm">
-          <Select disabled={jobRO}>
+          <Select disabled={jobRO} onChange={handleInsCoChange}>
             {bodyshop.md_ins_cos.map((s) => (
               <Select.Option key={s.name} value={s.name}>
                 {s.name}

client/src/components/jobs-detail-header-actions/jobs-detail-header-actions.addtoproduction.util.jsx

@@ -29,6 +29,7 @@ export default function AddToProduction(
         insertAuditTrail({
           jobid: jobId,
           operation: AuditTrailMapping.jobinproductionchange(!remove),
+          type: "jobinproductionchange",
         })
       );
       if (completionCallback) completionCallback();

client/src/components/jobs-detail-header-actions/jobs-detail-header-actions.component.jsx

@@ -52,8 +52,8 @@ const mapDispatchToProps = (dispatch) => ({
     dispatch(setModalContext({ context: context, modal: "timeTicket" })),
   setCardPaymentContext: (context) =>
     dispatch(setModalContext({ context: context, modal: "cardPayment" })),
-  insertAuditTrail: ({ jobid, operation }) =>
-    dispatch(insertAuditTrail({ jobid, operation })),
+  insertAuditTrail: ({ jobid, operation, type }) =>
+    dispatch(insertAuditTrail({ jobid, operation, type })),
 });
 
 export function JobsDetailHeaderActions({
@@ -115,6 +115,7 @@ export function JobsDetailHeaderActions({
           ? !job.production_vars.alert
           : true
       ),
+      type: "alertToggle",
     });
   };
 
@@ -134,6 +135,7 @@ export function JobsDetailHeaderActions({
       operation: AuditTrailMapping.jobsuspend(
         !!job.suspended ? !job.suspended : true
       ),
+      type: "jobsuspend",
     });
   };
 
@@ -190,6 +192,7 @@ export function JobsDetailHeaderActions({
                       jobid: job.id,
                       operation:
                         AuditTrailMapping.appointmentcancel(lost_sale_reason),
+                      type: "appointmentcancel",
                     });
                     return;
                   }
@@ -549,6 +552,7 @@ export function JobsDetailHeaderActions({
                   insertAuditTrail({
                     jobid: job.id,
                     operation: AuditTrailMapping.jobvoid(),
+                    type: "jobvoid",
                   });
                   //go back to jobs list.
                   history.push(`/manage/`);

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

@@ -4,7 +4,8 @@ import {
   PauseCircleOutlined,
   WarningFilled,
 } from "@ant-design/icons";
-import { Card, Col, Row, Space, Tag, Tooltip } from "antd";
+import { Card, Col, Divider, Row, Space, Tag, Tooltip } from "antd";
+import moment from "moment";
 import React, { useState } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
@@ -62,6 +63,13 @@ export function JobsDetailHeader({ job, bodyshop, disabled }) {
   ${job.v_make_desc || ""} 
   ${job.v_model_desc || ""}`.trim();
 
+  const bodyHrs = job.joblines
+    .filter((j) => j.mod_lbr_ty !== "LAR")
+    .reduce((acc, val) => acc + val.mod_lb_hrs, 0);
+  const refinishHrs = job.joblines
+    .filter((line) => line.mod_lbr_ty === "LAR")
+    .reduce((acc, val) => acc + val.mod_lb_hrs, 0);
+
   const ownerTitle = OwnerNameDisplayFunction(job).trim();
 
   return (
@@ -93,7 +101,13 @@ export function JobsDetailHeader({ job, bodyshop, disabled }) {
                 {job.status === bodyshop.md_ro_statuses.default_scheduled &&
                 job.scheduled_in ? (
                   <Tag>
-                    <DateTimeFormatter>{job.scheduled_in}</DateTimeFormatter>
+                    <Link
+                      to={`/manage/schedule?date=${moment(
+                        job.scheduled_in
+                      ).format("YYYY-MM-DD")}`}
+                    >
+                      <DateTimeFormatter>{job.scheduled_in}</DateTimeFormatter>
+                    </Link>
                   </Tag>
                 ) : null}
               </Space>
@@ -211,6 +225,12 @@ export function JobsDetailHeader({ job, bodyshop, disabled }) {
                 {job.owner?.tax_number || ""}
               </DataLabel>
             )}
+            <DataLabel
+              label={t("owners.fields.note")}
+              valueStyle={{ overflow: "hidden", textOverflow: "ellipsis" }}
+            >
+              {job.owner?.note || ""}
+            </DataLabel>
           </div>
         </Card>
       </Col>
@@ -299,6 +319,11 @@ export function JobsDetailHeader({ job, bodyshop, disabled }) {
         >
           <div>
             <JobEmployeeAssignments job={job} />
+            <Divider style={{ margin: ".5rem" }} />
+            <DataLabel label={t("jobs.labels.labor_hrs")}>
+              {bodyHrs.toFixed(1)} / {refinishHrs.toFixed(1)} /{" "}
+              {(bodyHrs + refinishHrs).toFixed(1)}
+            </DataLabel>
           </div>
         </Card>
       </Col>

client/src/components/jobs-export-all-button/jobs-export-all-button.component.jsx

@@ -23,8 +23,8 @@ const mapStateToProps = createStructuredSelector({
 });
 
 const mapDispatchToProps = (dispatch) => ({
-  insertAuditTrail: ({ jobid, operation }) =>
-    dispatch(insertAuditTrail({ jobid, operation })),
+  insertAuditTrail: ({ jobid, operation, type }) =>
+    dispatch(insertAuditTrail({ jobid, operation, type })),
 });
 
 function updateJobCache(items) {
@@ -189,6 +189,7 @@ export function JobsExportAllButton({
                 insertAuditTrail({
                   jobid: job.id,
                   operation: AuditTrailMapping.jobexported(),
+                  type: "jobexported",
                 });
               });
               updateJobCache(
@@ -230,6 +231,7 @@ export function JobsExportAllButton({
               insertAuditTrail({
                 jobid: successfulTransactionsSet[0],
                 operation: AuditTrailMapping.jobexported(),
+                type: "jobexported",
               });
             }
             updateJobCache(successfulTransactionsSet);

client/src/components/jobs-list/jobs-list.component.jsx

@@ -21,6 +21,7 @@ import useLocalStorage from "../../utils/useLocalStorage";
 import AlertComponent from "../alert/alert.component";
 import ChatOpenButton from "../chat-open-button/chat-open-button.component";
 import OwnerNameDisplay from "../owner-name-display/owner-name-display.component";
+import { OwnerNameDisplayFunction } from "./../owner-name-display/owner-name-display.component";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
@@ -145,7 +146,8 @@ export function JobsList({ bodyshop }) {
       key: "owner",
       ellipsis: true,
       responsive: ["md"],
-      sorter: (a, b) => alphaSort(a.ownr_ln, b.ownr_ln),
+      sorter: (a, b) =>
+        alphaSort(OwnerNameDisplayFunction(a), OwnerNameDisplayFunction(b)),
       sortOrder:
         state.sortedInfo.columnKey === "owner" && state.sortedInfo.order,
       render: (text, record) => {
@@ -188,7 +190,8 @@ export function JobsList({ bodyshop }) {
       dataIndex: "status",
       key: "status",
       ellipsis: true,
-      sorter: (a, b) => alphaSort(a.status, b.status),
+      sorter: (a, b) =>
+        statusSort(a.status, b.status, bodyshop.md_ro_statuses.active_statuses),
       sortOrder:
         state.sortedInfo.columnKey === "status" && state.sortedInfo.order,
       filteredValue: filter?.status || null,
@@ -219,6 +222,15 @@ export function JobsList({ bodyshop }) {
       dataIndex: "vehicle",
       key: "vehicle",
       ellipsis: true,
+      sorter: (a, b) =>
+        alphaSort(
+          `${a.v_model_yr || ""} ${a.v_make_desc || ""} ${
+            a.v_model_desc || ""
+          }`,
+          `${b.v_model_yr || ""} ${b.v_make_desc || ""} ${b.v_model_desc || ""}`
+        ),
+      sortOrder:
+        state.sortedInfo.columnKey === "vehicle" && state.sortedInfo.order,
       render: (text, record) => {
         return record.vehicleid ? (
           <Link
@@ -266,6 +278,9 @@ export function JobsList({ bodyshop }) {
       dataIndex: "ins_co_nm",
       key: "ins_co_nm",
       ellipsis: true,
+      sorter: (a, b) => alphaSort(a.ins_co_nm, b.ins_co_nm),
+      sortOrder:
+        state.sortedInfo.columnKey === "ins_co_nm" && state.sortedInfo.order,
       filteredValue: filter?.ins_co_nm || null,
       filters:
         (jobs &&
@@ -302,6 +317,13 @@ export function JobsList({ bodyshop }) {
       key: "estimator",
       ellipsis: true,
       responsive: ["xl"],
+      sorter: (a, b) =>
+        alphaSort(
+          `${a.est_ct_fn || ""} ${a.est_ct_ln || ""}`.trim(),
+          `${b.est_ct_fn || ""} ${b.est_ct_ln || ""}`.trim()
+        ),
+      sortOrder:
+        state.sortedInfo.columnKey === "estimator" && state.sortedInfo.order,
       filterSearch: true,
       filteredValue: filter?.estimator || null,
       filters:

client/src/components/jobs-notes/jobs-notes.container.jsx

@@ -19,8 +19,8 @@ const mapStateToProps = createStructuredSelector({
   //currentUser: selectCurrentUser
 });
 const mapDispatchToProps = (dispatch) => ({
-  insertAuditTrail: ({ jobid, operation }) =>
-    dispatch(insertAuditTrail({ jobid, operation })),
+  insertAuditTrail: ({ jobid, operation, type }) =>
+    dispatch(insertAuditTrail({ jobid, operation, type })),
 });
 export default connect(mapStateToProps, mapDispatchToProps)(JobNotesContainer);
 
@@ -49,6 +49,7 @@ export function JobNotesContainer({ jobId, insertAuditTrail }) {
       insertAuditTrail({
         jobid: jobId,
         operation: AuditTrailMapping.jobnotedeleted(),
+        type: "jobnotedeleted",
       });
     });
     setDeleteLoading(false);

client/src/components/labor-allocations-adjustment-edit/labor-allocations-adjustment-edit.component.jsx

@@ -20,8 +20,8 @@ const mapStateToProps = createStructuredSelector({
   //currentUser: selectCurrentUser
 });
 const mapDispatchToProps = (dispatch) => ({
-  insertAuditTrail: ({ jobid, operation }) =>
-    dispatch(insertAuditTrail({ jobid, operation })),
+  insertAuditTrail: ({ jobid, operation, type }) =>
+    dispatch(insertAuditTrail({ jobid, operation, type })),
 });
 export default connect(
   mapStateToProps,
@@ -76,6 +76,7 @@ export function LaborAllocationsAdjustmentEdit({
             values.hours -
             ((adjustments && adjustments[mod_lbr_ty]) || 0).toFixed(1),
         }),
+        type: "jobmodifylbradj",
       });
     }
     setLoading(false);

client/src/components/note-upsert-modal/note-upsert-modal.container.jsx

@@ -19,8 +19,8 @@ const mapStateToProps = createStructuredSelector({
 });
 const mapDispatchToProps = (dispatch) => ({
   toggleModalVisible: () => dispatch(toggleModalVisible("noteUpsert")),
-  insertAuditTrail: ({ jobid, operation }) =>
-    dispatch(insertAuditTrail({ jobid, operation })),
+  insertAuditTrail: ({ jobid, operation, type }) =>
+    dispatch(insertAuditTrail({ jobid, operation, type })),
 });
 
 export function NoteUpsertModalContainer({
@@ -70,6 +70,7 @@ export function NoteUpsertModalContainer({
         insertAuditTrail({
           jobid: context.jobId,
           operation: AuditTrailMapping.jobnoteupdated(),
+          type: "jobnoteupdated",
         });
       });
       if (refetch) refetch();
@@ -102,6 +103,7 @@ export function NoteUpsertModalContainer({
           insertAuditTrail({
             jobid: newJobId,
             operation: AuditTrailMapping.jobnoteadded(),
+            type: "jobnoteadded",
           });
         });
       }
@@ -115,6 +117,7 @@ export function NoteUpsertModalContainer({
       insertAuditTrail({
         jobid: context.jobId,
         operation: AuditTrailMapping.jobnoteadded(),
+        type: "jobnoteadded",
       });
     }
   };

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

@@ -24,7 +24,7 @@ function OwnerDetailJobsComponent({ bodyshop, owner }) {
   const handleTableChange = (pagination, filters, sorter) => {
     setState({ ...state, filteredInfo: filters, sortedInfo: sorter });
   };
-  
+
   const columns = [
     {
       title: t("jobs.fields.ro_number"),
@@ -44,6 +44,15 @@ function OwnerDetailJobsComponent({ bodyshop, owner }) {
       title: t("jobs.fields.vehicle"),
       dataIndex: "vehicleid",
       key: "vehicleid",
+      sorter: (a, b) =>
+        alphaSort(
+          `${a.v_model_yr || ""} ${a.v_make_desc || ""} ${
+            a.v_model_desc || ""
+          }`,
+          `${b.v_model_yr || ""} ${b.v_make_desc || ""} ${b.v_model_desc || ""}`
+        ),
+      sortOrder:
+        state.sortedInfo.columnKey === "vehicleid" && state.sortedInfo.order,
       render: (text, record) =>
         record.vehicleid ? (
           <Link to={`/manage/vehicles/${record.vehicleid}`}>
@@ -67,9 +76,15 @@ function OwnerDetailJobsComponent({ bodyshop, owner }) {
       title: t("jobs.fields.status"),
       dataIndex: "status",
       key: "status",
-      sorter: (a, b) => statusSort(a.status, b.status, bodyshop.md_ro_statuses.statuses),
+      sorter: (a, b) =>
+        statusSort(a.status, b.status, bodyshop.md_ro_statuses.statuses),
       sortOrder:
         state.sortedInfo.columnKey === "status" && state.sortedInfo.order,
+      filters: bodyshop.md_ro_statuses.statuses.map((status) => ({
+        text: status,
+        value: status,
+      })),
+      onFilter: (value, record) => value.includes(record.status),
     },
 
     {

client/src/components/parts-order-modal/parts-order-modal.container.jsx

@@ -1,12 +1,16 @@
-import { useMutation, useQuery, useApolloClient } from "@apollo/client";
+import { useApolloClient, useMutation, useQuery } from "@apollo/client";
+import { useTreatments } from "@splitsoftware/splitio-react";
 import { Form, Modal, notification } from "antd";
+import axios from "axios";
+import _ from "lodash";
 import moment from "moment";
 import React, { useEffect, useState } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
-import { logImEXEvent, auth } from "../../firebase/firebase.utils";
+import { auth, logImEXEvent } from "../../firebase/firebase.utils";
 import { UPDATE_JOB_LINE_STATUS } from "../../graphql/jobs-lines.queries";
+import { UPDATE_JOB } from "../../graphql/jobs.queries";
 import {
   INSERT_NEW_PARTS_ORDERS,
   QUERY_PARTS_ORDER_OEC,
@@ -29,10 +33,6 @@ import { TemplateList } from "../../utils/TemplateConstants";
 import AlertComponent from "../alert/alert.component";
 import LoadingSpinner from "../loading-spinner/loading-spinner.component";
 import PartsOrderModalComponent from "./parts-order-modal.component";
-import axios from "axios";
-import { useTreatments } from "@splitsoftware/splitio-react";
-import _ from "lodash";
-import { UPDATE_JOB } from "../../graphql/jobs.queries";
 
 const mapStateToProps = createStructuredSelector({
   currentUser: selectCurrentUser,
@@ -45,8 +45,8 @@ const mapDispatchToProps = (dispatch) => ({
   toggleModalVisible: () => dispatch(toggleModalVisible("partsOrder")),
   setBillEnterContext: (context) =>
     dispatch(setModalContext({ context: context, modal: "billEnter" })),
-  insertAuditTrail: ({ jobid, operation }) =>
-    dispatch(insertAuditTrail({ jobid, operation })),
+  insertAuditTrail: ({ jobid, operation, type }) =>
+    dispatch(insertAuditTrail({ jobid, operation, type })),
 });
 
 export function PartsOrderModalContainer({
@@ -142,6 +142,7 @@ export function PartsOrderModalContainer({
         : AuditTrailMapping.jobspartsorder(
             insertResult.data.insert_parts_orders.returning[0].order_number
           ),
+      type: isReturn ? "jobspartsreturn" : "jobspartsorder",
     });
 
     const jobLinesResult = await updateJobLines({

client/src/components/parts-queue-list/parts-queue.list.component.jsx

@@ -95,15 +95,13 @@ export function PartsQueueListComponent({ bodyshop }) {
   };
 
   const handleOnRowClick = (record) => {
-    if (record) {
-      if (record.id) {
-        history.push({
-          search: queryString.stringify({
-            ...searchParams,
-            selected: record.id,
-          }),
-        });
-      }
+    if (record?.id) {
+      history.replace({
+        search: queryString.stringify({
+          ...searchParams,
+          selected: record.id,
+        }),
+      });
     }
   };
 
@@ -350,6 +348,13 @@ export function PartsQueueListComponent({ bodyshop }) {
           selectedRowKeys: [selected],
           type: "radio",
         }}
+        onRow={(record, rowIndex) => {
+          return {
+            onClick: (event) => {
+              handleOnRowClick(record);
+            },
+          };
+        }}
       />
     </Card>
   );

client/src/components/phonebook-form/phonebook-form.component.jsx

@@ -1,6 +1,12 @@
 import { Button, Form, Input, PageHeader, Space } from "antd";
 import React from "react";
 import { useTranslation } from "react-i18next";
+import { connect } from "react-redux";
+import { createStructuredSelector } from "reselect";
+import {
+  selectAuthLevel,
+  selectBodyshop,
+} from "../../redux/user/user.selectors";
 import FormFieldsChanged from "../form-fields-changed-alert/form-fields-changed-alert.component";
 import FormItemEmail from "../form-items-formatted/email-form-item.component";
 import PhoneFormItem, {
@@ -8,12 +14,6 @@ import PhoneFormItem, {
 } from "../form-items-formatted/phone-form-item.component";
 import LayoutFormRow from "../layout-form-row/layout-form-row.component";
 import { HasRbacAccess } from "../rbac-wrapper/rbac-wrapper.component";
-import { connect } from "react-redux";
-import { createStructuredSelector } from "reselect";
-import {
-  selectAuthLevel,
-  selectBodyshop,
-} from "../../redux/user/user.selectors";
 const mapStateToProps = createStructuredSelector({
   authLevel: selectAuthLevel,
   bodyshop: selectBodyshop,
@@ -46,13 +46,19 @@ export function PhonebookFormComponent({
   return (
     <div>
       <PageHeader
-        title={`${form.getFieldValue("firstname") || ""} ${
-          form.getFieldValue("lastname") || ""
-        }${
-          form.getFieldValue("company")
-            ? ` - ${form.getFieldValue("company")}`
-            : ""
-        }`}
+        title={
+          <Form.Item shouldUpdate>
+            {() =>
+              `${form.getFieldValue("firstname") || ""} ${
+                form.getFieldValue("lastname") || ""
+              }${
+                form.getFieldValue("company")
+                  ? ` - ${form.getFieldValue("company")}`
+                  : ""
+              }`
+            }
+          </Form.Item>
+        }
         extra={
           <Space>
             <Button

client/src/components/production-board-kanban/production-board-kanban.component.jsx

@@ -29,8 +29,8 @@ const mapStateToProps = createStructuredSelector({
 });
 
 const mapDispatchToProps = (dispatch) => ({
-  insertAuditTrail: ({ jobid, operation }) =>
-    dispatch(insertAuditTrail({ jobid, operation })),
+  insertAuditTrail: ({ jobid, operation, type }) =>
+    dispatch(insertAuditTrail({ jobid, operation, type })),
 });
 
 export function ProductionBoardKanbanComponent({
@@ -133,6 +133,7 @@ export function ProductionBoardKanbanComponent({
     insertAuditTrail({
       jobid: card.id,
       operation: AuditTrailMapping.jobstatuschange(destination.toColumnId),
+      type: "jobstatuschange",
     });
 
     if (update.errors) {

client/src/components/production-list-columns/production-list-columns.alert.component.jsx

@@ -13,8 +13,8 @@ import AuditTrailMapping from "../../utils/AuditTrailMappings";
 const mapStateToProps = createStructuredSelector({});
 
 const mapDispatchToProps = (dispatch) => ({
-  insertAuditTrail: ({ jobid, operation }) =>
-    dispatch(insertAuditTrail({ jobid, operation })),
+  insertAuditTrail: ({ jobid, operation, type }) =>
+    dispatch(insertAuditTrail({ jobid, operation, type })),
 });
 
 export function ProductionListColumnAlert({ record, insertAuditTrail }) {
@@ -46,6 +46,7 @@ export function ProductionListColumnAlert({ record, insertAuditTrail }) {
           ? !record.production_vars.alert
           : true
       ),
+      type: "alertToggle",
     }).then(() => {
       if (record.refetch) record.refetch();
     });

client/src/components/production-list-columns/production-list-columns.data.js

@@ -1,7 +1,6 @@
 import { BranchesOutlined, PauseCircleOutlined } from "@ant-design/icons";
-import { Space, Tooltip } from "antd";
+import { Checkbox, Space, Tooltip } from "antd";
 import i18n from "i18next";
-import moment from "moment";
 import { Link } from "react-router-dom";
 import CurrencyFormatter from "../../utils/CurrencyFormatter";
 import { TimeFormatter } from "../../utils/DateFormatter";
@@ -10,7 +9,9 @@ import { onlyUnique } from "../../utils/arrayHelper";
 import { alphaSort, dateSort, statusSort } from "../../utils/sorters";
 import JobAltTransportChange from "../job-at-change/job-at-change.component";
 import JobPartsQueueCount from "../job-parts-queue-count/job-parts-queue-count.component";
-import OwnerNameDisplay from "../owner-name-display/owner-name-display.component";
+import OwnerNameDisplay, {
+  OwnerNameDisplayFunction,
+} from "../owner-name-display/owner-name-display.component";
 import ProductionSubletsManageComponent from "../production-sublets-manage/production-sublets-manage.component";
 import ProductionListColumnAlert from "./production-list-columns.alert.component";
 import ProductionListColumnBodyPriority from "./production-list-columns.bodypriority.component";
@@ -84,7 +85,8 @@ const r = ({ technician, state, activeStatuses, data, bodyshop }) => {
             <OwnerNameDisplay ownerObject={record} />
           </Link>
         ),
-      sorter: (a, b) => alphaSort(a.ownr_ln, b.ownr_ln),
+      sorter: (a, b) =>
+        alphaSort(OwnerNameDisplayFunction(a), OwnerNameDisplayFunction(b)),
       sortOrder:
         state.sortedInfo.columnKey === "ownr" && state.sortedInfo.order,
     },
@@ -95,8 +97,10 @@ const r = ({ technician, state, activeStatuses, data, bodyshop }) => {
       ellipsis: true,
       sorter: (a, b) =>
         alphaSort(
-          a.v_make_desc + a.v_model_desc,
-          b.v_make_desc + b.v_model_desc
+          `${a.v_model_yr || ""} ${a.v_make_desc || ""} ${
+            a.v_model_desc || ""
+          }`,
+          `${b.v_model_yr || ""} ${b.v_make_desc || ""} ${b.v_model_desc || ""}`
         ),
       sortOrder:
         state.sortedInfo.columnKey === "vehicle" && state.sortedInfo.order,
@@ -185,17 +189,12 @@ const r = ({ technician, state, activeStatuses, data, bodyshop }) => {
         state.sortedInfo.columnKey === "date_next_contact" &&
         state.sortedInfo.order,
       render: (text, record) => (
-        <span
-          style={{
-            color:
-              record.date_next_contact &&
-              moment(record.date_next_contact).isBefore(moment())
-                ? "red"
-                : "",
-          }}
-        >
-          <ProductionListDate record={record} field="date_next_contact" time />
-        </span>
+        <ProductionListDate
+          record={record}
+          field="date_next_contact"
+          pastIndicator
+          time
+        />
       ),
     },
     {
@@ -291,6 +290,20 @@ const r = ({ technician, state, activeStatuses, data, bodyshop }) => {
       dataIndex: "special_coverage_policy",
       key: "special_coverage_policy",
       ellipsis: true,
+      sorter: (a, b) =>
+        Number(a.special_coverage_policy) - Number(b.special_coverage_policy),
+      sortOrder:
+        state.sortedInfo.columnKey === "special_coverage_policy" &&
+        state.sortedInfo.order,
+      filters: [
+        { text: "True", value: true },
+        { text: "False", value: false },
+      ],
+      onFilter: (value, record) =>
+        value.includes(record.special_coverage_policy),
+      render: (text, record) => (
+        <Checkbox checked={record.special_coverage_policy} />
+      ),
     },
 
     {
@@ -302,6 +315,16 @@ const r = ({ technician, state, activeStatuses, data, bodyshop }) => {
       sortOrder:
         state.sortedInfo.columnKey === "alt_transport" &&
         state.sortedInfo.order,
+      filters:
+        (bodyshop &&
+          bodyshop.appt_alt_transport.map((s) => {
+            return {
+              text: s,
+              value: [s],
+            };
+          })) ||
+        [],
+      onFilter: (value, record) => value.includes(record.alt_transport),
       render: (text, record) => (
         <div>
           {record.alt_transport}
@@ -382,7 +405,11 @@ const r = ({ technician, state, activeStatuses, data, bodyshop }) => {
       title: i18n.t("production.labels.alert"),
       dataIndex: "alert",
       key: "alert",
-
+      sorter: (a, b) =>
+        Number(a.production_vars?.alert || false) -
+        Number(b.production_vars?.alert || false),
+      sortOrder:
+        state.sortedInfo.columnKey === "alert" && state.sortedInfo.order,
       render: (text, record) => <ProductionListColumnAlert record={record} />,
     },
     {

client/src/components/production-list-columns/production-list-columns.empassignment.component.jsx

@@ -3,12 +3,12 @@ import { useMutation } from "@apollo/client";
 import {
   Button,
   Col,
-  notification,
   Popover,
   Row,
   Select,
   Space,
   Spin,
+  notification,
 } from "antd";
 import React, { useState } from "react";
 import { useTranslation } from "react-i18next";
@@ -25,8 +25,8 @@ const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
 });
 const mapDispatchToProps = (dispatch) => ({
-  insertAuditTrail: ({ jobid, operation }) =>
-    dispatch(insertAuditTrail({ jobid, operation })),
+  insertAuditTrail: ({ jobid, operation, type }) =>
+    dispatch(insertAuditTrail({ jobid, operation, type })),
 });
 
 export function ProductionListEmpAssignment({
@@ -55,6 +55,7 @@ export function ProductionListEmpAssignment({
     insertAuditTrail({
       jobid: record.id,
       operation: AuditTrailMapping.jobassignmentchange(empAssignment, name),
+      type: "jobassignmentchange",
     });
 
     if (!!result.errors) {
@@ -80,6 +81,7 @@ export function ProductionListEmpAssignment({
     insertAuditTrail({
       jobid: record.id,
       operation: AuditTrailMapping.jobassignmentremoved(empAssignment),
+      type: "jobassignmentremoved",
     });
 
     if (!!result.errors) {

client/src/components/production-list-columns/production-list-columns.status.category.jsx

@@ -12,8 +12,8 @@ const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
 });
 const mapDispatchToProps = (dispatch) => ({
-  insertAuditTrail: ({ jobid, operation }) =>
-    dispatch(insertAuditTrail({ jobid, operation })),
+  insertAuditTrail: ({ jobid, operation, type }) =>
+    dispatch(insertAuditTrail({ jobid, operation, type })),
 });
 export function ProductionListColumnCategory({ record, bodyshop }) {
   const [updateJob] = useMutation(UPDATE_JOB);

client/src/components/production-list-columns/production-list-columns.status.component.jsx

@@ -5,16 +5,16 @@ import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
 import { logImEXEvent } from "../../firebase/firebase.utils";
 import { UPDATE_JOB } from "../../graphql/jobs.queries";
-import { selectBodyshop } from "../../redux/user/user.selectors";
 import { insertAuditTrail } from "../../redux/application/application.actions";
+import { selectBodyshop } from "../../redux/user/user.selectors";
 import AuditTrailMapping from "../../utils/AuditTrailMappings";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
 });
 const mapDispatchToProps = (dispatch) => ({
-  insertAuditTrail: ({ jobid, operation }) =>
-    dispatch(insertAuditTrail({ jobid, operation })),
+  insertAuditTrail: ({ jobid, operation, type }) =>
+    dispatch(insertAuditTrail({ jobid, operation, type })),
 });
 export function ProductionListColumnStatus({
   record,
@@ -40,6 +40,7 @@ export function ProductionListColumnStatus({
     insertAuditTrail({
       jobid: record.id,
       operation: AuditTrailMapping.jobstatuschange(key),
+      type: "jobstatuschange",
     });
 
     setLoading(false);

client/src/components/report-center-modal/report-center-modal-filters-sorters-component.jsx

@@ -142,7 +142,8 @@ function FiltersSection({filters, form, bodyshop}) {
                                                                         return generateInternalReflections({
                                                                             bodyshop,
                                                                             upperPath,
-                                                                            finalPath
+                                                                            finalPath,
+                                                                            t
                                                                         });
                                                                     };
 

client/src/components/report-center-modal/report-center-modal-utils.js

@@ -22,7 +22,6 @@ const generateOptionsFromArray = (bodyshop, path) => {
     })), 'value');
 }
 
-
 /**
  * Valid internal reflections
  * Note: This is intended for future functionality
@@ -57,10 +56,34 @@ const generateOptionsFromObject = (bodyshop, path, labelPath, valuePath) => {
  * Generate special reflections
  * @param bodyshop
  * @param finalPath
+ * @param t - i18n
  * @returns {{label: *, value: *}[]|{label: *, value: *}[]|{label: string, value: *}[]|*[]}
  */
-const generateSpecialReflections = (bodyshop, finalPath) => {
+const generateSpecialReflections = (bodyshop, finalPath, t) => {
     switch (finalPath) {
+        case 'payment_payers':
+            return [
+                {
+                    label: t("payments.labels.customer"),
+                    value: t("payments.labels.customer"),
+                },
+                {
+                    label: t("payments.labels.insurance"),
+                    value: t("payments.labels.insurance"),
+                },
+                // This is a weird one supposedly only used by one shop and could potentially be
+                // placed behind a SplitSDK
+                {
+                    label: t("payments.labels.external"),
+                    value: t("payments.labels.external"),
+                }
+            ];
+        case 'payment_types':
+            return generateOptionsFromArray(bodyshop, 'md_payment_types');
+        case 'alt_transports':
+            return generateOptionsFromArray(bodyshop, 'appt_alt_transport');
+        case 'lost_sale_reasons':
+            return generateOptionsFromArray(bodyshop, 'md_lost_sale_reasons');
         // Special case because Referral Sources is an Array, not an Object.
         case 'referral_source':
             return generateOptionsFromArray(bodyshop, 'md_referral_sources');
@@ -121,12 +144,13 @@ const generateBodyshopReflections = (bodyshop, finalPath) => {
  * @param bodyshop
  * @param upperPath
  * @param finalPath
+ * @param t - i18n
  * @returns {{label: *, value: *}[]|[]|{label: *, value: *}[]|{label: string, value: *}[]|{label: *, value: *}[]|*[]}
  */
-const generateInternalReflections = ({bodyshop, upperPath, finalPath}) => {
+const generateInternalReflections = ({bodyshop, upperPath, finalPath, t}) => {
     switch (upperPath) {
         case 'special':
-            return generateSpecialReflections(bodyshop, finalPath);
+            return generateSpecialReflections(bodyshop, finalPath, t);
         case 'bodyshop':
             return generateBodyshopReflections(bodyshop, finalPath);
         default:

client/src/components/schedule-job-modal/schedule-job-modal.container.jsx

@@ -34,8 +34,8 @@ const mapStateToProps = createStructuredSelector({
 const mapDispatchToProps = (dispatch) => ({
   toggleModalVisible: () => dispatch(toggleModalVisible("schedule")),
   setEmailOptions: (e) => dispatch(setEmailOptions(e)),
-  insertAuditTrail: ({ jobid, operation }) =>
-    dispatch(insertAuditTrail({ jobid, operation })),
+  insertAuditTrail: ({ jobid, operation, type }) =>
+    dispatch(insertAuditTrail({ jobid, operation, type })),
 });
 
 export function ScheduleJobModalContainer({
@@ -146,6 +146,7 @@ export function ScheduleJobModalContainer({
         operation: AuditTrailMapping.appointmentinsert(
           DateTimeFormat(values.start)
         ),
+        type: "appointmentinsert",
       });
     }
 

client/src/components/shop-info/shop-info.responsibilitycenters.component.jsx

@@ -5,6 +5,7 @@ import {
   Input,
   InputNumber,
   Select,
+  Space,
   Switch,
   Typography,
 } from "antd";
@@ -17,6 +18,7 @@ import { selectBodyshop } from "../../redux/user/user.selectors";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
 import { useTreatments } from "@splitsoftware/splitio-react";
+import FormListMoveArrows from "../form-list-move-arrows/form-list-move-arrows.component";
 
 const SelectorDiv = styled.div`
   .ant-form-item .ant-select {
@@ -191,7 +193,7 @@ export function ShopInfoResponsibilityCenterComponent({ bodyshop, form }) {
           </LayoutFormRow>
           <LayoutFormRow header={t("bodyshop.labels.dms.cdk.payers")}>
             <Form.List name={["cdk_configuration", "payers"]}>
-              {(fields, { add, remove }) => {
+              {(fields, { add, remove, move }) => {
                 return (
                   <div>
                     {fields.map((field, index) => (
@@ -249,11 +251,18 @@ export function ShopInfoResponsibilityCenterComponent({ bodyshop, form }) {
                             </Select>
                           </Form.Item>
 
-                          <DeleteFilled
-                            onClick={() => {
-                              remove(field.name);
-                            }}
-                          />
+                          <Space align="center">
+                            <DeleteFilled
+                              onClick={() => {
+                                remove(field.name);
+                              }}
+                            />
+                            <FormListMoveArrows
+                              move={move}
+                              index={index}
+                              total={fields.length}
+                            />
+                          </Space>
                         </LayoutFormRow>
                       </Form.Item>
                     ))}
@@ -345,7 +354,7 @@ export function ShopInfoResponsibilityCenterComponent({ bodyshop, form }) {
         id="costs"
       >
         <Form.List name={["md_responsibility_centers", "costs"]}>
-          {(fields, { add, remove }) => {
+          {(fields, { add, remove, move }) => {
             return (
               <div>
                 {fields.map((field, index) => (
@@ -462,12 +471,18 @@ export function ShopInfoResponsibilityCenterComponent({ bodyshop, form }) {
                           <Input onBlur={handleBlur} />
                         </Form.Item>
                       )}
-
-                      <DeleteFilled
-                        onClick={() => {
-                          remove(field.name);
-                        }}
-                      />
+                      <Space align="center">
+                        <DeleteFilled
+                          onClick={() => {
+                            remove(field.name);
+                          }}
+                        />
+                        <FormListMoveArrows
+                          move={move}
+                          index={index}
+                          total={fields.length}
+                        />
+                      </Space>
                     </LayoutFormRow>
                   </Form.Item>
                 ))}
@@ -493,7 +508,7 @@ export function ShopInfoResponsibilityCenterComponent({ bodyshop, form }) {
         id="profits"
       >
         <Form.List name={["md_responsibility_centers", "profits"]}>
-          {(fields, { add, remove }) => {
+          {(fields, { add, remove, move }) => {
             return (
               <div>
                 {fields.map((field, index) => (
@@ -595,11 +610,18 @@ export function ShopInfoResponsibilityCenterComponent({ bodyshop, form }) {
                           <Input onBlur={handleBlur} />
                         </Form.Item>
                       )}
-                      <DeleteFilled
-                        onClick={() => {
-                          remove(field.name);
-                        }}
-                      />
+                      <Space align="center">
+                        <DeleteFilled
+                          onClick={() => {
+                            remove(field.name);
+                          }}
+                        />
+                        <FormListMoveArrows
+                          move={move}
+                          index={index}
+                          total={fields.length}
+                        />
+                      </Space>
                     </LayoutFormRow>
                   </Form.Item>
                 ))}

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

@@ -7,7 +7,9 @@ import { createStructuredSelector } from "reselect";
 import { selectBodyshop } from "../../redux/user/user.selectors";
 import CurrencyFormatter from "../../utils/CurrencyFormatter";
 import { alphaSort, statusSort } from "../../utils/sorters";
-import OwnerNameDisplay from "../owner-name-display/owner-name-display.component";
+import OwnerNameDisplay, {
+  OwnerNameDisplayFunction,
+} from "../owner-name-display/owner-name-display.component";
 import VehicleDetailUpdateJobsComponent from "../vehicle-detail-update-jobs/vehicle-detail-update-jobs.component";
 
 const mapStateToProps = createStructuredSelector({
@@ -45,6 +47,10 @@ export function VehicleDetailJobsComponent({ vehicle, bodyshop }) {
       title: t("jobs.fields.owner"),
       dataIndex: "owner",
       key: "owner",
+      sorter: (a, b) =>
+        alphaSort(OwnerNameDisplayFunction(a), OwnerNameDisplayFunction(b)),
+      sortOrder:
+        state.sortedInfo.columnKey === "owner" && state.sortedInfo.order,
       render: (text, record) => (
         <Link to={`/manage/owners/${record.owner.id}`}>
           <OwnerNameDisplay ownerObject={record} />
@@ -63,9 +69,15 @@ export function VehicleDetailJobsComponent({ vehicle, bodyshop }) {
       title: t("jobs.fields.status"),
       dataIndex: "status",
       key: "status",
-      sorter: (a, b) => statusSort(a.status, b.status, bodyshop.md_ro_statuses.statuses),
+      sorter: (a, b) =>
+        statusSort(a.status, b.status, bodyshop.md_ro_statuses.statuses),
       sortOrder:
         state.sortedInfo.columnKey === "status" && state.sortedInfo.order,
+      filters: bodyshop.md_ro_statuses.statuses.map((status) => ({
+        text: status,
+        value: status,
+      })),
+      onFilter: (value, record) => value.includes(record.status),
     },
 
     {

client/src/components/vehicles-list/vehicles-list.component.jsx

@@ -4,8 +4,9 @@ import queryString from "query-string";
 import React, { useState } from "react";
 import { useTranslation } from "react-i18next";
 import { Link, useHistory, useLocation } from "react-router-dom";
+import { pageLimit } from "../../utils/config";
 import VehicleVinDisplay from "../vehicle-vin-display/vehicle-vin-display.component";
-import {pageLimit} from "../../utils/config";
+import { alphaSort } from './../../utils/sorters';
 export default function VehiclesListComponent({
   loading,
   vehicles,
@@ -31,6 +32,8 @@ export default function VehiclesListComponent({
       title: t("vehicles.fields.v_vin"),
       dataIndex: "v_vin",
       key: "v_vin",
+      sorter: (a, b) => alphaSort(a.v_vin, b.v_vin),
+      sortOrder: state.sortedInfo.columnKey === "v_vin" && state.sortedInfo.order,
       render: (text, record) => (
         <Link to={"/manage/vehicles/" + record.id}>
           <VehicleVinDisplay>{record.v_vin || "N/A"}</VehicleVinDisplay>
@@ -51,8 +54,10 @@ export default function VehiclesListComponent({
     },
     {
       title: t("vehicles.fields.plate_no"),
-      dataIndex: "plate",
-      key: "plate",
+      dataIndex: "plate_no",
+      key: "plate_no",
+      sorter: (a, b) => alphaSort(a.plate_no, b.plate_no),
+      sortOrder: state.sortedInfo.columnKey === "plate_no" && state.sortedInfo.order,
       render: (text, record) => {
         return (
           <span>{`${record.plate_st || ""} | ${record.plate_no || ""}`}</span>

client/src/firebase/firebase.utils.js

@@ -4,6 +4,8 @@ import { getAuth, updatePassword, updateProfile } from "firebase/auth";
 import { getFirestore } from "firebase/firestore";
 import { getMessaging, getToken, onMessage } from "firebase/messaging";
 import { store } from "../redux/store";
+import axios from "axios";
+import { checkBeta } from "../utils/handleBeta";
 
 const config = JSON.parse(process.env.REACT_APP_FIREBASE_CONFIG);
 initializeApp(config);
@@ -86,6 +88,18 @@ export const logImEXEvent = (eventName, additionalParams, stateProp = null) => {
       null,
     ...additionalParams,
   };
+  axios.post("/ioevent", {
+    useremail:
+      (state.user && state.user.currentUser && state.user.currentUser.email) ||
+      null,
+    bodyshopid:
+      (state.user && state.user.bodyshop && state.user.bodyshop.id) || null,
+    operationName: eventName,
+    variables: additionalParams,
+    dbevent: false,
+    env: checkBeta() ? "beta" : "master",
+  });
+
   // console.log(
   //   "%c[Analytics]",
   //   "background-color: green ;font-weight:bold;",

client/src/graphql/audit_trail.queries.js

@@ -40,6 +40,7 @@ export const INSERT_AUDIT_TRAIL = gql`
       bodyshopid
       created
       operation
+      type
       useremail
     }
   }

client/src/graphql/jobs.queries.js

@@ -704,6 +704,7 @@ export const GET_JOB_BY_PK = gql`
       other_amount_payable
       owner {
         id
+        note
         ownr_fn
         ownr_ln
         ownr_co_nm
@@ -1862,6 +1863,7 @@ export const QUERY_ALL_JOBS_PAGINATED_STATUS_FILTERED = gql`
       ownr_co_nm
       ownr_ph1
       ownr_ph2
+      ownerid
       plate_no
       plate_st
       v_vin

client/src/graphql/vehicles.queries.js

@@ -31,6 +31,7 @@ export const QUERY_VEHICLE_BY_ID = gql`
       jobs(order_by: { date_open: desc }) {
         id
         ro_number
+        ownr_co_nm
         ownr_fn
         ownr_ln
         owner {

client/src/pages/bills/bills.page.component.jsx

@@ -13,8 +13,8 @@ import { setModalContext } from "../../redux/modals/modals.actions";
 import CurrencyFormatter from "../../utils/CurrencyFormatter";
 import { DateFormatter } from "../../utils/DateFormatter";
 import { TemplateList } from "../../utils/TemplateConstants";
+import { pageLimit } from "../../utils/config";
 import { alphaSort, dateSort } from "../../utils/sorters";
-import {pageLimit} from "../../utils/config";
 
 const mapDispatchToProps = (dispatch) => ({
   setPartsOrderContext: (context) =>
@@ -125,9 +125,7 @@ export function BillsListPage({
       sortOrder:
         state.sortedInfo.columnKey === "is_credit_memo" &&
         state.sortedInfo.order,
-      render: (text, record) => (
-        <Checkbox disabled checked={record.is_credit_memo} />
-      ),
+      render: (text, record) => <Checkbox checked={record.is_credit_memo} />,
     },
     {
       title: t("bills.fields.exported"),
@@ -136,7 +134,7 @@ export function BillsListPage({
       sorter: (a, b) => a.exported - b.exported,
       sortOrder:
         state.sortedInfo.columnKey === "exported" && state.sortedInfo.order,
-      render: (text, record) => <Checkbox disabled checked={record.exported} />,
+      render: (text, record) => <Checkbox checked={record.exported} />,
     },
     {
       title: t("general.labels.actions"),

client/src/pages/dms/dms.container.jsx

@@ -40,8 +40,8 @@ const mapStateToProps = createStructuredSelector({
 const mapDispatchToProps = (dispatch) => ({
   setBreadcrumbs: (breadcrumbs) => dispatch(setBreadcrumbs(breadcrumbs)),
   setSelectedHeader: (key) => dispatch(setSelectedHeader(key)),
-  insertAuditTrail: ({ jobid, operation }) =>
-    dispatch(insertAuditTrail({ jobid, operation })),
+  insertAuditTrail: ({ jobid, operation, type }) =>
+    dispatch(insertAuditTrail({ jobid, operation, type })),
 });
 
 export default connect(mapStateToProps, mapDispatchToProps)(DmsContainer);
@@ -127,6 +127,7 @@ export function DmsContainer({
       insertAuditTrail({
         jobid: payload,
         operation: AuditTrailMapping.jobexported(),
+        type: "jobexported",
       });
       history.push("/manage/accounting/receivables");
     });

client/src/pages/export-logs/export-logs.page.component.jsx

@@ -12,7 +12,8 @@ import AlertComponent from "../../components/alert/alert.component";
 import { QUERY_EXPORT_LOG_PAGINATED } from "../../graphql/accounting.queries";
 import { selectBodyshop } from "../../redux/user/user.selectors";
 import { DateTimeFormatter } from "../../utils/DateFormatter";
-import {pageLimit} from "../../utils/config";
+import { pageLimit } from "../../utils/config";
+import { alphaSort, dateSort } from "./../../utils/sorters";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
@@ -34,11 +35,43 @@ export function ExportLogsPageComponent({ bodyshop }) {
         limit: pageLimit,
         order: [
           {
-            [sortcolumn || "created_at"]: sortorder
-              ? sortorder === "descend"
-                ? "desc"
-                : "asc"
-              : "desc",
+            ...(sortcolumn === "ro_number"
+              ? {
+                  job: {
+                    [sortcolumn || "created_at"]: sortorder
+                      ? sortorder === "descend"
+                        ? "desc"
+                        : "asc"
+                      : "desc",
+                  },
+                }
+              : sortcolumn === "invoice_number"
+              ? {
+                  bill: {
+                    [sortcolumn || "created_at"]: sortorder
+                      ? sortorder === "descend"
+                        ? "desc"
+                        : "asc"
+                      : "desc",
+                  },
+                }
+              : sortcolumn === "paymentnum"
+              ? {
+                  payment: {
+                    [sortcolumn || "created_at"]: sortorder
+                      ? sortorder === "descend"
+                        ? "desc"
+                        : "asc"
+                      : "desc",
+                  },
+                }
+              : {
+                  [sortcolumn || "created_at"]: sortorder
+                    ? sortorder === "descend"
+                      ? "desc"
+                      : "asc"
+                    : "desc",
+                }),
           },
         ],
       },
@@ -68,6 +101,8 @@ export function ExportLogsPageComponent({ bodyshop }) {
       title: t("general.labels.created_at"),
       dataIndex: "created_at",
       key: "created_at",
+      sorter: (a, b) => dateSort(a.created_at, b.created_at),
+      sortOrder: sortcolumn === "created_at" && sortorder,
       render: (text, record) => (
         <DateTimeFormatter>{record.created_at}</DateTimeFormatter>
       ),
@@ -81,7 +116,8 @@ export function ExportLogsPageComponent({ bodyshop }) {
       title: t("jobs.fields.ro_number"),
       dataIndex: "ro_number",
       key: "ro_number",
-
+      sorter: (a, b) => alphaSort(a.ro_number, b.ro_number),
+      sortOrder: sortcolumn === "ro_number" && sortorder,
       render: (text, record) =>
         record.job && (
           <Link to={`/manage/jobs/${record.job.id}`}>
@@ -93,6 +129,8 @@ export function ExportLogsPageComponent({ bodyshop }) {
       title: t("bills.fields.invoice_number"),
       dataIndex: "invoice_number",
       key: "invoice_number",
+      sorter: (a, b) => alphaSort(a.invoice_number, b.invoice_number),
+      sortOrder: sortcolumn === "invoice_number" && sortorder,
       render: (text, record) =>
         record.bill && (
           <Link to={"/manage/bills?billid=" + (record.bill && record.bill.id)}>
@@ -104,6 +142,8 @@ export function ExportLogsPageComponent({ bodyshop }) {
       title: t("payments.fields.paymentnum"),
       dataIndex: "paymentnum",
       key: "paymentnum",
+      sorter: (a, b) => alphaSort(a.paymentnum, b.paymentnum),
+      sortOrder: sortcolumn === "paymentnum" && sortorder,
       render: (text, record) =>
         record.payment && (
           <Link
@@ -120,9 +160,14 @@ export function ExportLogsPageComponent({ bodyshop }) {
       title: t("general.labels.successful"),
       dataIndex: "successful",
       key: "successful",
-      render: (text, record) => (
-        <Checkbox disabled checked={record.successful} />
-      ),
+      sorter: (a, b) => Number(a.successful) - Number(b.successful),
+      sortOrder: sortcolumn === "successful" && sortorder,
+      filters: [
+        { text: "True", value: true },
+        { text: "False", value: false },
+      ],
+      onFilter: (value, record) => record.successful === value,
+      render: (text, record) => <Checkbox checked={record.successful} />,
     },
     {
       title: t("general.labels.message"),

client/src/pages/jobs-close/jobs-close.component.jsx

@@ -47,11 +47,11 @@ const mapStateToProps = createStructuredSelector({
 });
 
 const mapDispatchToProps = (dispatch) => ({
-  insertAuditTrail: ({ jobid, operation }) =>
-    dispatch(insertAuditTrail({ jobid, operation })),
+  insertAuditTrail: ({ jobid, operation, type }) =>
+    dispatch(insertAuditTrail({ jobid, operation, type })),
 });
 
-export function JobsCloseComponent({ job, bodyshop, jobRO, insertAuditTrail, }) {
+export function JobsCloseComponent({ job, bodyshop, jobRO, insertAuditTrail }) {
   const { t } = useTranslation();
   const [form] = Form.useForm();
   const client = useApolloClient();
@@ -121,6 +121,7 @@ export function JobsCloseComponent({ job, bodyshop, jobRO, insertAuditTrail, })
       insertAuditTrail({
         jobid: job.id,
         operation: AuditTrailMapping.jobinvoiced(),
+        type: "jobinvoiced",
       });
       // history.push(`/manage/jobs/${job.id}`);
     } else {

client/src/pages/jobs-detail/jobs-detail.page.component.jsx

@@ -29,6 +29,7 @@ import { createStructuredSelector } from "reselect";
 import FormFieldsChanged from "../../components/form-fields-changed-alert/form-fields-changed-alert.component";
 import JobAuditTrail from "../../components/job-audit-trail/job-audit-trail.component";
 import JobsLinesContainer from "../../components/job-detail-lines/job-lines.container";
+import JobLifecycleComponent from "../../components/job-lifecycle/job-lifecycle.component";
 import JobLineUpsertModalContainer from "../../components/job-lines-upsert-modal/job-lines-upsert-modal.container";
 import JobReconciliationModal from "../../components/job-reconciliation-modal/job-reconciliation.modal.container";
 import JobSyncButton from "../../components/job-sync-button/job-sync-button.component";
@@ -54,7 +55,6 @@ import { selectBodyshop } from "../../redux/user/user.selectors";
 import AuditTrailMapping from "../../utils/AuditTrailMappings";
 import UndefinedToNull from "../../utils/undefinedtonull";
 import { DateTimeFormat } from "./../../utils/DateFormatter";
-import JobLifecycleComponent from "../../components/job-lifecycle/job-lifecycle.component";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
@@ -63,8 +63,8 @@ const mapStateToProps = createStructuredSelector({
 const mapDispatchToProps = (dispatch) => ({
   setPrintCenterContext: (context) =>
     dispatch(setModalContext({ context: context, modal: "printCenter" })),
-  insertAuditTrail: ({ jobid, operation }) =>
-    dispatch(insertAuditTrail({ jobid, operation })),
+  insertAuditTrail: ({ jobid, operation, type }) =>
+    dispatch(insertAuditTrail({ jobid, operation, type })),
 });
 export function JobsDetailPage({
   bodyshop,
@@ -177,6 +177,7 @@ export function JobsDetailPage({
               ? DateTimeFormat(changedAuditFields[key])
               : changedAuditFields[key]
           ),
+          type: "jobfieldchange",
         });
       });
 
@@ -334,15 +335,23 @@ export function JobsDetailPage({
           >
             <JobsDetailLaborContainer job={job} jobId={job.id} />
           </Tabs.TabPane>
-            <Tabs.TabPane
-                forceRender
-                tab={<span><BarsOutlined />{t('menus.jobsdetail.lifecycle')}</span>}
-                key="lifecycle"
-            >
-                <JobLifecycleComponent job={job} statuses={bodyshop.md_ro_statuses}/>
-            </Tabs.TabPane>
+          <Tabs.TabPane
+            forceRender
+            tab={
+              <span>
+                <BarsOutlined />
+                {t("menus.jobsdetail.lifecycle")}
+              </span>
+            }
+            key="lifecycle"
+          >
+            <JobLifecycleComponent
+              job={job}
+              statuses={bodyshop.md_ro_statuses}
+            />
+          </Tabs.TabPane>
 
-            <Tabs.TabPane
+          <Tabs.TabPane
             forceRender
             tab={
               <span>

client/src/redux/application/application.actions.js

@@ -54,9 +54,9 @@ export const setOnline = (isOnline) => ({
   payload: isOnline,
 });
 
-export const insertAuditTrail = ({ jobid, billid, operation }) => ({
+export const insertAuditTrail = ({ jobid, billid, operation, type }) => ({
   type: ApplicationActionTypes.INSERT_AUDIT_TRAIL,
-  payload: { jobid, billid, operation },
+  payload: { jobid, billid, operation, type },
 });
 export const setProblemJobs = (problemJobs) => ({
   type: ApplicationActionTypes.SET_PROBLEM_JOBS,

client/src/redux/application/application.sagas.js

@@ -266,7 +266,7 @@ export function* onInsertAuditTrail() {
 }
 
 export function* insertAuditTrailSaga({
-  payload: { jobid, billid, operation },
+  payload: { jobid, billid, operation, type },
 }) {
   const state = yield select();
   const bodyshop = state.user.bodyshop;
@@ -278,6 +278,7 @@ export function* insertAuditTrailSaga({
       jobid,
       billid,
       operation,
+      type,
       useremail: currentUser.email,
     },
   };

client/src/translations/en_us/common.json

@@ -259,6 +259,7 @@
 				"saving": "Error encountered while saving. {{message}}"
 			},
 			"fields": {
+				"ReceivableCustomField": "QBO Receivable Custom Field {{number}}",
 				"address1": "Address 1",
 				"address2": "Address 2",
 				"appt_alt_transport": "Appointment Alternative Transportation Options",
@@ -477,7 +478,6 @@
 						"editaccess": "Users -> Edit access"
 					}
 				},
-				"ReceivableCustomField": "QBO Receivable Custom Field {{number}}",
 				"responsibilitycenter": "Responsibility Center",
 				"responsibilitycenter_accountdesc": "Account Description",
 				"responsibilitycenter_accountitem": "Item",
@@ -608,7 +608,7 @@
 				"dms": {
 					"cdk": {
 						"controllist": "Control Number List",
-						"payers": "CDK Payers"
+						"payers": "Payers"
 					},
 					"cdk_dealerid": "CDK Dealer ID",
 					"pbs_serialnumber": "PBS Serial Number",
@@ -844,8 +844,8 @@
 				"notconfigured": "You do not have any current CSI Question Sets configured.",
 				"notfoundsubtitle": "We were unable to find a survey using the link you provided. Please ensure the URL is correct or reach out to your shop for more help.",
 				"notfoundtitle": "No survey found.",
-				"surveycompletetitle": "Survey previously completed",
-				"surveycompletesubtitle": "This survey was already completed on {{date}}."
+				"surveycompletesubtitle": "This survey was already completed on {{date}}.",
+				"surveycompletetitle": "Survey previously completed"
 			},
 			"fields": {
 				"completedon": "Completed On",
@@ -854,13 +854,13 @@
 				"validuntil": "Valid Until"
 			},
 			"labels": {
+				"copyright": "Copyright © $t(titles.app). All Rights Reserved.",
+				"greeting": "Hi {{name}}!",
+				"intro": "At {{shopname}}, we value your feedback. We would love to hear what you have to say. Please fill out the form below.",
 				"nologgedinuser": "Please log out of $t(titles.app)",
 				"nologgedinuser_sub": "Users of $t(titles.app) cannot complete CSI surveys while logged in. Please log out and try again.",
 				"noneselected": "No response selected.",
-				"title": "Customer Satisfaction Survey",
-				"greeting": "Hi {{name}}!",
-				"intro": "At {{shopname}}, we value your feedback. We would love to hear what you have to say. Please fill out the form below.",
-				"copyright": "Copyright © $t(titles.app). All Rights Reserved."
+				"title": "Customer Satisfaction Survey"
 			},
 			"successes": {
 				"created": "CSI created successfully.",
@@ -898,7 +898,8 @@
 				"scheduledindate": "Sheduled In Today: {{date}}",
 				"scheduledintoday": "Sheduled In Today",
 				"scheduledoutdate": "Sheduled Out Today: {{date}}",
-				"scheduledouttoday": "Sheduled Out Today"
+				"scheduledouttoday": "Sheduled Out Today",
+				"joblifecycle": "Job Lifecycle"
 			}
 		},
 		"dms": {
@@ -1113,6 +1114,7 @@
 				"loadingshop": "Loading shop data...",
 				"loggingin": "Authorizing...",
 				"markedexported": "Manually marked as exported.",
+				"media": "Media",
 				"message": "Message",
 				"monday": "Monday",
 				"na": "N/A",
@@ -1236,7 +1238,15 @@
 				"relative_end": "Relative End",
 				"relative_start": "Relative Start",
 				"start": "Start",
-				"value": "Value"
+				"value": "Value",
+				"status": "Status",
+				"percentage": "Percentage",
+				"human_readable": "Human Readable",
+				"status_count": "In Status"
+			},
+			"titles": {
+				"dashboard": "Job Lifecycle",
+				"top_durations": "Top Durations"
 			},
 			"content": {
 				"current_status_accumulated_time": "Current Status Accumulated Time",
@@ -1248,7 +1258,9 @@
 				"title": "Job Lifecycle Component",
 				"title_durations": "Historical Status Durations",
 				"title_loading": "Loading",
-				"title_transitions": "Transitions"
+				"title_transitions": "Transitions",
+				"calculated_based_on": "Calculated based on",
+				"jobs_in_since": "Jobs in since"
 			},
 			"errors": {
 				"fetch": "Error getting Job Lifecycle Data"
@@ -1561,7 +1573,7 @@
 				"federal_tax_payable": "Federal Tax Payable",
 				"federal_tax_rate": "Federal Tax Rate",
 				"ins_addr1": "Insurance Co. Address",
-				"ins_city": "Insurance City",
+				"ins_city": "Insurance Co. City",
 				"ins_co_id": "Insurance Co. ID",
 				"ins_co_nm": "Insurance Company Name",
 				"ins_co_nm_short": "Ins.  Co.",
@@ -1823,6 +1835,7 @@
 				"job": "Job Details",
 				"jobcosting": "Job Costing",
 				"jobtotals": "Job Totals",
+				"labor_hrs": "B/P/T Hrs",
 				"labor_rates_subtotal": "Labor Rates Subtotal",
 				"laborallocations": "Labor Allocations",
 				"labortotals": "Labor Totals",
@@ -2417,6 +2430,7 @@
 				"invoice_total_payable": "Invoice (Total Payable)",
 				"iou_form": "IOU Form",
 				"job_costing_ro": "Job Costing",
+				"job_lifecycle_ro": "Job Lifecycle",
 				"job_notes": "Job Notes",
 				"key_tag": "Key Tag",
 				"labels": {
@@ -2583,17 +2597,17 @@
 			},
 			"labels": {
 				"advanced_filters": "Advanced Filters and Sorters",
-				"advanced_filters_show": "Show",
-				"advanced_filters_hide": "Hide",
-				"advanced_filters_filters": "Filters",
-				"advanced_filters_sorters": "Sorters",
-				"advanced_filters_filter_field": "Field",
-				"advanced_filters_sorter_field": "Field",
-				"advanced_filters_true": "True",
 				"advanced_filters_false": "False",
-				"advanced_filters_sorter_direction": "Direction",
+				"advanced_filters_filter_field": "Field",
 				"advanced_filters_filter_operator": "Operator",
 				"advanced_filters_filter_value": "Value",
+				"advanced_filters_filters": "Filters",
+				"advanced_filters_hide": "Hide",
+				"advanced_filters_show": "Show",
+				"advanced_filters_sorter_direction": "Direction",
+				"advanced_filters_sorter_field": "Field",
+				"advanced_filters_sorters": "Sorters",
+				"advanced_filters_true": "True",
 				"dates": "Dates",
 				"employee": "Employee",
 				"filterson": "Filters on {{object}}: {{field}}",
@@ -2675,6 +2689,8 @@
 				"job_costing_ro_date_summary": "Job Costing by RO - Summary",
 				"job_costing_ro_estimator": "Job Costing by Estimator",
 				"job_costing_ro_ins_co": "Job Costing by RO Source",
+				"job_lifecycle_date_detail": "Job Lifecycle by Date - Detail",
+				"job_lifecycle_date_summary": "Job Lifecycle by Date - Summary",
 				"jobs_completed_not_invoiced": "Jobs Completed not Invoiced",
 				"jobs_invoiced_not_exported": "Jobs Invoiced not Exported",
 				"jobs_reconcile": "Parts/Sublet/Labor Reconciliation",

client/src/translations/es/common.json

@@ -259,6 +259,7 @@
 				"saving": ""
 			},
 			"fields": {
+				"ReceivableCustomField": "",
 				"address1": "",
 				"address2": "",
 				"appt_alt_transport": "",
@@ -477,7 +478,6 @@
 						"editaccess": ""
 					}
 				},
-				"ReceivableCustomField": "",
 				"responsibilitycenter": "",
 				"responsibilitycenter_accountdesc": "",
 				"responsibilitycenter_accountitem": "",
@@ -844,8 +844,8 @@
 				"notconfigured": "",
 				"notfoundsubtitle": "",
 				"notfoundtitle": "",
-				"surveycompletetitle": "",
-				"surveycompletesubtitle": ""
+				"surveycompletesubtitle": "",
+				"surveycompletetitle": ""
 			},
 			"fields": {
 				"completedon": "",
@@ -854,13 +854,13 @@
 				"validuntil": ""
 			},
 			"labels": {
+				"copyright": "",
+				"greeting": "",
+				"intro": "",
 				"nologgedinuser": "",
 				"nologgedinuser_sub": "",
 				"noneselected": "",
-				"title": "",
-				"greeting": "",
-				"intro": "",
-				"copyright": ""
+				"title": ""
 			},
 			"successes": {
 				"created": "",
@@ -898,7 +898,8 @@
 				"scheduledindate": "",
 				"scheduledintoday": "",
 				"scheduledoutdate": "",
-				"scheduledouttoday": ""
+				"scheduledouttoday": "",
+				"joblifecycle": ""
 			}
 		},
 		"dms": {
@@ -1236,7 +1237,15 @@
 				"relative_end": "",
 				"relative_start": "",
 				"start": "",
-				"value": ""
+				"value": "",
+				"status": "",
+				"percentage": "",
+				"human_readable": "",
+				"status_count": ""
+			},
+			"titles": {
+				"dashboard": "",
+				"top_durations": ""
 			},
 			"content": {
 				"current_status_accumulated_time": "",
@@ -1248,7 +1257,9 @@
 				"title": "",
 				"title_durations": "",
 				"title_loading": "",
-				"title_transitions": ""
+				"title_transitions": "",
+				"calculated_based_on": "",
+				"jobs_in_since": ""
 			},
 			"errors": {
 				"fetch": "Error al obtener los datos del ciclo de vida del trabajo"
@@ -1823,6 +1834,7 @@
 				"job": "",
 				"jobcosting": "",
 				"jobtotals": "",
+				"labor_hrs": "",
 				"labor_rates_subtotal": "",
 				"laborallocations": "",
 				"labortotals": "",
@@ -2417,6 +2429,7 @@
 				"invoice_total_payable": "",
 				"iou_form": "",
 				"job_costing_ro": "",
+				"job_lifecycle_ro": "",
 				"job_notes": "",
 				"key_tag": "",
 				"labels": {
@@ -2583,17 +2596,17 @@
 			},
 			"labels": {
 				"advanced_filters": "",
-				"advanced_filters_show": "",
-				"advanced_filters_hide": "",
-				"advanced_filters_filters": "",
-				"advanced_filters_sorters": "",
-				"advanced_filters_filter_field": "",
-				"advanced_filters_sorter_field": "",
-				"advanced_filters_true": "",
 				"advanced_filters_false": "",
-				"advanced_filters_sorter_direction": "",
+				"advanced_filters_filter_field": "",
 				"advanced_filters_filter_operator": "",
 				"advanced_filters_filter_value": "",
+				"advanced_filters_filters": "",
+				"advanced_filters_hide": "",
+				"advanced_filters_show": "",
+				"advanced_filters_sorter_direction": "",
+				"advanced_filters_sorter_field": "",
+				"advanced_filters_sorters": "",
+				"advanced_filters_true": "",
 				"dates": "",
 				"employee": "",
 				"filterson": "",
@@ -2675,6 +2688,8 @@
 				"job_costing_ro_date_summary": "",
 				"job_costing_ro_estimator": "",
 				"job_costing_ro_ins_co": "",
+				"job_lifecycle_date_detail": "",
+				"job_lifecycle_date_summary": "",
 				"jobs_completed_not_invoiced": "",
 				"jobs_invoiced_not_exported": "",
 				"jobs_reconcile": "",

client/src/translations/fr/common.json

@@ -259,6 +259,7 @@
 				"saving": ""
 			},
 			"fields": {
+				"ReceivableCustomField": "",
 				"address1": "",
 				"address2": "",
 				"appt_alt_transport": "",
@@ -477,7 +478,6 @@
 						"editaccess": ""
 					}
 				},
-				"ReceivableCustomField": "",
 				"responsibilitycenter": "",
 				"responsibilitycenter_accountdesc": "",
 				"responsibilitycenter_accountitem": "",
@@ -844,8 +844,8 @@
 				"notconfigured": "",
 				"notfoundsubtitle": "",
 				"notfoundtitle": "",
-				"surveycompletetitle": "",
-				"surveycompletesubtitle": ""
+				"surveycompletesubtitle": "",
+				"surveycompletetitle": ""
 			},
 			"fields": {
 				"completedon": "",
@@ -854,13 +854,13 @@
 				"validuntil": ""
 			},
 			"labels": {
+				"copyright": "",
+				"greeting": "",
+				"intro": "",
 				"nologgedinuser": "",
 				"nologgedinuser_sub": "",
 				"noneselected": "",
-				"title": "",
-				"greeting": "",
-				"intro": "",
-				"copyright": ""
+				"title": ""
 			},
 			"successes": {
 				"created": "",
@@ -1236,7 +1236,15 @@
 				"relative_end": "",
 				"relative_start": "",
 				"start": "",
-				"value": ""
+				"value": "",
+				"status": "",
+				"percentage": "",
+				"human_readable": "",
+				"status_count": ""
+			},
+			"titles": {
+				"dashboard": "",
+				"top_durations": ""
 			},
 			"content": {
 				"current_status_accumulated_time": "",
@@ -1248,7 +1256,10 @@
 				"title": "",
 				"title_durations": "",
 				"title_loading": "",
-				"title_transitions": ""
+				"title_transitions": "",
+				"calculated_based_on": "",
+				"jobs_in_since": "",
+				"joblifecycle": ""
 			},
 			"errors": {
 				"fetch": "Erreur lors de l'obtention des données du cycle de vie des tâches"
@@ -1823,6 +1834,7 @@
 				"job": "",
 				"jobcosting": "",
 				"jobtotals": "",
+				"labor_hrs": "",
 				"labor_rates_subtotal": "",
 				"laborallocations": "",
 				"labortotals": "",
@@ -2417,6 +2429,7 @@
 				"invoice_total_payable": "",
 				"iou_form": "",
 				"job_costing_ro": "",
+				"job_lifecycle_ro": "",
 				"job_notes": "",
 				"key_tag": "",
 				"labels": {
@@ -2583,17 +2596,17 @@
 			},
 			"labels": {
 				"advanced_filters": "",
-				"advanced_filters_show": "",
-				"advanced_filters_hide": "",
-				"advanced_filters_filters": "",
-				"advanced_filters_sorters": "",
-				"advanced_filters_filter_field": "",
-				"advanced_filters_sorter_field": "",
-				"advanced_filters_true": "",
 				"advanced_filters_false": "",
-				"advanced_filters_sorter_direction": "",
+				"advanced_filters_filter_field": "",
 				"advanced_filters_filter_operator": "",
 				"advanced_filters_filter_value": "",
+				"advanced_filters_filters": "",
+				"advanced_filters_hide": "",
+				"advanced_filters_show": "",
+				"advanced_filters_sorter_direction": "",
+				"advanced_filters_sorter_field": "",
+				"advanced_filters_sorters": "",
+				"advanced_filters_true": "",
 				"dates": "",
 				"employee": "",
 				"filterson": "",
@@ -2675,6 +2688,8 @@
 				"job_costing_ro_date_summary": "",
 				"job_costing_ro_estimator": "",
 				"job_costing_ro_ins_co": "",
+				"job_lifecycle_date_detail": "",
+				"job_lifecycle_date_summary": "",
 				"jobs_completed_not_invoiced": "",
 				"jobs_invoiced_not_exported": "",
 				"jobs_reconcile": "",

client/src/utils/TemplateConstants.js

@@ -514,6 +514,14 @@ export const TemplateList = (type, context) => {
             group: "financial",
             dms: true,
           },
+          job_lifecycle_ro: {
+            title: i18n.t("printcenter.jobs.job_lifecycle_ro"),
+            description: "",
+            subject: i18n.t("printcenter.jobs.job_lifecycle_ro"),
+            key: "job_lifecycle_ro",
+            disabled: false,
+            group: "post",
+          },
         }
       : {}),
     ...(!type || type === "job_special"
@@ -2048,6 +2056,30 @@ export const TemplateList = (type, context) => {
             datedisable: true,
             group: "customers",
           },
+          job_lifecycle_date_detail: {
+            title: i18n.t("reportcenter.templates.job_lifecycle_date_detail"),
+            subject: i18n.t("reportcenter.templates.job_lifecycle_date_detail"),
+            key: "job_lifecycle_date_detail",
+            //idtype: "vendor",
+            disabled: false,
+            rangeFilter: {
+              object: i18n.t("reportcenter.labels.objects.jobs"),
+              field: i18n.t("jobs.fields.date_invoiced"),
+            },
+            group: "jobs",
+          },
+          job_lifecycle_date_summary: {
+            title: i18n.t("reportcenter.templates.job_lifecycle_date_summary"),
+            subject: i18n.t("reportcenter.templates.job_lifecycle_date_summary"),
+            key: "job_lifecycle_date_summary",
+            //idtype: "vendor",
+            disabled: false,
+            rangeFilter: {
+              object: i18n.t("reportcenter.labels.objects.jobs"),
+              field: i18n.t("jobs.fields.date_invoiced"),
+            },
+            group: "jobs",
+          },
         }
       : {}),
     ...(!type || type === "courtesycarcontract"

hasura/metadata/tables.yaml

@@ -259,28 +259,30 @@
                 - active:
                     _eq: true
         columns:
-          - id
+          - billid
+          - bodyshopid
           - created
-          - operation
+          - id
+          - jobid
           - new_val
           - old_val
+          - operation
+          - type
           - useremail
-          - bodyshopid
-          - jobid
-          - billid
   select_permissions:
     - role: user
       permission:
         columns:
+          - billid
+          - bodyshopid
+          - created
           - id
+          - jobid
           - new_val
           - old_val
           - operation
+          - type
           - useremail
-          - created
-          - billid
-          - bodyshopid
-          - jobid
         filter:
           bodyshop:
             associations:
@@ -567,6 +569,13 @@
           table:
             name: parts_orders
             schema: public
+    - name: tasks
+      using:
+        foreign_key_constraint_on:
+          column: billid
+          table:
+            name: tasks
+            schema: public
   insert_permissions:
     - role: user
       permission:
@@ -816,6 +825,13 @@
           table:
             name: inventory
             schema: public
+    - name: ioevents
+      using:
+        foreign_key_constraint_on:
+          column: bodyshopid
+          table:
+            name: ioevents
+            schema: public
     - name: jobs
       using:
         foreign_key_constraint_on:
@@ -844,6 +860,13 @@
           table:
             name: phonebook
             schema: public
+    - name: tasks
+      using:
+        foreign_key_constraint_on:
+          column: bodyshopid
+          table:
+            name: tasks
+            schema: public
     - name: timetickets
       using:
         foreign_key_constraint_on:
@@ -2673,6 +2696,13 @@
 - table:
     name: ioevents
     schema: public
+  object_relationships:
+    - name: bodyshop
+      using:
+        foreign_key_constraint_on: bodyshopid
+    - name: user
+      using:
+        foreign_key_constraint_on: useremail
 - table:
     name: job_ar_schema
     schema: public
@@ -2822,6 +2852,13 @@
           table:
             name: parts_order_lines
             schema: public
+    - name: tasks
+      using:
+        foreign_key_constraint_on:
+          column: joblineid
+          table:
+            name: tasks
+            schema: public
   insert_permissions:
     - role: user
       permission:
@@ -3309,6 +3346,13 @@
           table:
             name: scoreboard
             schema: public
+    - name: tasks
+      using:
+        foreign_key_constraint_on:
+          column: jobid
+          table:
+            name: tasks
+            schema: public
     - name: timetickets
       using:
         foreign_key_constraint_on:
@@ -4198,7 +4242,7 @@
         interval_sec: 10
         num_retries: 0
         timeout_sec: 60
-      webhook_from_env: HASURA_API_URL
+      webhook: https://worktest.home.irony.online
       headers:
         - name: event-secret
           value_from_env: EVENT_SECRET
@@ -5006,6 +5050,13 @@
           table:
             name: parts_order_lines
             schema: public
+    - name: tasks
+      using:
+        foreign_key_constraint_on:
+          column: partsorderid
+          table:
+            name: tasks
+            schema: public
   insert_permissions:
     - role: user
       permission:
@@ -5621,6 +5672,128 @@
                         _eq: X-Hasura-User-Id
                   - active:
                       _eq: true
+- table:
+    name: tasks
+    schema: public
+  object_relationships:
+    - name: bill
+      using:
+        foreign_key_constraint_on: billid
+    - name: bodyshop
+      using:
+        foreign_key_constraint_on: bodyshopid
+    - name: job
+      using:
+        foreign_key_constraint_on: jobid
+    - name: jobline
+      using:
+        foreign_key_constraint_on: joblineid
+    - name: parts_order
+      using:
+        foreign_key_constraint_on: partsorderid
+    - name: user
+      using:
+        foreign_key_constraint_on: assigned_to
+    - name: userByCreatedBy
+      using:
+        foreign_key_constraint_on: created_by
+  insert_permissions:
+    - role: user
+      permission:
+        check:
+          bodyshop:
+            associations:
+              _and:
+                - user:
+                    authid:
+                      _eq: X-Hasura-User-Id
+                - active:
+                    _eq: true
+        columns:
+          - completed
+          - deleted
+          - priority
+          - assigned_to
+          - created_by
+          - description
+          - title
+          - completed_at
+          - created_at
+          - deleted_at
+          - due_date
+          - remind_at
+          - updated_at
+          - billid
+          - bodyshopid
+          - id
+          - jobid
+          - joblineid
+          - partsorderid
+  select_permissions:
+    - role: user
+      permission:
+        columns:
+          - completed
+          - deleted
+          - priority
+          - assigned_to
+          - created_by
+          - description
+          - title
+          - completed_at
+          - created_at
+          - deleted_at
+          - due_date
+          - remind_at
+          - updated_at
+          - billid
+          - bodyshopid
+          - id
+          - jobid
+          - joblineid
+          - partsorderid
+        filter:
+          bodyshop:
+            associations:
+              _and:
+                - user:
+                    authid:
+                      _eq: X-Hasura-User-Id
+                - active:
+                    _eq: true
+  update_permissions:
+    - role: user
+      permission:
+        columns:
+          - completed
+          - deleted
+          - priority
+          - assigned_to
+          - created_by
+          - description
+          - title
+          - completed_at
+          - created_at
+          - deleted_at
+          - due_date
+          - remind_at
+          - updated_at
+          - billid
+          - bodyshopid
+          - id
+          - jobid
+          - joblineid
+          - partsorderid
+        filter:
+          bodyshop:
+            associations:
+              _and:
+                - user:
+                    authid:
+                      _eq: X-Hasura-User-Id
+                - active:
+                    _eq: true
+        check: null
 - table:
     name: timetickets
     schema: public
@@ -6004,6 +6177,13 @@
           table:
             name: exportlog
             schema: public
+    - name: ioevents
+      using:
+        foreign_key_constraint_on:
+          column: useremail
+          table:
+            name: ioevents
+            schema: public
     - name: messages
       using:
         foreign_key_constraint_on:
@@ -6032,6 +6212,20 @@
           table:
             name: parts_orders
             schema: public
+    - name: tasks
+      using:
+        foreign_key_constraint_on:
+          column: assigned_to
+          table:
+            name: tasks
+            schema: public
+    - name: tasksByCreatedBy
+      using:
+        foreign_key_constraint_on:
+          column: created_by
+          table:
+            name: tasks
+            schema: public
     - name: timetickets
       using:
         foreign_key_constraint_on:

hasura/migrations/1709671738458_alter_table_public_audit_trail_add_column_type/down.sql

@@ -0,0 +1,4 @@
+-- Could not auto-generate a down migration.
+-- Please write an appropriate down migration for the SQL below:
+-- alter table "public"."audit_trail" add column "type" text
+--  null;

hasura/migrations/1709671738458_alter_table_public_audit_trail_add_column_type/up.sql

@@ -0,0 +1,2 @@
+alter table "public"."audit_trail" add column "type" text
+ null;

hasura/migrations/1710520532230_alter_table_public_ioevents_add_column_useremail/down.sql

@@ -0,0 +1,4 @@
+-- Could not auto-generate a down migration.
+-- Please write an appropriate down migration for the SQL below:
+-- alter table "public"."ioevents" add column "useremail" text
+--  not null;

hasura/migrations/1710520532230_alter_table_public_ioevents_add_column_useremail/up.sql

@@ -0,0 +1 @@
+alter table "public"."ioevents" add column "useremail" text;

hasura/migrations/1710520551755_alter_table_public_ioevents_add_column_bodyshopid/down.sql

@@ -0,0 +1,4 @@
+-- Could not auto-generate a down migration.
+-- Please write an appropriate down migration for the SQL below:
+-- alter table "public"."ioevents" add column "bodyshopid" uuid
+--  null;

hasura/migrations/1710520551755_alter_table_public_ioevents_add_column_bodyshopid/up.sql

@@ -0,0 +1,2 @@
+alter table "public"."ioevents" add column "bodyshopid" uuid
+ null;

hasura/migrations/1710520563676_alter_table_public_ioevents_alter_column_useremail/down.sql

@@ -0,0 +1 @@
+alter table "public"."ioevents" alter column "useremail" set not null;

hasura/migrations/1710520563676_alter_table_public_ioevents_alter_column_useremail/up.sql

@@ -0,0 +1 @@
+alter table "public"."ioevents" alter column "useremail" drop not null;

hasura/migrations/1710520583458_alter_table_public_ioevents_add_column_env/down.sql

@@ -0,0 +1,4 @@
+-- Could not auto-generate a down migration.
+-- Please write an appropriate down migration for the SQL below:
+-- alter table "public"."ioevents" add column "env" text
+--  null;

hasura/migrations/1710520583458_alter_table_public_ioevents_add_column_env/up.sql

@@ -0,0 +1,2 @@
+alter table "public"."ioevents" add column "env" text
+ null;

hasura/migrations/1710520629475_create_index_ioevents_useremail/down.sql

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

hasura/migrations/1710520629475_create_index_ioevents_useremail/up.sql

@@ -0,0 +1,2 @@
+CREATE  INDEX "ioevents_useremail" on
+  "public"."ioevents" using btree ("useremail");

hasura/migrations/1710520654372_set_fk_public_ioevents_useremail/down.sql

@@ -0,0 +1 @@
+alter table "public"."ioevents" drop constraint "ioevents_useremail_fkey";

hasura/migrations/1710520654372_set_fk_public_ioevents_useremail/up.sql

@@ -0,0 +1,5 @@
+alter table "public"."ioevents"
+  add constraint "ioevents_useremail_fkey"
+  foreign key ("useremail")
+  references "public"."users"
+  ("email") on update set null on delete set null;

hasura/migrations/1710520693899_set_fk_public_ioevents_bodyshopid/down.sql

@@ -0,0 +1 @@
+alter table "public"."ioevents" drop constraint "ioevents_bodyshopid_fkey";

hasura/migrations/1710520693899_set_fk_public_ioevents_bodyshopid/up.sql

@@ -0,0 +1,5 @@
+alter table "public"."ioevents"
+  add constraint "ioevents_bodyshopid_fkey"
+  foreign key ("bodyshopid")
+  references "public"."bodyshops"
+  ("id") on update set null on delete set null;

hasura/migrations/1710523428339_create_index_idx_audit_trail_type/down.sql

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

hasura/migrations/1710523428339_create_index_idx_audit_trail_type/up.sql

@@ -0,0 +1,2 @@
+CREATE  INDEX "idx_audit_trail_type" on
+  "public"."audit_trail" using btree ("type");

hasura/migrations/1710532848432_create_table_public_tasks/down.sql

@@ -0,0 +1 @@
+DROP TABLE "public"."tasks";

hasura/migrations/1710532848432_create_table_public_tasks/up.sql

@@ -0,0 +1,18 @@
+CREATE TABLE "public"."tasks" ("id" uuid NOT NULL DEFAULT gen_random_uuid(), "created_at" timestamptz NOT NULL DEFAULT now(), "updated_at" timestamptz NOT NULL DEFAULT now(), "title" text NOT NULL, "description" Text, "deleted" boolean NOT NULL DEFAULT false, "deleted_at" timestamptz, "due_date" timestamptz, "created_by" text NOT NULL, "assigned_to" Text, "completed" boolean NOT NULL DEFAULT false, "completed_at" timestamptz, "remind_at" timestamptz, "priority" numeric, "bodyshopid" UUID NOT NULL, "jobid" UUID NOT NULL, "joblineid" UUID, "partsorderid" UUID, "billid" UUID, PRIMARY KEY ("id") , FOREIGN KEY ("created_by") REFERENCES "public"."users"("email") ON UPDATE restrict ON DELETE restrict, FOREIGN KEY ("assigned_to") REFERENCES "public"."users"("email") ON UPDATE restrict ON DELETE restrict, FOREIGN KEY ("bodyshopid") REFERENCES "public"."bodyshops"("id") ON UPDATE restrict ON DELETE restrict, FOREIGN KEY ("jobid") REFERENCES "public"."jobs"("id") ON UPDATE cascade ON DELETE cascade, FOREIGN KEY ("joblineid") REFERENCES "public"."joblines"("id") ON UPDATE set null ON DELETE set null, FOREIGN KEY ("partsorderid") REFERENCES "public"."parts_orders"("id") ON UPDATE set null ON DELETE set null, FOREIGN KEY ("billid") REFERENCES "public"."bills"("id") ON UPDATE set null ON DELETE set null);
+CREATE OR REPLACE FUNCTION "public"."set_current_timestamp_updated_at"()
+RETURNS TRIGGER AS $$
+DECLARE
+  _new record;
+BEGIN
+  _new := NEW;
+  _new."updated_at" = NOW();
+  RETURN _new;
+END;
+$$ LANGUAGE plpgsql;
+CREATE TRIGGER "set_public_tasks_updated_at"
+BEFORE UPDATE ON "public"."tasks"
+FOR EACH ROW
+EXECUTE PROCEDURE "public"."set_current_timestamp_updated_at"();
+COMMENT ON TRIGGER "set_public_tasks_updated_at" ON "public"."tasks" 
+IS 'trigger to set value of column "updated_at" to current timestamp on row update';
+CREATE EXTENSION IF NOT EXISTS pgcrypto;

server/data/kaizen.js

@@ -201,19 +201,24 @@ exports.default = async (req, res) => {
     } finally {
       sftp.end();
     }
-    sendServerEmail({
-      subject: `Kaizen Report ${moment().format("MM-DD-YY")}`,
-      text: `Errors: ${allErrors.map((e) => JSON.stringify(e, null, 2))}
-      Uploaded: ${JSON.stringify(
-        allxmlsToUpload.map((x) => ({ filename: x.filename, count: x.count })),
-        null,
-        2
-      )}
-      `,
-    });
+    // sendServerEmail({
+    //   subject: `Kaizen Report ${moment().format("MM-DD-YY")}`,
+    //   text: `Errors: ${allErrors.map((e) => JSON.stringify(e, null, 2))}
+    //   Uploaded: ${JSON.stringify(
+    //     allxmlsToUpload.map((x) => ({ filename: x.filename, count: x.count })),
+    //     null,
+    //     2
+    //   )}
+    //   `,
+    // });
     res.sendStatus(200);
   } catch (error) {
     res.status(200).json(error);
+    sendServerEmail({
+      subject: `Kaizen Report ${moment().format("MM-DD-YY @ HH:mm:ss")}`,
+      text: `Errors: JSON.stringify(error)}
+      All Errors: ${allErrors.map((e) => JSON.stringify(e, null, 2))}`,
+    });
   }
 };
 

server/ioevent/ioevent.js

@@ -11,27 +11,40 @@ require("dotenv").config({
 });
 
 exports.default = async (req, res) => {
-  const { operationName, time, dbevent, user, imexshopid } = req.body;
+  const {
+    useremail,
+    bodyshopid,
+    operationName,
+    variables,
+    env,
+    time,
+    dbevent,
+    user,
+  } = req.body;
 
   try {
-    // await client.request(queries.INSERT_IOEVENT, {
-    //   event: {
-    //     operationname: operationName,
-    //     time,
-    //     dbevent,
-    //   },
-    // });
-    console.log("IOEVENT", operationName, time, dbevent, user, imexshopid);
-    logger.log("ioevent", "trace", user, null, {
-      imexshopid,
-      operationName,
-      time,
-      dbevent,
+    await client.request(queries.INSERT_IOEVENT, {
+      event: {
+        operationname: operationName,
+        time,
+        dbevent,
+        env,
+        variables,
+        bodyshopid,
+        useremail,
+      },
     });
-
     res.sendStatus(200);
   } catch (error) {
-    console.log("error", error);
-    res.status(400).send(error);
+    logger.log("ioevent-error", "trace", user, null, {
+      operationname: operationName,
+      time,
+      dbevent,
+      env,
+      variables,
+      bodyshopid,
+      useremail,
+    });
+    res.sendStatus(200);
   }
 };

server/job/job-lifecycle.js

@@ -3,6 +3,7 @@ const queries = require("../graphql-client/queries");
 const moment = require("moment");
 const durationToHumanReadable = require("../utils/durationToHumanReadable");
 const calculateStatusDuration = require("../utils/calculateStatusDuration");
+const getLifecycleStatusColor = require("../utils/getLifecycleStatusColor");
 
 const jobLifecycle = async (req, res) => {
     // Grab the jobids and statuses from the request body
@@ -28,12 +29,12 @@ const jobLifecycle = async (req, res) => {
             jobIDs,
             transitions: []
         });
-
     }
 
     const transitionsByJobId = _.groupBy(resp.transitions, 'jobid');
 
     const groupedTransitions = {};
+    const allDurations = [];
 
     for (let jobId in transitionsByJobId) {
         let lifecycle = transitionsByJobId[jobId].map(transition => {
@@ -53,15 +54,57 @@ const jobLifecycle = async (req, res) => {
             return transition;
         });
 
+        const durations = calculateStatusDuration(lifecycle, statuses);
+
         groupedTransitions[jobId] = {
-            lifecycle: lifecycle,
-            durations: calculateStatusDuration(lifecycle, statuses),
+            lifecycle,
+            durations
         };
+
+        if (durations?.summations) {
+            allDurations.push(durations.summations);
+        }
     }
 
+    const finalSummations = [];
+    const flatGroupedAllDurations = _.groupBy(allDurations.flat(),'status');
+
+    const finalStatusCounts = Object.keys(flatGroupedAllDurations).reduce((acc, status) => {
+        acc[status] = flatGroupedAllDurations[status].length;
+        return acc;
+    }, {});
+    // Calculate total value of all statuses
+    const finalTotal = Object.values(flatGroupedAllDurations).reduce((total, statusArr) => {
+        return total + statusArr.reduce((acc, curr) => acc + curr.value, 0);
+    }, 0);
+
+    Object.keys(flatGroupedAllDurations).forEach(status => {
+        const value = flatGroupedAllDurations[status].reduce((acc, curr) => acc + curr.value, 0);
+        const humanReadable = durationToHumanReadable(moment.duration(value));
+        const percentage = (value / finalTotal) * 100;
+        const color = getLifecycleStatusColor(status);
+        const roundedPercentage = `${Math.round(percentage)}%`;
+        finalSummations.push({
+            status,
+            value,
+            humanReadable,
+            percentage,
+            color,
+            roundedPercentage
+        });
+    });
+
     return res.status(200).json({
         jobIDs,
         transition: groupedTransitions,
+        durations: {
+            jobs: jobIDs.length,
+            summations: finalSummations,
+            totalStatuses: finalSummations.length,
+            total: finalTotal,
+            statusCounts: finalStatusCounts,
+            humanReadable:  durationToHumanReadable(moment.duration(finalTotal))
+        }
     });
 }
 

server/utils/calculateStatusDuration.js

@@ -1,15 +1,7 @@
 const durationToHumanReadable = require("./durationToHumanReadable");
 const moment = require("moment");
+const getLifecycleStatusColor = require("./getLifecycleStatusColor");
 const _ = require("lodash");
-const crypto = require('crypto');
-
-const getColor = (key) => {
-    const hash = crypto.createHash('sha256');
-    hash.update(key);
-    const hashedKey = hash.digest('hex');
-    const num = parseInt(hashedKey, 16);
-    return '#' + (num % 16777215).toString(16).padStart(6, '0');
-};
 
 const calculateStatusDuration = (transitions, statuses) => {
     let statusDuration = {};
@@ -33,26 +25,16 @@ const calculateStatusDuration = (transitions, statuses) => {
         if (!transition.prev_value) {
             statusDuration[transition.value] = {
                 value: duration,
-                humanReadable: transition.duration_readable
+                humanReadable: durationToHumanReadable(moment.duration(duration))
             };
-        } else if (!transition.next_value) {
+        }  else {
             if (statusDuration[transition.value]) {
                 statusDuration[transition.value].value += duration;
-                statusDuration[transition.value].humanReadable = transition.duration_readable;
+                statusDuration[transition.value].humanReadable = durationToHumanReadable(moment.duration(statusDuration[transition.value].value));
             } else {
                 statusDuration[transition.value] = {
                     value: duration,
-                    humanReadable: transition.duration_readable
-                };
-            }
-        } else {
-            if (statusDuration[transition.value]) {
-                statusDuration[transition.value].value += duration;
-                statusDuration[transition.value].humanReadable = transition.duration_readable;
-            } else {
-                statusDuration[transition.value] = {
-                    value: duration,
-                    humanReadable: transition.duration_readable
+                    humanReadable: durationToHumanReadable(moment.duration(duration))
                 };
             }
         }
@@ -79,7 +61,7 @@ const calculateStatusDuration = (transitions, statuses) => {
                 value,
                 humanReadable,
                 percentage: statusDuration[status].percentage,
-                color: getColor(status),
+                color: getLifecycleStatusColor(status),
                 roundedPercentage: `${Math.round(statusDuration[status].percentage)}%`
             });
         }

server/utils/getLifecycleStatusColor.js

@@ -0,0 +1,11 @@
+const crypto = require('crypto');
+
+const getLifecycleStatusColor = (key) => {
+    const hash = crypto.createHash('sha256');
+    hash.update(key);
+    const hashedKey = hash.digest('hex');
+    const num = parseInt(hashedKey, 16);
+    return '#' + (num % 16777215).toString(16).padStart(6, '0');
+};
+
+module.exports = getLifecycleStatusColor;