- Add Tasks to production board (and required refactors)

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

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

@@ -18,7 +18,8 @@ const InformationSettings = ({ t }) => (
         "sublets",
         "partsstatus",
         "estimator",
-        "subtotal"
+        "subtotal",
+        "tasks"
       ].map((item) => (
         <Col span={4} key={item}>
           <Form.Item name={item} valuePropName="checked">

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

@@ -8,7 +8,9 @@ const statisticsItems = [
   { id: 6, name: "totalAmountOnBoard", label: "total_amount_on_board" },
   { id: 7, name: "totalLABOnBoard", label: "total_lab_on_board" },
   { id: 8, name: "totalLAROnBoard", label: "total_lar_on_board" },
-  { id: 9, name: "jobsOnBoard", label: "total_jobs_on_board" }
+  { id: 9, name: "jobsOnBoard", label: "total_jobs_on_board" },
+  { id: 10, name: "tasksOnBoard", label: "tasks_on_board" },
+  { id: 11, name: "tasksInProduction", label: "tasks_in_production" }
 ];
 
 const defaultKanbanSettings = {
@@ -23,6 +25,7 @@ const defaultKanbanSettings = {
   scheduled_completion: true,
   cardcolor: false,
   orientation: false,
+  tasks: false,
   cardSize: "small",
   model_info: true,
   kiosk: false,
@@ -35,6 +38,8 @@ const defaultKanbanSettings = {
   totalLABOnBoard: false,
   totalLAROnBoard: false,
   jobsOnBoard: false,
+  tasksOnBoard: false,
+  tasksInProduction: false,
   totalAmountOnBoard: true,
   estimator: false,
   subtotal: false,
@@ -43,4 +48,20 @@ const defaultKanbanSettings = {
   selectedEstimators: []
 };
 
-export { defaultKanbanSettings, statisticsItems };
+const mergeWithDefaults = (settings) => {
+  // Create a new object that starts with the default settings
+  const mergedSettings = { ...defaultKanbanSettings };
+
+  // Override with the provided settings, if any
+  if (settings) {
+    for (const key in settings) {
+      if (settings.hasOwnProperty(key)) {
+        mergedSettings[key] = settings[key];
+      }
+    }
+  }
+
+  return mergedSettings;
+};
+
+export { defaultKanbanSettings, statisticsItems, mergeWithDefaults };

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

@@ -3,13 +3,14 @@ import { Button, Card, Col, Form, notification, Popover, Row, Tabs } from "antd"
 import React, { useEffect, useState } from "react";
 import { useTranslation } from "react-i18next";
 import { UPDATE_KANBAN_SETTINGS } from "../../../graphql/user.queries.js";
-import { defaultKanbanSettings } from "./defaultKanbanSettings.js";
+import { defaultKanbanSettings, mergeWithDefaults } from "./defaultKanbanSettings.js";
 import LayoutSettings from "./LayoutSettings.jsx";
 import InformationSettings from "./InformationSettings.jsx";
 import StatisticsSettings from "./StatisticsSettings.jsx";
 import FilterSettings from "./FilterSettings.jsx";
+import PropTypes from "prop-types";
 
-export default function ProductionBoardKanbanSettings({ associationSettings, parentLoading, bodyshop, data }) {
+function ProductionBoardKanbanSettings({ associationSettings, parentLoading, bodyshop, data }) {
   const [form] = Form.useForm();
   const [open, setOpen] = useState(false);
   const [loading, setLoading] = useState(false);
@@ -23,16 +24,11 @@ export default function ProductionBoardKanbanSettings({ associationSettings, par
 
   useEffect(() => {
     if (associationSettings?.kanban_settings) {
-      form.setFieldsValue(associationSettings.kanban_settings);
-      if (associationSettings.kanban_settings.statisticsOrder) {
-        setStatisticsOrder(associationSettings.kanban_settings.statisticsOrder);
-      }
-      if (associationSettings.kanban_settings.selectedMdInsCos) {
-        setSelectedMdInsCos(associationSettings.kanban_settings.selectedMdInsCos);
-      }
-      if (associationSettings.kanban_settings.selectedEstimators) {
-        setSelectedEstimators(associationSettings.kanban_settings.selectedEstimators);
-      }
+      const finalSettings = mergeWithDefaults(associationSettings.kanban_settings);
+      form.setFieldsValue(finalSettings);
+      setStatisticsOrder(finalSettings.statisticsOrder);
+      setSelectedMdInsCos(finalSettings.selectedMdInsCos);
+      setSelectedEstimators(finalSettings.selectedEstimators);
     }
   }, [form, associationSettings]);
 
@@ -155,3 +151,12 @@ export default function ProductionBoardKanbanSettings({ associationSettings, par
     </Popover>
   );
 }
+
+ProductionBoardKanbanSettings.propTypes = {
+  associationSettings: PropTypes.object,
+  parentLoading: PropTypes.func.isRequired,
+  bodyshop: PropTypes.object.isRequired,
+  data: PropTypes.array
+};
+
+export default ProductionBoardKanbanSettings;