@@ -30,7 +30,7 @@
disableEncounterDate()
//Disable linked to TB clinic option
- disableContainer("#" + 164435)
+ disableContainer("#" + 175384)
//Disable screened for HIV option
disableContainer("#" + 99550)
@@ -72,7 +72,7 @@
// In edit mode, enable linked to TB clinic and Unit TB Number if lab TB results were initially positive
var labTBResultsValue = jq('#165291').find("select option:selected").val()
if(labTBResultsValue === "703"){
- enableContainer("#" + 164435)
+ enableContainer("#" + 175384)
enable_fields(164955)
}
@@ -142,10 +142,10 @@
jq('#165291').find("select").change(function(){
const selectedOption = $(this).children("option:selected").val()
if(selectedOption === '703'){
- enableContainer("#164435")
+ enableContainer("#175384")
enableContainer("#164955")
}else{
- disableContainer("#164435")
+ disableContainer("#175384")
disableContainer("#164955")
}
@@ -429,7 +429,7 @@
-
+
|
diff --git a/omod/src/main/webapp/resources/htmlforms/HMIS-005-IntegratedAntenatalRegister.xml b/omod/src/main/webapp/resources/htmlforms/HMIS-005-IntegratedAntenatalRegister.xml
index 1db78ea22..d5ece7d73 100644
--- a/omod/src/main/webapp/resources/htmlforms/HMIS-005-IntegratedAntenatalRegister.xml
+++ b/omod/src/main/webapp/resources/htmlforms/HMIS-005-IntegratedAntenatalRegister.xml
@@ -2,7 +2,7 @@
formDescription="Entry form for patients enrolled for ANC services"
formEncounterType="044daI6d-f80e-48fe-aba9-037f241905Pe"
formUuid="362e296b-1315-48a9-8de6-5f4cc3cad314"
- formVersion="3.0.0"
+ formVersion="4.0.0"
formAddMetadata="yes"
formUILocation="patientDashboard.visitActions"
formOrder="8"
diff --git a/omod/src/main/webapp/resources/htmlforms/HMIS-100-DeathAndCertification.xml b/omod/src/main/webapp/resources/htmlforms/HMIS-100-DeathAndCertification.xml
index 93ce6caa0..98805ea68 100644
--- a/omod/src/main/webapp/resources/htmlforms/HMIS-100-DeathAndCertification.xml
+++ b/omod/src/main/webapp/resources/htmlforms/HMIS-100-DeathAndCertification.xml
@@ -2,7 +2,7 @@
formDescription="Death Notification and Certification"
formEncounterType="e75c856a-9e91-4ffb-bf43-1b0450b4ff8c"
formUuid="bb282ac8-d8b6-4d76-88b9-86da83efec41"
- formVersion="1.2"
+ formVersion="4.0.0"
formAddMetadata="yes"
formUILocation="patientDashboard.visitActions"
formOrder="12"
diff --git a/omod/src/main/webapp/resources/htmlforms/HMIS-ACP-001-Viral-Load Non-SupressedRegister.xml b/omod/src/main/webapp/resources/htmlforms/HMIS-ACP-001-Viral-Load Non-SupressedRegister.xml
index 6b04325fa..d7e7e9354 100644
--- a/omod/src/main/webapp/resources/htmlforms/HMIS-ACP-001-Viral-Load Non-SupressedRegister.xml
+++ b/omod/src/main/webapp/resources/htmlforms/HMIS-ACP-001-Viral-Load Non-SupressedRegister.xml
@@ -2,7 +2,7 @@
formDescription="All Viral Loads that are non suppressed"
formEncounterType="38cb2232-30fc-4b1f-8df1-47c795771ee9"
formUuid="32f56e18-8dbf-4f17-8d09-d1fa3fb84843"
- formVersion="3.0"
+ formVersion="4.0.0"
formAddMetadata="yes"
formUILocation="patientDashboard.visitActions"
formOrder="3"
diff --git a/omod/src/main/webapp/resources/htmlforms/HMIS-ACP-003-HivCareArtCard-HealthEducationAndPsychosocialSupportPage.xml b/omod/src/main/webapp/resources/htmlforms/HMIS-ACP-003-HivCareArtCard-HealthEducationAndPsychosocialSupportPage.xml
index ded4c2604..f2d427f9f 100644
--- a/omod/src/main/webapp/resources/htmlforms/HMIS-ACP-003-HivCareArtCard-HealthEducationAndPsychosocialSupportPage.xml
+++ b/omod/src/main/webapp/resources/htmlforms/HMIS-ACP-003-HivCareArtCard-HealthEducationAndPsychosocialSupportPage.xml
@@ -2,7 +2,7 @@
formDescription="Captures health eduction and counseling encounters"
formEncounterType="6d88e370-f2ba-476b-bf1b-d8eaf3b1b67e"
formUuid="b8224534-7df0-4c00-ba8e-6b1f291087eb"
- formVersion="3.0"
+ formVersion="4.0.0"
formAddMetadata="yes"
formUILocation="patientDashboard.visitActions"
formOrder="2"
diff --git a/omod/src/main/webapp/resources/htmlforms/HMIS-ACP-005b-EmergencyARTRefillForm.xml b/omod/src/main/webapp/resources/htmlforms/HMIS-ACP-005b-EmergencyARTRefillForm.xml
index 81c476642..a59a17cab 100644
--- a/omod/src/main/webapp/resources/htmlforms/HMIS-ACP-005b-EmergencyARTRefillForm.xml
+++ b/omod/src/main/webapp/resources/htmlforms/HMIS-ACP-005b-EmergencyARTRefillForm.xml
@@ -2,7 +2,7 @@
formDescription="HMIS ACP 005b: Emergency ART Refill Form"
formEncounterType="d18bd8f2-dfcd-11eb-ba80-0242ac130004"
formUuid="aa858f72-0080-44a8-8bac-55bc275e1d10"
-formVersion="3.0"
+formVersion="4.0.0"
formAddMetadata="yes"
formUILocation="patientDashboard.visitActions"
formOrder="3"
diff --git a/omod/src/main/webapp/resources/htmlforms/HMIS-ACP-007-MissedAppointmentRegister.xml b/omod/src/main/webapp/resources/htmlforms/HMIS-ACP-007-MissedAppointmentRegister.xml
index 5dc930e7e..5e9da62f1 100644
--- a/omod/src/main/webapp/resources/htmlforms/HMIS-ACP-007-MissedAppointmentRegister.xml
+++ b/omod/src/main/webapp/resources/htmlforms/HMIS-ACP-007-MissedAppointmentRegister.xml
@@ -2,7 +2,7 @@
formDescription="Record all clients who missed their appointment"
formEncounterType="791faefd-36b8-482f-ab78-20c297b03851"
formUuid="59d9341a-f65e-4e86-a98b-415ea54dfa81"
- formVersion="3.4.2"
+ formVersion="4.0.0"
formAddMetadata="yes"
formUILocation="patientDashboard.visitActions"
formOrder="2"
diff --git a/omod/src/main/webapp/resources/htmlforms/HMIS-ACP-015-ExposedInfantClinicalChart-EncounterPage.xml b/omod/src/main/webapp/resources/htmlforms/HMIS-ACP-015-ExposedInfantClinicalChart-EncounterPage.xml
index 1d726cb11..a5df182e0 100644
--- a/omod/src/main/webapp/resources/htmlforms/HMIS-ACP-015-ExposedInfantClinicalChart-EncounterPage.xml
+++ b/omod/src/main/webapp/resources/htmlforms/HMIS-ACP-015-ExposedInfantClinicalChart-EncounterPage.xml
@@ -2,7 +2,7 @@
formDescription="Captures encounter details for infants born to HIV positive mothers"
formEncounterType="4345dacb-909d-429c-99aa-045f2db77e2b"
formUuid="6f6b4802-7642-4226-84dc-ea7db01924b6"
- formVersion="3.0.0"
+ formVersion="4.0.0"
formAddMetadata="yes"
formUILocation="patientDashboard.visitActions"
formOrder="5"
@@ -345,7 +345,152 @@
}
});
+ var enableStockManagement = ;
+ jq(document).ready(function () {
+
+ currentLocationUUID = getLocationByName(jq("#location_id").find("select").find(":selected").text())
+ if (enableStockManagement) {
+ jq("#drug_strength_select_1").removeClass("hidden");
+ jq("#drug_strength_select_2").removeClass("hidden");
+ jq("#drug_strength_select_3").removeClass("hidden");
+ jq("#drug_strength_select_4").removeClass("hidden");
+ jq("#drug_strength_select_5").removeClass("hidden");
+ jq("#drug_strength_select_6").removeClass("hidden");
+ jq("#drug_strength_select_7").removeClass("hidden");
+ jq("#drug_strength_select_8").removeClass("hidden");
+ jq("#drug_strength_select_9").removeClass("hidden");
+ jq("#drug_strength_select_10").removeClass("hidden");
+
+ } else {
+ jq("#drug_strength_1").removeClass("hidden");
+ jq("#drug_strength_2").removeClass("hidden");
+ jq("#drug_strength_3").removeClass("hidden");
+ jq("#drug_strength_4").removeClass("hidden");
+ jq("#drug_strength_5").removeClass("hidden");
+ jq("#drug_strength_6").removeClass("hidden");
+ jq("#drug_strength_7").removeClass("hidden");
+ jq("#drug_strength_8").removeClass("hidden");
+ jq("#drug_strength_9").removeClass("hidden");
+ jq("#drug_strength_10").removeClass("hidden");
+ }
+
+ if (enableStockManagement) {
+ jq(".drug_strength").change(function () {
+ var objectPosition = jq(this).attr("id").match(/\d/g)[0]
+ jq('#drug_strength_' + objectPosition + ' input').val(jq(this).find(":selected").attr("strength"))
+ jq('#drug_stock_item_' + objectPosition + ' input').val(jq(this).find(":selected").attr("stockItemUUID"))
+ jq('#drug_dispensing_location_' + objectPosition + ' input').val(jq(this).find(":selected").attr("location"))
+ jq('#drug_' + objectPosition + ' input').val(jq(this).find(":selected").attr("drugUuid"))
+ });
+
+ jq("#art-regimen select").change(function () {
+ getDrugByConcept(jq(this).find(":selected").val(), "drug_strength_art_select")
+ });
+
+ jq("#drug_strength_art_select").change(function () {
+ jq(this).parent().find('#drug_strength_art_id input').val(jq(this).find(":selected").attr("strength"))
+ jq(this).parent().find('#drug_stock_item_id input').val(jq(this).find(":selected").attr("stockItemUUID"))
+ jq(this).parent().find('#drug_dispensing_location_id input').val(jq(this).find(":selected").attr("location"))
+ jq(this).parent().find('#drug_id input').val(jq(this).find(":selected").attr("drugUuid"))
+ });
+
+ jq("#isoniazid-trigger input:radio").change(function () {
+ getDrugByConcept(jq(this).val(), "drug_strength_isoniazid_select")
+ });
+
+ jq("#drug_strength_isoniazid_select").change(function () {
+ jq(this).parent().find('#drug_strength_isoniazid_id input').val(jq(this).find(":selected").attr("strength"))
+ jq(this).parent().find('#drug_stock_item_id input').val(jq(this).find(":selected").attr("stockItemUUID"))
+ jq(this).parent().find('#drug_dispensing_location_id input').val(jq(this).find(":selected").attr("location"))
+ jq(this).parent().find('#drug_id input').val(jq(this).find(":selected").attr("drugUuid"))
+ });
+
+ jq("#vitamin-b6-trigger input:radio").change(function () {
+ getDrugByConcept(jq(this).val(), "drug_strength_vitamin_b6_select")
+ });
+
+ jq("#drug_strength_vitamin_b6_select").change(function () {
+ jq(this).parent().find('#drug_strength_vitamin_b6_id input').val(jq(this).find(":selected").attr("strength"))
+ jq(this).parent().find('#drug_stock_item_vitamin_b6_id input').val(jq(this).find(":selected").attr("stockItemUUID"))
+ jq(this).parent().find('#drug_dispensing_location_vitamin_b6_id input').val(jq(this).find(":selected").attr("location"))
+ jq(this).parent().find('#drug_vitamin_b6_id input').val(jq(this).find(":selected").attr("drugUuid"))
+ });
+
+ jq("#fluconazole-trigger input:radio").change(function () {
+ getDrugByConcept(jq(this).val(), "drug_strength_fluconazole_select")
+ });
+
+ jq("#drug_strength_fluconazole_select").change(function () {
+ jq(this).parent().find('#drug_strength_fluconazole_id input').val(jq(this).find(":selected").attr("strength"))
+ jq(this).parent().find('#drug_stock_item_fluconazole_id input').val(jq(this).find(":selected").attr("stockItemUUID"))
+ jq(this).parent().find('#drug_dispensing_location_fluconazole_id input').val(jq(this).find(":selected").attr("location"))
+ jq(this).parent().find('#drug_fluconazole_id input').val(jq(this).find(":selected").attr("drugUuid"))
+ });
+
+ jq("#99413-target input:radio").change(function () {
+ getDrugByConcept(jq(this).val(), "drug_strength_99413_select")
+ });
+
+ jq("#drug_strength_99413_select").change(function () {
+ jq(this).parent().find('#drug_strength_99413_id input').val(jq(this).find(":selected").attr("strength"))
+ jq(this).parent().find('#drug_stock_item_99413_id input').val(jq(this).find(":selected").attr("stockItemUUID"))
+ jq(this).parent().find('#drug_dispensing_location_99413_id input').val(jq(this).find(":selected").attr("location"))
+ jq(this).parent().find('#drug_99413_id input').val(jq(this).find(":selected").attr("drugUuid"))
+ });
+
+ jq(".drug-other").change(function () {
+ getDrugByConcept(jq(this).find("input:hidden").val(), "drug_strength_select_" + jq(this).attr("id").match(/\d/g)[0] + "")
+ });
+
+ jq(".arv-split").change(function () {
+ getDrugByConcept(jq(this).find("input:hidden").val(), jq(this).attr("id").match(/\d/g)[0] + "_arv_split_strength_select")
+ });
+ jq(".arv_split-strength").change(function () {
+ var objectPosition = jq(this).attr("id").match(/\d/g)[0]
+ jq('#' + objectPosition + '_arv_split_strength input').val(jq(this).find(":selected").attr("strength"))
+ jq('#' + objectPosition + '_arv_split_stock_item input').val(jq(this).find(":selected").attr("stockItemUUID"))
+ jq('#' + objectPosition + '_arv_split_dispensing_location input').val(jq(this).find(":selected").attr("location"))
+ jq('#' + objectPosition + '_arv_split input').val(jq(this).find(":selected").attr("drugUuid"))
+ });
+ }
+
+ });
+ function getDrugByConcept(concept, drug_strength_id) {
+ if (enableStockManagement) {
+ jq("#" + drug_strength_id + "").find("select").empty();
+ var stockItems = []
+ jq.ajax({
+ type: "GET",
+ url: '/' + OPENMRS_CONTEXT_PATH + "/ws/rest/v1/stockmanagement/stockiteminventory?v=default&limit=10&totalCount=true&conceptId=" + concept + "&groupBy=LocationStockItem&dispenseLocationUuid=" + currentLocationUUID + "&includeStrength=1&includeConceptRefIds=1",
+ dataType: "json",
+ async: false,
+ success: function (data) {
+ stockItems = data.results;
+ }
+ });
+ if (stockItems.length) {
+ enable_fields(drug_strength_id)
+ }
+ jq("#" + drug_strength_id + "").find("select").append($("").attr("value", ''));
+ for (var i = 0; i < stockItems.length; i++) {
+ jq("#" + drug_strength_id + "").find("select").append($("").attr("value", stockItems[i].stockItemUuid).text((stockItems[i].drugName + " | " + stockItems[i].quantity + " " + stockItems[i].quantityUoM + " at " + stockItems[i].partyName).replace("null", " qty ")).attr("location", stockItems[i].locationUuid).attr("strength", stockItems[i].drugStrength).attr("stockItemUUID", stockItems[i].stockItemUuid).attr("drugUuid", stockItems[i].drugUuid));
+ }
+ }
+ }
+ function getLocationByName(locationName) {
+ var locationUUID
+ jq.ajax({
+ type: "GET",
+ url: '/' + OPENMRS_CONTEXT_PATH + "/ws/rest/v1/location?q=" + locationName,
+ dataType: "json",
+ async: false,
+ success: function (data) {
+ locationUUID = data.results[0].uuid
+ }
+ });
+ return locationUUID
+ }
@@ -597,58 +742,85 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/omod/src/main/webapp/resources/htmlforms/HMIS-ACP-015-ExposedInfantClinicalChart-SummaryPage.xml b/omod/src/main/webapp/resources/htmlforms/HMIS-ACP-015-ExposedInfantClinicalChart-SummaryPage.xml
index 7df88cf92..f6079898e 100644
--- a/omod/src/main/webapp/resources/htmlforms/HMIS-ACP-015-ExposedInfantClinicalChart-SummaryPage.xml
+++ b/omod/src/main/webapp/resources/htmlforms/HMIS-ACP-015-ExposedInfantClinicalChart-SummaryPage.xml
@@ -2,7 +2,7 @@
formDescription="Captures demographic details for infants born to HIV positive mothers"
formEncounterType="9fcfcc91-ad60-4d84-9710-11cc25258719"
formUuid="860c5f2f-cf3c-4c3f-b0c4-9958b6a5a938"
- formVersion="3.0.0"
+ formVersion="4.0.0"
formAddMetadata="yes"
formUILocation="patientDashboard.visitActions"
formOrder="4"
diff --git a/omod/src/main/webapp/resources/htmlforms/HMIS-ACP-018-HTSClientCard.xml b/omod/src/main/webapp/resources/htmlforms/HMIS-ACP-018-HTSClientCard.xml
index ee5be9eb6..6fcd1660a 100644
--- a/omod/src/main/webapp/resources/htmlforms/HMIS-ACP-018-HTSClientCard.xml
+++ b/omod/src/main/webapp/resources/htmlforms/HMIS-ACP-018-HTSClientCard.xml
@@ -2,7 +2,7 @@
formDescription="HIV Testing Services Client Card"
formEncounterType="264daIZd-f80e-48fe-nba9-P37f2W1905Pv"
formUuid="b5c62a98-84d3-43e8-a9be-972185070dd4"
- formVersion="1.2"
+ formVersion="4.0.0"
formAddMetadata="yes"
formUILocation="patientDashboard.visitActions"
formOrder="6"
diff --git a/omod/src/main/webapp/resources/htmlforms/HMIS-ACP-029-SafeMaleCircumcisionClientCard-FollowUpSection.xml b/omod/src/main/webapp/resources/htmlforms/HMIS-ACP-029-SafeMaleCircumcisionClientCard-FollowUpSection.xml
index 909ddcc91..043b32091 100644
--- a/omod/src/main/webapp/resources/htmlforms/HMIS-ACP-029-SafeMaleCircumcisionClientCard-FollowUpSection.xml
+++ b/omod/src/main/webapp/resources/htmlforms/HMIS-ACP-029-SafeMaleCircumcisionClientCard-FollowUpSection.xml
@@ -2,7 +2,7 @@
formDescription="Captures clients undergoing safe male circumcision follow up"
formEncounterType="d0f9e0b7-f336-43bd-bf50-0a7243857fa6"
formUuid="a4054e91-668f-4bc5-9ba5-6d40e446e2ac"
- formVersion="3.0.0"
+ formVersion="4.0.0"
formAddMetadata="yes"
formUILocation="patientDashboard.visitActions"
formOrder="10"
diff --git a/omod/src/main/webapp/resources/htmlforms/HMIS-ACP-029-SafeMaleCircumcisionClientForm.xml b/omod/src/main/webapp/resources/htmlforms/HMIS-ACP-029-SafeMaleCircumcisionClientForm.xml
index 594ecf39d..b4a154e9d 100644
--- a/omod/src/main/webapp/resources/htmlforms/HMIS-ACP-029-SafeMaleCircumcisionClientForm.xml
+++ b/omod/src/main/webapp/resources/htmlforms/HMIS-ACP-029-SafeMaleCircumcisionClientForm.xml
@@ -2,7 +2,7 @@
formDescription="Safe Male Circumcision Client Form"
formEncounterType="244da86d-f80e-48fe-aba9-067f241905ee"
formUuid="9d9193e7-b038-4c44-a7a3-830baa288565"
- formVersion="3.0.0"
+ formVersion="4.0.0"
formAddMetadata="yes"
formUILocation="patientDashboard.visitActions"
formOrder="9"
diff --git a/omod/src/main/webapp/resources/htmlforms/HMIS-ACP-CervicalCancerPreTreatmentRegister.xml b/omod/src/main/webapp/resources/htmlforms/HMIS-ACP-CervicalCancerPreTreatmentRegister.xml
index 6eec9f55c..515ec76fa 100644
--- a/omod/src/main/webapp/resources/htmlforms/HMIS-ACP-CervicalCancerPreTreatmentRegister.xml
+++ b/omod/src/main/webapp/resources/htmlforms/HMIS-ACP-CervicalCancerPreTreatmentRegister.xml
@@ -2,7 +2,7 @@
formDescription="Cervical Cancer Treatment Form"
formEncounterType="6d647bd4-33d6-4d04-a04a-595d2159b456"
formUuid="9bc7f745-b61f-4553-ad77-7208238a7068"
- formVersion="3.1.0"
+ formVersion="4.0.0"
formAddMetadata="yes"
formUILocation="patientDashboard.visitActions"
formOrder="17"
diff --git a/omod/src/main/webapp/resources/htmlforms/HMIS-ACP-CervicalCancerScreeningForm.xml b/omod/src/main/webapp/resources/htmlforms/HMIS-ACP-CervicalCancerScreeningForm.xml
index 459ca769c..dc6e55ea3 100644
--- a/omod/src/main/webapp/resources/htmlforms/HMIS-ACP-CervicalCancerScreeningForm.xml
+++ b/omod/src/main/webapp/resources/htmlforms/HMIS-ACP-CervicalCancerScreeningForm.xml
@@ -2,7 +2,7 @@
formDescription="Cervical Cancer Screening Form"
formEncounterType="91725548-2d90-4b28-be6d-0509ba37bb0f"
formUuid="e4c98c45-f01e-4737-a62a-baf981ae7b14"
- formVersion="3.1.0"
+ formVersion="4.0.0"
formAddMetadata="yes"
formUILocation="patientDashboard.visitActions"
formOrder="16"
diff --git a/omod/src/main/webapp/resources/htmlforms/HMIS-EPI-003-ChildHealthCard.xml b/omod/src/main/webapp/resources/htmlforms/HMIS-EPI-003-ChildHealthCard.xml
index aa47785a7..224dd4425 100644
--- a/omod/src/main/webapp/resources/htmlforms/HMIS-EPI-003-ChildHealthCard.xml
+++ b/omod/src/main/webapp/resources/htmlforms/HMIS-EPI-003-ChildHealthCard.xml
@@ -3,7 +3,7 @@
formDescription="Immunization record and education document for mothers"
formEncounterType="87a0d5b1-53dc-4269-bf39-ada0d5d16c0c"
formUuid="0c18dfe5-4ac2-4755-8b09-462de8ebafba"
- formVersion="1.0.0"
+ formVersion="4.0.0"
formAddMetadata="yes"
formUILocation="patientDashboard.visitActions"
formIcon="icon-medkit"
diff --git a/omod/src/main/webapp/resources/htmlforms/HMIS-EPI-007-ChildRegister.xml b/omod/src/main/webapp/resources/htmlforms/HMIS-EPI-007-ChildRegister.xml
index 88f6046b8..9690553fa 100644
--- a/omod/src/main/webapp/resources/htmlforms/HMIS-EPI-007-ChildRegister.xml
+++ b/omod/src/main/webapp/resources/htmlforms/HMIS-EPI-007-ChildRegister.xml
@@ -3,7 +3,7 @@
within the health unit service area to facilitate monitoring (defaulter tracking)"
formEncounterType="87a0d5b1-53dc-4269-bf39-ada0d5d16c0c"
formUuid="0f0ea87a-ef9e-4603-8789-3698d90b6a65"
- formVersion="1.0.0"
+ formVersion="4.0.0"
formAddMetadata="yes"
formUILocation="patientDashboard.visitActions"
formIcon="icon-medkit"
diff --git a/omod/src/main/webapp/resources/htmlforms/HMIS-HIV-003-HivCareArtCard-ClinicalAssessmentPage.xml b/omod/src/main/webapp/resources/htmlforms/HMIS-HIV-003-HivCareArtCard-ClinicalAssessmentPage.xml
index ff46e8312..6301e255f 100644
--- a/omod/src/main/webapp/resources/htmlforms/HMIS-HIV-003-HivCareArtCard-ClinicalAssessmentPage.xml
+++ b/omod/src/main/webapp/resources/htmlforms/HMIS-HIV-003-HivCareArtCard-ClinicalAssessmentPage.xml
@@ -2,7 +2,7 @@
formDescription="A visit for a client for clinical assessment "
formEncounterType="8d5b2be0-c2cc-11de-8d13-0010c6dffd0f"
formUuid="12de5bc5-352e-4faf-9961-a2125085a75c"
- formVersion="3.2.0"
+ formVersion="4.0.0"
formAddMetadata="yes"
formUILocation="patientDashboard.visitActions"
formOrder="0"
diff --git a/omod/src/main/webapp/resources/htmlforms/HMIS-IPD-003-InPatientRegister.xml b/omod/src/main/webapp/resources/htmlforms/HMIS-IPD-003-InPatientRegister.xml
index be8289d78..d8bf608ef 100644
--- a/omod/src/main/webapp/resources/htmlforms/HMIS-IPD-003-InPatientRegister.xml
+++ b/omod/src/main/webapp/resources/htmlforms/HMIS-IPD-003-InPatientRegister.xml
@@ -1,6 +1,6 @@
@@ -32,7 +32,7 @@
disableEncounterDate()
//Disable linked to TB clinic option
- disableContainer("#" + 164435)
+ disableContainer("#" + 175384)
//Disable screened for HIV option
disableContainer("#" + 99550)
@@ -74,7 +74,7 @@
// In edit mode, enable linked to TB clinic and Unit TB Number if lab TB results were initially positive
var labTBResultsValue = jq('#165291').find("select option:selected").val()
if(labTBResultsValue === "703"){
- enableContainer("#" + 164435)
+ enableContainer("#" + 175384)
enable_fields(164955)
}
@@ -117,10 +117,10 @@
jq('#165291').find("select").change(function(){
const selectedOption = $(this).children("option:selected").val()
if(selectedOption === '703'){
- enableContainer("#164435")
+ enableContainer("#175384")
enableContainer("#164955")
}else{
- disableContainer("#164435")
+ disableContainer("#175384")
disableContainer("#164955")
}
diff --git a/omod/src/main/webapp/resources/htmlforms/HMIS-LAB-001-GENERAL-LABORATORY-TEST-REQUEST-FORM.xml b/omod/src/main/webapp/resources/htmlforms/HMIS-LAB-001-GENERAL-LABORATORY-TEST-REQUEST-FORM.xml
index 9ee9aa2bd..822e3f092 100644
--- a/omod/src/main/webapp/resources/htmlforms/HMIS-LAB-001-GENERAL-LABORATORY-TEST-REQUEST-FORM.xml
+++ b/omod/src/main/webapp/resources/htmlforms/HMIS-LAB-001-GENERAL-LABORATORY-TEST-REQUEST-FORM.xml
@@ -2,7 +2,7 @@
formDescription="A request for Lab test to Lab"
formEncounterType="cbf01392-ca29-11e9-a32f-2a2ae2dbcce4"
formUuid="14f82cc8-ca2a-11e9-a32f-2a2ae2dbcce4"
- formVersion="3.7.11"
+ formVersion="4.0.0"
formAddMetadata="yes"
formUILocation="patientDashboard.visitActions"
formOrder="2"
diff --git a/omod/src/main/webapp/resources/htmlforms/HMIS-MCH-006-Maternity.xml b/omod/src/main/webapp/resources/htmlforms/HMIS-MCH-006-Maternity.xml
index 2362f5557..42adddeb9 100644
--- a/omod/src/main/webapp/resources/htmlforms/HMIS-MCH-006-Maternity.xml
+++ b/omod/src/main/webapp/resources/htmlforms/HMIS-MCH-006-Maternity.xml
@@ -1,4 +1,4 @@
-
+
|