Changes in dev to working

distro/configuration/ampathforms/cacx_registration_v1.0.json

@@ -1,5 +1,5 @@
 {
-  "name": "Cervical Cancer Screening Log",
+  "name": "Cervical Cancer Registration Form",
   "version": "1",
   "published": true,
   "retired": false,

distro/configuration/ampathforms/cacx_treatment_v1.0.json

@@ -877,6 +877,17 @@
                   }
                 ]
               },
+              "behaviours":[
+                {
+                  "intent":"*",
+                  "required":"true",
+                  "unspecified":"true",
+                  "hide":{
+                    "hideWhenExpression":"!includes('cacx_screening_methods','160705AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA')"
+                  },
+                  "validators":[]
+                }
+              ],
               "id": "Colposcopy_of_cervix_findings"
             },
             {
@@ -1032,6 +1043,17 @@
                   }
                 ]
               },
+              "behaviours":[
+                {
+                  "intent":"*",
+                  "required":"true",
+                  "unspecified":"true",
+                  "hide":{
+                    "hideWhenExpression":"!includes('cacx_screening_methods','9580690a-0e84-451a-ada9-c4478d999dc2')"
+                  },
+                  "validators":[]
+                }
+              ],
               "id": "hpv_result"
             },
             {
@@ -1144,6 +1166,17 @@
                   }
                 ]
               },
+              "behaviours":[
+                {
+                  "intent":"*",
+                  "required":"true",
+                  "unspecified":"true",
+                  "hide":{
+                    "hideWhenExpression":"!includes('cacx_screening_methods','885AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA')"
+                  },
+                  "validators":[]
+                }
+              ],
               "id": "pap_smear_results"
             },
             {
@@ -1269,6 +1302,17 @@
                   }
                 ]
               },
+              "behaviours":[
+                {
+                  "intent":"*",
+                  "required":"true",
+                  "unspecified":"true",
+                  "hide":{
+                    "hideWhenExpression":"!includes('cacx_screening_methods','8304ffef-ac7b-425c-af3b-6ddc4d052ca8')"
+                  },
+                  "validators":[]
+                }
+              ],
               "id": "cacx_VIA_result"
             }
           ]

distro/configuration/ampathforms/hts_hiv_testing_v1.0.json

@@ -1181,7 +1181,7 @@
       "sections": [
         {
           "label": "HIV Testing Status",
-          "isExpanded": "false",
+          "isExpanded": "true",
           "questions": [
             {
               "label": "State of testing algorithm",

distro/configuration/ampathforms/pmtct_antenatal_v1.0.json

@@ -1117,7 +1117,7 @@
   "processor":"EncounterFormProcessor",
   "uuid":"12de5bc5-352e-4faf-9961-a2125085a75c",
   "referencedForms":[],
-  "encounterType":"2549af50-75c8-4aeb-87ca-4bb2cef6c69a",
+  "encounterType":"677d1a80-dbbe-4399-be34-aa7f54f11405",
   "postSubmissionActions": ["PTrackerSubmissionAction", "ArtSubmissionAction"],
   "allowUnspecifiedAll":true,
   "formOptions": {

distro/configuration/ampathforms/pmtct_labour_and_delivery_v1.0.json

@@ -1240,7 +1240,7 @@
   "processor":"EncounterFormProcessor",
   "uuid":"1e5614d6-5306-11e6-beb8-9e71128cae77",
   "referencedForms":[],
-  "encounterType":"2678423c-0523-4d76-b0da-18177b439eed",
+  "encounterType":"6dc5308d-27c9-4d49-b16f-2c5e3c759757",
   "postSubmissionActions": ["MotherToChildLinkageSubmissionAction", "ArtSubmissionAction"],
   "allowUnspecifiedAll":true,
   "formOptions": {

distro/configuration/concepts/concepts.csv

@@ -1922,3 +1922,4 @@ bd86f7ee-1d5f-4f5d-aa0f-4680aa6e65cb,,Ever been threatened,Ever been threatened,
 162170AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA,,Sulfonamide drug class,Class of antibiotic or substance,Pharmacologic Drug Class,N/A,,Pyrimethamine / sulfadoxine;Sulfadoxine;Sulfadoxine and pyrimethamine,,,,,,,,,,,,,,,,,,
 162399AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA,,Each,Default Dispensing unit,Misc,N/A,,,SNOMED CT:419473009,,,,,,,,,,,,,,,,,
 162402AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA,,Dispensing Units,,ConvSet,N/A,,Each,,,,,,,,,,,,,,,,,,
+1c70c490-cafa-4c95-9fdd-a30b62bb78b8,,Labor & Delivery Details for Child,Labor & Delivery Details for Child,Misc,Rule,,,,,,,,,,,,,,,,,,,,

distro/configuration/concepts/ptracker_concepts.csv

@@ -1,11 +1,12 @@
 uuid,Void/Retire,Fully specified name:en,Description:en,Data class,Data type,Answers,Members,Same as mappings,Short name:en
 6c45421e-2566-47cb-bbb3-07586fffbfe2,,PTrackerID,Namibia P-Tracker Concept,Misc,Text,,,,
-8c64a106-3db1-4a78-af11-df6f5a054945,,Currently Exposed,Namibia P-Tracker Concept,Finding,N/A,,,,
+8c64a106-3db1-4a78-af11-df6f5a054945,,Currently Unexposed,Namibia P-Tracker Concept,Finding,N/A,,,,
 3cc14c25-3117-4541-8f8e-705943087385,,Stopped CTX Prophylaxis according to guideline,Namibia P-Tracker Concept,Finding,N/A,,,,
 a1cab110-9652-4891-90e2-c01a5dbca453,,Never Received CTX Prophylaxis,Namibia P-Tracker Concept,Finding,N/A,,,,
 f3a26c7d-a612-4b71-bd30-a359cae817bc,,Received CTX Prophylaxis,Namibia P-Tracker Concept,Finding,N/A,,,,
 90bd8fec-3ff1-11e9-b210-d663bd873d93,,Date Partner Tested,Namibia P-Tracker Concept,Question,Date,,,,
 52f7fc03-611b-4b62-8498-37beb2fa99ed,,In Transit,Namibia P-Tracker Concept,Misc,N/A,,,,
+54431b42-dae4-4d19-9034-44ba7489a334,,Currently Exposed,Namibia P-Tracker Concept,Finding,N/A,,,,
 6027869c-5d7e-4a82-b22f-6d9c57d61a4d,,HIV Exposure Status,Namibia P-Tracker Concept,Question,Coded,,,,
 efc87cd5-2fd8-411c-ba52-b0d858f541e7,,Facility of next appointment,Namibia P-Tracker Concept,Question,Coded,Current health facility;Patient transferred out;In Transit;Unknown,,,
 f3de6eb3-5d4a-43ca-8648-74649271238c,,CTX Prophylaxis Status,Namibia P-Tracker Concept,Question,Coded,Received CTX Prophylaxis;Never Received CTX Prophylaxis;Stopped CTX Prophylaxis according to guideline;Unknown,,,
@@ -14,3 +15,10 @@ a40d8bc4-56b8-4f28-a1dd-412da5cf20ed,,Linked to ART,Namibia P-Tracker Concept,Qu
 8c2b3506-5b77-4916-a5c8-677a37a65007,,Confirmatory test performed on this visit,Namibia P-Tracker Concept,Question,Coded,Yes;No;Unknown,,,
 ee8c0292-47f8-4c01-8b60-8ba13a560e1a,,Infant HIV Test,Namibia P-Tracker Concept,Test,Coded,"HIV DNA polymerase chain reaction ;HIV enzyme immunoassay, qualitative ;Unknown",,,
 6e62bf7e-2107-4d09-b485-6e60cbbb2d08,,ART Initiation Status,Namibia P-Tracker Concept,Finding,Coded,Currently taking ARV;Medications unavailable;Taking initiated ARVs;Treatment never started - patient refused;Unknown,,,
+6f041992-f0fd-4ec7-b7b6-c06b0f60bf3f,,Tested for HIV during this visit,Namibia P-Tracker Concept,Finding,N/A,,,,
+d18fa331-f158-47d0-b344-cf147c7125a4,,Not tested for HIV during this visit,Namibia P-Tracker Concept,Finding,N/A,,,,
+8b8951a8-e8d6-40ca-ad70-89e8f8f71fa8,,Previously known positive,Namibia P-Tracker Concept,Finding,N/A,,,,
+54b96458-6585-4c4c-a5b1-b3ca7f1be351,,Missing,Namibia P-Tracker Concept,Finding,N/A,,,,
+1587AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA,,"Child's Gender","The newborn child's gender",Question,Coded,Male gender;Female gender;Unknown;Other non-coded,,CIEL:1587,
+99b29c50-fc67-11e8-8eb2-f2801f1b9fd1,,Infant received NVP + AZT prophylaxis up to 6 weeks,,Finding,N/A,,,,
+83a60fef-31c6-4937-907b-42ced15474e3,,NVP Prophylaxis daily up to 6 weeks,,Finding,N/A,,,,

distro/configuration/encountertypes/encountertypes.csv

@@ -37,8 +37,10 @@ a77d3e7f-5c8f-4074-a207-77a70e197b0c,,COVID Lab Encounter,Used for COVID Lab Ord
 a221448d-512b-4750-84bf-d29be9f802b3,,HIV Program Status,To hold computed Obs for care and treatment,,,
 39da3525-afe4-45ff-8977-c53b7b359158,,Drug Order,Encounter for capturing drug orders,,,
 88b84b7b-9d62-4e1e-a16c-a22df76d11ed,,component,Building block for other forms,,,
-677d1a80-dbbe-4399-be34-aa7f54f11405,,Antenatal,ANC visit by a mother,,,
-6dc5308d-27c9-4d49-b16f-2c5e3c759757,,Labor and Delivery,Labor and delivery visit by a mother,,,
+2549af50-75c8-4aeb-87ca-4bb2cef6c69a,,Antenatal,ANC visit by a mother,,,
+2678423c-0523-4d76-b0da-18177b439eed,,Labor and Delivery,Labor and delivery visit by a mother,,,
 4362fd2d-1866-4ea0-84ef-5e5da9627440,,Postnatal,Post natal visit by a mother,,,
 f3d92c68-27e3-4395-b002-5db5f3ca4ef7,,HIV Exposed Infant,HIV Exposed Infant encounter,,,
-f9b52289-3d6d-4a87-ae45-d014d64c8693,,UI select extended test,UI select extended test,,,
+f9b52289-3d6d-4a87-ae45-d014d64c8693,,UI select extended test,UI select extended test,,,
+af1f1b24-d2e8-4282-b308-0bf79b365584,,Infant Postnatal,PNC visit by infant after birth,,,
+269bcc7f-04f8-4ddc-883d-7a3a0d569aad,,Mother Postnatal,Post natal visit by a mother,,,

distro/distro.properties

@@ -16,8 +16,8 @@ omod.owa=${owa.version}
 
 omod.attachments=${attachments.version}
 omod.queue=${queue.version}
-omod.appointments=${appointments.version}
-omod.appointments.groupId=org.bahmni.module
+#omod.appointments=${appointments.version}
+#omod.appointments.groupId=org.bahmni.module
 omod.cohort=${cohort.version}
 omod.reporting=${reporting.version}
 omod.reportingrest=${reportingrest.version}
@@ -37,7 +37,7 @@ omod.uiframework=${uiframework.version}
 omod.ohricore=${ohricore.version}
 omod.ohrireports=${ohrireports.version}
 # omod.casereport=${casereport.version}
-omod.patientflags=${patientflags.version}
+#omod.patientflags=${patientflags.version}
 
 omod.emrapi=${emrapi.version}
 omod.event=${event.version}

distro/pom.xml

@@ -42,7 +42,7 @@
     <!-- <referencedemodata.version>2.1.0-SNAPSHOT</referencedemodata.version> -->
 
     <queue.version>1.0.0-alpha</queue.version>
-    <appointments.version>1.8.0-SNAPSHOT</appointments.version>
+    <!--<appointments.version>1.8.0-SNAPSHOT</appointments.version>-->
     <cohort.version>3.4.0</cohort.version>
     <reporting.version>1.25.0</reporting.version>
     <reportingrest.version>1.14.0</reportingrest.version>
@@ -52,7 +52,7 @@
     <htmlwidgets.version>1.11.0</htmlwidgets.version>
     <serialization-xstream.version>0.2.16</serialization-xstream.version>
     <!-- this is required for flags and taks-->
-    <patientflags.version>3.0.6-SNAPSHOT</patientflags.version>
+    <!--<patientflags.version>3.0.6-SNAPSHOT</patientflags.version>-->
 
     <!-- <ordertemplates.version>1.0.1</ordertemplates.version> -->
     <!-- Versions required for OHRI -->     
@@ -174,12 +174,12 @@
       <version>${queue.version}</version>
       <scope>provided</scope>
     </dependency>
-    <dependency>
+    <!--<dependency>
       <groupId>org.bahmni.module</groupId>
       <artifactId>appointments-omod</artifactId>
       <version>${appointments.version}</version>
       <scope>provided</scope>
-    </dependency>
+    </dependency>-->
     <dependency>
       <groupId>org.openmrs.module</groupId>
       <artifactId>cohort-omod</artifactId>
@@ -216,12 +216,12 @@
       <version>${serialization-xstream.version}</version>
       <scope>provided</scope>
     </dependency>
-    <dependency>
+    <!--<dependency>
       <groupId>org.openmrs.module</groupId>
       <artifactId>patientflags-omod</artifactId>
       <version>${patientflags.version}</version>
       <scope>provided</scope>
-    </dependency>
+    </dependency>-->
 
      <!-- Versions required for OHRI -->
      <dependency>