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