Merge pull request #35 from EyeSeeTea/fix/some-more-fixes

some more fixes

i18n/en.pot

@@ -5,8 +5,8 @@ msgstr ""
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
-"POT-Creation-Date: 2024-10-16T14:36:22.158Z\n"
-"PO-Revision-Date: 2024-10-16T14:36:22.158Z\n"
+"POT-Creation-Date: 2024-11-03T18:35:32.151Z\n"
+"PO-Revision-Date: 2024-11-03T18:35:32.151Z\n"
 
 msgid "Low"
 msgstr ""
@@ -87,9 +87,15 @@ msgstr ""
 msgid "Edit Action Plan"
 msgstr ""
 
+msgid "Event completed"
+msgstr ""
+
 msgid "Edit Details"
 msgstr ""
 
+msgid "Complete Event"
+msgstr ""
+
 msgid "Notes"
 msgstr ""
 

src/CompositionRoot.ts

@@ -67,6 +67,7 @@ import { GetConfigurationsUseCase } from "./domain/usecases/GetConfigurationsUse
 import { ConfigurationsRepository } from "./domain/repositories/ConfigurationsRepository";
 import { ConfigurationsD2Repository } from "./data/repositories/ConfigurationsD2Repository";
 import { ConfigurationsTestRepository } from "./data/repositories/test/ConfigurationsTestRepository";
+import { CompleteEventTrackerUseCase } from "./domain/usecases/CompleteEventTrackerUseCase";
 
 export type CompositionRoot = ReturnType<typeof getCompositionRoot>;
 
@@ -106,6 +107,7 @@ function getCompositionRoot(repositories: Repositories) {
                 repositories.configurationsRepository,
                 repositories.teamMemberRepository
             ),
+            complete: new CompleteEventTrackerUseCase(repositories),
         },
         incidentActionPlan: {
             get: new GetIncidentActionByIdUseCase(repositories),

src/data/repositories/DiseaseOutbreakEventD2Repository.ts

@@ -2,7 +2,7 @@ import { D2Api } from "../../types/d2-api";
 import { DiseaseOutbreakEventRepository } from "../../domain/repositories/DiseaseOutbreakEventRepository";
 import { apiToFuture, FutureData } from "../api-futures";
 import { DiseaseOutbreakEventBaseAttrs } from "../../domain/entities/disease-outbreak-event/DiseaseOutbreakEvent";
-import { Id, ConfigLabel } from "../../domain/entities/Ref";
+import { Id } from "../../domain/entities/Ref";
 import {
     mapDiseaseOutbreakEventToTrackedEntityAttributes,
     mapTrackedEntityAttributesToDiseaseOutbreak,
@@ -13,6 +13,7 @@ import { getProgramTEAsMetadata } from "./utils/MetadataHelper";
 import { assertOrError } from "./utils/AssertOrError";
 import { Future } from "../../domain/entities/generic/Future";
 import { getAllTrackedEntitiesAsync } from "./utils/getAllTrackedEntities";
+import { D2TrackerEnrollment } from "@eyeseetea/d2-api/api/trackerEnrollments";
 
 export class DiseaseOutbreakEventD2Repository implements DiseaseOutbreakEventRepository {
     constructor(private api: D2Api) {}
@@ -84,8 +85,44 @@ export class DiseaseOutbreakEventD2Repository implements DiseaseOutbreakEventRep
         );
     }
 
-    getConfigStrings(): FutureData<ConfigLabel[]> {
-        throw new Error("Method not implemented.");
+    complete(id: Id): FutureData<void> {
+        return apiToFuture(
+            this.api.tracker.enrollments.get({
+                fields: {
+                    enrollment: true,
+                    enrolledAt: true,
+                    occurredAt: true,
+                },
+                trackedEntity: id,
+                enrolledBefore: new Date().toISOString(),
+                program: RTSL_ZEBRA_PROGRAM_ID,
+                orgUnit: RTSL_ZEBRA_ORG_UNIT_ID,
+            })
+        ).flatMap(enrollmentResponse => {
+            const currentEnrollment = enrollmentResponse.instances[0];
+            const currentEnrollmentId = currentEnrollment?.enrollment;
+            if (!currentEnrollment || !currentEnrollmentId) {
+                return Future.error(new Error(`Enrollment not found for Event Tracker`));
+            }
+
+            const enrollment: D2TrackerEnrollment = {
+                ...currentEnrollment,
+                orgUnit: RTSL_ZEBRA_ORG_UNIT_ID,
+                program: RTSL_ZEBRA_PROGRAM_ID,
+                trackedEntity: id,
+                status: "COMPLETED",
+            };
+
+            return apiToFuture(
+                this.api.tracker.post({ importStrategy: "UPDATE" }, { enrollments: [enrollment] })
+            ).flatMap(response => {
+                if (response.status !== "OK") {
+                    return Future.error(
+                        new Error(`Error completing disease outbreak event : ${response.message}`)
+                    );
+                } else return Future.success(undefined);
+            });
+        });
     }
 
     //TO DO : Implement delete/archive after requirement confirmation

src/data/repositories/test/DiseaseOutbreakEventTestRepository.ts

@@ -10,6 +10,9 @@ import { DiseaseOutbreakEventRepository } from "../../../domain/repositories/Dis
 import { FutureData } from "../../api-futures";
 
 export class DiseaseOutbreakEventTestRepository implements DiseaseOutbreakEventRepository {
+    complete(_id: Id): FutureData<void> {
+        return Future.success(undefined);
+    }
     get(id: Id): FutureData<DiseaseOutbreakEventBaseAttrs> {
         return Future.success({
             id: id,

src/domain/repositories/DiseaseOutbreakEventRepository.ts

@@ -1,10 +1,10 @@
 import { FutureData } from "../../data/api-futures";
 import { DiseaseOutbreakEventBaseAttrs } from "../entities/disease-outbreak-event/DiseaseOutbreakEvent";
-import { ConfigLabel, Id } from "../entities/Ref";
+import { Id } from "../entities/Ref";
 
 export interface DiseaseOutbreakEventRepository {
     get(id: Id): FutureData<DiseaseOutbreakEventBaseAttrs>;
     getAll(): FutureData<DiseaseOutbreakEventBaseAttrs[]>;
     save(diseaseOutbreak: DiseaseOutbreakEventBaseAttrs): FutureData<Id>;
-    getConfigStrings(): FutureData<ConfigLabel[]>;
+    complete(id: Id): FutureData<void>;
 }

src/domain/usecases/CompleteEventTrackerUseCase.ts

@@ -0,0 +1,15 @@
+import { FutureData } from "../../data/api-futures";
+import { Id } from "../entities/Ref";
+import { DiseaseOutbreakEventRepository } from "../repositories/DiseaseOutbreakEventRepository";
+
+export class CompleteEventTrackerUseCase {
+    constructor(
+        private options: {
+            diseaseOutbreakEventRepository: DiseaseOutbreakEventRepository;
+        }
+    ) {}
+
+    public execute(id: Id): FutureData<void> {
+        return this.options.diseaseOutbreakEventRepository.complete(id);
+    }
+}

src/domain/usecases/GetDiseaseOutbreakByIdUseCase.ts

@@ -10,8 +10,6 @@ import { OrgUnitRepository } from "../repositories/OrgUnitRepository";
 import { RiskAssessmentRepository } from "../repositories/RiskAssessmentRepository";
 import { RoleRepository } from "../repositories/RoleRepository";
 import { TeamMemberRepository } from "../repositories/TeamMemberRepository";
-import { getIncidentAction } from "./utils/incident-action/GetIncidentActionById";
-import { getIncidentManagementTeamById } from "./utils/incident-management-team/GetIncidentManagementTeamById";
 import { getAll } from "./utils/risk-assessment/GetRiskAssessmentById";
 
 export class GetDiseaseOutbreakByIdUseCase {
@@ -62,18 +60,8 @@ export class GetDiseaseOutbreakByIdUseCase {
                         this.options.riskAssessmentRepository,
                         configurations
                     ),
-                    incidentAction: getIncidentAction(
-                        id,
-                        this.options.incidentActionRepository,
-                        configurations
-                    ),
-                    incidentManagementTeam: getIncidentManagementTeamById(
-                        id,
-                        this.options,
-                        configurations
-                    ),
                     roles: this.options.roleRepository.getAll(),
-                }).flatMap(({ riskAssessment, incidentAction, incidentManagementTeam, roles }) => {
+                }).flatMap(({ riskAssessment, roles }) => {
                     return this.options.incidentManagementTeamRepository
                         .getIncidentManagementTeamMember(incidentManagerName, id, roles)
                         .flatMap(incidentManager => {
@@ -86,8 +74,8 @@ export class GetDiseaseOutbreakByIdUseCase {
                                     notificationSource: notificationSource,
                                     incidentManager: incidentManager,
                                     riskAssessment: riskAssessment,
-                                    incidentActionPlan: incidentAction,
-                                    incidentManagementTeam: incidentManagementTeam,
+                                    incidentActionPlan: undefined, //IAP is fetched on menu click. It is not needed here.
+                                    incidentManagementTeam: undefined, //IMT is fetched on menu click. It is not needed here.
                                 });
                             return Future.success(diseaseOutbreakEvent);
                         });

src/webapp/components/form/form-summary/FormSummary.tsx → src/webapp/components/form/form-summary/EventTrackerFormSummary.tsx

@@ -6,14 +6,16 @@ import { Box, Button, Typography } from "@material-ui/core";
 import { UserCard } from "../../user-selector/UserCard";
 import { RouteName, useRoutes } from "../../../hooks/useRoutes";
 import { EditOutlined } from "@material-ui/icons";
+import { CheckOutlined } from "@material-ui/icons";
 import { Loader } from "../../loader/Loader";
 import { useSnackbar } from "@eyeseetea/d2-ui-components";
 import { FormSummaryData } from "../../../pages/event-tracker/useDiseaseOutbreakEvent";
 import { Maybe } from "../../../../utils/ts-utils";
 import { FormType } from "../../../pages/form-page/FormPage";
 import { Id } from "../../../../domain/entities/Ref";
+import { useAppContext } from "../../../contexts/app-context";
 
-export type FormSummaryProps = {
+export type EventTrackerFormSummaryProps = {
     id: Id;
     formType: FormType;
     formSummary: Maybe<FormSummaryData>;
@@ -22,7 +24,8 @@ export type FormSummaryProps = {
 
 const ROW_COUNT = 3;
 
-export const FormSummary: React.FC<FormSummaryProps> = React.memo(props => {
+export const EventTrackerFormSummary: React.FC<EventTrackerFormSummaryProps> = React.memo(props => {
+    const { compositionRoot } = useAppContext();
     const { id, formType, formSummary, summaryError } = props;
     const { goTo } = useRoutes();
     const snackbar = useSnackbar();
@@ -38,6 +41,18 @@ export const FormSummary: React.FC<FormSummaryProps> = React.memo(props => {
         goTo(RouteName.EDIT_FORM, { formType: formType, id: id });
     }, [formType, goTo, id]);
 
+    const onCompleteClick = useCallback(() => {
+        compositionRoot.diseaseOutbreakEvent.complete.execute(id).run(
+            () => {
+                snackbar.success(i18n.t("Event completed"));
+            },
+            err => {
+                snackbar.error(i18n.t(`Failed to complete event: ${err.message}`));
+                console.error(err);
+            }
+        );
+    }, [compositionRoot, id, snackbar]);
+
     const editButton = (
         <Button
             variant="outlined"
@@ -49,6 +64,17 @@ export const FormSummary: React.FC<FormSummaryProps> = React.memo(props => {
         </Button>
     );
 
+    const completeButton = (
+        <Button
+            variant="outlined"
+            color="secondary"
+            onClick={onCompleteClick}
+            startIcon={<CheckOutlined />}
+        >
+            {i18n.t("Complete Event")}
+        </Button>
+    );
+
     const getSummaryColumn = useCallback((index: number, label: string, value: string) => {
         return (
             <Typography key={index}>
@@ -66,6 +92,7 @@ export const FormSummary: React.FC<FormSummaryProps> = React.memo(props => {
                 title={formSummary.subTitle}
                 hasSeparator={true}
                 headerButton={editButton}
+                secondaryHeaderButton={completeButton}
                 titleVariant="secondary"
             >
                 <SummaryContainer>

src/webapp/components/section/Section.tsx

@@ -9,6 +9,7 @@ type SectionProps = {
     lastUpdated?: string;
     children: React.ReactNode;
     headerButton?: React.ReactNode;
+    secondaryHeaderButton?: React.ReactNode;
     hasSeparator?: boolean;
     titleVariant?: "primary" | "secondary";
 };
@@ -18,6 +19,7 @@ export const Section: React.FC<SectionProps> = React.memo(
         title = "",
         lastUpdated = "",
         headerButton,
+        secondaryHeaderButton,
         hasSeparator = false,
         children,
         titleVariant = "primary",
@@ -40,15 +42,21 @@ export const Section: React.FC<SectionProps> = React.memo(
                         ) : null}
                     </TitleContainer>
 
-                    {headerButton ? <div>{headerButton}</div> : null}
+                    <ButtonContainer>
+                        {headerButton ? <div>{headerButton}</div> : null}
+                        {secondaryHeaderButton ? <div>{secondaryHeaderButton}</div> : null}
+                    </ButtonContainer>
                 </Header>
 
                 <Content>{children}</Content>
             </SectionContainer>
         );
     }
 );
-
+const ButtonContainer = styled.div`
+    display: flex;
+    gap: 5px;
+`;
 const SectionContainer = styled.section<{ $hasSeparator?: boolean }>`
     width: 100%;
     margin-block-end: ${props => (props.$hasSeparator ? "0" : "24px")};

src/webapp/components/table/BasicTable.tsx

@@ -1,10 +1,18 @@
-import React from "react";
-import { Table, TableBody, TableCell, TableHead, TableRow } from "@material-ui/core";
+import React, { useCallback, useState } from "react";
+import {
+    Table,
+    TableBody,
+    TableCell,
+    TableHead,
+    TableRow,
+    TableSortLabel,
+} from "@material-ui/core";
 import styled from "styled-components";
 import { Maybe } from "../../../utils/ts-utils";
 import i18n from "../../../utils/i18n";
 import { Option } from "../utils/option";
 import { Cell } from "./Cell";
+import _c from "../../../domain/entities/generic/Collection";
 
 const noop = () => {};
 
@@ -34,18 +42,41 @@ interface BasicTableProps {
     rows: TableRowType[];
     onChange?: (cell: Maybe<string>, rowIndex: number, column: TableColumn["value"]) => void;
     showRowIndex?: boolean;
+    onOrderBy?: (direction: "asc" | "desc") => void;
 }
 
 export const BasicTable: React.FC<BasicTableProps> = React.memo(
-    ({ columns, rows, onChange = noop, showRowIndex = false }) => {
+    ({ columns, rows, onChange = noop, showRowIndex = false, onOrderBy }) => {
+        const [order, setOrder] = useState<"asc" | "desc">();
+
+        const orderBy = useCallback(() => {
+            const updatedOrder = order === "asc" ? "desc" : "asc";
+            setOrder(prevOrder => (prevOrder === "asc" ? "desc" : "asc"));
+            onOrderBy && onOrderBy(updatedOrder);
+        }, [onOrderBy, order]);
+
         return (
             <StyledTable stickyHeader>
                 <TableHead>
                     <TableRow>
                         {showRowIndex && <TableCell />}
-                        {columns.map(({ value, label }) => (
-                            <TableCell key={value}>{i18n.t(label)}</TableCell>
-                        ))}
+                        {columns.map(({ value, label }) =>
+                            label === "Assessment Date" ? (
+                                <TableCell key={value} sortDirection={order}>
+                                    <TableSortLabel
+                                        direction={order}
+                                        onClick={orderBy}
+                                        active={true}
+                                    >
+                                        {label}
+                                    </TableSortLabel>
+                                </TableCell>
+                            ) : (
+                                <TableCell key={value} sortDirection={order}>
+                                    {i18n.t(label)}
+                                </TableCell>
+                            )
+                        )}
                     </TableRow>
                 </TableHead>
                 <TableBody>