- Add Tasks to production board (and required refactors)

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

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

@@ -2,11 +2,13 @@ import React, { useMemo } from "react";
 import { Card, Statistic } from "antd";
 import { useTranslation } from "react-i18next";
 import PropTypes from "prop-types";
-import { statisticsItems, defaultKanbanSettings } from "./settings/defaultKanbanSettings.js";
+import { defaultKanbanSettings, statisticsItems } from "./settings/defaultKanbanSettings.js";
+
 export const StatisticType = {
   HOURS: "hours",
   AMOUNT: "amount",
-  JOBS: "jobs"
+  JOBS: "jobs",
+  TASKS: "tasks"
 };
 
 const mergeStatistics = (items, values) => {
@@ -122,6 +124,20 @@ const ProductionStatistics = ({ data, cardSettings, reducerData }) => {
     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);
+  }, [data, cardSettings.tasksInProduction]);
+
+  const tasksOnBoard = useMemo(() => {
+    if (!reducerData || !cardSettings.tasksOnBoard) return null;
+    return reducerData.lanes.reduce((acc, lane) => {
+      return (
+        acc + lane.cards.reduce((laneAcc, card) => laneAcc + (card.metadata.tasks_aggregate?.aggregate?.count || 0), 0)
+      );
+    }, 0);
+  }, [reducerData, cardSettings.tasksOnBoard]);
+
   const statistics = useMemo(
     () =>
       mergeStatistics(statisticsItems, [
@@ -134,7 +150,9 @@ const ProductionStatistics = ({ data, cardSettings, reducerData }) => {
         { id: 6, value: totalAmountOnBoard, type: StatisticType.AMOUNT },
         { id: 7, value: totalLABOnBoard, type: StatisticType.HOURS },
         { id: 8, value: totalLAROnBoard, type: StatisticType.HOURS },
-        { id: 9, value: jobsOnBoard, type: StatisticType.JOBS }
+        { id: 9, value: jobsOnBoard, type: StatisticType.JOBS },
+        { id: 10, value: tasksOnBoard, type: StatisticType.TASKS },
+        { id: 11, value: tasksInProduction, type: StatisticType.TASKS }
       ]),
     [
       totalHrs,
@@ -146,7 +164,9 @@ const ProductionStatistics = ({ data, cardSettings, reducerData }) => {
       totalAmountOnBoard,
       totalLABOnBoard,
       totalLAROnBoard,
-      jobsOnBoard
+      jobsOnBoard,
+      tasksOnBoard,
+      tasksInProduction
     ]
   );
 
@@ -187,37 +207,9 @@ const ProductionStatistics = ({ data, cardSettings, reducerData }) => {
 };
 
 ProductionStatistics.propTypes = {
-  data: PropTypes.arrayOf(
-    PropTypes.shape({
-      labhrs: PropTypes.object,
-      larhrs: PropTypes.object,
-      job_totals: PropTypes.object
-    })
-  ).isRequired,
-  cardSettings: PropTypes.shape({
-    totalHrs: PropTypes.bool,
-    totalLAB: PropTypes.bool,
-    totalLAR: PropTypes.bool,
-    jobsInProduction: PropTypes.bool,
-    totalAmountInProduction: PropTypes.bool,
-    totalHrsOnBoard: PropTypes.bool,
-    totalLABOnBoard: PropTypes.bool,
-    totalLAROnBoard: PropTypes.bool,
-    jobsOnBoard: PropTypes.bool,
-    totalAmountOnBoard: PropTypes.bool,
-    statisticsOrder: PropTypes.arrayOf(PropTypes.number)
-  }).isRequired,
-  reducerData: PropTypes.shape({
-    lanes: PropTypes.arrayOf(
-      PropTypes.shape({
-        cards: PropTypes.arrayOf(
-          PropTypes.shape({
-            metadata: PropTypes.object
-          })
-        ).isRequired
-      })
-    ).isRequired
-  })
+  data: PropTypes.array.isRequired,
+  cardSettings: PropTypes.object.isRequired,
+  reducerData: PropTypes.object
 };
 
 export default ProductionStatistics;