fixed endet at and duration not set after grouptask finished

main
alex 2023-11-01 21:04:22 +01:00
parent 4e66d10a51
commit 97e25d4d0c
1 changed files with 84 additions and 76 deletions

View File

@ -643,21 +643,13 @@ export default function GroupTasksViewModal({ isOpen }) {
);
};
return (
<MyModal isOpen={isOpen} onCancel={handleCancel}>
{notificationContextHolder}
const PopoverContent = () => {
// get current group task from useState as endetAt and duration not updated only with currentGroupTask as it is a useRef
const cGroupTask = groupTasksContext.groupTasks.find(
(g) => g.Id === currentGroupTask.current.Id
);
{!currentGroupTask.current ||
groupTasksContext === null ||
!hasXYPermission(
appContext.userPermissions,
Constants.PERMISSIONS.GROUP_TASKS.OVERVIEW.XYView,
currentGroupTask.current.Category
) ? (
<MyNotFoundModalContent
resultTitle={t("groupTasks.groupTasksViewModal.groupTaskNotFound")}
/>
) : (
return (
<div key={paramGroupTaskId}>
<h1
style={{
@ -697,15 +689,12 @@ export default function GroupTasksViewModal({ isOpen }) {
<span style={{ fontWeight: "bold" }}>
{t("groupTasks.groupTasksViewModal.endedAt")}:
</span>{" "}
{FormatDatetime(currentGroupTask.current.EndedAt)}
{FormatDatetime(cGroupTask.EndedAt)}
<br />
<span style={{ fontWeight: "bold" }}>
{t("groupTasks.groupTasksViewModal.duration")}:
</span>{" "}
{GetDuration(
currentGroupTask.current.StartedAt,
currentGroupTask.current.EndedAt
)}
{GetDuration(cGroupTask.StartedAt, cGroupTask.EndedAt)}
</p>
<GlobalInputs />
@ -734,6 +723,25 @@ export default function GroupTasksViewModal({ isOpen }) {
<Steps direction="vertical" items={stepsItemHandler()} />
</div>
);
};
return (
<MyModal isOpen={isOpen} onCancel={handleCancel}>
{notificationContextHolder}
{!currentGroupTask.current ||
groupTasksContext === null ||
!hasXYPermission(
appContext.userPermissions,
Constants.PERMISSIONS.GROUP_TASKS.OVERVIEW.XYView,
currentGroupTask.current.Category
) ? (
<MyNotFoundModalContent
resultTitle={t("groupTasks.groupTasksViewModal.groupTaskNotFound")}
/>
) : (
<PopoverContent />
)}
</MyModal>
);