IO-3592 WIP Summary Reports

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

client/src/components/eula/eula.component.jsx

@@ -25,6 +25,7 @@ const Eula = ({ currentEula, currentUser, acceptEula }) => {
 
   const handleScroll = useCallback(
     (e) => {
+      if (!e.target) return;
       const bottom = e.target.scrollHeight - 100 <= e.target.scrollTop + e.target.clientHeight;
       if (bottom && !hasEverScrolledToBottom) {
         setHasEverScrolledToBottom(true);
@@ -36,7 +37,9 @@ const Eula = ({ currentEula, currentUser, acceptEula }) => {
   );
 
   useEffect(() => {
-    handleScroll({ target: markdownCardRef.current });
+    if (markdownCardRef.current) {
+      handleScroll({ target: markdownCardRef.current });
+    }
   }, [handleScroll]);
 
   const handleChange = useCallback(() => {

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

@@ -1,7 +1,7 @@
 import Icon from "@ant-design/icons";
 import { useMutation } from "@apollo/client/react";
 import { Button, Input, Popover, Tooltip } from "antd";
-import { useState, useRef } from "react";
+import { useState } from "react";
 import { useTranslation } from "react-i18next";
 import { FaRegStickyNote } from "react-icons/fa";
 import { UPDATE_JOB } from "../../graphql/jobs.queries";
@@ -9,10 +9,10 @@ import { logImEXEvent } from "../../firebase/firebase.utils";
 
 export default function ProductionListColumnComment({ record, usePortal = false }) {
   const { t } = useTranslation();
+
   const [note, setNote] = useState(record.comment || "");
+
   const [open, setOpen] = useState(false);
-  const textAreaRef = useRef(null);
-  const rafIdRef = useRef(null);
 
   const [updateAlert] = useMutation(UPDATE_JOB);
 
@@ -38,35 +38,23 @@ export default function ProductionListColumnComment({ record, usePortal = false
   };
 
   const handleOpenChange = (flag) => {
-    if (rafIdRef.current) {
-      cancelAnimationFrame(rafIdRef.current);
-      rafIdRef.current = null;
-    }
     setOpen(flag);
-    if (flag) {
-      setNote(record.comment || "");
-      rafIdRef.current = requestAnimationFrame(() => {
-        rafIdRef.current = null;
-        if (textAreaRef.current?.focus) {
-          try {
-            textAreaRef.current.focus({ preventScroll: true });
-          } catch {
-            textAreaRef.current.focus();
-          }
-        }
-      });
-    }
+    if (flag) setNote(record.comment || "");
   };
 
   const content = (
-    <div style={{ width: "30em" }} onClick={(e) => e.stopPropagation()} onPointerDown={(e) => e.stopPropagation()}>
+    <div 
+      style={{ width: "30em" }} 
+      onClick={(e) => e.stopPropagation()}
+      onPointerDown={(e) => e.stopPropagation()}
+    >
       <Input.TextArea
         id={`job-comment-${record.id}`}
         name="comment"
         rows={5}
         value={note}
         onChange={handleChange}
-        ref={textAreaRef}
+        autoFocus
         allowClear
         style={{ marginBottom: "1em" }}
       />
@@ -79,13 +67,13 @@ export default function ProductionListColumnComment({ record, usePortal = false
   );
 
   return (
-    <Popover
-      onOpenChange={handleOpenChange}
-      open={open}
-      content={content}
-      trigger="click"
+    <Popover 
+      onOpenChange={handleOpenChange} 
+      open={open} 
+      content={content} 
+      trigger="click" 
       destroyOnHidden
-      styles={{ body: { padding: "12px" } }}
+      styles={{ body: { padding: '12px' } }}
       {...(usePortal ? { getPopupContainer: (trigger) => trigger.parentElement || document.body } : {})}
     >
       <div

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

@@ -1,7 +1,7 @@
 import Icon from "@ant-design/icons";
 import { useMutation } from "@apollo/client/react";
 import { Button, Input, Popover, Space } from "antd";
-import { useCallback, useRef, useState } from "react";
+import { useCallback, useState } from "react";
 import { useTranslation } from "react-i18next";
 import { FaRegStickyNote } from "react-icons/fa";
 import { logImEXEvent } from "../../firebase/firebase.utils";
@@ -20,8 +20,6 @@ function ProductionListColumnProductionNote({ record, setNoteUpsertContext, useP
   const { t } = useTranslation();
   const [note, setNote] = useState(record.production_vars?.note || "");
   const [open, setOpen] = useState(false);
-  const textAreaRef = useRef(null);
-  const rafIdRef = useRef(null);
 
   const [updateAlert] = useMutation(UPDATE_JOB);
 
@@ -54,37 +52,25 @@ function ProductionListColumnProductionNote({ record, setNoteUpsertContext, useP
 
   const handleOpenChange = useCallback(
     (flag) => {
-      if (rafIdRef.current) {
-        cancelAnimationFrame(rafIdRef.current);
-        rafIdRef.current = null;
-      }
       setOpen(flag);
-      if (flag) {
-        setNote(record.production_vars?.note || "");
-        rafIdRef.current = requestAnimationFrame(() => {
-          rafIdRef.current = null;
-          if (textAreaRef.current?.focus) {
-            try {
-              textAreaRef.current.focus({ preventScroll: true });
-            } catch {
-              textAreaRef.current.focus();
-            }
-          }
-        });
-      }
+      if (flag) setNote(record.production_vars?.note || "");
     },
     [record]
   );
 
   const content = (
-    <div style={{ width: "30em" }} onClick={(e) => e.stopPropagation()} onPointerDown={(e) => e.stopPropagation()}>
+    <div 
+      style={{ width: "30em" }} 
+      onClick={(e) => e.stopPropagation()}
+      onPointerDown={(e) => e.stopPropagation()}
+    >
       <Input.TextArea
         id={`job-production-note-${record.id}`}
         name="production_note"
         rows={5}
         value={note}
         onChange={handleChange}
-        ref={textAreaRef}
+        autoFocus
         allowClear
         style={{ marginBottom: "1em" }}
       />
@@ -110,13 +96,13 @@ function ProductionListColumnProductionNote({ record, setNoteUpsertContext, useP
   );
 
   return (
-    <Popover
-      onOpenChange={handleOpenChange}
-      open={open}
-      content={content}
-      trigger="click"
+    <Popover 
+      onOpenChange={handleOpenChange} 
+      open={open} 
+      content={content} 
+      trigger="click" 
       destroyOnHidden
-      styles={{ body: { padding: "12px" } }}
+      styles={{ body: { padding: '12px' } }}
       {...(usePortal ? { getPopupContainer: (trigger) => trigger.parentElement || document.body } : {})}
     >
       <div

client/src/translations/en_us/common.json

@@ -3372,8 +3372,10 @@
         "void_ros": "Void ROs",
         "work_in_progress_committed_labour": "Work in Progress - Committed Labor",
         "work_in_progress_jobs": "Work in Progress - Jobs",
-        "work_in_progress_labour": "Work in Progress - Labor",
-        "work_in_progress_payables": "Work in Progress - Payables"
+        "work_in_progress_labour": "Work in Progress - Labor (Detail)",
+        "work_in_progress_labour_summary": "Work in Progress - Labor (Summary)",
+        "work_in_progress_payables": "Work in Progress - Payables (Detail)",
+        "work_in_progress_payables_summary": "Work in Progress - Payables (Summary)"
       }
     },
     "schedule": {

client/src/translations/es/common.json

@@ -3373,7 +3373,9 @@
         "work_in_progress_committed_labour": "",
         "work_in_progress_jobs": "",
         "work_in_progress_labour": "",
-        "work_in_progress_payables": ""
+        "work_in_progress_labour_summary": "",
+        "work_in_progress_payables": "",
+        "work_in_progress_payables_summary": ""
       }
     },
     "schedule": {

client/src/translations/fr/common.json

@@ -3373,7 +3373,9 @@
         "work_in_progress_committed_labour": "",
         "work_in_progress_jobs": "",
         "work_in_progress_labour": "",
-        "work_in_progress_payables": ""
+        "work_in_progress_labour_summary": "",
+        "work_in_progress_payables": "",
+        "work_in_progress_payables_summary": ""
       }
     },
     "schedule": {

client/src/utils/TemplateConstants.js

@@ -1717,6 +1717,20 @@ export const TemplateList = (type, context) => {
             group: "jobs",
             featureNameRestricted: "timetickets"
           },
+          work_in_progress_labour_summary: {
+            title: i18n.t("reportcenter.templates.work_in_progress_labour_summary"),
+            description: "",
+            subject: i18n.t("reportcenter.templates.work_in_progress_labour_summary"),
+            key: "work_in_progress_labour_summary",
+            //idtype: "vendor",
+            disabled: false,
+            rangeFilter: {
+              object: i18n.t("reportcenter.labels.objects.jobs"),
+              field: i18n.t("jobs.fields.date_open")
+            },
+            group: "jobs",
+            featureNameRestricted: "timetickets"
+          },
           work_in_progress_committed_labour: {
             title: i18n.t("reportcenter.templates.work_in_progress_committed_labour"),
             description: "",
@@ -1746,6 +1760,20 @@ export const TemplateList = (type, context) => {
             group: "jobs",
             featureNameRestricted: "bills"
           },
+          work_in_progress_payables_summary: {
+            title: i18n.t("reportcenter.templates.work_in_progress_payables_summary"),
+            description: "",
+            subject: i18n.t("reportcenter.templates.work_in_progress_payables_summary"),
+            key: "work_in_progress_payables_summary",
+            //idtype: "vendor",
+            disabled: false,
+            rangeFilter: {
+              object: i18n.t("reportcenter.labels.objects.jobs"),
+              field: i18n.t("jobs.fields.date_open")
+            },
+            group: "jobs",
+            featureNameRestricted: "bills"
+          },
           lag_time: {
             title: i18n.t("reportcenter.templates.lag_time"),
             description: "",