From 4fbad6fb0a30d89549479ccddf0dba8efc66de1d Mon Sep 17 00:00:00 2001
From: alex <alex@roese.dev>
Date: Wed, 1 Nov 2023 20:19:28 +0100
Subject: [PATCH] checkbox

---
 .../Overview/GroupTasksViewModal.js           | 27 +++++++++----------
 .../Overview/GroupTypeSelectionModal.js       | 27 ++++++++++++++++++-
 2 files changed, 38 insertions(+), 16 deletions(-)

diff --git a/src/Pages/GroupTasks/Overview/GroupTasksViewModal.js b/src/Pages/GroupTasks/Overview/GroupTasksViewModal.js
index 9b03497..b47d282 100644
--- a/src/Pages/GroupTasks/Overview/GroupTasksViewModal.js
+++ b/src/Pages/GroupTasks/Overview/GroupTasksViewModal.js
@@ -174,7 +174,7 @@ export default function GroupTasksViewModal({ isOpen }) {
       if (specifiedTaskInputs.length > 0) {
         for (let i = 0; i < specifiedTaskInputs.length; i++) {
           if (specifiedTaskInputs[i].type === "search") {
-            foundSelectInputs.push(specifiedTaskInputs[i].id);
+            foundSelectInputs.push(specifiedTaskInputs[i].id.split("-")[6]);
             continue;
           }
 
@@ -206,8 +206,8 @@ export default function GroupTasksViewModal({ isOpen }) {
             break;
           }
 
-          taskInputs[specifiedTaskInputs[i].id.split("-")[6]] = {
-            value: specifiedTaskInputs[i].value,
+          taskInputs[specifiedTaskTextareas[i].id.split("-")[6]] = {
+            value: specifiedTaskTextareas[i].value,
           };
         }
       }
@@ -221,16 +221,12 @@ export default function GroupTasksViewModal({ isOpen }) {
         if (!selectInputsObjectKeys.includes(foundSelectInputs[i])) {
           canTaskContinued = false;
           break;
+        } else {
+          taskInputs[foundSelectInputs[i]] = {
+            value: groupTasksContext.selectInputs[foundSelectInputs[i]].value,
+          };
         }
       }
-    } else {
-      selectInputsObjectKeys.forEach(
-        (key) =>
-          (taskInputs[key] = {
-            value: groupTasksContext.selectInputs[key].value,
-            data: groupTasksContext.selectInputs[key].data,
-          })
-      );
     }
 
     if (!canTaskContinued) {
@@ -245,6 +241,8 @@ export default function GroupTasksViewModal({ isOpen }) {
       return;
     }
 
+    console.log("send", taskInputs);
+
     webSocketContext.SendSocketMessage(
       SentMessagesCommands.TaskContinueTaskStep,
       {
@@ -923,8 +921,7 @@ function InputRequiredHandler({
                 isGlobal={groupTaskParameter.global}
               >
                 <SelectMachineComponent
-                  // id needed for the validation to check if task continue is possible
-                  id={groupTaskParameter.parameterName}
+                  id={`${currentGroupTask.Id}-${step}-${groupTaskParameter.parameterName}`}
                   disabled={taskLockedByUserId !== ""}
                   t={t}
                   notificationApi={notificationApi}
@@ -955,6 +952,7 @@ function InputRequiredHandler({
                 }}
               >
                 <Checkbox
+                  id={`${currentGroupTask.Id}-${step}-${groupTaskParameter.parameterName}`}
                   disabled={taskLockedByUserId !== ""}
                   checked={
                     groupTasksContext.selectInputs[
@@ -994,8 +992,7 @@ function InputRequiredHandler({
                 isGlobal={groupTaskParameter.global}
               >
                 <SelectComponent
-                  // id needed for the validation to check if task continue is possible
-                  id={groupTaskParameter.parameterName}
+                  id={`${currentGroupTask.Id}-${step}-${groupTaskParameter.parameterName}`}
                   t={t}
                   disabled={taskLockedByUserId !== ""}
                   options={groupTaskParameter.options}
diff --git a/src/Pages/GroupTasks/Overview/GroupTypeSelectionModal.js b/src/Pages/GroupTasks/Overview/GroupTypeSelectionModal.js
index 84db40b..b89d55b 100644
--- a/src/Pages/GroupTasks/Overview/GroupTypeSelectionModal.js
+++ b/src/Pages/GroupTasks/Overview/GroupTypeSelectionModal.js
@@ -322,7 +322,6 @@ export function SelectMachineComponent({
   globalInput,
   onSelectChange,
   disabled,
-  defaultValue,
 }) {
   const groupTasksContext = useGroupTasksContext();
   const [loading, setLoading] = useState(false);
@@ -395,6 +394,32 @@ export function SelectMachineComponent({
       setOptions(finalOptions);
       responseData.current = data;
       setLoading(false);
+
+      if (
+        groupTasksContext.selectInputs[globalInput.parameterName] !==
+          undefined &&
+        groupTasksContext.selectInputs[globalInput.parameterName] !== null
+      ) {
+        const parsedNotes = JSON.parse(
+          responseData.current[
+            groupTasksContext.selectInputs[globalInput.parameterName].value
+          ].Notes
+        );
+
+        if (
+          parsedNotes !== undefined ||
+          parsedNotes !== null ||
+          parsedNotes !== ""
+        ) {
+          groupTasksContext.setSelectInputs((prevState) => ({
+            ...prevState,
+            [globalInput.parameterName]: {
+              value: parsedNotes.displayName,
+              data: parsedNotes,
+            },
+          }));
+        }
+      }
     });
   }, []);