@openmrs/esm-fast-data-entry-app 1.0.1-pre.15 → 1.0.1-pre.21

package/src/FormBootstrap.tsx

@@ -107,6 +107,7 @@ interface FormParams {
   showDiscardSubmitButtons?: boolean;
   handlePostResponse?: (Encounter) => void;
   handleEncounterCreate?: (Object) => void;
+  handleOnValidate?: (boolean) => void;
 }
 
 const FormBootstrap = ({
@@ -117,6 +118,7 @@ const FormBootstrap = ({
   encounterUuid,
   handlePostResponse,
   handleEncounterCreate,
+  handleOnValidate,
 }: FormParams) => {
   const patient = useGetPatient(patientUuid);
 
@@ -140,6 +142,7 @@ const FormBootstrap = ({
             closeWorkspace: () => undefined,
             handlePostResponse,
             handleEncounterCreate,
+            handleOnValidate,
             showDiscardSubmitButtons: false,
           }}
         />

package/src/context/FormWorkflowReducer.ts

@@ -259,6 +259,8 @@ const reducer = (state, action) => {
         activeFormUuid: null,
       };
       persistData(newState);
+      //eslint-disable-next-line
+      navigate({ to: "${openmrsSpaBase}/forms" });
       return newState;
     }
     case "CLOSE_SESSION": {
@@ -267,6 +269,8 @@ const reducer = (state, action) => {
         activeFormUuid: null,
       };
       persistData(newState);
+      //eslint-disable-next-line
+      navigate({ to: "${openmrsSpaBase}/forms" });
       return newState;
     }
     default:

package/src/context/GroupFormWorkflowContext.tsx

@@ -2,6 +2,7 @@ import React, { useEffect, useMemo, useReducer } from "react";
 import reducer from "./GroupFormWorkflowReducer";
 import { useParams } from "react-router-dom";
 import { Type } from "@openmrs/esm-framework";
+import useGetSystemSetting from "../hooks/useGetSystemSetting";
 interface ParamTypes {
   formUuid?: string;
 }
@@ -25,9 +26,14 @@ const initialActions = {
   openPatientSearch: () => undefined,
   saveEncounter: (encounterUuid: string | number) => undefined,
   editEncounter: (patientUuid: string | number) => undefined,
+  validateForNext: () => undefined,
+  validateForComplete: () => undefined,
+  updateVisitUuid: (visitUuid: string) => undefined,
   submitForNext: () => undefined,
   submitForReview: () => undefined,
   submitForComplete: () => undefined,
+  addPatientUuid: (patientUuid: string) => undefined,
+  removePatientUuid: (patientUuid: string) => undefined,
   goToReview: () => undefined,
   destroySession: () => undefined,
   closeSession: () => undefined,
@@ -42,17 +48,21 @@ export const initialWorkflowState = {
   //     aciveFormUuid
   workflowState: null, // pseudo field from state[activeFormUuid].workflowState
   activePatientUuid: null, // pseudo field from state[activeFormUuid].activePatientUuid
-  activeEncounterUuid: null, // pseudo field from state[activeFormUuid].encounterUuid
+  activeEncounterUuid: null, // pseudo field from state[activeFormUuid].activeEncounterUuid
+  activeVisitUuid: null, // pseudo field from state[activeFormUuid].activeVisitUuid
   patientUuids: [], // pseudo field from state[activeFormUuid].patientUuids
   encounters: {}, // pseudo field from state[activeFormUuid].encounters
+  visits: {}, // pseudo field from state[activeFormUuid].visits
   activeGroupUuid: null, // pseudo field from state[activeFormUuid].groupUuid
-  activeGroupName: null, // pseudo field from state[activeFormUuid].groupname
+  activeGroupName: null, // pseudo field from state[activeFormUuid].groupName
+  activeGroupMembers: [], // pseudo field from state[activeFormUuid].groupMembers
   activeSessionMeta: {
     sessionName: null,
     practitionerName: null,
     sessionDate: null,
     sessionNotes: null,
   },
+  groupVisitTypeUuid: null,
 };
 
 const GroupFormWorkflowContext = React.createContext({
@@ -63,6 +73,10 @@ const GroupFormWorkflowContext = React.createContext({
 const GroupFormWorkflowProvider = ({ children }) => {
   const { formUuid } = useParams() as ParamTypes;
   const activeFormUuid = formUuid.split("&")[0];
+  const systemSetting = useGetSystemSetting(
+    "@openmrs/esm-fast-data-entry-app.groupSessionVisitTypeUuid"
+  );
+  const groupVisitTypeUuid = systemSetting?.result?.data?.results?.[0]?.value;
   const [state, dispatch] = useReducer(reducer, {
     ...initialWorkflowState,
     ...initialActions,
@@ -78,12 +92,20 @@ const GroupFormWorkflowProvider = ({ children }) => {
       setGroup: (group) => dispatch({ type: "SET_GROUP", group }),
       unsetGroup: () => dispatch({ type: "UNSET_GROUP" }),
       setSessionMeta: (meta) => dispatch({ type: "SET_SESSION_META", meta }),
+      addPatientUuid: (patientUuid) =>
+        dispatch({ type: "ADD_PATIENT_UUID", patientUuid }),
+      removePatientUuid: (patientUuid) =>
+        dispatch({ type: "REMOVE_PATIENT_UUID", patientUuid }),
       openPatientSearch: () => dispatch({ type: "OPEN_PATIENT_SEARCH" }),
       saveEncounter: (encounterUuid) =>
         dispatch({
           type: "SAVE_ENCOUNTER",
           encounterUuid,
         }),
+      validateForNext: () => dispatch({ type: "VALIDATE_FOR_NEXT" }),
+      validateForComplete: () => dispatch({ type: "VALIDATE_FOR_COMPLETE" }),
+      updateVisitUuid: (visitUuid) =>
+        dispatch({ type: "UPDATE_VISIT_UUID", visitUuid }),
       submitForNext: () => dispatch({ type: "SUBMIT_FOR_NEXT" }),
       submitForComplete: () => dispatch({ type: "SUBMIT_FOR_COMPLETE" }),
       editEncounter: (patientUuid) =>
@@ -106,6 +128,7 @@ const GroupFormWorkflowProvider = ({ children }) => {
   return (
     <GroupFormWorkflowContext.Provider
       value={{
+        groupVisitTypeUuid,
         ...state,
         ...actions,
         workflowState:
@@ -117,6 +140,9 @@ const GroupFormWorkflowProvider = ({ children }) => {
         activeEncounterUuid:
           state.forms?.[state.activeFormUuid]?.activeEncounterUuid ??
           initialWorkflowState.activeEncounterUuid,
+        activeVisitUuid:
+          state.forms?.[state.activeFormUuid]?.activeVisitUuid ??
+          initialWorkflowState.activeVisitUuid,
         patientUuids:
           state.forms?.[state.activeFormUuid]?.patientUuids ??
           initialWorkflowState.patientUuids,
@@ -129,6 +155,9 @@ const GroupFormWorkflowProvider = ({ children }) => {
         activeGroupName:
           state.forms?.[state.activeFormUuid]?.groupName ??
           initialWorkflowState.activeGroupName,
+        activeGroupMembers:
+          state.forms?.[state.activeFormUuid]?.groupMembers ??
+          initialWorkflowState.activeGroupMembers,
         activeSessionMeta:
           state.forms?.[state.activeFormUuid]?.sessionMeta ??
           initialWorkflowState.activeSessionMeta,

package/src/context/GroupFormWorkflowReducer.ts

@@ -12,10 +12,13 @@ const initialFormState = {
   workflowState: "NEW_GROUP_SESSION",
   groupUuid: null,
   groupName: null,
+  groupMembers: [],
   activePatientUuid: null,
   activeEncounterUuid: null,
+  activeVisitUuid: null,
   patientUuids: [],
   encounters: {},
+  visits: {},
 };
 
 const reducer = (state, action) => {
@@ -50,6 +53,8 @@ const reducer = (state, action) => {
               activePatientUuid: activePatientUuid,
               activeEncounterUuid:
                 thisSavedForm?.encounters?.[activePatientUuid] || null,
+              activeVisitUuid:
+                thisSavedForm?.visits?.[activePatientUuid] || null,
             },
           },
         };
@@ -84,8 +89,13 @@ const reducer = (state, action) => {
               action.group.cohortMembers?.map(
                 (member) => member?.patient?.uuid
               ) ?? [],
+            groupMembers:
+              action.group.cohortMembers?.map(
+                (member) => member?.patient?.uuid
+              ) ?? [],
             activePatientUuid: null,
             activeEncounterUuid: null,
+            activeVisitUuid: null,
           },
         },
       };
@@ -102,8 +112,10 @@ const reducer = (state, action) => {
             groupUuid: null,
             groupName: null,
             patientUuids: [],
+            groupMembers: [],
             activePatientUuid: null,
             activeEncounterUuid: null,
+            activeVisitUuid: null,
           },
         },
       };
@@ -125,6 +137,10 @@ const reducer = (state, action) => {
               state.forms[state.activeFormUuid].encounters[
                 state.forms[state.activeFormUuid].patientUuids?.[0]
               ] || null,
+            activeVisitUuid:
+              state.forms[state.activeFormUuid].visits[
+                state.forms[state.activeFormUuid].patientUuids?.[0]
+              ] || null,
             workflowState: "EDIT_FORM",
           },
         },
@@ -132,7 +148,47 @@ const reducer = (state, action) => {
       persistData(newState);
       return newState;
     }
+    case "ADD_PATIENT_UUID": {
+      if (
+        state.forms[state.activeFormUuid].patientUuids.includes(
+          action.patientUuid
+        )
+      ) {
+        return state;
+      }
 
+      const newState = {
+        ...state,
+        forms: {
+          ...state.forms,
+          [state.activeFormUuid]: {
+            ...state.forms[state.activeFormUuid],
+            patientUuids: [
+              ...state.forms[state.activeFormUuid].patientUuids,
+              action.patientUuid,
+            ],
+          },
+        },
+      };
+      persistData(newState);
+      return newState;
+    }
+    case "REMOVE_PATIENT_UUID": {
+      const newState = {
+        ...state,
+        forms: {
+          ...state.forms,
+          [state.activeFormUuid]: {
+            ...state.forms[state.activeFormUuid],
+            patientUuids: state.forms[
+              state.activeFormUuid
+            ].patientUuids?.filter((uuid) => action.patientUuid !== uuid),
+          },
+        },
+      };
+      persistData(newState);
+      return newState;
+    }
     case "SAVE_ENCOUNTER": {
       const thisForm = state.forms[state.activeFormUuid];
       if (thisForm.workflowState === "SUBMIT_FOR_COMPLETE") {
@@ -166,6 +222,7 @@ const reducer = (state, action) => {
               },
               activePatientUuid: nextPatientUuid,
               activeEncounterUuid: thisForm.encounters[nextPatientUuid] || null,
+              activeVisitUuid: thisForm.visits[nextPatientUuid] || null,
               workflowState: "EDIT_FORM",
             },
           },
@@ -183,6 +240,8 @@ const reducer = (state, action) => {
             ...state.forms[state.activeFormUuid],
             activeEncounterUuid:
               state.forms[state.activeFormUuid].encounters[action.patientUuid],
+            activeVisitUuid:
+              state.forms[state.activeFormUuid].visits[action.patientUuid],
             activePatientUuid: action.patientUuid,
             workflowState: "EDIT_FORM",
           },
@@ -191,6 +250,46 @@ const reducer = (state, action) => {
       persistData(newState);
       return newState;
     }
+    case "VALIDATE_FOR_NEXT":
+      // this state should not be persisted
+      window.dispatchEvent(
+        new CustomEvent("ampath-form-action", {
+          detail: {
+            formUuid: state.activeFormUuid,
+            patientUuid: state.forms[state.activeFormUuid].activePatientUuid,
+            action: "validateForm",
+          },
+        })
+      );
+      return {
+        ...state,
+        forms: {
+          ...state.forms,
+          [state.activeFormUuid]: {
+            ...state.forms[state.activeFormUuid],
+            workflowState: "VALIDATE_FOR_NEXT",
+          },
+        },
+      };
+    case "UPDATE_VISIT_UUID":
+      // this state should not be persisted
+      // we don't pers
+      return {
+        ...state,
+        forms: {
+          ...state.forms,
+          [state.activeFormUuid]: {
+            ...state.forms[state.activeFormUuid],
+            visits: {
+              ...state.forms[state.activeFormUuid].visits,
+              [state.forms[state.activeFormUuid].activePatientUuid]:
+                action.visitUuid,
+            },
+            activeVisitUuid: action.visitUuid,
+          },
+        },
+      };
+
     case "SUBMIT_FOR_NEXT":
       // this state should not be persisted
       window.dispatchEvent(
@@ -233,6 +332,28 @@ const reducer = (state, action) => {
           },
         },
       };
+
+    case "VALIDATE_FOR_COMPLETE":
+      // this state should not be persisted
+      window.dispatchEvent(
+        new CustomEvent("ampath-form-action", {
+          detail: {
+            formUuid: state.activeFormUuid,
+            patientUuid: state.forms[state.activeFormUuid].activePatientUuid,
+            action: "validateForm",
+          },
+        })
+      );
+      return {
+        ...state,
+        forms: {
+          ...state.forms,
+          [state.activeFormUuid]: {
+            ...state.forms[state.activeFormUuid],
+            workflowState: "VALIDATE_FOR_COMPLETE",
+          },
+        },
+      };
     case "SUBMIT_FOR_COMPLETE":
       // this state should not be persisted
       window.dispatchEvent(
@@ -262,6 +383,7 @@ const reducer = (state, action) => {
           [state.activeFormUuid]: {
             ...state.forms[state.activeFormUuid],
             activeEncounterUuid: null,
+            activVisitUuid: null,
             activePatientUuid: null,
             workflowState: "REVIEW",
           },
@@ -278,7 +400,9 @@ const reducer = (state, action) => {
         activeFormUuid: null,
       };
       persistData(newState);
-      return newState;
+      //eslint-disable-next-line
+      navigate({ to: "${openmrsSpaBase}/forms" });
+      return { ...newState, formDestroyed: true };
     }
     case "CLOSE_SESSION": {
       const newState = {
@@ -286,6 +410,8 @@ const reducer = (state, action) => {
         activeFormUuid: null,
       };
       persistData(newState);
+      //eslint-disable-next-line
+      navigate({ to: "${openmrsSpaBase}/forms" });
       return newState;
     }
     default:

package/src/form-entry-workflow/FormEntryWorkflow.tsx

@@ -3,15 +3,8 @@ import {
   getGlobalStore,
   useStore,
 } from "@openmrs/esm-framework";
-import {
-  Button,
-  ComposedModal,
-  ModalBody,
-  ModalFooter,
-  ModalHeader,
-} from "@carbon/react";
+import { Button } from "@carbon/react";
 import React, { useContext, useState } from "react";
-import { useNavigate } from "react-router-dom";
 import FormBootstrap from "../FormBootstrap";
 import PatientCard from "../patient-card/PatientCard";
 import styles from "./styles.scss";
@@ -22,83 +15,15 @@ import FormWorkflowContext, {
 } from "../context/FormWorkflowContext";
 import WorkflowReview from "./workflow-review";
 import PatientBanner from "./patient-banner";
+import CompleteModal from "../CompleteModal";
+import CancelModal from "../CancelModal";
 
 const formStore = getGlobalStore("ampath-form-state");
 
-const CancelModal = ({ open, setOpen }) => {
-  const { destroySession, closeSession } = useContext(FormWorkflowContext);
-  const { t } = useTranslation();
-  const navigate = useNavigate();
-
-  const discard = async () => {
-    await destroySession();
-    setOpen(false);
-    navigate("../");
-  };
-
-  const saveAndClose = async () => {
-    await closeSession();
-    setOpen(false);
-    navigate("../");
-  };
-
-  return (
-    <ComposedModal open={open}>
-      <ModalHeader>{t("areYouSure", "Are you sure?")}</ModalHeader>
-      <ModalBody>
-        {t(
-          "cancelExplanation",
-          "You will lose any unsaved changes on the current form. Do you want to discard the current session?"
-        )}
-      </ModalBody>
-      <ModalFooter>
-        <Button kind="secondary" onClick={() => setOpen(false)}>
-          {t("cancel", "Cancel")}
-        </Button>
-        <Button kind="danger" onClick={discard}>
-          {t("discard", "Discard")}
-        </Button>
-        <Button kind="primary" onClick={saveAndClose}>
-          {t("saveSession", "Save Session")}
-        </Button>
-      </ModalFooter>
-    </ComposedModal>
-  );
-};
-
-const CompleteModal = ({ open, setOpen }) => {
-  const { submitForComplete } = useContext(FormWorkflowContext);
-  const { t } = useTranslation();
-
-  const completeSession = () => {
-    submitForComplete();
-    setOpen(false);
-  };
-
-  return (
-    <ComposedModal open={open}>
-      <ModalHeader>{t("areYouSure", "Are you sure?")}</ModalHeader>
-      <ModalBody>
-        {t(
-          "saveExplanation",
-          "Do you want to save the current form and exit the workflow?"
-        )}
-      </ModalBody>
-      <ModalFooter>
-        <Button kind="secondary" onClick={() => setOpen(false)}>
-          {t("cancel", "Cancel")}
-        </Button>
-        <Button kind="primary" onClick={completeSession}>
-          {t("complete", "Complete")}
-        </Button>
-      </ModalFooter>
-    </ComposedModal>
-  );
-};
-
 const WorkflowNavigationButtons = () => {
+  const context = useContext(FormWorkflowContext);
   const { activeFormUuid, submitForNext, workflowState, destroySession } =
-    useContext(FormWorkflowContext);
+    context;
   const store = useStore(formStore);
   const formState = store[activeFormUuid];
   const navigationDisabled = formState !== "ready";
@@ -132,8 +57,16 @@ const WorkflowNavigationButtons = () => {
           {t("cancel", "Cancel")}
         </Button>
       </div>
-      <CancelModal open={cancelModalOpen} setOpen={setCancelModalOpen} />
-      <CompleteModal open={completeModalOpen} setOpen={setCompleteModalOpen} />
+      <CancelModal
+        open={cancelModalOpen}
+        setOpen={setCancelModalOpen}
+        context={context}
+      />
+      <CompleteModal
+        open={completeModalOpen}
+        setOpen={setCompleteModalOpen}
+        context={context}
+      />
     </>
   );
 };