IO-3480 Production List Actual Completion

Signed-off-by: Allan Carr <allan@imexsystems.ca>

client/src/components/job-parts-received/job-parts-received.component.jsx

@@ -1,105 +0,0 @@
-import { useCallback, useMemo, useState } from "react";
-import PropTypes from "prop-types";
-import { Popover } from "antd";
-import { connect } from "react-redux";
-import { createStructuredSelector } from "reselect";
-import { selectBodyshop } from "../../redux/user/user.selectors";
-import JobPartsQueueCount from "../job-parts-queue-count/job-parts-queue-count.component";
-import { useTranslation } from "react-i18next";
-
-const mapStateToProps = createStructuredSelector({
-  bodyshop: selectBodyshop
-});
-
-/**
- * Displays "Parts Received" summary (modeled after the Production Board List column),
- * and on click shows a popover with the Parts Status grid (existing JobPartsQueueCount UI).
- * @param bodyshop
- * @param parts
- * @param displayMode
- * @param popoverPlacement
- * @returns {JSX.Element}
- * @constructor
- */
-export function JobPartsReceived({ bodyshop, parts, displayMode = "full", popoverPlacement = "top" }) {
-  const [open, setOpen] = useState(false);
-  const { t } = useTranslation();
-
-  const summary = useMemo(() => {
-    const receivedStatus = bodyshop?.md_order_statuses?.default_received;
-
-    if (!Array.isArray(parts) || parts.length === 0 || !receivedStatus) {
-      return { total: 0, received: 0, percentLabel: t("general.labels.na") };
-    }
-
-    // Keep consistent with JobPartsQueueCount: exclude PAS / PASL from parts math
-    const { total, received } = parts.reduce(
-      (acc, val) => {
-        if (val?.part_type === "PAS" || val?.part_type === "PASL") return acc;
-        const count = Number(val?.count || 0);
-        acc.total += count;
-
-        if (val?.status === receivedStatus) {
-          acc.received += count;
-        }
-        return acc;
-      },
-      { total: 0, received: 0 }
-    );
-
-    const percentLabel = total > 0 ? `${Math.round((received / total) * 100)}%` : t("general.labels.na");
-    return { total, received, percentLabel };
-  }, [parts, bodyshop?.md_order_statuses?.default_received]);
-
-  const canOpen = summary.total > 0;
-
-  const handleOpenChange = useCallback(
-    (nextOpen) => {
-      if (!canOpen) return;
-      setOpen(nextOpen);
-    },
-    [canOpen]
-  );
-
-  const displayText =
-    displayMode === "compact" ? summary.percentLabel : `${summary.percentLabel} (${summary.received}/${summary.total})`;
-
-  // Prevent row/cell click handlers (table selection, drawer selection, etc.)
-  const stop = (e) => e.stopPropagation();
-
-  return (
-    <Popover
-      open={open}
-      onOpenChange={handleOpenChange}
-      trigger={["click"]}
-      placement={popoverPlacement}
-      content={
-        <div onClick={stop} style={{ minWidth: 260 }}>
-          <JobPartsQueueCount parts={parts} />
-        </div>
-      }
-    >
-      <div
-        onClick={stop}
-        style={{
-          width: "100%",
-          height: "19px",
-          cursor: canOpen ? "pointer" : "default",
-          userSelect: "none"
-        }}
-        title={canOpen ? t("production.labels.click_for_statuses") : undefined}
-      >
-        {displayText}
-      </div>
-    </Popover>
-  );
-}
-
-JobPartsReceived.propTypes = {
-  bodyshop: PropTypes.object,
-  parts: PropTypes.array,
-  displayMode: PropTypes.oneOf(["full", "compact"]),
-  popoverPlacement: PropTypes.string
-};
-
-export default connect(mapStateToProps)(JobPartsReceived);

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

@@ -16,11 +16,11 @@ import { pageLimit } from "../../utils/config";
 import { alphaSort, dateSort } from "../../utils/sorters";
 import useLocalStorage from "../../utils/useLocalStorage";
 import AlertComponent from "../alert/alert.component";
+import JobPartsQueueCount from "../job-parts-queue-count/job-parts-queue-count.component";
 import JobRemoveFromPartsQueue from "../job-remove-from-parst-queue/job-remove-from-parts-queue.component";
 import OwnerNameDisplay, { OwnerNameDisplayFunction } from "../owner-name-display/owner-name-display.component";
 import ProductionListColumnComment from "../production-list-columns/production-list-columns.comment.component";
 import { logImEXEvent } from "../../firebase/firebase.utils";
-import JobPartsReceived from "../job-parts-received/job-parts-received.component";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop
@@ -235,9 +235,7 @@ export function PartsQueueListComponent({ bodyshop }) {
       title: t("jobs.fields.partsstatus"),
       dataIndex: "partsstatus",
       key: "partsstatus",
-      render: (text, record) => (
-        <JobPartsReceived parts={record.joblines_status} displayMode="full" popoverPlacement="topLeft" />
-      )
+      render: (text, record) => <JobPartsQueueCount parts={record.joblines_status} />
     },
     {
       title: t("jobs.fields.comment"),

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

@@ -19,7 +19,6 @@ import JobPartsQueueCount from "../job-parts-queue-count/job-parts-queue-count.c
 import OwnerNameDisplay from "../owner-name-display/owner-name-display.component";
 import ShareToTeamsButton from "../share-to-teams/share-to-teams.component.jsx";
 import { PiMicrosoftTeamsLogo } from "react-icons/pi";
-import ProductionListColumnPartsReceived from "../production-list-columns/production-list-columns.partsreceived.component";
 
 const cardColor = (ssbuckets, totalHrs) => {
   const bucket = ssbuckets.find((bucket) => bucket.gte <= totalHrs && (!bucket.lt || bucket.lt > totalHrs));
@@ -313,20 +312,6 @@ const TasksToolTip = ({ metadata, cardSettings, t }) =>
     </Col>
   );
 
-const PartsReceivedComponent = ({ metadata, cardSettings, card }) =>
-  cardSettings?.partsreceived && (
-    <Col span={24} style={{ textAlign: "center" }}>
-      <ProductionListColumnPartsReceived
-        displayMode="full"
-        popoverPlacement="topLeft"
-        record={{
-          ...metadata,
-          id: card?.id,
-          refetch: card?.refetch
-        }}
-      />
-    </Col>
-  );
 export default function ProductionBoardCard({ technician, card, bodyshop, cardSettings }) {
   const { t } = useTranslation();
   const { metadata } = card;
@@ -426,7 +411,6 @@ export default function ProductionBoardCard({ technician, card, bodyshop, cardSe
       <SubletsComponent metadata={metadata} cardSettings={cardSettings} />
       <ProductionNoteComponent metadata={metadata} cardSettings={cardSettings} card={card} />
       <PartsStatusComponent metadata={metadata} cardSettings={cardSettings} />
-      <PartsReceivedComponent metadata={metadata} cardSettings={cardSettings} card={card} />
     </Row>
   );
 

client/src/components/production-board-kanban/settings/InformationSettings.jsx

@@ -18,8 +18,7 @@ const InformationSettings = ({ t }) => (
         "partsstatus",
         "estimator",
         "subtotal",
-        "tasks",
-        "partsreceived"
+        "tasks"
       ].map((item) => (
         <Col xs={24} sm={12} md={8} lg={6} key={item}>
           <Form.Item name={item} valuePropName="checked">

client/src/components/production-board-kanban/settings/defaultKanbanSettings.js

@@ -74,7 +74,6 @@ const defaultKanbanSettings = {
   cardSize: "small",
   model_info: true,
   kiosk: false,
-  partsreceived: false,
   totalHrs: true,
   totalAmountInProduction: false,
   totalLAB: true,

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

@@ -161,7 +161,6 @@ const productionListColumnsData = ({ technician, state, activeStatuses, data, bo
       dataIndex: "actual_in_time",
       key: "actual_in_time",
       ellipsis: true,
-
       render: (text, record) => <TimeFormatter>{record.actual_in}</TimeFormatter>
     },
     {
@@ -181,6 +180,22 @@ const productionListColumnsData = ({ technician, state, activeStatuses, data, bo
 
       render: (text, record) => <TimeFormatter>{record.scheduled_completion}</TimeFormatter>
     },
+    {
+      title: i18n.t("jobs.fields.actual_completion"),
+      dataIndex: "actual_completion",
+      key: "actual_completion",
+      ellipsis: true,
+      sorter: (a, b) => dateSort(a.actual_completion, b.actual_completion),
+      sortOrder: state.sortedInfo.columnKey === "actual_completion" && state.sortedInfo.order,
+      render: (text, record) => <ProductionListDate record={record} field="actual_completion" time />
+    },
+    {
+      title: i18n.t("jobs.fields.actual_completion") + " (HH:MM)",
+      dataIndex: "actual_completion_time",
+      key: "actual_completion_time",
+      ellipsis: true,
+      render: (text, record) => <TimeFormatter>{record.actual_completion}</TimeFormatter>
+    },
     {
       title: i18n.t("jobs.fields.date_last_contacted"),
       dataIndex: "date_last_contacted",

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

@@ -1,5 +1,33 @@
-import JobPartsReceived from "../job-parts-received/job-parts-received.component";
+import { useMemo } from "react";
+import { connect } from "react-redux";
+import { createStructuredSelector } from "reselect";
+import { selectBodyshop } from "../../redux/user/user.selectors";
 
-export default function ProductionListColumnPartsReceived({ record }) {
-  return <JobPartsReceived parts={record.joblines_status} displayMode="full" popoverPlacement="topLeft" />;
+const mapStateToProps = createStructuredSelector({
+  bodyshop: selectBodyshop
+});
+const mapDispatchToProps = () => ({
+  //setUserLanguage: language => dispatch(setUserLanguage(language))
+});
+export default connect(mapStateToProps, mapDispatchToProps)(ProductionListColumnPartsReceived);
+
+export function ProductionListColumnPartsReceived({ bodyshop, record }) {
+  const amount = useMemo(() => {
+    const amount = record.joblines_status.reduce(
+      (acc, val) => {
+        acc.total += val.count;
+        acc.received =
+          val.status === bodyshop.md_order_statuses.default_received ? acc.received + val.count : acc.received;
+        return acc;
+      },
+      { total: 0, received: 0 }
+    );
+
+    return {
+      ...amount,
+      percent: amount.total !== 0 ? ((amount.received / amount.total) * 100).toFixed(0) + "%" : "N/A"
+    };
+  }, [record, bodyshop.md_order_statuses]);
+
+  return `${amount.percent} (${amount.received}/${amount.total})`;
 }

client/src/graphql/jobs.queries.js

@@ -1096,6 +1096,7 @@ export const UPDATE_JOB = gql`
         scheduled_completion
         scheduled_delivery
         actual_in
+        actual_completion
         date_repairstarted
         date_void
         date_lost_sale
@@ -2592,6 +2593,7 @@ export const QUERY_JOBS_IN_PRODUCTION = gql`
       vehicleid
       plate_no
       actual_in
+      actual_completion
       scheduled_completion
       scheduled_delivery
       date_last_contacted

client/src/redux/user/user.sagas.js

@@ -239,22 +239,13 @@ export function* signInSuccessSaga({ payload }) {
 
   try {
     window.$crisp.push(["set", "user:nickname", [payload.displayName || payload.email]]);
-    const currentUserSegment = InstanceRenderManager({
-      imex: "imex-online-user",
-      rome: "rome-online-user"
-    });
-    window.$crisp.push(["set", "session:segments", [[currentUserSegment]]]);
 
     InstanceRenderManager({
       executeFunction: true,
       args: [],
-      imex: () => {
-        window.$crisp.push(["set", "session:segments", [["imex"]]]);
-      },
       rome: () => {
         window.$zoho.salesiq.visitor.name(payload.displayName || payload.email);
         window.$zoho.salesiq.visitor.email(payload.email);
-        window.$crisp.push(["set", "session:segments", [["rome"]]]);
       }
     });
 
@@ -262,11 +253,13 @@ export function* signInSuccessSaga({ payload }) {
     try {
       const state = yield select();
       const isParts = state?.application?.isPartsEntry === true;
-      const instanceSeg = InstanceRenderManager({ imex: "imex", rome: "rome" });
+      const instanceSeg = InstanceRenderManager({
+        imex: ["imex-online-user", "imex"],
+        rome: ["rome-online-user", "rome"]
+      });
       // Always ensure segments include instance + user, and append partsManagement if applicable
       const segs = [
-        currentUserSegment,
-        instanceSeg,
+        ...instanceSeg,
         ...(isParts
           ? [
               InstanceRenderManager({
@@ -373,7 +366,10 @@ export function* SetAuthLevelFromShopDetails({ payload }) {
 
       // Build consolidated Crisp segments including instance, region, features, and parts mode
       const isParts = yield select((state) => state.application.isPartsEntry === true);
-      const instanceSeg = InstanceRenderManager({ imex: "imex", rome: "rome" });
+      const instanceSeg = InstanceRenderManager({
+        imex: ["imex-online-user", "imex"],
+        rome: ["rome-online-user", "rome"]
+      });
 
       const featureSegments =
         payload.features?.allAccess === true
@@ -402,7 +398,7 @@ export function* SetAuthLevelFromShopDetails({ payload }) {
       featureSegments.push(...additionalSegments);
 
       const regionSeg = payload.region_config ? `region:${payload.region_config}` : null;
-      const segments = [instanceSeg, ...(regionSeg ? [regionSeg] : []), ...featureSegments];
+      const segments = [...instanceSeg, ...(regionSeg ? [regionSeg] : []), ...featureSegments];
       if (isParts) {
         segments.push(InstanceRenderManager({ imex: "ImexPartsManagement", rome: "RomePartsManagement" }));
       }

client/src/translations/en_us/common.json

@@ -2950,8 +2950,6 @@
         "settings": "Error saving board settings: {{error}}"
       },
       "labels": {
-        "click_for_statuses": "Click to view parts statuses",
-        "partsreceived": "Parts Received",
         "actual_in": "Actual In",
         "addnewprofile": "Add New Profile",
         "alert": "Alert",

client/src/translations/es/common.json

@@ -2950,8 +2950,6 @@
         "settings": ""
       },
       "labels": {
-        "click_for_statuses": "",
-        "partsreceived": "",
         "actual_in": "",
         "addnewprofile": "",
         "alert": "",

client/src/translations/fr/common.json

@@ -2950,8 +2950,6 @@
         "settings": ""
       },
       "labels": {
-        "click_for_statuses": "",
-        "partsreceived": "",
         "actual_in": "",
         "addnewprofile": "",
         "alert": "",