IO-2893 Enhance disable of editing of tickets

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

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

@@ -6,11 +6,11 @@ import {
   PauseCircleOutlined
 } from "@ant-design/icons";
 import { Card, Col, Row, Space, Tooltip } from "antd";
-import Dinero from "dinero.js";
 import React, { useMemo } from "react";
 import { useTranslation } from "react-i18next";
 import { Link } from "react-router-dom";
 import { DateTimeFormatter } from "../../utils/DateFormatter";
+import Dinero from "dinero.js";
 
 import ProductionAlert from "../production-list-columns/production-list-columns.alert.component";
 import ProductionListColumnProductionNote from "../production-list-columns/production-list-columns.productionnote.component";
@@ -18,8 +18,8 @@ import ProductionSubletsManageComponent from "../production-sublets-manage/produ
 
 import dayjs from "../../utils/day";
 
-import JobPartsQueueCount from "../job-parts-queue-count/job-parts-queue-count.component";
 import OwnerNameDisplay from "../owner-name-display/owner-name-display.component";
+import JobPartsQueueCount from "../job-parts-queue-count/job-parts-queue-count.component";
 
 const cardColor = (ssbuckets, totalHrs) => {
   const bucket = ssbuckets.find((bucket) => bucket.gte <= totalHrs && (!bucket.lt || bucket.lt > totalHrs));
@@ -213,13 +213,21 @@ const EstimatorToolTip = ({ metadata, cardSettings }) => {
 };
 
 const SubtotalTooltip = ({ metadata, cardSettings, t }) => {
-  const dineroAmount = Dinero(metadata?.job_totals?.totals?.subtotal ?? Dinero()).toFormat();
+  const amount = metadata?.job_totals?.totals?.subtotal?.amount;
+  const dineroAmount = amount ? Dinero({ amount: parseInt(amount * 100) }).toFormat("0,0.00") : null;
 
   return (
     cardSettings?.subtotal && (
       <Col span={cardSettings.compact ? 24 : 12}>
-        <EllipsesToolTip title={`${dineroAmount}`} kiosk={cardSettings.kiosk}>
-          {dineroAmount}
+        <EllipsesToolTip
+          title={!!amount ? `${t("production.statistics.currency_symbol")}${dineroAmount}` : null}
+          kiosk={cardSettings.kiosk}
+        >
+          {!!amount ? (
+            <span>{`${t("production.statistics.currency_symbol")}${dineroAmount}`}</span>
+          ) : (
+            <span>&nbsp;</span>
+          )}
         </EllipsesToolTip>
       </Col>
     )

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

@@ -3,7 +3,6 @@ import { Card, Statistic } from "antd";
 import { useTranslation } from "react-i18next";
 import PropTypes from "prop-types";
 import { defaultKanbanSettings, statisticsItems } from "./settings/defaultKanbanSettings.js";
-import Dinero from "dinero.js";
 
 export const StatisticType = {
   HOURS: "hours",
@@ -32,33 +31,8 @@ const ProductionStatistics = ({ data, cardSettings, reducerData }) => {
     return items.reduce((acc, item) => acc + (item[key]?.aggregate?.sum?.[subKey] || 0), 0);
   };
 
-  const sumDineroAmounts = (items, key, getAmountFn) => {
-    return items.reduce(
-      (acc, item) => {
-        const amount = getAmountFn(item, key);
-        const dineroAmount = Dinero(amount ?? 0);
-        return acc.add(dineroAmount);
-      },
-      Dinero({ amount: 0 })
-    );
-  };
-
   const calculateTotalAmount = (items, key) => {
-    return items.reduce((acc, item) => acc.add(Dinero(item[key]?.totals?.subtotal ?? Dinero())), Dinero({ amount: 0 }));
-  };
-
-  const calculateReducerTotalAmount = (lanes, key) => {
-    return lanes.reduce(
-      (acc, lane) => {
-        return acc.add(
-          lane.cards.reduce(
-            (laneAcc, card) => laneAcc.add(Dinero(card.metadata[key]?.totals?.subtotal ?? Dinero())),
-            Dinero({ amount: 0 })
-          )
-        );
-      },
-      Dinero({ amount: 0 })
-    );
+    return items.reduce((acc, item) => acc + (item[key]?.totals?.subtotal?.amount || 0), 0);
   };
 
   const calculateReducerTotal = (lanes, key, subKey) => {
@@ -69,6 +43,14 @@ const ProductionStatistics = ({ data, cardSettings, reducerData }) => {
     }, 0);
   };
 
+  const calculateReducerTotalAmount = (lanes, key) => {
+    return lanes.reduce((acc, lane) => {
+      return (
+        acc + lane.cards.reduce((laneAcc, card) => laneAcc + (card.metadata[key]?.totals?.subtotal?.amount || 0), 0)
+      );
+    }, 0);
+  };
+
   const formatValue = (value, type) => {
     if (type === StatisticType.JOBS) {
       return value.toFixed(0);
@@ -105,15 +87,9 @@ const ProductionStatistics = ({ data, cardSettings, reducerData }) => {
   const totalAmountInProduction = useMemo(() => {
     if (!cardSettings.totalAmountInProduction) return null;
     const total = calculateTotalAmount(data, "job_totals");
-    return total.toFormat("$0,0.00");
+    return parseFloat(total.toFixed(2));
   }, [data, cardSettings.totalAmountInProduction]);
 
-  const totalAmountOnBoard = useMemo(() => {
-    if (!reducerData || !cardSettings.totalAmountOnBoard) return null;
-    const total = calculateReducerTotalAmount(reducerData.lanes, "job_totals");
-    return total.toFormat("$0,0.00");
-  }, [reducerData, cardSettings.totalAmountOnBoard]);
-
   const totalHrsOnBoard = useMemo(() => {
     if (!reducerData || !cardSettings.totalHrsOnBoard) return null;
     const total =
@@ -142,6 +118,12 @@ const ProductionStatistics = ({ data, cardSettings, reducerData }) => {
     [reducerData, cardSettings.jobsOnBoard]
   );
 
+  const totalAmountOnBoard = useMemo(() => {
+    if (!reducerData || !cardSettings.totalAmountOnBoard) return null;
+    const total = calculateReducerTotalAmount(reducerData.lanes, "job_totals");
+    return parseFloat(total.toFixed(2));
+  }, [reducerData, cardSettings.totalAmountOnBoard]);
+
   const tasksInProduction = useMemo(() => {
     if (!data || !cardSettings.tasksInProduction) return null;
     return data.reduce((acc, item) => acc + (item.tasks_aggregate?.aggregate?.count || 0), 0);
@@ -209,6 +191,7 @@ const ProductionStatistics = ({ data, cardSettings, reducerData }) => {
           <Statistic
             title={t(`production.statistics.${stat.label}`)}
             value={formatValue(stat.value, stat.type)}
+            prefix={stat.type === StatisticType.AMOUNT ? t("production.statistics.currency_symbol") : undefined}
             suffix={
               stat.type === StatisticType.HOURS
                 ? t("production.statistics.hours")

client/src/components/production-list-table/production-list-table.component.jsx

@@ -1,23 +1,23 @@
-import { SyncOutlined } from "@ant-design/icons";
-import { PageHeader } from "@ant-design/pro-layout";
-import { useSplitTreatments } from "@splitsoftware/splitio-react";
-import { Button, Dropdown, Input, Space, Statistic, Table } from "antd";
-import _ from "lodash";
 import React, { useEffect, useMemo, useRef, useState } from "react";
+import { Button, Dropdown, Input, Space, Statistic, Table } from "antd";
+import { PageHeader } from "@ant-design/pro-layout";
 import ReactDragListView from "react-drag-listview";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
 import { selectTechnician } from "../../redux/tech/tech.selectors";
 import { selectBodyshop, selectCurrentUser } from "../../redux/user/user.selectors";
-import Prompt from "../../utils/prompt.js";
-import AlertComponent from "../alert/alert.component.jsx";
 import ProductionListColumnsAdd from "../production-list-columns/production-list-columns.add.component";
 import ProductionListColumns from "../production-list-columns/production-list-columns.data";
 import ProductionListDetail from "../production-list-detail/production-list-detail.component";
-import { ProductionListConfigManager } from "./production-list-config-manager.component.jsx";
 import ProductionListPrint from "./production-list-print.component";
 import ResizeableTitle from "./production-list-table.resizeable.component";
+import { useSplitTreatments } from "@splitsoftware/splitio-react";
+import { SyncOutlined } from "@ant-design/icons";
+import Prompt from "../../utils/prompt.js";
+import _ from "lodash";
+import AlertComponent from "../alert/alert.component.jsx";
+import { ProductionListConfigManager } from "./production-list-config-manager.component.jsx";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
@@ -43,7 +43,7 @@ export function ProductionListTable({ loading, data, refetch, bodyshop, technici
   const initialStateRef = useRef(
     (bodyshop.production_config &&
       bodyshop.production_config.find((p) => p.name === defaultView)?.columns.tableState) ||
-      (bodyshop.production_config && bodyshop.production_config[0]?.columns.tableState) || {
+      bodyshop.production_config[0]?.columns.tableState || {
         sortedInfo: {},
         filteredInfo: { text: "" }
       }

client/src/components/tech-job-print-tickets/tech-job-print-tickets.component.jsx

@@ -1,4 +1,5 @@
 import { Button, Card, DatePicker, Form, Popover, Radio, Space } from "antd";
+import dayjs from "../../utils/day";
 import React, { useEffect, useState } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
@@ -6,12 +7,10 @@ import { createStructuredSelector } from "reselect";
 import { logImEXEvent } from "../../firebase/firebase.utils";
 import { selectTechnician } from "../../redux/tech/tech.selectors";
 import DatePIckerRanges from "../../utils/DatePickerRanges";
-import dayjs from "../../utils/day";
 import { GenerateDocument } from "../../utils/RenderTemplate";
 import { TemplateList } from "../../utils/TemplateConstants";
 
 const mapStateToProps = createStructuredSelector({
-  bodyshop: selectTechnician,
   technician: selectTechnician
 });
 const mapDispatchToProps = (dispatch) => ({
@@ -19,7 +18,7 @@ const mapDispatchToProps = (dispatch) => ({
 });
 export default connect(mapStateToProps, mapDispatchToProps)(TechJobPrintTickets);
 
-export function TechJobPrintTickets({ bodyshop, technician, event, attendacePrint }) {
+export function TechJobPrintTickets({ technician, event, attendacePrint }) {
   const { t } = useTranslation();
 
   const [loading, setLoading] = useState(false);
@@ -58,8 +57,7 @@ export function TechJobPrintTickets({ bodyshop, technician, event, attendacePrin
           subject:
             attendacePrint === true ? Templates.attendance_employee.subject : Templates.timetickets_employee.subject
         },
-        values.sendby,
-        bodyshop
+        values.sendby // === "email" ? "e" : "p"
       );
     } catch (error) {
       console.log(error);

client/src/components/time-ticket-list/time-ticket-list.component.jsx

@@ -12,7 +12,7 @@ import { DateFormatter, DateTimeFormatter } from "../../utils/DateFormatter";
 import { onlyUnique } from "../../utils/arrayHelper";
 import dayjs from "../../utils/day";
 import { alphaSort, dateSort } from "../../utils/sorters";
-import RbacWrapper, { HasRbacAccess } from "../rbac-wrapper/rbac-wrapper.component";
+import { HasRbacAccess } from "../rbac-wrapper/rbac-wrapper.component";
 import TimeTicketEnterButton from "../time-ticket-enter-button/time-ticket-enter-button.component";
 
 const mapStateToProps = createStructuredSelector({
@@ -52,6 +52,10 @@ export function TimeTicketList({
     splitKey: bodyshop.imexshopid
   });
 
+  const canEditCommittedTimeTickets = HasRbacAccess({ bodyshop, authLevel, action: "timetickets:editcommitted" });
+  const canEditTimeTickets = HasRbacAccess({ bodyshop, authLevel, action: "timetickets:edit" });
+  const canEditShiftTickets = HasRbacAccess({ bodyshop, authLevel, action: "timetickets:shiftedit" });
+
   const totals = useMemo(() => {
     if (timetickets)
       return timetickets.reduce(
@@ -65,6 +69,18 @@ export function TimeTicketList({
     return { productivehrs: 0, actualhrs: 0 };
   }, [timetickets]);
 
+  const isDisabled = (record) => {
+    if (disabled === true || !record.id) return true;
+
+    const isShiftTicket = !record.ciecacode;
+    const isCommitted = record.committed_at;
+    if (isShiftTicket) {
+      return !(canEditShiftTickets && (!isCommitted || canEditCommittedTimeTickets));
+    }
+    
+    return !(canEditTimeTickets && (!isCommitted || canEditCommittedTimeTickets));
+  };
+
   const columns = [
     ...(Enhanced_Payroll.treatment === "on"
       ? [
@@ -165,7 +181,7 @@ export function TimeTicketList({
       key: "memo",
       sorter: (a, b) => alphaSort(a.memo, b.memo),
       sortOrder: state.sortedInfo.columnKey === "memo" && state.sortedInfo.order,
-      render: (text, record) => (record.memo?.startsWith("timetickets.labels") ? t(record.memo) : record.memo)
+      render: (text, record) => (record.clockon || record.clockoff ? t(record.memo) : record.memo)
     },
     ...(Enhanced_Payroll.treatment === "on"
       ? [
@@ -241,59 +257,16 @@ export function TimeTicketList({
             </TimeTicketEnterButton>
           )}
           {!techConsole && (
-            <RbacWrapper
-              action="timetickets:edit"
-              noauth={() => {
-                return <div />;
+            <TimeTicketEnterButton
+              actions={{ refetch }}
+              context={{
+                id: record.id,
+                timeticket: record
               }}
+              disabled={isDisabled(record)}
             >
-              <TimeTicketEnterButton
-                actions={{ refetch }}
-                context={{
-                  id: record.id,
-                  timeticket: record
-                }}
-                disabled={
-                  record.ciecacode
-                    ? record.committed_at
-                      ? HasRbacAccess({
-                          bodyshop,
-                          authLevel: authLevel,
-                          action: "timetickets:editcommitted"
-                        }) &&
-                        HasRbacAccess({
-                          bodyshop,
-                          authLevel: authLevel,
-                          action: "timetickets:edit"
-                        })
-                      : HasRbacAccess({
-                          bodyshop,
-                          authLevel: authLevel,
-                          action: "timetickets:edit"
-                        })
-                    : record.committed_at
-                      ? HasRbacAccess({
-                          bodyshop,
-                          authLevel: authLevel,
-                          action: "timetickets:editcommitted"
-                        }) &&
-                        HasRbacAccess({
-                          bodyshop,
-                          authLevel: authLevel,
-                          action: "timetickets:shiftedit"
-                        })
-                      : HasRbacAccess({
-                            bodyshop,
-                            authLevel: authLevel,
-                            action: "timetickets:shiftedit"
-                          })
-                        ? disabled
-                        : !record.jobid
-                }
-              >
-                <EditFilled />
-              </TimeTicketEnterButton>
-            </RbacWrapper>
+              <EditFilled />
+            </TimeTicketEnterButton>
           )}
         </Space>
       )

client/src/components/time-ticket-modal/time-ticket-modal.component.jsx

@@ -1,5 +1,4 @@
 import { useLazyQuery } from "@apollo/client";
-import { useSplitTreatments } from "@splitsoftware/splitio-react";
 import { Form, Input, InputNumber, Select, Switch } from "antd";
 import React from "react";
 import { useTranslation } from "react-i18next";
@@ -8,10 +7,8 @@ import { createStructuredSelector } from "reselect";
 import { GET_LINE_TICKET_BY_PK } from "../../graphql/jobs-lines.queries";
 import { selectAuthLevel, selectBodyshop } from "../../redux/user/user.selectors";
 import EmployeeSearchSelect from "../employee-search-select/employee-search-select.component";
-import {
-  default as DateTimePicker,
-  default as FormDateTimePicker
-} from "../form-date-time-picker/form-date-time-picker.component";
+import FormDateTimePicker from "../form-date-time-picker/form-date-time-picker.component";
+import DateTimePicker from "../form-date-time-picker/form-date-time-picker.component";
 import JobSearchSelect from "../job-search-select/job-search-select.component";
 import LaborAllocationsTable from "../labor-allocations-table/labor-allocations-table.component";
 import { CalculateAllocationsTotals } from "../labor-allocations-table/labor-allocations-table.utility";
@@ -19,6 +16,7 @@ import LayoutFormRow from "../layout-form-row/layout-form-row.component";
 import LoadingSkeleton from "../loading-skeleton/loading-skeleton.component";
 import { HasRbacAccess } from "../rbac-wrapper/rbac-wrapper.component";
 import TimeTicketList from "../time-ticket-list/time-ticket-list.component";
+import { useSplitTreatments } from "@splitsoftware/splitio-react";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
@@ -71,7 +69,13 @@ export function TimeTicketModalComponent({
   };
 
   const MemoInput = ({ value, ...props }) => {
-    return <Input value={value?.startsWith("timetickets.labels") ? t(value) : value} {...props} />;
+    return (
+      <Input
+        value={value?.startsWith("timetickets.") ? t(value) : value}
+        {...props}
+        disabled={value?.startsWith("timetickets.") || disabled}
+      />
+    );
   };
 
   return (

client/src/components/time-ticket-shift-active/time-ticket-shift-active.component.jsx

@@ -39,7 +39,7 @@ export default function TimeTicketShiftActive({ timetickets, refetch, isTechCons
               renderItem={(ticket) => (
                 <List.Item>
                   <Card
-                    title={ticket.memo?.startsWith("timetickets.labels") ? t(ticket.memo) : ticket.memo}
+                    title={t(ticket.memo)}
                     actions={[
                       <TechClockOffButton
                         jobId={ticket.jobid}

hasura/metadata/cron_triggers.yaml

@@ -1,19 +1,3 @@
-- name: AutoHouse Data Pump
-  webhook: '{{HASURA_API_URL}}/data/ah'
-  schedule: 0 6 * * *
-  include_in_metadata: true
-  payload: {}
-  headers:
-    - name: x-imex-auth
-      value_from_env: DATAPUMP_AUTH
-- name: Claimscorp Data Pump
-  webhook: '{{HASURA_API_URL}}/data/cc'
-  schedule: 30 6 * * *
-  include_in_metadata: true
-  payload: {}
-  headers:
-    - name: x-imex-auth
-      value_from_env: DATAPUMP_AUTH
 - name: Kaizen Data Pump
   webhook: '{{HASURA_API_URL}}/data/kaizen'
   schedule: 30 5 * * *

server/data/autohouse.js

@@ -31,12 +31,6 @@ const ftpSetup = {
 };
 
 exports.default = async (req, res) => {
-  // Only process if in production environment.
-  if (process.env.NODE_ENV !== "production") {
-    res.sendStatus(403);
-    return;
-  }
-
   //Query for the List of Bodyshop Clients.
   logger.log("autohouse-start", "DEBUG", "api", null, null);
   const { bodyshops } = await client.request(queries.GET_AUTOHOUSE_SHOPS);

server/data/claimscorp.js

@@ -31,12 +31,6 @@ const ftpSetup = {
 };
 
 exports.default = async (req, res) => {
-  // Only process if in production environment.
-  if (process.env.NODE_ENV !== "production") {
-    res.sendStatus(403);
-    return;
-  }
-
   //Query for the List of Bodyshop Clients.
   logger.log("claimscorp-start", "DEBUG", "api", null, null);
   const { bodyshops } = await client.request(queries.GET_CLAIMSCORP_SHOPS);

server/data/kaizen.js

@@ -31,12 +31,6 @@ const ftpSetup = {
 };
 
 exports.default = async (req, res) => {
-  // Only process if in production environment.
-  if (process.env.NODE_ENV !== "production") {
-    res.sendStatus(403);
-    return;
-  }
-
   //Query for the List of Bodyshop Clients.
   logger.log("kaizen-start", "DEBUG", "api", null, null);
   const kaizenShopsIDs = ["SUMMIT", "STRATHMORE", "SUNRIDGE", "SHAW"];