U4X-521:Refactoring code to enable the launch of TB and HIV enrolment… (

mohuganda#474) U4X-521:Refactoring code to enable the launch of TB and HIV enrolment… (mohuganda#474)
Daphne210 · Apr 16, 2024 · 4af0a7c · 4af0a7c
1 parent f2a76e4
commit 4af0a7c
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 9 deletions.
diff --git a/api/src/main/java/org/openmrs/module/ugandaemr/UgandaEMRConstants.java b/api/src/main/java/org/openmrs/module/ugandaemr/UgandaEMRConstants.java
@@ -175,14 +175,14 @@ public class UgandaEMRConstants {
     public static final String HIV_PROGRAM_UUID = "18c6d4aa-0a36-11e7-8dbb-507b9dc4c741";
     public static final String HIV_DISCONTINUATION_FORM_NAME = "HIV Discontinuation";
     public static final String HIV_DISCONTINUATION_FORM_UUID ="1c7baac0-87cf-4d12-a938-81ea0d6f6448";
-    public static final String HIV_ENROLLMENT_FORM_NAME ="HIV Enrollment";
-    public static final String HIV_ENROLLMENT_FORM_UUID ="4d933e88-27fb-320e-9323-14c5d35ea1ee";
+    public static final String HIV_ENROLLMENT_FORM_NAME ="HMIS ACP HIV 003: HIV CARE/ART CARD - Summary Form";
+    public static final String HIV_ENROLLMENT_FORM_UUID ="52653a60-8300-4c13-be4d-4b746da06fee";
 
     public static final String TB_PROGRAM = "TB Program";
     public static final String TB_PROGRAM_UUID="9dc21a72-0971-11e7-8037-507b9dc4c741";
     public static final String TB_DISCONTINUATION_FORM_NAME = "TB Discontinuation";
     public static final String TB_DISCONTINUATION_FORM_UUID ="7d0dd4eb-3ff7-412c-97e4-808ac8251a83";
-    public static final String TB_ENROLLMENT_FORM_NAME ="TB Enrollment";
+    public static final String TB_ENROLLMENT_FORM_NAME ="DS TB: HMIS TB 003 - TB Client Card Enrollment Page";
     public static final String DR_TB_ENROLLMENT_FORM_UUID ="4929f668-f8d0-11ea-adc1-0242ac120002";
-    public static final String DS_TB_ENROLLMENT_FORM_UUID ="261721d5-1f2e-351b-9159-b25882a6811d";
+    public static final String DS_TB_ENROLLMENT_FORM_UUID ="b00452b6-bb7c-11ea-b3de-0242ac130004";
 }
diff --git a/api/src/main/resources/openmrs-distro.properties b/api/src/main/resources/openmrs-distro.properties
@@ -87,12 +87,11 @@ spa.frontendModules.@openmrs/esm-patient-medications-app=next
 spa.frontendModules.@openmrs/esm-patient-orders-app=next
 spa.frontendModules.@openmrs/esm-patient-programs-app=next
 spa.frontendModules.@openmrs/esm-patient-search-app=next
-spa.frontendModules.@openmrs/esm-patient-test-results-app=next
 spa.frontendModules.@openmrs/esm-patient-vitals-app=next
 spa.frontendModules.@openmrs/esm-system-admin-app=next
 spa.frontendModules.@openmrs/esm-laboratory-app=next
 spa.frontendModules.@openmrs/esm-patient-immunizations-app=next
-spa.frontendModules.@openmrs/esm-stock-management-app=next 
+spa.frontendModules.@openmrs/esm-stock-management-app=next
 spa.frontendModules.@ohri/openmrs-esm-ohri-form-render-app=next
 
 

diff --git a/omod/src/main/webapp/resources/jsonforms/003-HMIS_ACP_ARTCard-SummaryPage .json b/omod/src/main/webapp/resources/jsonforms/003-HMIS_ACP_ARTCard-SummaryPage .json
@@ -6,7 +6,7 @@
   "encounterType": "8d5b27bc-c2cc-11de-8d13-0010c6dffd0f",
   "uuid": "52653a60-8300-4c13-be4d-4b746da06fee",
   "processor": "EncounterFormProcessor",
-  "published": true,
+  "published": false,
   "retired": false,
   "meta": {
     "programs": {

diff --git a/...main/webapp/resources/jsonforms/HMIS-TB-001-SecondLineTBTreatmentForm-EnrollmentPage.json b/...main/webapp/resources/jsonforms/HMIS-TB-001-SecondLineTBTreatmentForm-EnrollmentPage.json
@@ -6,7 +6,7 @@
   "encounterType": "0271ee3d-f274-49d1-b376-c842f075413f",
   "uuid": "4929f668-f8d0-11ea-adc1-0242ac120002",
   "processor": "EncounterFormProcessor",
-  "published": true,
+  "published": false,
   "retired": false,
   "meta": {
     "programs": {

diff --git a/omod/src/main/webapp/resources/jsonforms/HMIS-TB-003-TBClientCard-EnrollmentPage.json b/omod/src/main/webapp/resources/jsonforms/HMIS-TB-003-TBClientCard-EnrollmentPage.json
@@ -6,7 +6,7 @@
   "encounter": "TB Summary (Enrollment)",
   "uuid": "b00452b6-bb7c-11ea-b3de-0242ac130004",
   "processor": "EncounterFormProcessor",
-  "published": true,
+  "published": false,
   "retired": false,
   "meta": {
     "programs": {