(fix) remove getLatestObs from all forms in Edit mode, and add 'edit'…

… intent for all Edit action buttons
CDC-HIS · Aug 2, 2024 · 79343f1 · 79343f1
1 parent 938c4ba
commit 79343f1
Show file tree

Hide file tree

Showing 26 changed files with 147 additions and 75 deletions.
diff --git a/src/forms/hei-final-outcome.json b/src/forms/hei-final-outcome.json
@@ -80,7 +80,16 @@
                 "calculate": {
                   "calculateExpression": "resolve(api.getLatestObs(patient.id, '5c118396-52dc-4cac-8860-e6d8e4a7f296', 'd7f3c5d9-2927-41c4-a39f-ad9a6c7cf31d'))?.valueDateTime"
                   }
-              }
+              },
+              "behaviours": [
+								{
+									"intent": "edit",
+									"questionOptions": {
+										"rendering": "fixed",
+                "concept": "5c118396-52dc-4cac-8860-e6d8e4a7f296"
+								}
+								}
+							]
             }
           ]
         },

diff --git a/src/forms/hei-followup.json b/src/forms/hei-followup.json
@@ -45,6 +45,15 @@
                   "calculateExpression": "resolve(api.getLatestObs(patient.id, '1ebc345c-6f09-43e1-a616-d7e52fff4c7d', 'ca7108d6-b4f2-4b46-be1c-d0ddd4f0ed97'))?.valueDateTime"
                   }
 							},
+              "behaviours": [
+								{
+									"intent": "edit",
+									"questionOptions": {
+										"rendering": "fixed",
+								"concept": "1ebc345c-6f09-43e1-a616-d7e52fff4c7d"
+								}
+								}
+							],
 							"id": "enrollment_date"
 						}
           ]
@@ -1070,6 +1079,25 @@
                   }
                 ]
               },
+              "behaviours": [
+								{
+									"intent": "edit",
+									"questionOptions": {
+										"rendering": "radio",
+                "concept": "b7f50074-b9f2-4b0d-9f20-d18b646d822e",
+                "answers": [
+                  {
+                    "concept": "b5b94269-9ee1-4733-8a24-96213cf3c291",
+                    "label": "NVP + AZT for 6 weeks and NVP only for additionally 6 weeks"
+                  },
+                  {
+                    "concept": "d32ee1d2-2518-478d-bceb-7e80fc8cb3b1",
+                    "label": "None"
+                  }
+                ]
+								}
+								}
+							],
               "validators": []
             }
           ]

diff --git a/src/forms/ict-general.json b/src/forms/ict-general.json
@@ -553,6 +553,15 @@
                                 ],
                                 "answers": []
                             },
+                            "behaviours": [
+								{
+									"intent": "edit",
+									"questionOptions": {
+										"rendering": "date",
+                                "concept": "ae329187-6232-4142-aa91-22c85bc8e5b5"
+								}
+								}
+							],
                             "validators": [
 								{
                                     "type": "date",

diff --git a/src/forms/intake-b.json b/src/forms/intake-b.json
@@ -220,9 +220,6 @@
 				"label": "TB prophylaxis type",
 				"type": "obs",
 				"questionOptions": {
-					"calculate": {
-						"calculateExpression": "resolve(api.getLatestObs(patient.id, '54084c9e-bc87-4d95-89fc-eb9a2cffb592'))?.valueCodeableConcept?.coding[0]?.code"
-					  },
 					"rendering": "radio",
 					"concept": "54084c9e-bc87-4d95-89fc-eb9a2cffb592",
 					"answers": [

diff --git a/src/forms/pmtct-mother-discharge.json b/src/forms/pmtct-mother-discharge.json
@@ -23,10 +23,17 @@
                     "calculateExpression": "resolve(api.getLatestObs(patient.id, '0fe4faee-0717-4dc0-be3d-1cd52923804a', '1914ed4a-86fe-43d2-8338-2be2937ff11e'))?.valueDateTime"
                   },
                   "rendering": "date",
-                  "concept": "0fe4faee-0717-4dc0-be3d-1cd52923804a",
-                  "conceptMappings": [],
-                  "answers": []
+                  "concept": "0fe4faee-0717-4dc0-be3d-1cd52923804a"
                 },
+                "behaviours": [
+                  {
+                    "intent": "edit",
+                    "questionOptions": {
+                      "rendering": "date",
+                  "concept": "0fe4faee-0717-4dc0-be3d-1cd52923804a"
+                  }
+                  }
+                ],
                 "validators": [
                   {
                     "type": "date",

diff --git a/src/forms/post-exposure-followup.json b/src/forms/post-exposure-followup.json
@@ -24,6 +24,15 @@
 						"concept": "4285d9e8-3ab4-4a94-bd4e-4dd92855795c",
 						"weeksList": ""
 					},
+					"behaviours": [
+						{
+							"intent": "edit",
+							"questionOptions": {
+								"rendering": "date",
+						"concept": "4285d9e8-3ab4-4a94-bd4e-4dd92855795c"
+						}
+						}
+					],
 					"id": "reportingDate"
 				},
 				{

diff --git a/src/forms/pre-exposure-followup.json b/src/forms/pre-exposure-followup.json
@@ -45,7 +45,16 @@
 							  "calculate": {
 								"calculateExpression": "resolve(api.getLatestObs(patient.id, 'bd09b775-0294-4775-9615-964d98e06a4f', '8c2b6a9b-4795-417d-affe-2530a753b715'))?.valueDateTime"
 							  }
-							}
+							},
+              "behaviours": [
+								{
+									"intent": "edit",
+									"questionOptions": {
+										"concept": "bd09b775-0294-4775-9615-964d98e06a4f",
+							  "rendering": "fixed"
+								}
+								}
+							]
 						  }
           ]
         },

diff --git a/src/views/hiv-testing-service/tabs/positive-tracking.component.tsx b/src/views/hiv-testing-service/tabs/positive-tracking.component.tsx
@@ -1,8 +1,6 @@
 import React, { useCallback, useEffect, useState } from "react";
 import { EncounterList } from "@ohri/openmrs-esm-ohri-commons-lib";
-import {
-  POSITIVE_TRACKING_ENCOUNTER_TYPE,
-} from "../../../constants";
+import { POSITIVE_TRACKING_ENCOUNTER_TYPE } from "../../../constants";
 import { getData } from "../../encounterUtils";
 import { moduleName } from "../../../index";
 import { getPatientEncounters } from "../../../api/api";
@@ -64,14 +62,14 @@ const columns = [
       {
         form: { name: "Positive Tracking", package: "eth_hiv" },
         encounterUuid: encounter.uuid,
-        intent: "*",
+        intent: "view",
         label: "View Positive Tracking",
         mode: "view",
       },
       {
         form: { name: "Positive Tracking", package: "eth_hiv" },
         encounterUuid: encounter.uuid,
-        intent: "*",
+        intent: "edit",
         label: "Edit Positive Tracking",
         mode: "edit",
       },
@@ -97,32 +95,32 @@ const PositiveTrackingList: React.FC<{ patientUuid: string }> = ({
   }, []);
 
   useEffect(() => {
-      (async () => {
-        const previousEncounters = await getPatientEncounters(
-          patientUuid,
-          POSITIVE_TRACKING_ENCOUNTER_TYPE
-        );
-        previousEncounters.length
-          ? setHasPreviousEncounter(true)
-          : setHasPreviousEncounter(false);
-      })();
+    (async () => {
+      const previousEncounters = await getPatientEncounters(
+        patientUuid,
+        POSITIVE_TRACKING_ENCOUNTER_TYPE
+      );
+      previousEncounters.length
+        ? setHasPreviousEncounter(true)
+        : setHasPreviousEncounter(false);
+    })();
   }, [isFormSaved]);
 
   return (
-      <EncounterList
-        patientUuid={patientUuid}
-        encounterType={POSITIVE_TRACKING_ENCOUNTER_TYPE}
-        formList={[{ name: "Positive Tracking" }]}
-        columns={columns}
-        description="Positive Tracking List"
-        headerTitle="Positive Tracking"
-        launchOptions={{
-          displayText: "Add",
-          moduleName: moduleName,
-          hideFormLauncher: hasPreviousEncounter,
-        }}
-        afterFormSaveAction={updateFormSavedStatus}
-      />
+    <EncounterList
+      patientUuid={patientUuid}
+      encounterType={POSITIVE_TRACKING_ENCOUNTER_TYPE}
+      formList={[{ name: "Positive Tracking" }]}
+      columns={columns}
+      description="Positive Tracking List"
+      headerTitle="Positive Tracking"
+      launchOptions={{
+        displayText: "Add",
+        moduleName: moduleName,
+        hideFormLauncher: hasPreviousEncounter,
+      }}
+      afterFormSaveAction={updateFormSavedStatus}
+    />
   );
 };
 

diff --git a/src/views/hiv-testing-service/tabs/retest.component.tsx b/src/views/hiv-testing-service/tabs/retest.component.tsx
@@ -67,14 +67,14 @@ const columns = [
       {
         form: { name: "Re-test", package: "eth_hiv" },
         encounterUuid: encounter.uuid,
-        intent: "*",
+        intent: "view",
         label: "View HIV Retest",
         mode: "view",
       },
       {
         form: { name: "Re-test", package: "eth_hiv" },
         encounterUuid: encounter.uuid,
-        intent: "*",
+        intent: "edit",
         label: "Edit HIV Retest",
         mode: "edit",
       },

diff --git a/src/views/index-case-testing/tabs/ict-general.component.tsx b/src/views/index-case-testing/tabs/ict-general.component.tsx
@@ -52,14 +52,14 @@ const columns = [
       {
         form: { name: "POC ICT General", package: "eth_hiv" },
         encounterUuid: encounter.uuid,
-        intent: "*",
+        intent: "view",
         label: "View ICT General",
         mode: "view",
       },
       {
         form: { name: "POC ICT General", package: "eth_hiv" },
         encounterUuid: encounter.uuid,
-        intent: "*",
+        intent: "edit",
         label: "Edit ICT General",
         mode: "edit",
       },

diff --git a/src/views/index-case-testing/tabs/ict-offer.component.tsx b/src/views/index-case-testing/tabs/ict-offer.component.tsx
@@ -42,14 +42,14 @@ const columns = [
       {
         form: { name: "POC ICT Offer", package: "eth_hiv" },
         encounterUuid: encounter.uuid,
-        intent: "*",
+        intent: "view",
         label: "View ICT Offer",
         mode: "view",
       },
       {
         form: { name: "POC ICT Offer", package: "eth_hiv" },
         encounterUuid: encounter.uuid,
-        intent: "*",
+        intent: "edit",
         label: "Edit ICT Offer",
         mode: "edit",
       },

diff --git a/src/views/index-case-testing/tabs/index-contact-followup.component.tsx b/src/views/index-case-testing/tabs/index-contact-followup.component.tsx
@@ -49,14 +49,14 @@ const columns = [
       {
         form: { name: "POC Index Contact Followup", package: "eth_hiv" },
         encounterUuid: encounter.uuid,
-        intent: "*",
+        intent: "view",
         label: "View Index Contact Followup",
         mode: "view",
       },
       {
         form: { name: "POC Index Contact Followup", package: "eth_hiv" },
         encounterUuid: encounter.uuid,
-        intent: "*",
+        intent: "edit",
         label: "Edit Index Contact Followup",
         mode: "edit",
       },

diff --git a/src/views/pmtct/child/tabs/hei-enrollment.component.tsx b/src/views/pmtct/child/tabs/hei-enrollment.component.tsx
@@ -62,14 +62,14 @@ const columns = [
       {
         form: { name: "HEI Enrollment", package: "eth_hiv" },
         encounterUuid: encounter.uuid,
-        intent: "*",
+        intent: "view",
         label: "View HEI Enrollment",
         mode: "view",
       },
       {
         form: { name: "HEI Enrollment", package: "eth_hiv" },
         encounterUuid: encounter.uuid,
-        intent: "*",
+        intent: "edit",
         label: "Edit HEI Enrollment",
         mode: "edit",
       },

diff --git a/src/views/pmtct/child/tabs/hei-final-outcome.tsx b/src/views/pmtct/child/tabs/hei-final-outcome.tsx
@@ -31,14 +31,14 @@ const columns = [
       {
         form: { name: "HEI Final Outcome", package: "eth_hiv" },
         encounterUuid: encounter.uuid,
-        intent: "*",
+        intent: "view",
         label: "View HEI Final Outcome",
         mode: "view",
       },
       {
         form: { name: "HEI Final Outcome", package: "eth_hiv" },
         encounterUuid: encounter.uuid,
-        intent: "*",
+        intent: "edit",
         label: "Edit HEI Final Outcome",
         mode: "edit",
       },

diff --git a/src/views/pmtct/child/tabs/hei-followup.component.tsx b/src/views/pmtct/child/tabs/hei-followup.component.tsx
@@ -78,14 +78,14 @@ const PMTCTFollowupEncounterList = ({ patientUuid, isFormSaved }) => {
           {
             form: { name: "HEI Followup", package: "eth_hiv" },
             encounterUuid: encounter.uuid,
-            intent: "*",
+            intent: "view",
             label: "View HEI Followup",
             mode: "view",
           },
           {
             form: { name: "HEI Followup", package: "eth_hiv" },
             encounterUuid: encounter.uuid,
-            intent: "*",
+            intent: "edit",
             label: "Edit HEI Followup",
             mode: "edit",
           },

diff --git a/src/views/pmtct/child/tabs/hei-immunization.component.tsx b/src/views/pmtct/child/tabs/hei-immunization.component.tsx
@@ -67,14 +67,14 @@ const columns = [
       {
         form: { name: "HEI Immunization", package: "eth_hiv" },
         encounterUuid: encounter.uuid,
-        intent: "*",
+        intent: "view",
         label: "View HEI Immunization",
         mode: "view",
       },
       {
         form: { name: "HEI Immunization", package: "eth_hiv" },
         encounterUuid: encounter.uuid,
-        intent: "*",
+        intent: "edit",
         label: "Edit HEI Immunization",
         mode: "edit",
       },

diff --git a/src/views/pmtct/mother/tabs/pmtct-mother-discharge.tsx b/src/views/pmtct/mother/tabs/pmtct-mother-discharge.tsx
@@ -31,14 +31,14 @@ const columns = [
       {
         form: { name: "PMTCT Discharge", package: "eth_hiv" },
         encounterUuid: encounter.uuid,
-        intent: "*",
+        intent: "view",
         label: "View Mother's Discharge",
         mode: "view",
       },
       {
         form: { name: "PMTCT Discharge", package: "eth_hiv" },
         encounterUuid: encounter.uuid,
-        intent: "*",
+        intent: "edit",
         label: "Edit Mother's Discharge",
         mode: "edit",
       },

diff --git a/src/views/pmtct/mother/tabs/pmtct-mother-enrollment.tsx b/src/views/pmtct/mother/tabs/pmtct-mother-enrollment.tsx
@@ -43,14 +43,14 @@ const columns = [
       {
         form: { name: "PMTCT Enrollment", package: "eth_hiv" },
         encounterUuid: encounter.uuid,
-        intent: "*",
+        intent: "view",
         label: "View Mother's Enrollment",
         mode: "view",
       },
       {
         form: { name: "PMTCT Enrollment", package: "eth_hiv" },
         encounterUuid: encounter.uuid,
-        intent: "*",
+        intent: "edit",
         label: "Edit Mother's Enrollment",
         mode: "edit",
       },