Resolve event env var.

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

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

@@ -1,169 +0,0 @@
-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_order_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,391 +1,380 @@
-import Icon, {SyncOutlined} from "@ant-design/icons";
-import {gql, useMutation, useQuery} from "@apollo/client";
-import {Button, Dropdown, Menu, notification, PageHeader, Space} from "antd";
+import Icon, { SyncOutlined } from "@ant-design/icons";
+import { gql, useMutation, useQuery } from "@apollo/client";
+import { Button, Dropdown, Menu, PageHeader, Space, notification } 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: []}),
+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 },
+      },
     });
+    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 {loading, error, data, refetch} = useQuery(
-        createDashboardQuery(state),
-        {fetchPolicy: "network-only", nextFetchPolicy: "network-only"}
-    );
+    const items = _.cloneDeep(state.items);
 
-    const [updateLayout] = useMutation(UPDATE_DASHBOARD_LAYOUT);
+    items.splice(idxToRemove, 1);
+    setState({ ...state, items });
+  };
 
-    const handleLayoutChange = async (layout, layouts) => {
-        logImEXEvent("dashboard_change_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,
+        },
+      ],
+    });
+  };
 
-        setState({...state, layout, layouts});
+  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>
+  );
 
-        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),
-                }),
-            });
+  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 handleRemoveComponent = (key) => {
-        logImEXEvent("dashboard_remove_component", {name: key});
-        const idxToRemove = state.items.findIndex((i) => i.i === key);
+      />
 
-        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}
+      <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,
+              }}
             >
-                {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>
-    );
+              <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>
+  );
 }
 
 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,
-    },
-    // 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,
-    },
+  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,
+  },
 };
 
 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-detail-cards/job-detail-cards.totals.component.jsx

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

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

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

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

@@ -43,13 +43,13 @@ export function JobEmployeeAssignmentsContainer({
     });
     if (refetch) refetch();
 
-    if (!!!result.errors) {
-      insertAuditTrail({
-        jobid: job.id,
-        operation: AuditTrailMapping.jobassignmentchange(operation, name),
-        type: "jobassignmentchange",
-      });
-    } else {
+    insertAuditTrail({
+      jobid: job.id,
+      operation: AuditTrailMapping.jobassignmentchange(operation, name),
+      type: "jobassignmentchange",
+    });
+
+    if (!!result.errors) {
       notification["error"]({
         message: t("jobs.errors.assigning", {
           message: JSON.stringify(result.errors),
@@ -67,19 +67,18 @@ export function JobEmployeeAssignmentsContainer({
       variables: { jobId: job.id, job: { [empAssignment]: null } },
     });
 
-    if (!!!result.errors) {
-      insertAuditTrail({
-        jobid: job.id,
-        operation: AuditTrailMapping.jobassignmentremoved(operation),
-        type: "jobassignmentremoved",
-      });
-    } else {
+    if (!!result.errors) {
       notification["error"]({
         message: t("jobs.errors.assigning", {
           message: JSON.stringify(result.errors),
         }),
       });
     }
+    insertAuditTrail({
+      jobid: job.id,
+      operation: AuditTrailMapping.jobassignmentremoved(operation),
+      type: "jobassignmentremoved",
+    });
     setLoading(false);
   };
 

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

@@ -4,7 +4,7 @@ import {
   PauseCircleOutlined,
   WarningFilled,
 } from "@ant-design/icons";
-import { Card, Col, Divider, Row, Space, Tag, Tooltip } from "antd";
+import { Card, Col, Row, Space, Tag, Tooltip } from "antd";
 import React, { useState } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
@@ -26,7 +26,6 @@ import ProductionListColumnComment from "../production-list-columns/production-l
 import ProductionListColumnProductionNote from "../production-list-columns/production-list-columns.productionnote.component";
 import VehicleVinDisplay from "../vehicle-vin-display/vehicle-vin-display.component";
 import "./jobs-detail-header.styles.scss";
-import moment from "moment";
 
 const mapStateToProps = createStructuredSelector({
   jobRO: selectJobReadOnly,
@@ -63,13 +62,6 @@ 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 (
@@ -101,9 +93,7 @@ export function JobsDetailHeader({ job, bodyshop, disabled }) {
                 {job.status === bodyshop.md_ro_statuses.default_scheduled &&
                 job.scheduled_in ? (
                   <Tag>
-                    <Link to={`/manage/schedule?date=${moment(job.scheduled_in).format('YYYY-MM-DD')}`}>
-                      <DateTimeFormatter>{job.scheduled_in}</DateTimeFormatter>
-                    </Link>
+                    <DateTimeFormatter>{job.scheduled_in}</DateTimeFormatter>
                   </Tag>
                 ) : null}
               </Space>
@@ -309,11 +299,6 @@ 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/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,15 +44,6 @@ 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}`}>
@@ -76,15 +67,9 @@ 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-queue-list/parts-queue.list.component.jsx

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

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

@@ -1,6 +1,7 @@
 import { BranchesOutlined, PauseCircleOutlined } from "@ant-design/icons";
 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";
@@ -189,12 +190,17 @@ const r = ({ technician, state, activeStatuses, data, bodyshop }) => {
         state.sortedInfo.columnKey === "date_next_contact" &&
         state.sortedInfo.order,
       render: (text, record) => (
-        <ProductionListDate
-          record={record}
-          field="date_next_contact"
-          pastIndicator
-          time
-        />
+        <span
+          style={{
+            color:
+              record.date_next_contact &&
+              moment(record.date_next_contact).isBefore(moment())
+                ? "red"
+                : "",
+          }}
+        >
+          <ProductionListDate record={record} field="date_next_contact" time />
+        </span>
       ),
     },
     {

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

@@ -5,7 +5,6 @@ import {
   Input,
   InputNumber,
   Select,
-  Space,
   Switch,
   Typography,
 } from "antd";
@@ -18,7 +17,6 @@ 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 {
@@ -193,7 +191,7 @@ export function ShopInfoResponsibilityCenterComponent({ bodyshop, form }) {
           </LayoutFormRow>
           <LayoutFormRow header={t("bodyshop.labels.dms.cdk.payers")}>
             <Form.List name={["cdk_configuration", "payers"]}>
-              {(fields, { add, remove, move }) => {
+              {(fields, { add, remove }) => {
                 return (
                   <div>
                     {fields.map((field, index) => (
@@ -251,18 +249,11 @@ export function ShopInfoResponsibilityCenterComponent({ bodyshop, form }) {
                             </Select>
                           </Form.Item>
 
-                          <Space align="center">
-                            <DeleteFilled
-                              onClick={() => {
-                                remove(field.name);
-                              }}
-                            />
-                            <FormListMoveArrows
-                              move={move}
-                              index={index}
-                              total={fields.length}
-                            />
-                          </Space>
+                          <DeleteFilled
+                            onClick={() => {
+                              remove(field.name);
+                            }}
+                          />
                         </LayoutFormRow>
                       </Form.Item>
                     ))}
@@ -354,7 +345,7 @@ export function ShopInfoResponsibilityCenterComponent({ bodyshop, form }) {
         id="costs"
       >
         <Form.List name={["md_responsibility_centers", "costs"]}>
-          {(fields, { add, remove, move }) => {
+          {(fields, { add, remove }) => {
             return (
               <div>
                 {fields.map((field, index) => (
@@ -471,18 +462,12 @@ export function ShopInfoResponsibilityCenterComponent({ bodyshop, form }) {
                           <Input onBlur={handleBlur} />
                         </Form.Item>
                       )}
-                      <Space align="center">
-                        <DeleteFilled
-                          onClick={() => {
-                            remove(field.name);
-                          }}
-                        />
-                        <FormListMoveArrows
-                          move={move}
-                          index={index}
-                          total={fields.length}
-                        />
-                      </Space>
+
+                      <DeleteFilled
+                        onClick={() => {
+                          remove(field.name);
+                        }}
+                      />
                     </LayoutFormRow>
                   </Form.Item>
                 ))}
@@ -508,7 +493,7 @@ export function ShopInfoResponsibilityCenterComponent({ bodyshop, form }) {
         id="profits"
       >
         <Form.List name={["md_responsibility_centers", "profits"]}>
-          {(fields, { add, remove, move }) => {
+          {(fields, { add, remove }) => {
             return (
               <div>
                 {fields.map((field, index) => (
@@ -610,18 +595,11 @@ export function ShopInfoResponsibilityCenterComponent({ bodyshop, form }) {
                           <Input onBlur={handleBlur} />
                         </Form.Item>
                       )}
-                      <Space align="center">
-                        <DeleteFilled
-                          onClick={() => {
-                            remove(field.name);
-                          }}
-                        />
-                        <FormListMoveArrows
-                          move={move}
-                          index={index}
-                          total={fields.length}
-                        />
-                      </Space>
+                      <DeleteFilled
+                        onClick={() => {
+                          remove(field.name);
+                        }}
+                      />
                     </LayoutFormRow>
                   </Form.Item>
                 ))}

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

@@ -7,9 +7,7 @@ import { createStructuredSelector } from "reselect";
 import { selectBodyshop } from "../../redux/user/user.selectors";
 import CurrencyFormatter from "../../utils/CurrencyFormatter";
 import { alphaSort, statusSort } from "../../utils/sorters";
-import OwnerNameDisplay, {
-  OwnerNameDisplayFunction,
-} from "../owner-name-display/owner-name-display.component";
+import OwnerNameDisplay from "../owner-name-display/owner-name-display.component";
 import VehicleDetailUpdateJobsComponent from "../vehicle-detail-update-jobs/vehicle-detail-update-jobs.component";
 
 const mapStateToProps = createStructuredSelector({
@@ -47,10 +45,6 @@ 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} />
@@ -69,15 +63,9 @@ 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,9 +4,8 @@ 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 { alphaSort } from './../../utils/sorters';
+import {pageLimit} from "../../utils/config";
 export default function VehiclesListComponent({
   loading,
   vehicles,
@@ -32,8 +31,6 @@ 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>
@@ -54,10 +51,8 @@ export default function VehiclesListComponent({
     },
     {
       title: t("vehicles.fields.plate_no"),
-      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,
+      dataIndex: "plate",
+      key: "plate",
       render: (text, record) => {
         return (
           <span>{`${record.plate_st || ""} | ${record.plate_no || ""}`}</span>

client/src/firebase/firebase.utils.js

@@ -4,8 +4,6 @@ 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);
@@ -88,18 +86,6 @@ 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/vehicles.queries.js

@@ -31,7 +31,6 @@ 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/translations/en_us/common.json

@@ -259,7 +259,6 @@
 				"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",
@@ -478,6 +477,7 @@
 						"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": "Payers"
+						"payers": "CDK 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.",
-				"surveycompletesubtitle": "This survey was already completed on {{date}}.",
-				"surveycompletetitle": "Survey previously completed"
+				"surveycompletetitle": "Survey previously completed",
+				"surveycompletesubtitle": "This survey was already completed on {{date}}."
 			},
 			"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"
+				"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."
 			},
 			"successes": {
 				"created": "CSI created successfully.",
@@ -898,8 +898,7 @@
 				"scheduledindate": "Sheduled In Today: {{date}}",
 				"scheduledintoday": "Sheduled In Today",
 				"scheduledoutdate": "Sheduled Out Today: {{date}}",
-				"scheduledouttoday": "Sheduled Out Today",
-				"joblifecycle": "Job Lifecycle"
+				"scheduledouttoday": "Sheduled Out Today"
 			}
 		},
 		"dms": {
@@ -1237,15 +1236,7 @@
 				"relative_end": "Relative End",
 				"relative_start": "Relative Start",
 				"start": "Start",
-				"value": "Value",
-				"status": "Status",
-				"percentage": "Percentage",
-				"human_readable": "Human Readable",
-				"status_count": "In Status"
-			},
-			"titles": {
-				"dashboard": "Job Lifecycle",
-				"top_durations": "Top Durations"
+				"value": "Value"
 			},
 			"content": {
 				"current_status_accumulated_time": "Current Status Accumulated Time",
@@ -1257,9 +1248,7 @@
 				"title": "Job Lifecycle Component",
 				"title_durations": "Historical Status Durations",
 				"title_loading": "Loading",
-				"title_transitions": "Transitions",
-				"calculated_based_on": "Calculated based on",
-				"jobs_in_since": "Jobs in since"
+				"title_transitions": "Transitions"
 			},
 			"errors": {
 				"fetch": "Error getting Job Lifecycle Data"
@@ -1834,7 +1823,6 @@
 				"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",
@@ -2429,7 +2417,6 @@
 				"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": {
@@ -2596,17 +2583,17 @@
 			},
 			"labels": {
 				"advanced_filters": "Advanced Filters and Sorters",
-				"advanced_filters_false": "False",
+				"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_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}}",
@@ -2688,8 +2675,6 @@
 				"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,7 +259,6 @@
 				"saving": ""
 			},
 			"fields": {
-				"ReceivableCustomField": "",
 				"address1": "",
 				"address2": "",
 				"appt_alt_transport": "",
@@ -478,6 +477,7 @@
 						"editaccess": ""
 					}
 				},
+				"ReceivableCustomField": "",
 				"responsibilitycenter": "",
 				"responsibilitycenter_accountdesc": "",
 				"responsibilitycenter_accountitem": "",
@@ -844,8 +844,8 @@
 				"notconfigured": "",
 				"notfoundsubtitle": "",
 				"notfoundtitle": "",
-				"surveycompletesubtitle": "",
-				"surveycompletetitle": ""
+				"surveycompletetitle": "",
+				"surveycompletesubtitle": ""
 			},
 			"fields": {
 				"completedon": "",
@@ -854,13 +854,13 @@
 				"validuntil": ""
 			},
 			"labels": {
-				"copyright": "",
-				"greeting": "",
-				"intro": "",
 				"nologgedinuser": "",
 				"nologgedinuser_sub": "",
 				"noneselected": "",
-				"title": ""
+				"title": "",
+				"greeting": "",
+				"intro": "",
+				"copyright": ""
 			},
 			"successes": {
 				"created": "",
@@ -898,8 +898,7 @@
 				"scheduledindate": "",
 				"scheduledintoday": "",
 				"scheduledoutdate": "",
-				"scheduledouttoday": "",
-				"joblifecycle": ""
+				"scheduledouttoday": ""
 			}
 		},
 		"dms": {
@@ -1237,15 +1236,7 @@
 				"relative_end": "",
 				"relative_start": "",
 				"start": "",
-				"value": "",
-				"status": "",
-				"percentage": "",
-				"human_readable": "",
-				"status_count": ""
-			},
-			"titles": {
-				"dashboard": "",
-				"top_durations": ""
+				"value": ""
 			},
 			"content": {
 				"current_status_accumulated_time": "",
@@ -1257,9 +1248,7 @@
 				"title": "",
 				"title_durations": "",
 				"title_loading": "",
-				"title_transitions": "",
-				"calculated_based_on": "",
-				"jobs_in_since": ""
+				"title_transitions": ""
 			},
 			"errors": {
 				"fetch": "Error al obtener los datos del ciclo de vida del trabajo"
@@ -1834,7 +1823,6 @@
 				"job": "",
 				"jobcosting": "",
 				"jobtotals": "",
-				"labor_hrs": "",
 				"labor_rates_subtotal": "",
 				"laborallocations": "",
 				"labortotals": "",
@@ -2429,7 +2417,6 @@
 				"invoice_total_payable": "",
 				"iou_form": "",
 				"job_costing_ro": "",
-				"job_lifecycle_ro": "",
 				"job_notes": "",
 				"key_tag": "",
 				"labels": {
@@ -2596,17 +2583,17 @@
 			},
 			"labels": {
 				"advanced_filters": "",
-				"advanced_filters_false": "",
+				"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_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": "",
@@ -2688,8 +2675,6 @@
 				"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,7 +259,6 @@
 				"saving": ""
 			},
 			"fields": {
-				"ReceivableCustomField": "",
 				"address1": "",
 				"address2": "",
 				"appt_alt_transport": "",
@@ -478,6 +477,7 @@
 						"editaccess": ""
 					}
 				},
+				"ReceivableCustomField": "",
 				"responsibilitycenter": "",
 				"responsibilitycenter_accountdesc": "",
 				"responsibilitycenter_accountitem": "",
@@ -844,8 +844,8 @@
 				"notconfigured": "",
 				"notfoundsubtitle": "",
 				"notfoundtitle": "",
-				"surveycompletesubtitle": "",
-				"surveycompletetitle": ""
+				"surveycompletetitle": "",
+				"surveycompletesubtitle": ""
 			},
 			"fields": {
 				"completedon": "",
@@ -854,13 +854,13 @@
 				"validuntil": ""
 			},
 			"labels": {
-				"copyright": "",
-				"greeting": "",
-				"intro": "",
 				"nologgedinuser": "",
 				"nologgedinuser_sub": "",
 				"noneselected": "",
-				"title": ""
+				"title": "",
+				"greeting": "",
+				"intro": "",
+				"copyright": ""
 			},
 			"successes": {
 				"created": "",
@@ -1236,15 +1236,7 @@
 				"relative_end": "",
 				"relative_start": "",
 				"start": "",
-				"value": "",
-				"status": "",
-				"percentage": "",
-				"human_readable": "",
-				"status_count": ""
-			},
-			"titles": {
-				"dashboard": "",
-				"top_durations": ""
+				"value": ""
 			},
 			"content": {
 				"current_status_accumulated_time": "",
@@ -1256,10 +1248,7 @@
 				"title": "",
 				"title_durations": "",
 				"title_loading": "",
-				"title_transitions": "",
-				"calculated_based_on": "",
-				"jobs_in_since": "",
-				"joblifecycle": ""
+				"title_transitions": ""
 			},
 			"errors": {
 				"fetch": "Erreur lors de l'obtention des données du cycle de vie des tâches"
@@ -1834,7 +1823,6 @@
 				"job": "",
 				"jobcosting": "",
 				"jobtotals": "",
-				"labor_hrs": "",
 				"labor_rates_subtotal": "",
 				"laborallocations": "",
 				"labortotals": "",
@@ -2429,7 +2417,6 @@
 				"invoice_total_payable": "",
 				"iou_form": "",
 				"job_costing_ro": "",
-				"job_lifecycle_ro": "",
 				"job_notes": "",
 				"key_tag": "",
 				"labels": {
@@ -2596,17 +2583,17 @@
 			},
 			"labels": {
 				"advanced_filters": "",
-				"advanced_filters_false": "",
+				"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_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": "",
@@ -2688,8 +2675,6 @@
 				"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,14 +514,6 @@ 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"
@@ -2056,30 +2048,6 @@ 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

@@ -569,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:
@@ -818,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:
@@ -846,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:
@@ -2675,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
@@ -2824,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:
@@ -3311,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:
@@ -4200,7 +4242,7 @@
         interval_sec: 10
         num_retries: 0
         timeout_sec: 60
-      webhook: https://worktest.home.irony.online
+      webhook_from_env: HASURA_API_URL
       headers:
         - name: event-secret
           value_from_env: EVENT_SECRET
@@ -5008,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:
@@ -5623,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
@@ -6006,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:
@@ -6034,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/1710520532230_alter_table_public_ioevents_add_column_useremail/down.sql

@@ -1,4 +0,0 @@
--- 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

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

hasura/migrations/1710520551755_alter_table_public_ioevents_add_column_bodyshopid/down.sql

@@ -1,4 +0,0 @@
--- 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

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

hasura/migrations/1710520563676_alter_table_public_ioevents_alter_column_useremail/down.sql

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

hasura/migrations/1710520563676_alter_table_public_ioevents_alter_column_useremail/up.sql

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

hasura/migrations/1710520583458_alter_table_public_ioevents_add_column_env/down.sql

@@ -1,4 +0,0 @@
--- 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

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

hasura/migrations/1710520629475_create_index_ioevents_useremail/down.sql

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

hasura/migrations/1710520629475_create_index_ioevents_useremail/up.sql

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

hasura/migrations/1710520654372_set_fk_public_ioevents_useremail/down.sql

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

hasura/migrations/1710520654372_set_fk_public_ioevents_useremail/up.sql

@@ -1,5 +0,0 @@
-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

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

hasura/migrations/1710520693899_set_fk_public_ioevents_bodyshopid/up.sql

@@ -1,5 +0,0 @@
-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

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

hasura/migrations/1710523428339_create_index_idx_audit_trail_type/up.sql

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

server/job/job-lifecycle.js

@@ -3,7 +3,6 @@ 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
@@ -29,12 +28,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 => {
@@ -54,57 +53,15 @@ const jobLifecycle = async (req, res) => {
             return transition;
         });
 
-        const durations = calculateStatusDuration(lifecycle, statuses);
-
         groupedTransitions[jobId] = {
-            lifecycle,
-            durations
+            lifecycle: lifecycle,
+            durations: calculateStatusDuration(lifecycle, statuses),
         };
-
-        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,7 +1,15 @@
 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 = {};
@@ -25,16 +33,26 @@ const calculateStatusDuration = (transitions, statuses) => {
         if (!transition.prev_value) {
             statusDuration[transition.value] = {
                 value: duration,
-                humanReadable: durationToHumanReadable(moment.duration(duration))
+                humanReadable: transition.duration_readable
             };
-        }  else {
+        } else if (!transition.next_value) {
             if (statusDuration[transition.value]) {
                 statusDuration[transition.value].value += duration;
-                statusDuration[transition.value].humanReadable = durationToHumanReadable(moment.duration(statusDuration[transition.value].value));
+                statusDuration[transition.value].humanReadable = transition.duration_readable;
             } else {
                 statusDuration[transition.value] = {
                     value: duration,
-                    humanReadable: durationToHumanReadable(moment.duration(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
                 };
             }
         }
@@ -61,7 +79,7 @@ const calculateStatusDuration = (transitions, statuses) => {
                 value,
                 humanReadable,
                 percentage: statusDuration[status].percentage,
-                color: getLifecycleStatusColor(status),
+                color: getColor(status),
                 roundedPercentage: `${Math.round(statusDuration[status].percentage)}%`
             });
         }

server/utils/getLifecycleStatusColor.js

@@ -1,11 +0,0 @@
-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;