From c5c4e853d100c2b32f79b620b2ffb6616a5a3faf Mon Sep 17 00:00:00 2001
From: alex <alex@roese.dev>
Date: Fri, 19 May 2023 13:49:13 +0200
Subject: [PATCH] added group task description

---
 src/Pages/GroupTasks/GroupTasksTableList.js   |  6 +++
 src/Pages/GroupTasks/GroupTasksViewModal.js   |  5 +++
 .../GroupTasks/GroupTypeSelectionModal.js     | 38 ++++++++++++++++---
 3 files changed, 44 insertions(+), 5 deletions(-)

diff --git a/src/Pages/GroupTasks/GroupTasksTableList.js b/src/Pages/GroupTasks/GroupTasksTableList.js
index 308ed8c..56fdbbd 100644
--- a/src/Pages/GroupTasks/GroupTasksTableList.js
+++ b/src/Pages/GroupTasks/GroupTasksTableList.js
@@ -27,6 +27,11 @@ const columns = [
     dataIndex: "groupName",
     key: "groupName",
   },
+  {
+    title: "Description",
+    dataIndex: "description",
+    key: "description",
+  },
   {
     title: "Step",
     dataIndex: "step",
@@ -110,6 +115,7 @@ export default function GroupTaskTableList({
             </>
           ),
           groupName: groupTask.GroupName,
+          description: groupTask.Description,
           step: `${groupTask.CurrentTasksStep} / ${groupTask.NumberOfSteps}`,
           status: getStatusBadge(groupTask.Status),
           startedAt: FormatDatetime(groupTask.StartedAt),
diff --git a/src/Pages/GroupTasks/GroupTasksViewModal.js b/src/Pages/GroupTasks/GroupTasksViewModal.js
index a8f070d..5ac2e3e 100644
--- a/src/Pages/GroupTasks/GroupTasksViewModal.js
+++ b/src/Pages/GroupTasks/GroupTasksViewModal.js
@@ -377,6 +377,7 @@ export default function GroupTasksViewModal({ isOpen }) {
                 style={{
                   color: Constants.COLORS.PRIMARY,
                   fontWeight: "bold",
+                  marginBottom: 0,
                 }}
               >
                 {currentGroupTask.GroupName}{" "}
@@ -475,7 +476,11 @@ export default function GroupTasksViewModal({ isOpen }) {
                   allUsers={webSocketContext.AllUsers}
                   userId={currentGroupTask.CreatorUserId}
                 />
+                <br />
               </h1>
+              <div style={{ marginBottom: 16 }}>
+                <span>{currentGroupTask.Description}</span>
+              </div>
 
               <Steps direction="vertical" items={stepsItemHandler()} />
             </div>
diff --git a/src/Pages/GroupTasks/GroupTypeSelectionModal.js b/src/Pages/GroupTasks/GroupTypeSelectionModal.js
index 03265bc..98f57e7 100644
--- a/src/Pages/GroupTasks/GroupTypeSelectionModal.js
+++ b/src/Pages/GroupTasks/GroupTypeSelectionModal.js
@@ -12,6 +12,7 @@ import {
 } from "antd";
 import { WebSocketContext, SentMessagesCommands } from "../../utils";
 import { useContext } from "react";
+import { InfoCircleOutlined } from "@ant-design/icons";
 
 export default function GroupTypeSelectionModal({
   isOpen,
@@ -48,14 +49,23 @@ export default function GroupTypeSelectionModal({
   };
 
   const handleStartTask = () => {
+    let canTaskBeStarted = true;
+
+    const groupTaskDescription = document.getElementById(
+      "fitem-grouptypedescription"
+    ).value;
+
+    if (groupTaskDescription === "") {
+      canTaskBeStarted = false;
+    }
+
     const userSpecifiedGlobalInputForm = document.getElementById(
       "groupTypeSelectionUserSpecifiedGlobalInputForm"
     );
 
     let globalInputs = [];
-    let canTaskBeStarted = true;
 
-    if (userSpecifiedGlobalInputForm !== null) {
+    if (canTaskBeStarted && userSpecifiedGlobalInputForm !== null) {
       const userSpecifiedGlobalInputs =
         userSpecifiedGlobalInputForm.getElementsByTagName("input");
 
@@ -103,6 +113,7 @@ export default function GroupTypeSelectionModal({
       category: categoryGroup.category,
       id: currentSelectedModalGroupType,
       groupName: groupName,
+      description: groupTaskDescription,
       numberOfSteps: parseInt(numberOfSteps),
       globalInputs: globalInputs,
       rememberId: rememberId, // used to open the modal when group task is started by backend and send via websocket back
@@ -151,6 +162,25 @@ export default function GroupTypeSelectionModal({
           : null}
       </Select>
 
+      {console.log(currentSelectedModalGroupType)}
+
+      {currentSelectedModalGroupType !== null && (
+        <Form layout="vertical">
+          <br />
+          <Form.Item
+            label="Description"
+            tooltip={{
+              title:
+                "This description helps to understand afterwards what this task was about",
+              icon: <InfoCircleOutlined />,
+            }}
+            required
+          >
+            <Input id="fitem-grouptypedescription" />
+          </Form.Item>
+        </Form>
+      )}
+
       <GroupGlobalInputs
         categoryGroup={categoryGroup}
         currentSelectedModalGroupType={currentSelectedModalGroupType}
@@ -165,7 +195,7 @@ function GroupGlobalInputs({
   currentSelectedModalGroupType,
   notificationApi,
 }) {
-  const MyFormItem = ({ children, displayName, parameterName }) => {
+  const MyFormItem = ({ children, displayName }) => {
     return (
       <Form.Item
         label={
@@ -198,7 +228,6 @@ function GroupGlobalInputs({
                 <MyFormItem
                   key={"fitem-" + globalInput.parameterName}
                   displayName={globalInput.displayName}
-                  parameterName={globalInput.parameterName}
                   children={
                     <Input
                       key={"input-" + globalInput.parameterName}
@@ -213,7 +242,6 @@ function GroupGlobalInputs({
                 <MyFormItem
                   key={"fitem-" + globalInput.parameterName}
                   displayName={globalInput.displayName}
-                  parameterName={globalInput.parameterName}
                   children={
                     <InputNumber
                       key={"input-" + globalInput.parameterName}