diff --git a/src/forms/hei-final-outcome.json b/src/forms/hei-final-outcome.json
index 48b5fbe0..db890ed3 100644
--- 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
index 963cc0e5..154f4eba 100644
--- 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
index 1b20e4e3..3f2a0aea 100644
--- 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
index 05251c58..ffa8a2cb 100644
--- 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
index 7ac2e518..470bdf30 100644
--- 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
index ec74d010..02d11bf4 100644
--- 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
index 02a3cf11..a3dfb988 100644
--- 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
index cdba6b59..3ddac2fa 100644
--- 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 (
-
{MRN_NULL_WARNING}
} diff --git a/src/views/post-exposure/tabs/post-exposure-registration.component.tsx b/src/views/post-exposure/tabs/post-exposure-registration.component.tsx index 1a9576e5..381c7420 100644 --- a/src/views/post-exposure/tabs/post-exposure-registration.component.tsx +++ b/src/views/post-exposure/tabs/post-exposure-registration.component.tsx @@ -69,14 +69,14 @@ const columns = [ { form: { name: "Exposed Person Information", package: "eth_hiv" }, encounterUuid: encounter.uuid, - intent: "*", + intent: "view", label: "View Post Exposure Registration", mode: "view", }, { form: { name: "Exposed Person Information", package: "eth_hiv" }, encounterUuid: encounter.uuid, - intent: "*", + intent: "edit", label: "Edit Post Exposure Registration", mode: "edit", }, diff --git a/src/views/pre-exposure/tabs/pre-exposure-followup.component.tsx b/src/views/pre-exposure/tabs/pre-exposure-followup.component.tsx index d29b1e44..9487e352 100644 --- a/src/views/pre-exposure/tabs/pre-exposure-followup.component.tsx +++ b/src/views/pre-exposure/tabs/pre-exposure-followup.component.tsx @@ -90,14 +90,14 @@ const columns = [ { form: { name: "Pre Exposure Followup", package: "eth_hiv" }, encounterUuid: encounter.uuid, - intent: "*", + intent: "view", label: "View Pre Exposure Followup", mode: "view", }, { form: { name: "Pre Exposure Followup", package: "eth_hiv" }, encounterUuid: encounter.uuid, - intent: "*", + intent: "edit", label: "Edit Pre Exposure Followup", mode: "edit", }, diff --git a/src/views/pre-exposure/tabs/pre-exposure-screening.component.tsx b/src/views/pre-exposure/tabs/pre-exposure-screening.component.tsx index f09df321..5a741120 100644 --- a/src/views/pre-exposure/tabs/pre-exposure-screening.component.tsx +++ b/src/views/pre-exposure/tabs/pre-exposure-screening.component.tsx @@ -90,14 +90,14 @@ const columns = [ { form: { name: "Prep", package: "eth_hiv" }, encounterUuid: encounter.uuid, - intent: "*", + intent: "view", label: "View Pre Exposure Screening", mode: "view", }, { form: { name: "Prep", package: "eth_hiv" }, encounterUuid: encounter.uuid, - intent: "*", + intent: "edit", label: "Edit Pre Exposure Screening", mode: "edit", }, diff --git a/src/views/program-management/tabs/family-information.component.tsx b/src/views/program-management/tabs/family-information.component.tsx index 20612bb7..7d26a7aa 100644 --- a/src/views/program-management/tabs/family-information.component.tsx +++ b/src/views/program-management/tabs/family-information.component.tsx @@ -75,14 +75,14 @@ const columns = [ { form: { name: "Family Information", package: "eth_hiv" }, encounterUuid: encounter.uuid, - intent: "*", + intent: "view", label: "View Family Information", mode: "view", }, { form: { name: "Family Information", package: "eth_hiv" }, encounterUuid: encounter.uuid, - intent: "*", + intent: "edit", label: "Edit Family Information", mode: "edit", }, diff --git a/src/views/program-management/tabs/intake-a.component.tsx b/src/views/program-management/tabs/intake-a.component.tsx index b6067b9a..eaf7ba89 100644 --- a/src/views/program-management/tabs/intake-a.component.tsx +++ b/src/views/program-management/tabs/intake-a.component.tsx @@ -56,14 +56,14 @@ const columns = [ { form: { name: "POC Intake-A", package: "eth_hiv" }, encounterUuid: encounter.uuid, - intent: "*", + intent: "view", label: "View Intake-A", mode: "view", }, { form: { name: "POC Intake-A", package: "eth_hiv" }, encounterUuid: encounter.uuid, - intent: "*", + intent: "edit", label: "Edit Intake-A", mode: "edit", }, diff --git a/src/views/program-management/tabs/intake-b.component.tsx b/src/views/program-management/tabs/intake-b.component.tsx index 5d57e432..40742d7c 100644 --- a/src/views/program-management/tabs/intake-b.component.tsx +++ b/src/views/program-management/tabs/intake-b.component.tsx @@ -56,14 +56,14 @@ const columns = [ { form: { name: "POC Intake-B", package: "eth_hiv" }, encounterUuid: encounter.uuid, - intent: "*", + intent: "view", label: "View Intake-B", mode: "view", }, { form: { name: "POC Intake-B", package: "eth_hiv" }, encounterUuid: encounter.uuid, - intent: "*", + intent: "edit", label: "Edit Intake-B", mode: "edit", }, diff --git a/src/views/program-management/tabs/phdp.component.tsx b/src/views/program-management/tabs/phdp.component.tsx index aa744a91..d0d9f125 100644 --- a/src/views/program-management/tabs/phdp.component.tsx +++ b/src/views/program-management/tabs/phdp.component.tsx @@ -36,14 +36,14 @@ const columns = [ { form: { name: "POC PHDP Form", package: "eth_hiv" }, encounterUuid: encounter.uuid, - intent: "*", + intent: "view", label: "View PHDP", mode: "view", }, { form: { name: "POC PHDP Form", package: "eth_hiv" }, encounterUuid: encounter.uuid, - intent: "*", + intent: "edit", label: "Edit PHDP", mode: "edit", },