diff --git a/src/Pages/GroupTasks/GroupTasksTableList.js b/src/Pages/GroupTasks/GroupTasksTableList.js index cfccc6f..be4eb4b 100644 --- a/src/Pages/GroupTasks/GroupTasksTableList.js +++ b/src/Pages/GroupTasks/GroupTasksTableList.js @@ -87,7 +87,7 @@ export default function GroupTaskTableList({ endedAt: groupTask.EndedAt !== "0001-01-01T00:00:00Z" ? FormatDatetime(groupTask.EndedAt) - : "-/-", + : Constants.TEXT_EMPTY_PLACEHOLDER, }); } }); diff --git a/src/Pages/GroupTasks/GroupTasksViewModal.js b/src/Pages/GroupTasks/GroupTasksViewModal.js index bc31ad0..741da09 100644 --- a/src/Pages/GroupTasks/GroupTasksViewModal.js +++ b/src/Pages/GroupTasks/GroupTasksViewModal.js @@ -1,4 +1,4 @@ -import { Alert, Button, Input, Modal, Result, Steps } from "antd"; +import { Alert, Button, Modal, Popover, Result, Steps } from "antd"; import { useContext } from "react"; import { useNavigate, useParams } from "react-router-dom"; import { @@ -145,11 +145,9 @@ export default function GroupTasksViewModal({ isOpen }) { Ended at:{" "} {groupTaskSteps[index].EndedAt !== "0001-01-01T00:00:00Z" ? FormatDatetime(groupTaskSteps[index].EndedAt) - : "-/-"} + : Constants.TEXT_EMPTY_PLACEHOLDER}
- -
- ID:{" "}
- {paramGroupTaskId}
- Category:{" "}
- {currentGroupTask.Category}
-
- Started at:{" "}
- {FormatDatetime(currentGroupTask.StartedAt)}
-
+ ID:{" "}
+ {paramGroupTaskId}
+ Category:{" "}
+ {currentGroupTask.Category}
+
+
+ Started at:
+ {" "}
+ {FormatDatetime(currentGroupTask.StartedAt)}
+
+ {JSON.parse(currentGroupTask.GlobalInputs).map(
+ (globalInput) => {
+ return (
+
+
+ {globalInput.parameterName}:{" "}
+
+
+ {globalInput.value !== ""
+ ? globalInput.value
+ : Constants.TEXT_EMPTY_PLACEHOLDER}
+
+
+
+ );
+ }
+ )}
+