diff --git a/.gitignore b/.gitignore old mode 100644 new mode 100755 diff --git a/.tx/config b/.tx/config old mode 100644 new mode 100755 diff --git a/LICENSE b/LICENSE old mode 100644 new mode 100755 index 722fa17693..d7d3aaaf34 --- a/LICENSE +++ b/LICENSE @@ -1,5 +1,6 @@ -Bahmni OpenMRS Apps -Copyright 2014 ThoughtWorks, Inc +Bahmni application configuration for default demo setup + +Copyright (C) 2018 OpenMRS, Inc This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as diff --git a/README.md b/README.md old mode 100644 new mode 100755 diff --git a/offline/openmrs/apps/clinical/.extension.json.swp b/offline/openmrs/apps/clinical/.extension.json.swp old mode 100644 new mode 100755 diff --git a/openelis/images/labLogo.jpg b/openelis/images/labLogo.jpg old mode 100644 new mode 100755 diff --git a/openelis/migrations/liquibase.xml b/openelis/migrations/liquibase.xml old mode 100644 new mode 100755 diff --git a/openmrs/apps/JsBarcode.all.min.js b/openmrs/apps/JsBarcode.all.min.js old mode 100644 new mode 100755 diff --git a/openmrs/apps/admin/app.json b/openmrs/apps/admin/app.json old mode 100644 new mode 100755 diff --git a/openmrs/apps/admin/extension.json b/openmrs/apps/admin/extension.json old mode 100644 new mode 100755 diff --git a/openmrs/apps/adt/app.json b/openmrs/apps/adt/app.json old mode 100644 new mode 100755 diff --git a/openmrs/apps/adt/extension.json b/openmrs/apps/adt/extension.json old mode 100644 new mode 100755 diff --git a/openmrs/apps/appointments/app.json b/openmrs/apps/appointments/app.json old mode 100644 new mode 100755 index ad88678de5..06fbf7d12b --- a/openmrs/apps/appointments/app.json +++ b/openmrs/apps/appointments/app.json @@ -9,7 +9,7 @@ ], "config": { "minCharLengthToTriggerPatientSearch": 3, - "enableSpecialities": true, + "enableSpecialities": false, "startOfWeek": 2, "weekStart": "isoWeek", "calendarSlotDuration": "00:30", @@ -42,6 +42,12 @@ "#FF1493", "#00BFFF" ], + "appointmentBlocks":[ + {"name":"APP_BLOCK_1","startTime":"12:00 am","endTime":"08:59 am"}, + {"name":"APP_BLOCK_2","startTime":"09:00 am","endTime":"11:59 am"}, + {"name":"APP_BLOCK_3","startTime":"12:00 pm","endTime":"03:29 pm"}, + {"name":"APP_BLOCK_4","startTime":"03:30 pm","endTime":"11:59 pm"} + ], "allowedActions": ["CheckedIn", "Completed", "Missed", "Cancelled"], "allowedActionsByStatus": { "Scheduled": ["CheckedIn", "Missed", "Cancelled"], diff --git a/openmrs/apps/appointments/extension.json b/openmrs/apps/appointments/extension.json old mode 100644 new mode 100755 diff --git a/openmrs/apps/appointments/printListView.html b/openmrs/apps/appointments/printListView.html old mode 100644 new mode 100755 diff --git a/openmrs/apps/clinical/app.json b/openmrs/apps/clinical/app.json old mode 100644 new mode 100755 index 2f01502297..aea5bbaaf6 --- a/openmrs/apps/clinical/app.json +++ b/openmrs/apps/clinical/app.json @@ -24,7 +24,6 @@ ], "config": { "hideConditions": false, - "enableRadiologyOrderOptions":["Urgent","NeedsPrint"], "enableLabOrderOptions":["Urgent", "NeedsPrint"], "quickPrints":false, "networkConnectivity" : { @@ -36,7 +35,7 @@ { "locale" : "pt", "css": "offline-language-portuguese-brazil"} ] }, - "diagnosisStatus": "Inactive", + "diagnosisStatus": "Inactive", "program": { "patientInformation": { "ageLimit": 100 @@ -52,29 +51,26 @@ } }, "patientContext": { - "programAttributes": [ - "Id_Number", - "Doctor", - "Stage" - ], - "personAttributes": [ - "class", - "caste" - ], - "additionalPatientIdentifiers": [ - "National ID" - ], - "preferredIdentifier": "Id_Number" - }, + "programAttributes": [ + "Id_Number", + "Doctor", + "Stage" + ], + "personAttributes": [ + + ], + "additionalPatientIdentifiers": [ + + ], + "preferredIdentifier": "Id_Number" + }, "obsIgnoreList": [ "REGISTRATION FEES", "COMMENTS", "Patient file" ], "otherInvestigationsMap": { - "Radiology": "Radiology Order", - "Endoscopy": "Endoscopy Order" - }, + }, "allowConsultationWhenNoOpenVisit": false, "defaultVisitType": "OPD", "visitTypeForRetrospectiveEntries": "Special OPD", @@ -87,6 +83,92 @@ "nonCodedConceptName":"Non-Coded Chief Complaint", "durationRequired": false, "allowAddMore": true + }, + "PP_Key_population": { + "disableAddNotes": true + }, + "PP_If_Key_population_yes": { + "disableAddNotes": true + }, + "PP_Vulnerable_Population": { + "disableAddNotes": true + }, + "PP_IF_Vulnerable_Population_Yes": { + "disableAddNotes": true + }, + "Probable delivery date": { + "allowFutureDates":true + }, + "Probable delivery date": { + "allowFutureDates":true + }, + "Symptoms_Prophylaxis": { + "required": true, + "dropdown": true + }, + "Symptoms Prophylaxis_New": { + "required": true + }, + "Date of Diagnosis": { + "required": true + }, + "Treatment End Date": { + "buttonSelect": true + }, + "Has STI Symptoms": { + "required": true + }, + "TB Type is Extrapulmonary": { + "required": true, + "buttonSelect": true + }, + "TInfants Odema_Prophylaxis": { + "required": true, + "buttonSelect": true + }, + "Nutrition Supplement": { + "buttonSelect": true + }, + "Quantity of Nutritional Supplement": { + "required": true + }, + "Type_Prophylaxis": { + "multiSelect" : true + }, + "State_Prophylaxis": { + "required": true, + "buttonSelect": true + }, + "State_Prophylaxis_CTZ": { + "required": true, + "buttonSelect": true + }, + "State_Prophylaxis_Fluconazol": { + "required": true, + "buttonSelect": true + }, + "Start Date_Prophylaxis": { + "required": true + }, + "Start Date_Prophylaxis_CTZ": { + "required": true + }, + "Start Date_Prophylaxis_Fluconazol": { + "required": true + }, + "Received nutritional support": { + "required": true + }, + "STI Diagnosis_Prophylaxis": { + "required": true, + "buttonSelect": true + }, + "Syndromic Approach_STI": { + "required": true, + "buttonSelect": true + }, + "TB Type": { + "dropdown": true }, "Tuberculosis, Adverse Effects" :{ "multiSelect" : true, diff --git a/openmrs/apps/clinical/dashboard.json b/openmrs/apps/clinical/dashboard.json old mode 100644 new mode 100755 index 7febca3b0f..6bb8d13df2 --- a/openmrs/apps/clinical/dashboard.json +++ b/openmrs/apps/clinical/dashboard.json @@ -35,29 +35,11 @@ "home", "visit", "registration", - "inpatient", - "enrolment", - "visitAttribute" + "enrolment" ] }, - "tuberculosis": { - "title": "Tuberculosis Follow Up", - "type": "tuberculosis", - "isObservation": true, - "dashboardConfig": { - "conceptNames": [ - "Tuberculosis Followup Template" - ], - "numberOfVisits": 2 - } - }, - "disposition":{ - "translationKey":"DASHBOARD_TITLE_DISPOSITION_KEY", - "showDetailsButton":true, - "type":"disposition", - "numberOfVisits":1, - "displayOrder":7 - }, + + "treatments":{ "translationKey":"DASHBOARD_TITLE_TREATMENTS_KEY", "type":"treatment", @@ -82,39 +64,14 @@ "showDetailsButton":true } }, - "radiology":{ - "translationKey":"DASHBOARD_TITLE_RADIOLOGY_KEY", - "type":"radiology", - "showDetailsButton":true, - "displayOrder":5 - }, + "programs":{ "translationKey":"DASHBOARD_TITLE_PROGRAMS_KEY", "type":"programs", "displayOrder":10 }, - "radiologyOrders":{ - "orderType":"Radiology Order", - "type":"ordersControl", - "translationKey":"DASHBOARD_TITLE_RADIOLOGY_ORDERS_KEY", - "displayOrder":17, - "dashboardConfig":{ - "conceptNames":[ - "Summary" - ], - "numberOfVisits":4 - } - }, - "pacs":{ - "orderType":"Radiology Order", - "type":"pacsOrders", - "translationKey":"DASHBOARD_TITLE_PACS_KEY", - "displayOrder":8, - "dashboardConfig":{ - "pacsImageUrl":"/oviyam2/viewer.html?patientID={{patientID}}&accessionNumber={{orderNumber}}", - "numberOfVisits":4 - } - }, + + "labOrdersDisplayControl":{ "translationKey":"DASHBOARD_TITLE_LAB_ORDERS_DISPLAY_CONTROL_KEY", "type":"ordersControl", @@ -139,17 +96,7 @@ "showDetailsButton":true } }, - "bacteriologyResults":{ - "translationKey":"DASHBOARD_TITLE_BACTERIOLOGY_RESULTS_KEY", - "type":"bacteriologyResultsControl", - "scope":"All", - "orderType":"", - "dashboardConfig":{ - "conceptNames":[ - "BACTERIOLOGY CONCEPT SET" - ] - } - }, + "labResults":{ "translationKey":"DASHBOARD_TITLE_LAB_RESULTS_KEY", "type":"labOrders", @@ -232,29 +179,7 @@ } } }, - "secondVitals":{ - "translationKey":"DASHBOARD_TITLE_SECOND_VITALS_KEY", - "type":"second vitals", - "isObservation":true, - "displayOrder":13, - "dashboardConfig":{ - "showDetailsButton":true, - "conceptNames":[ - "Second Vitals" - ], - "numberOfVisits":2 - }, - "expandedViewConfig":{ - "conceptNames":[ - "Second Vitals" - ], - "numberOfVisits":2, - "showDetailsButton":true, - "pivotTable":{ - - } - } - }, + "historyAndExaminations":{ "translationKey":"DASHBOARD_TITLE_HISTORY_AND_EXAMINATIONS_KEY", "type":"vitals", @@ -373,12 +298,7 @@ } } }, - "admissionDetails":{ - "translationKey":"DASHBOARD_TITLE_ADMISSION_DETAILS_KEY", - "type":"admissionDetails", - "displayOrder":19, - "showDetailsButton":true - }, + "conditions": { "translationKey":"CONDITION_LIST_DISPLAY_CONTROL_TITLE", "type": "conditionsList", @@ -534,23 +454,7 @@ "translationKey":"DASHBOARD_TAB_PATIENT_SUMMARY_KEY", "maxRecentlyViewedPatients":10, "sections":{ - "Bacteriology Concept Set":{ - "displayType":"Full-Page", - "translationKey":"DASHBOARD_TITLE_BACTERIOLOGY_RESULTS_KEY", - "type":"obsToObsFlowSheet", - "dashboardConfig":{ - "numberOfVisits":1, - "templateName":"BACTERIOLOGY CONCEPT SET", - "groupByConcept":"Specimen Collection Date", - "conceptNames":[ - "Specimen Id" - ] - }, - "expandedViewConfig":{ - "templateName":"BACTERIOLOGY CONCEPT SET", - "groupByConcept":"Specimen Collection Date" - } - }, + "HistoryAndExamination":{ "type":"historyAndExamination", "isObservation":true, diff --git a/openmrs/apps/clinical/extension-programs.json b/openmrs/apps/clinical/extension-programs.json old mode 100644 new mode 100755 index 31400109ae..94522add10 --- a/openmrs/apps/clinical/extension-programs.json +++ b/openmrs/apps/clinical/extension-programs.json @@ -1,17 +1,5 @@ { - "bahmniClinicalPatientsSearchActivePatientsForPrograms": { - "id": "bahmni.clinical.patients.search.activePatients", - "extensionPointId": "org.bahmni.patient.search", - "type": "config", - "extensionParams": { - "searchHandler": "emrapi.sqlSearch.activePatients", - "translationKey": "MODULE_LABEL_PROGRAMS_KEY", - "forwardUrl": "#/programs/patient/{{patientUuid}}/consultationContext" - }, - "label": "Active", - "order": 1, - "requiredPrivilege": "app:clinical" - }, + "bahmniClinicalPatientsSearchAllPatients": { "id": "bahmni.clinical.patients.search.allPatients", "extensionPointId": "org.bahmni.patient.search", diff --git a/openmrs/apps/clinical/extension.json b/openmrs/apps/clinical/extension.json old mode 100644 new mode 100755 index 8dd401c45d..9f90354187 --- a/openmrs/apps/clinical/extension.json +++ b/openmrs/apps/clinical/extension.json @@ -22,17 +22,7 @@ "order": 2, "requiredPrivilege": "app:clinical:diagnosisTab" }, - "disposition": { - "id": "bahmni.clinical.consultation.disposition", - "extensionPointId": "org.bahmni.clinical.consultation.board", - "type": "link", - "label": "Disposition", - "translationKey":"DISPOSITION_BOARD_LABEL_KEY", - "url": "disposition", - "icon": "fa-user-md", - "order": 3, - "requiredPrivilege": "app:clinical:dispositionTab" - }, + "consultationSummary": { "id": "bahmni.clinical.consultation.summary", "extensionPointId": "org.bahmni.clinical.consultation.board", @@ -67,58 +57,8 @@ "order": 1, "requiredPrivilege": "app:clinical" }, - "bahmniClinicalPatientsSearchActivePatientsForPrograms": { - "id": "bahmni.clinical.patients.search.activePatients", - "extensionPointId": "org.bahmni.patient.search", - "type": "config", - "extensionParams": { - "searchHandler": "emrapi.sqlSearch.activePatients", - "translationKey": "MODULE_LABEL_PROGRAMS_KEY", - "forwardUrl": "#/default/patient/{{patientUuid}}/consultationContext" - }, - "label": "Active", - "order": 1, - "requiredPrivilege": "app:clinical" - }, - "bahmniClinicalPatientsASearchActivePatientsByProvider": { - "id": "bahmni.clinical.patients.search.activePatientsByProvider", - "extensionPointId": "org.bahmni.patient.search", - "type": "config", - "extensionParams": { - "searchHandler": "emrapi.sqlSearch.activePatientsByProvider", - "translationKey": "MODULE_LABEL_MY_PATIENTS_KEY", - "forwardUrl": "#/default/patient/{{patientUuid}}/dashboard" - }, - "label": "Active", - "order": 2, - "requiredPrivilege": "app:clinical" - }, - "bahmniClinicalPatientsSearchOPDActivePatientsByProvider": { - "id": "bahmni.clinical.patients.search.OPDActivePatientsByProvider", - "extensionPointId": "org.bahmni.patient.search", - "type": "config", - "extensionParams": { - "searchHandler": "emrapi.sqlSearch.activePatientsByProvider", - "translationKey": "MODULE_LABEL_OPD_1_KEY", - "forwardUrl": "#/default/patient/{{patientUuid}}/consultationContext" - }, - "label": "OPD-1", - "order": 3, - "requiredPrivilege": "app:clinical" - }, - "activePatientsByLocation": { - "id": "bahmni.clinical.patients.search.activePatientsByLocation", - "extensionPointId": "org.bahmni.patient.search", - "type": "config", - "extensionParams": { - "searchHandler": "emrapi.sqlSearch.activePatientsByLocation", - "translationKey": "MODULE_LABEL_ACTIVE_PATIENTS_BY_LOCATION", - "forwardUrl": "#/default/patient/{{patientUuid}}/dashboard" - }, - "label": "Active", - "order": 4, - "requiredPrivilege": "app:clinical" - }, + + "bahmniClinicalPatientsSearchAllPatients": { "id": "bahmni.clinical.patients.search.allPatients", "extensionPointId": "org.bahmni.patient.search", @@ -189,16 +129,7 @@ "order": 5, "requiredPrivilege": "app:clinical" }, - "bahmniClinicalConceptSetGroupObservationsDischargeSummary": { - "id": "bahmni.clinical.conceptSetGroup.observations.dischargeSummary", - "extensionPointId": "org.bahmni.clinical.conceptSetGroup.observations", - "type": "config", - "extensionParams": { - "conceptName": "Discharge Summary" - }, - "order": 6, - "requiredPrivilege": "Discharge Summary" - }, + "bahmniClinicalBillingTreatment": { "id": "bahmni.clinical.billing.treatment", "extensionPointId": "org.bahmni.clinical.consultation.board", @@ -223,16 +154,5 @@ "icon": "icon-user-md", "order": 6, "requiredPrivilege": "app:clinical:ordersTab" - }, - "bahmniClinicalConsultationBacteriology": { - "id": "bahmni.clinical.consultation.bacteriology", - "extensionPointId": "org.bahmni.clinical.consultation.board", - "type": "link", - "label": "Bacteriology", - "translationKey":"BACTERIOLOGY_BOARD_LABEL_KEY", - "url": "bacteriology", - "icon": "icon-user-md", - "order": 7, - "requiredPrivilege": "app:clinical:bacteriologyTab" } } \ No newline at end of file diff --git a/openmrs/apps/clinical/formConditions.js b/openmrs/apps/clinical/formConditions.js old mode 100644 new mode 100755 index 9179a948a4..34bd0153b7 --- a/openmrs/apps/clinical/formConditions.js +++ b/openmrs/apps/clinical/formConditions.js @@ -1,5 +1,5 @@ -Bahmni.ConceptSet.FormConditions.rules = { - 'Diastolic Data' : function (formName, formFieldValues) { +Bahmni.ConceptSet.FormConditions.rulesOverride = { + 'Diastolic Data': function(formName, formFieldValues) { var systolic = formFieldValues['Systolic']; var diastolic = formFieldValues['Diastolic']; if (systolic || diastolic) { @@ -12,7 +12,158 @@ Bahmni.ConceptSet.FormConditions.rules = { } } }, - 'Systolic Data' : function (formName, formFieldValues) { + "TB_Type" (formName, formFieldValues) { + var dia = formFieldValues["TB_Type"]; + + if (dia === "Extrapulmonary (Sensitive/Resistant)") { + return { + show: ["TB Type is Extrapulmonary"] + } + } else { + return { + hide: ["TB Type is Extrapulmonary"] + } + } +}, +"Has TB Symptoms" (formName, formFieldValues) { + var dia = formFieldValues["Has TB Symptoms"]; + + if (dia === true) { + return { + + show: ["Symptoms Prophylaxis_New"] + } + } else { + return { + hide: ["Symptoms Prophylaxis_New"] + } + } +}, +"Has STI Symptoms" (formName, formFieldValues) { + var dia = formFieldValues["Has STI Symptoms"]; + + if (dia === true) { + return { + + show: ["STI Diagnosis_Prophylaxis"] + } + } else { + return { + hide: ["STI Diagnosis_Prophylaxis"] + } + } +}, +"Received nutritional support" (formName, formFieldValues) { + var dia = formFieldValues["Received nutritional support"]; + + if (dia === true) { + return { + + show: ["Received nutritional education"] + } + } else { + return { + hide: ["Received nutritional education"] + } + } +}, +"STI Diagnosis_Prophylaxis" (formName, formFieldValues) { + var dia = formFieldValues["STI Diagnosis_Prophylaxis"]; + + if (dia === "Syndromic Approach") { + return { + + show: ["Syndromic Approach_STI"] + } + } else { + return { + hide: ["Syndromic Approach_STI"] + } + } +}, +"Type_Prophylaxis" (formName, formFieldValues) { + var dia = formFieldValues["Type_Prophylaxis"]; + var returnShowValue = []; + var returnHideValue = []; + + + if (dia.includes("INH")) { + + returnShowValue.push("INH_Details"); + + } else { + returnHideValue.push("INH_Details"); + + } + if (dia.includes("CTZ")) { + + returnShowValue.push("CTZ_Details"); + + } else { + returnHideValue.push("CTZ_Details"); + + } + if (dia.includes("Fluconazol")) { + + returnShowValue.push("Fluconazol_Details"); + + } else { + returnHideValue.push("Fluconazol_Details"); + + } + + return { + + show: returnShowValue, + hide: returnHideValue + } + + + +}, +"Conduct_Family_planning" (formName, formFieldValues) { + var yes = formFieldValues["Conduct_Family_planning"]; + if (yes === "Conduct_Family_planning_Yes") { + return { + show: ["Conduct_Contraceptive_Methods_PRES_Condom_button","Conduct_Contraceptive_Methods_PIL_Oral_Contraceptive_button", +"Conduct_Contraceptive_Methods_INJ_Injection_button","Conduct_Contraceptive_Methods_IMP_Implant_button","Conduct_Contraceptive_Methods_DIU_Intra_button", +"Conduct_Contraceptive_Methods_Uterine_device_button","Conduct_Contraceptive_Methods_LT_Tubal_Ligation_button","Conduct_Contraceptive_Methods_VAS_Vasectomy_button", +"Conduct_Contraceptive_Methods_MAL_Lactational_Amenorrhea_Method_button","Conduct_Contraceptive_Methods_OUT_Other_button"] + } + } else { + return { + hide: ["Conduct_Contraceptive_Methods_PRES_Condom_button","Conduct_Contraceptive_Methods_PIL_Oral_Contraceptive_button", +"Conduct_Contraceptive_Methods_INJ_Injection_button","Conduct_Contraceptive_Methods_IMP_Implant_button","Conduct_Contraceptive_Methods_DIU_Intra_button", +"Conduct_Contraceptive_Methods_Uterine_device_button","Conduct_Contraceptive_Methods_LT_Tubal_Ligation_button","Conduct_Contraceptive_Methods_VAS_Vasectomy_button", +"Conduct_Contraceptive_Methods_MAL_Lactational_Amenorrhea_Method_button","Conduct_Contraceptive_Methods_OUT_Other_button"] + } + } + }, + "PP_Key_population" (formName, formFieldValues) { + var dia = formFieldValues["PP_Key_population"]; + if (dia === "PP_Key_population_Yes") { + return { + show: ["PP_If_Key_population_yes"] + } + } else { + return { + hide: ["PP_If_Key_population_yes"] + } + } + }, + "PP_Vulnerable_Population" (formName, formFieldValues) { + var dia = formFieldValues["PP_Vulnerable_Population"]; + if (dia === "PP_Vulnerable_Population_Yes") { + return { + show: ["PP_IF_Vulnerable_Population_Yes"] + } + } else { + return { + hide: ["PP_IF_Vulnerable_Population_Yes"] + } + } + }, + 'Systolic Data': function(formName, formFieldValues) { var systolic = formFieldValues['Systolic']; var diastolic = formFieldValues['Diastolic']; if (systolic || diastolic) { @@ -22,6 +173,32 @@ Bahmni.ConceptSet.FormConditions.rules = { } else { return { disable: ["Posture"] + }; + } + }, + "Reference_Other_Services" (formName, formFieldValues) { + var value = formFieldValues["Reference_Other_Services"]; + + if (value === "Reference_Other") { + return { + show: ["Reference_Other_Text"] + } + } else { + return { + hide: ["Reference_Other_Text"] + } + } + }, + "Reference_Eligible" (formName, formFieldValues) { + var value = formFieldValues["Reference_Eligible"]; + + if (value) { + return { + show: ["Reference_GA","Reference_AF","Reference_CA","Reference_PU","Reference_FR","Reference_DT","Reference_DC","Reference_MDC_Other"] + } + } else { + return { + hide: ["Reference_GA","Reference_AF","Reference_CA","Reference_PU","Reference_FR","Reference_DT","Reference_DC","Reference_MDC_Other"] } } } diff --git a/openmrs/apps/clinical/growthChartReference.csv b/openmrs/apps/clinical/growthChartReference.csv old mode 100644 new mode 100755 diff --git a/openmrs/apps/clinical/medication.json b/openmrs/apps/clinical/medication.json old mode 100644 new mode 100755 diff --git a/openmrs/apps/clinical/visit.json b/openmrs/apps/clinical/visit.json old mode 100644 new mode 100755 index 2da1e54d73..a62fb1fad0 --- a/openmrs/apps/clinical/visit.json +++ b/openmrs/apps/clinical/visit.json @@ -29,14 +29,7 @@ "labConcepts": "" } }, - "pacsOrders":{ - "type":"pacsOrders", - "displayOrder": 1, - "translationKey": "PACS_ORDERS_VISIT_PAGE_KEY", - "config":{ - "orderType": "Radiology Order" - } - }, + "conditions": { "title": "Conditions", "type": "conditionsList", @@ -62,15 +55,7 @@ "addressFields": ["address1", "address2", "cityVillage", "countyDistrict"] } }, - "admissionDetails":{ - "type": "admissionDetails", - "displayOrder": 1, - "config": { - "showDetailsButton": true, - "translationKey": "DISCHARGE_SUMMARY_ADMISSION_DETAILS_KEY" - - } - }, + "weightInitial":{ "type": "observation", "displayOrder": 2, @@ -106,9 +91,7 @@ "config": { "conceptNames": [ "History and Examination Notes", - "Discharge Summary", "Lab Investigation Notes", - "Radiology Notes", "Other Notes" ], "scope": "latest", @@ -143,38 +126,14 @@ "showDrugForm": true, "showProvider":false } - }, - "adviceOnDischarge":{ - "type": "observation", - "displayOrder": 8, - "translationKey":"DISCHARGE_SUMMARY_ADVICE_ON_DISCHARGE_KEY", - "config": { - "conceptNames": [ - "Additional Advice on Discharge", - "Follow up Date", - "Discharge Summary, Plan for follow up" - ], - "scope": "latest" - } } + } }, "orders":{ "translationKey": "DASHBOARD_TAB_ORDERS_KEY", "sections": { - "Radiology Orders": { - "type": "order", - "displayOrder": 0, - "translationKey": "Radiology Orders", - "config": { - "translationKey": "Radiology Orders", - "name": "ordersControl", - "orderType": "Radiology Order", - "conceptNames": [ - "Summary" - ] - } - } + } } diff --git a/openmrs/apps/customDisplayControl/js/customControl.js b/openmrs/apps/customDisplayControl/js/customControl.js old mode 100644 new mode 100755 diff --git a/openmrs/apps/customDisplayControl/views/birthCertificate.html b/openmrs/apps/customDisplayControl/views/birthCertificate.html old mode 100644 new mode 100755 diff --git a/openmrs/apps/customDisplayControl/views/customTreatmentChart.html b/openmrs/apps/customDisplayControl/views/customTreatmentChart.html old mode 100644 new mode 100755 diff --git a/openmrs/apps/customDisplayControl/views/deathCertificate.html b/openmrs/apps/customDisplayControl/views/deathCertificate.html old mode 100644 new mode 100755 diff --git a/openmrs/apps/customDisplayControl/views/patientAppointmentsDashboard.html b/openmrs/apps/customDisplayControl/views/patientAppointmentsDashboard.html old mode 100644 new mode 100755 diff --git a/openmrs/apps/dbNameCondition/dbNameCondition.js b/openmrs/apps/dbNameCondition/dbNameCondition.js old mode 100644 new mode 100755 diff --git a/openmrs/apps/documentUpload/app.json b/openmrs/apps/documentUpload/app.json old mode 100644 new mode 100755 diff --git a/openmrs/apps/documentUpload/extension-Patient Document.json b/openmrs/apps/documentUpload/extension-Patient Document.json old mode 100644 new mode 100755 diff --git a/openmrs/apps/documentUpload/extension-RADIOLOGY.json b/openmrs/apps/documentUpload/extension-RADIOLOGY.json old mode 100644 new mode 100755 diff --git a/openmrs/apps/home/app.json b/openmrs/apps/home/app.json old mode 100644 new mode 100755 diff --git a/openmrs/apps/home/extension.json b/openmrs/apps/home/extension.json old mode 100644 new mode 100755 index 4f282dc65b..c3dc10d689 --- a/openmrs/apps/home/extension.json +++ b/openmrs/apps/home/extension.json @@ -6,7 +6,7 @@ "translationKey": "MODULE_LABEL_REGISTRATION_KEY", "url": "../registration/index.html", "icon": "fa-user", - "order": 1, + "order": 2, "requiredPrivilege": "app:registration" }, "programs": { @@ -16,100 +16,9 @@ "translationKey": "MODULE_LABEL_PROGRAMS_KEY", "url": "../clinical/#/programs/patient/search", "icon": "icon-bahmni-program", - "order": 2, - "requiredPrivilege": "app:clinical" - }, - "clinical": { - "id": "bahmni.clinical", - "extensionPointId": "org.bahmni.home.dashboard", - "type": "link", - "translationKey": "MODULE_LABEL_CLINICAL_KEY", - "url": "../clinical/index.html#/default/patient/search", - "icon": "fa-stethoscope", "order": 3, "requiredPrivilege": "app:clinical" }, - "adt": { - "id": "bahmni.adt", - "extensionPointId": "org.bahmni.home.dashboard", - "type": "link", - "translationKey": "MODULE_LABEL_INPATIENT_KEY", - "url": "../adt/", - "icon": "icon-bahmni-inpatient", - "order": 4, - "requiredPrivilege": "app:adt" - }, - "bahmniIpd": { - "id": "bahmni.ipd", - "extensionPointId": "org.bahmni.home.dashboard", - "type": "link", - "translationKey": "MODULE_LABEL_BED_MANAGEMENT_KEY", - "label": "InPatient", - "url": "../bedmanagement/#/home", - "icon": "fa-bed", - "order": 7, - "requiredPrivilege": "app:adt" - }, - "radiologyDocumentUpload": { - "id": "bahmni.radiology.document.upload", - "extensionPointId": "org.bahmni.home.dashboard", - "type": "link", - "translationKey": "MODULE_LABEL_RADIOLOGY_UPLOAD_KEY", - "url": "../document-upload/?encounterType=RADIOLOGY&topLevelConcept=Radiology", - "icon": "icon-bahmni-radiology", - "order": 5, - "requiredPrivilege": "app:radiology-upload" - }, - "patientDocumentUpload": { - "id": "bahmni.patient.document.upload", - "extensionPointId": "org.bahmni.home.dashboard", - "type": "link", - "translationKey": "MODULE_LABEL_PATIENT_DOCUMENTS_KEY", - "url": "../document-upload/?encounterType=Patient Document&topLevelConcept=Patient Document&defaultOption=Patient file", - "icon": "icon-bahmni-documents", - "order": 6, - "requiredPrivilege": "app:patient-documents" - }, - "admin": { - "id": "bahmni.admin", - "extensionPointId": "org.bahmni.home.dashboard", - "type": "link", - "translationKey": "MODULE_LABEL_ADMIN_KEY", - "url": "../admin/#/dashboard/home", - "icon": "icon-bahmni-admin", - "order": 7, - "requiredPrivilege": "app:admin" - }, - "orders": { - "id": "bahmni.orders", - "extensionPointId": "org.bahmni.home.dashboard", - "type": "link", - "translationKey": "MODULE_LABEL_ORDERS_KEY", - "url": "../orders/#/search", - "icon": "icon-bahmni-orders", - "order": 10, - "requiredPrivilege": "app:orders" - }, - "reports": { - "id": "bahmni.reports", - "extensionPointId": "org.bahmni.home.dashboard", - "type": "link", - "translationKey": "MODULE_LABEL_REPORTS_KEY", - "url": "../reports/#/dashboard", - "icon": "icon-bahmni-reports", - "order": 8, - "requiredPrivilege": "app:reports" - }, - "bahmniOT": { - "id": "bahmni.ot", - "extensionPointId": "org.bahmni.home.dashboard", - "type": "link", - "translationKey": "Operation Theatre", - "url": "../ot/", - "icon": "fa-hospital-o", - "order": 9, - "requiredPrivilege": "app:ot" - }, "appointments": { "id": "bahmni.appointments", "extensionPointId": "org.bahmni.home.dashboard", @@ -120,25 +29,25 @@ "order": 11, "requiredPrivilege": "App: appointmentschedulingui.home" }, - "implementerInterface": { - "id": "bahmni.implementer.interface", +"admin": { + "id": "bahmni.admin", "extensionPointId": "org.bahmni.home.dashboard", "type": "link", - "translationKey": "MODULE_LABEL_IMPLEMENTER_INTERFACE_KEY", - "url": "/implementer-interface", - "icon": "fa fa-pencil-square-o", - "order": 12, - "requiredPrivilege": "app:implementer-interface" + "translationKey": "MODULE_LABEL_ADMIN_KEY", + "url": "../admin/#/dashboard/home", + "icon": "icon-bahmni-admin", + "order": 7, + "requiredPrivilege": "app:admin" }, - "atomfeedConsole": { - "id": "bahmni.atomfeed.console", + "clinical": { + "id": "bahmni.clinical", "extensionPointId": "org.bahmni.home.dashboard", "type": "link", - "translationKey": "MODULE_LABEL_ATOMFEED_CONSOLE_KEY", - "url": "/atomfeed-console", - "icon": "fa fa-terminal", - "order": 13, - "requiredPrivilege": "app:admin" + "translationKey": "MODULE_LABEL_CLINICAL_KEY", + "url": "../clinical/index.html#/default/patient/search", + "icon": "fa-stethoscope", + "order": 4, + "requiredPrivilege": "app:clinical" }, "appointmentScheduling": { "id": "bahmni.appointment.scheduling", @@ -147,7 +56,7 @@ "translationKey": "MODULE_LABEL_APPOINTMENT_SCHEDULING_KEY", "url": "../appointments", "icon": "fa fa-calendar", - "order": 14, + "order": 1, "requiredPrivilege": "app:appointments" } diff --git a/openmrs/apps/home/locale_languages.json b/openmrs/apps/home/locale_languages.json old mode 100644 new mode 100755 index 78059ef2ad..deedd408eb --- a/openmrs/apps/home/locale_languages.json +++ b/openmrs/apps/home/locale_languages.json @@ -1,6 +1,6 @@ -{"locales": [ {"code": "en", "nativeName": "English"}, +{"locales": [ {"code": "pt_BR", "nativeName": "Português"}, + {"code": "en", "nativeName": "English"}, {"code": "es", "nativeName": "Español"}, {"code": "fr", "nativeName": "Français"}, - {"code": "it", "nativeName": "Italiano"}, - {"code": "pt_BR", "nativeName": "Português"}] -} \ No newline at end of file + {"code": "it", "nativeName": "Italiano"}] +} diff --git a/openmrs/apps/home/offline-config.json b/openmrs/apps/home/offline-config.json old mode 100644 new mode 100755 diff --git a/openmrs/apps/home/whiteLabel.json b/openmrs/apps/home/whiteLabel.json old mode 100644 new mode 100755 index 10305921fc..68ab1eb37b --- a/openmrs/apps/home/whiteLabel.json +++ b/openmrs/apps/home/whiteLabel.json @@ -1,15 +1,18 @@ { "homePage": { - "header_text": "WELCOME TO
BAHMNI EMR & HOSPITAL SERVICE", - "logo": "/bahmni/images/bahmniLogoFull.png", + "header_text": "MINISTÉRIO DA SAÚDE
SISTEMA ELECTRÓNICO DE SEGUIMENTO DE PACIENTES(SESP) - POC", + "logo": "/bahmni/images/emblem_of_mozambique.png", "title_text": " " }, "loginPage": { - "logo": "/bahmni/images/bahmniLogoFull.png", + "logo": "/bahmni/images/flag_of_mozambique.png", "showHeaderText": true, - "showTitleText": false + "showTitleText": true }, "helpLink": { "url": "https://bahmni.atlassian.net/wiki/display/BAH/Bahmni+Home" + }, + "misauLink": { + "url": "http://www.misau.gov.mz" } } \ No newline at end of file diff --git a/openmrs/apps/ipd/app.json b/openmrs/apps/ipd/app.json old mode 100644 new mode 100755 index 5fd572af80..056a4e689a --- a/openmrs/apps/ipd/app.json +++ b/openmrs/apps/ipd/app.json @@ -24,7 +24,7 @@ "visitUuid" ], "config": { - "wardListSqlSearchHandler": "emrapi.sqlGet.allWardsListDetails", + "wardListSqlSearchHandler": "bedManagement.sqlGet.patientListForAdmissionLocation", "diagnosisStatus": "Inactive", "onAdmissionForwardTo": "#/bedManagement/patient/{{patientUuid}}/visit/{{visitUuid}}", "onTransferForwardTo": "#/bedManagement/patient/{{patientUuid}}/visit/{{visitUuid}}", @@ -77,8 +77,8 @@ "customLinks": [ { "name": "bedManagement", - "translationKey": "PATIENT_BED_MANAGEMENT_PAGE_KE", - "url": "../bedmanagement/#/bedManagement/patient/{{patientUuid}}/visit/{{visitUuid}}" + "translationKey": "PATIENT_BED_MANAGEMENT_PAGE_KEY", + "url": "../bedmanagement/#/bedManagement/patient/{{patientUuid}}" } ] }, diff --git a/openmrs/apps/ipd/extension.json b/openmrs/apps/ipd/extension.json old mode 100644 new mode 100755 index b27a9cca72..4c1b0181f1 --- a/openmrs/apps/ipd/extension.json +++ b/openmrs/apps/ipd/extension.json @@ -1,93 +1,4 @@ { - "bahmniAdtAdmitContinueVisit":{ - "id": "bahmni.adt.admit.continue.visit", - "extensionPointId": "org.bahmni.adt.admit.action", - "type": "config", - "extensionParams" : { - "displayFunction": "getDisplayForContinuingVisit", - "action":"admit", - "showCondition":"visitExists" - }, - "order": 2, - "requiredPrivilege": "app:adt" - }, - "bahmniAdtAdmitCancel":{ - "id": "bahmni.adt.admit.cancel", - "extensionPointId": "org.bahmni.adt.admit.action", - "type": "config", - "extensionParams" : { - "display": "Cancel", - "action":"cancel" - }, - "order": 3, - "requiredPrivilege": "app:adt" - }, - "bahmniAdtTransferSave":{ - "id": "bahmni.adt.transfer.save", - "extensionPointId": "org.bahmni.adt.transfer.action", - "type": "config", - "extensionParams" : { - "display": "Save", - "action":"transfer" - }, - "order": 1, - "requiredPrivilege": "app:adt" - }, - "bahmniAdtTransferCancel":{ - "id": "bahmni.adt.transfer.cancel", - "extensionPointId": "org.bahmni.adt.transfer.action", - "type": "config", - "extensionParams" : { - "display": "Cancel", - "action":"cancel" - }, - "order": 2, - "requiredPrivilege": "app:adt" - }, - "bahmniAdtDischargeSave":{ - "id": "bahmni.adt.discharge.save", - "extensionPointId": "org.bahmni.adt.discharge.action", - "type": "config", - "extensionParams" : { - "display": "Discharge", - "action":"discharge" - }, - "order": 2, - "requiredPrivilege": "app:adt" - }, - "bahmniAdtDischargeCancel":{ - "id": "bahmni.adt.discharge.cancel", - "extensionPointId": "org.bahmni.adt.discharge.action", - "type": "config", - "extensionParams" : { - "display": "Cancel", - "action":"cancel" - }, - "order": 3, - "requiredPrivilege": "app:adt" - }, - "bahmniAdtUndoDischarge":{ - "id": "bahmni.adt.undo.discharge", - "extensionPointId": "org.bahmni.adt.undo.discharge.action", - "type": "config", - "extensionParams" : { - "display": "Undo Discharge", - "action":"undoDischarge" - }, - "order": 1, - "requiredPrivilege": "app:adt" - }, - "bahmniAdtUndoDischargeCancel":{ - "id": "bahmni.adt.undo.discharge.cancel", - "extensionPointId": "org.bahmni.adt.undo.discharge.action", - "type": "config", - "extensionParams" : { - "display": "Cancel", - "action":"cancel" - }, - "order": 2, - "requiredPrivilege": "app:adt" - }, "bahmniAdtPatientsSearchPatientsToAdmit":{ "id": "bahmni.adt.patients.search.patientsToAdmit", "extensionPointId": "org.bahmni.patient.search", diff --git a/openmrs/apps/orders/app.json b/openmrs/apps/orders/app.json old mode 100644 new mode 100755 diff --git a/openmrs/apps/orders/extension.json b/openmrs/apps/orders/extension.json old mode 100644 new mode 100755 diff --git a/openmrs/apps/ot/app.json b/openmrs/apps/ot/app.json old mode 100644 new mode 100755 diff --git a/openmrs/apps/ot/extension.json b/openmrs/apps/ot/extension.json old mode 100644 new mode 100755 diff --git a/openmrs/apps/ot/printListView.html b/openmrs/apps/ot/printListView.html old mode 100644 new mode 100755 diff --git a/openmrs/apps/registration/app.json b/openmrs/apps/registration/app.json old mode 100644 new mode 100755 index 9155027840..244ff636ba --- a/openmrs/apps/registration/app.json +++ b/openmrs/apps/registration/app.json @@ -17,64 +17,79 @@ "activeVisitUuid" ], "config" : { - "patientInformation": { - "additionalPatientInformation": { - "title": "Additional Patient Information", - "attributes": [ - "distanceFromCenter", - "isUrban", - "cluster", - "RationCard", - "familyIncome", - "debt", - "cluster" - ] - }, - "hidden": { + "patientInformation": { + + "patientProfessionInformation": { + "title": "patientProfessionInformation", + "translationKey": "REGISTRATION_PROFESSIONAL_INFORMATION", + "attributes": ["PATIENT_OCCUPATION","PATIENT_EDUCATION"], + "order" : 1, + "expanded": true + }, + + "patientContactInformation": { + "title": "patientContactInformation", + "translationKey": "REGISTRATION_CONTACT_INFORMATION", + "attributes": ["PRIMARY_CONTACT_NUMBER_1","ALTERNATIVE_CONTACT_NUMBER_1","ALTERNATIVE_CONTACT_NUMBER_2"], + "order" : 2, + "expanded": true + }, + + "patientTransferenceInformation": { + "title": "patientTransferenceInformation", + "translationKey": "REGISTRATION_TRANSFERENCE_INFO_KEY", + "attributes": ["Transferred from another HF","Date of transference","Transferred out HF name","PATIENT_STATUS"], + "order" : 3, + "expanded": true + }, + + "patientHIVTestInformation": { + "title": "patientHIVTestInformation", + "translationKey": "REGISTRATION_HIVTEST_INFO_KEY", + "attributes": ["DateofHIVDiagnosis","Typeoftest","TEST_RESULT","PATIENT_STATUS","LOCATION_OF_TEST","SECTOR_SELECT","ATIP_SELECT","HEALTH_FACILITY_NAME","HEALTH_FACILITY_DISTRICT","HEALTH_FACILITY_PROVINCE"], + "order" : 4, + "expanded": true + }, + "hidden": { "attributes": [ - "primaryContact" + "primaryContact", + "TEST_RESULT" ] }, "defaults": { "class": "General", + "TEST_RESULT": "Positive", + "PATIENT_STATUS": "Pre TARV", "landHolding": 2 } }, "addressHierarchy": { - "showAddressFieldsTopDown": false, - "strictAutocompleteFromLevel": "stateProvince" + "showAddressFieldsTopDown": true, + "strictAutocompleteFromLevel": "address1" }, "relationshipTypeMap": { "Doctor":"provider", "Parent":"patient" }, - "autoCompleteFields":["familyName", "caste"], - "defaultIdentifierPrefix": "GAN", - "defaultVisitType": "OPD", + "defaultIdentifierPrefix": "MOZ", + "extraIdentifiersToDisplay" : "NID (SERVIÇO TARV)", + "defaultVisitType": "FIRST CONSULTATION", "searchByIdForwardUrl": "/patient/{{patientUuid}}", + "afterVisitSaveForwardUrl": "../registration/index.html#/search", "showMiddleName": true, "showLastName": true, "isLastNameMandatory": true, "showSaveConfirmDialog": false, - "showBirthTime": true, + "showBirthTime": false, + "disablePhotoCapture": true, "showCasteSameAsLastNameCheckbox": false, "printOptions": [ - { - "translationKey": "REGISTRATION_PRINT_REG_CARD_LOCAL_KEY", - "templateUrl": "/bahmni_config/openmrs/apps/registration/registrationCardLayout/print_local.html", - "shortcutKey": "l" - }, { "translationKey": "REGISTRATION_PRINT_REG_CARD_KEY", "templateUrl": "/bahmni_config/openmrs/apps/registration/registrationCardLayout/print.html", "shortcutKey": "p" }, - { - "translationKey": "REGISTRATION_PRINT_SUPPLEMENTAL_PAPER", - "templateUrl": "/bahmni_config/openmrs/apps/registration/supplementalPaperLayout/print.html", - "shortcutKey": "r" - }, { "translationKey": "REGISTRATION_PRINT_WITH_BARCODE", "templateUrl": "/bahmni_config/openmrs/apps/registration/registrationCardLayout/printWithBarcode.html", @@ -89,6 +104,24 @@ "FHS": { "buttonSelect": true }, + + "WEIGHT": { + "disableAddNotes": true + }, + "HEIGHT": { + "disableAddNotes": true + }, + "Home equipment": { + "dropdown": true, + "disableAddNotes": true + }, + "HF_Pregnancy status": { + "disableAddNotes": true + }, + "Breastfeeding status": { + "disableAddNotes": true + }, + "defaults":{ "FHS": "Present" } @@ -96,22 +129,35 @@ "fieldValidation" : { "primaryContact" : {"pattern" : "[0-9]{8,10}", "errorMessage" : "Should be 12 characters starting with 91 (country code)"}, "landHolding" : {"pattern" : "[0-9]{0,3}", "errorMessage" : "Should be between 1 to 999 acres"}, - "familyName" : {"pattern" : "[a-zA-Z]{0,}", "errorMessage" : "Should contain characters"}, - "givenName" : {"pattern" : "[a-zA-Z]{0,}", "errorMessage" : "Should contain characters"}, - "middleName" : {"pattern" : "[a-zA-Z]{0,}", "errorMessage" : "Should contain characters"}, - "address1" : {"pattern" : "[a-zA-Z0-9\\s]{2,}", "errorMessage" : "Should contain at least 2 characters"} + "familyName" : {"pattern" : "[a-záàãâéèêẽíìóòõôúùçA-ZÁÀÃÂÉÈÊẼÍÌÓÒÔÕÚÙÇ]{0,}", "errorMessage" : "Should contain characters"}, + "givenName" : {"pattern" : "[a-záàãâéèêẽíìóòõôúùçA-ZÁÀÃÂÉÈÊẼÍÌÓÒÔÕÚÙÇ]{0,}", "errorMessage" : "Should contain characters"}, + "middleName" : {"pattern" : "[a-záàãâéèêẽíìóòõôúùçA-ZÁÀÃÂÉÈÊẼÍÌÓÒÔÕÚÙÇ]{0,}", "errorMessage" : "Should contain characters"}, + "address3" : {"pattern" : "[a-záàãâéèêẽíìóòõôúùçA-ZÁÀÃÂÉÈÊẼÍÌÓÒÔÕÚÙÇ0-9_-;,:.]*", "errorMessage" : "Should contain characters"}, + "address4" : {"pattern" : "[a-záàãâéèêẽíìóòõôúùçA-ZÁÀÃÂÉÈÊẼÍÌÓÒÔÕÚÙÇ0-9_-;,:.]*", "errorMessage" : "Should contain characters"}, + "address5" : {"pattern" : "[a-záàãâéèêẽíìóòõôúùçA-ZÁÀÃÂÉÈÊẼÍÌÓÒÔÕÚÙÇ0-9_-;,:.]*", "errorMessage" : "Should contain characters"}, + "address6" : {"pattern" : "[a-záàãâéèêẽíìóòõôúùçA-ZÁÀÃÂÉÈÊẼÍÌÓÒÔÕÚÙÇ0-9_-;,:.]*", "errorMessage" : "Should contain characters"}, + "postalCode" : {"pattern" : "[a-záàãâéèêẽíìóòõôúùçA-ZÁÀÃÂÉÈÊẼÍÌÓÒÔÕÚÙÇ0-9_-;,:.]*", "errorMessage" : "Should contain characters"} }, - "patientSearch": { + "patientSearchResults": { "address": { - "label": "Rural Ward", - "placeholder": "Enter ward", - "field": "address2" + "fields" : [] }, - "customAttributes": { - "label": "रुग्णाचे नाव", - "placeholder": "रुग्णाचे नाव", - "fields": ["givenNameLocal", "middleNameLocal", "familyNameLocal"] + "personAttributes": { + "fields": [ + "NICK_NAME", + "PATIENT_STATUS", + "PRIMARY_CONTACT_NUMBER_1", + "US_REG_DATE" + ] } - } + }, + "patientSearch": { + "address": {}, + "customAttributes": { + "label": "Alcunha", + "placeholder": "Alcunha", + "fields": ["NICK_NAME"] + } + } } } diff --git a/openmrs/apps/registration/appTemplate.json b/openmrs/apps/registration/appTemplate.json old mode 100644 new mode 100755 diff --git a/openmrs/apps/registration/attributesConditions.js b/openmrs/apps/registration/attributesConditions.js new file mode 100755 index 0000000000..e69de29bb2 diff --git a/openmrs/apps/registration/extension.json b/openmrs/apps/registration/extension.json old mode 100644 new mode 100755 index f42906ff8b..78d22e5336 --- a/openmrs/apps/registration/extension.json +++ b/openmrs/apps/registration/extension.json @@ -45,18 +45,19 @@ "order": 1, "requiredPrivilege": "Edit Visits" }, - "feeInformation":{ - "id": "bahmni.registration.conceptSetGroup.feeInformation", + + "patientinfo":{ + "id": "bahmni.registration.conceptSetGroup.Vitals", "extensionPointId": "org.bahmni.registration.conceptSetGroup.observations", "type": "config", "extensionParams": { - "conceptName": "Fee Information", - "translationKey": "FEE_INFORMATION_LOCALE_KEY", + "conceptName": "Patient_information", + "translationKey": "PATIENT_OBS_INFORMATION_LOCALE_KEY", "required":true }, "order": 2, "requiredPrivilege": "Edit Visits" - }, + }, "nutritionalValue":{ "id": "bahmni.registration.conceptSetGroup.nutritionalValue", "extensionPointId": "org.bahmni.registration.conceptSetGroup.observations", diff --git a/openmrs/apps/registration/fieldValidation.js b/openmrs/apps/registration/fieldValidation.js old mode 100644 new mode 100755 diff --git a/openmrs/apps/registration/registrationCardLayout/css/print.css b/openmrs/apps/registration/registrationCardLayout/css/print.css old mode 100644 new mode 100755 diff --git a/openmrs/apps/registration/registrationCardLayout/images/bahmni-icon.png b/openmrs/apps/registration/registrationCardLayout/images/bahmni-icon.png old mode 100644 new mode 100755 diff --git a/openmrs/apps/registration/registrationCardLayout/print.html b/openmrs/apps/registration/registrationCardLayout/print.html old mode 100644 new mode 100755 index a7cb28cc12..59f26a586a --- a/openmrs/apps/registration/registrationCardLayout/print.html +++ b/openmrs/apps/registration/registrationCardLayout/print.html @@ -2,47 +2,9 @@ -
- - - - - -
-

Notice

-
    -
  • - {{ "REGISTRATION_BRING_CARD_TEXT_KEY" | translate }} -
    • -
  • - {{ "REGISTRATION_TAKE_MEDICINES_TEXT_KEY" | translate}} -
    • -
  • - {{ "REGISTRATION_TIMINGS_TEXT_KEY" | translate }} -
    • -
  • - {{ "REGISTRATION_OPD_DAYS_TEXT_KEY" | translate }} -
    • -
  • - {{ "REGISTRATION_SUNDAYS_HOLIDAY_TEXT_KEY" | translate }} -
    • -
-
-

Caution

-

- {{ "REGISTRATION_SMOKING_INJURIOUS_TEXT_KEY" | translate }} -

-
-
- 		- - - -

{{ "REGISTRATION_INSTITUTE_NAME_TEXT_KEY" | translate }} @@ -54,31 +16,26 @@

{{ "REGISTRATION_INSTITUTE_REGISTERED_TEXT_KEY" | tran onerror="this.onerror=null;this.src='../images/blank.jpeg';"/>

- {{ "REGISTRATION_INSTITUTE_ADDRESS" | translate }} -
- + - + - + + + + + + + - + + + + + + + + + + +
- Dated + {{ "REGISTRATION_LABEL_REGISTRATION_DATE" | translate }} : {{patient.registrationDate | bahmniDate}}
- Registration + {{ "REGISTRATION_LABEL_PATIENT_IDENTIFIER" | translate }} : {{patient.primaryIdentifier.identifier}}
- Name + {{ "REGISTRATION_LABEL_PATIENT_NAME" | translate }} : @@ -87,38 +44,61 @@

{{ "REGISTRATION_INSTITUTE_REGISTERED_TEXT_KEY" | tran

- Age + {{ "REGISTRATION_LABEL_AGE" | translate }} + : {{patient.age | age}}
- Gender + {{ "REGISTRATION_LABEL_GENDER" | translate }} : {{patient.gender}}
Address : {{patient.primaryRelative}}
- Village + {{ "locality_locale" | translate }} : {{patient.address.cityVillage}} {{patient.address.address1}}
+ {{ "administrative_locale" | translate }} + : {{patient.address.address2}}
- Tehsil + {{ "district_locale" | translate }} : {{patient.address.address3}} {{patient.address.cityVillage}}
+ {{ "province_locale" | translate }} + : {{patient.address.stateProvince}}
+ {{ "country_locale" | translate }} + : {{patient.address.country}}
@@ -126,3 +106,4 @@

{{ "REGISTRATION_INSTITUTE_REGISTERED_TEXT_KEY" | tran

+ diff --git a/openmrs/apps/registration/registrationCardLayout/printWithBarcode.html b/openmrs/apps/registration/registrationCardLayout/printWithBarcode.html old mode 100644 new mode 100755 index 39279bc2c5..050d960747 --- a/openmrs/apps/registration/registrationCardLayout/printWithBarcode.html +++ b/openmrs/apps/registration/registrationCardLayout/printWithBarcode.html @@ -5,13 +5,9 @@ - + @@ -31,23 +27,22 @@

Bahmni Hospital

- @@ -55,7 +50,7 @@

Bahmni Hospital

@@ -63,9 +58,9 @@

Bahmni Hospital

@@ -90,3 +85,4 @@

Bahmni Hospital

JsBarcode("#barcode").init(); })(); + diff --git a/openmrs/apps/registration/registrationCardLayout/print_local.html b/openmrs/apps/registration/registrationCardLayout/print_local.html old mode 100644 new mode 100755 diff --git a/openmrs/apps/registration/registrationCardLayout/print_registration.html b/openmrs/apps/registration/registrationCardLayout/print_registration.html new file mode 100755 index 0000000000..5f40a97fb5 --- /dev/null +++ b/openmrs/apps/registration/registrationCardLayout/print_registration.html @@ -0,0 +1,94 @@ + +
-

Bahmni Hospital

+

POC HF 01

 Bahmni Hospital
- Registration Date + data de registro : {{patient.registrationDate | bahmniDate}}
- Full Name + Nome completo : {{patient.fullNameLocal()}}
- Age + Era : {{patient.age | age}}
- Gender + Gênero : {{patient.gender}}
- Village + Aldeia : {{patient.address.cityVillage}}
- Bahmni Hospital jsbarcode-fontSize="10" /> -
{{patient.primaryIdentifier.identifier}}
+
+ + + + + +
+ + + + + +
+

+ {{ "REGISTRATION_INSTITUTE_NAME_TEXT_KEY" | translate }} +

+

{{ "REGISTRATION_INSTITUTE_REGISTERED_TEXT_KEY" | translate }}

+ 		+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ Data do Registro + : {{patient.registrationDate | bahmniDate}}
+ Patient Identifier + : {{patient.primaryIdentifier.identifier}}
+ Nome do Paciente + : + {{patient.fullNameLocal()}} +
+ Idade + : {{patient.age | age}}
+ Genero + : {{patient.gender}}
+ Address + : {{patient.primaryRelative}}
+ Localidade + : {{patient.address.address1}}
+ Administrativo + : {{patient.address.address2}}
+ Distrito + : {{patient.address.cityVillage}}
+
+ diff --git a/openmrs/apps/registration/supplementalPaperLayout/css/print.css b/openmrs/apps/registration/supplementalPaperLayout/css/print.css old mode 100644 new mode 100755 diff --git a/openmrs/apps/registration/supplementalPaperLayout/print.html b/openmrs/apps/registration/supplementalPaperLayout/print.html old mode 100644 new mode 100755 diff --git a/openmrs/apps/reports/app.json b/openmrs/apps/reports/app.json old mode 100644 new mode 100755 diff --git a/openmrs/apps/reports/extension.json b/openmrs/apps/reports/extension.json old mode 100644 new mode 100755 diff --git a/openmrs/apps/reports/reports.json b/openmrs/apps/reports/reports.json old mode 100644 new mode 100755 diff --git a/openmrs/apps/reports/sql/testCount.sql b/openmrs/apps/reports/sql/testCount.sql old mode 100644 new mode 100755 diff --git a/openmrs/aqs/aqs_query.json b/openmrs/aqs/aqs_query.json old mode 100644 new mode 100755 diff --git a/openmrs/beanshell/openelis-prefetch-eventfilter.bsh b/openmrs/beanshell/openelis-prefetch-eventfilter.bsh old mode 100644 new mode 100755 diff --git a/openmrs/elisFeedInterceptor/FilterDonorTestResults.groovy b/openmrs/elisFeedInterceptor/FilterDonorTestResults.groovy old mode 100644 new mode 100755 diff --git a/openmrs/i18n/admin/locale_en.json b/openmrs/i18n/admin/locale_en.json old mode 100644 new mode 100755 diff --git a/openmrs/i18n/adt/locale_en.json b/openmrs/i18n/adt/locale_en.json old mode 100644 new mode 100755 diff --git a/openmrs/i18n/adt/locale_pt_BR.json b/openmrs/i18n/adt/locale_pt_BR.json old mode 100644 new mode 100755 diff --git a/openmrs/i18n/clinical/locale_en.json b/openmrs/i18n/clinical/locale_en.json old mode 100644 new mode 100755 index aeae74e360..5b1542f91f --- a/openmrs/i18n/clinical/locale_en.json +++ b/openmrs/i18n/clinical/locale_en.json @@ -84,5 +84,8 @@ "DASHBOARD_UPCOMING_APPOINTMENTS_KEY": "Upcoming Appointments", "DASHBOARD_UPCOMING_APPOINTMENTS_KEY_LINK": "List View", "DASHBOARD_NO_PAST_APPOINTMENTS_KEY": "No past appointments", - "DASHBOARD_NO_UPCOMING_APPOINTMENTS_KEY": "No upcoming appointments" + "DASHBOARD_NO_UPCOMING_APPOINTMENTS_KEY": "No upcoming appointments", + "MODULE_LABEL_ART_PROGRAMS_KEY": "ART Program", + "MODULE_LABEL_TB_PROGRAMS_KEY": "TB Program", + "MODULE_LABEL_ALL_PROGRAMS_KEY": "ALL Program" } diff --git a/openmrs/i18n/clinical/locale_es.json b/openmrs/i18n/clinical/locale_es.json old mode 100644 new mode 100755 diff --git a/openmrs/i18n/clinical/locale_fr.json b/openmrs/i18n/clinical/locale_fr.json old mode 100644 new mode 100755 diff --git a/openmrs/i18n/clinical/locale_pt_BR.json b/openmrs/i18n/clinical/locale_pt_BR.json old mode 100644 new mode 100755 index 670ceead75..eb7c470481 --- a/openmrs/i18n/clinical/locale_pt_BR.json +++ b/openmrs/i18n/clinical/locale_pt_BR.json @@ -1,67 +1,81 @@ { - "MODULE_LABEL_ACTIVE_KEY": "Ativar", - "MODULE_LABEL_PROGRAMS_KEY": "Programas", - "MODULE_LABEL_MY_PATIENTS_KEY": "Meus Pacientes", - "MODULE_LABEL_ACTIVE_PATIENTS_BY_LOCATION": "PacientesPorLocal", - "MODULE_LABEL_OPD_1_KEY": "Ambulatório-1", - "MODULE_LABEL_ALL_KEY": "Todos", - - "DASHBOARD_TITLE_LAB_RESULTS_KEY": "Resultados Lab", - "DASHBOARD_TITLE_LAB_ORDERS_DISPLAY_CONTROL_KEY": "Controle Exibição Pedido Lab", - "DASHBOARD_TITLE_PACS_KEY": "PACS", - "DASHBOARD_TITLE_RADIOLOGY_KEY": "Radiologia", - "DASHBOARD_TITLE_VISITS_KEY": "Visitas", - "DASHBOARD_TITLE_PROGRAMS_KEY": "Programas", - "DASHBOARD_TITLE_TREATMENTS_KEY": "Tretamentos", - "DASHBOARD_TITLE_DISPOSITION_KEY": "Terapêutica", - "DASHBOARD_TITLE_DIAGNOSIS_KEY": "Diagnóstico", - "DASHBOARD_TITLE_ADMISSION_DETAILS_KEY": "Detalhes Admissão", - "DASHBOARD_TITLE_NUTRITIONAL_VALUES_KEY": "Valores Nutricionais", - "DASHBOARD_TITLE_SECOND_VITALS_KEY": "Segundo Vitais", - "DASHBOARD_TITLE_GYNAECOLOGY_KEY": "Ginecologia", - "DASHBOARD_TITLE_HISTORY_AND_EXAMINATIONS_KEY": "Histórico e Exames", - "DASHBOARD_TITLE_OBSTETRICS_KEY": "Obstetrícia", - "DASHBOARD_TITLE_NAVIGATION_LINKS_CONTROL_KEY": "Controle Links de Navegação", - "DASHBOARD_TITLE_RADIOLOGY_ORDERS_KEY": "Pedidos de Radiologia", - "DASHBOARD_TITLE_VITALS_KEY": "Vitais", - "DASHBOARD_TITLE_PATIENT_INFORMATION_KEY": "Informações do Paciente", - "DASHBOARD_TITLE_BACTERIOLOGY_RESULTS_KEY":"Resultados Bacteriologia", - - - "DASHBOARD_TAB_GENERAL_KEY": "Geral", - "DASHBOARD_TAB_TRENDS_KEY": "Tendências", - "DASHBOARD_TAB_PATIENT_SUMMARY_KEY": "Resumo do Paciente", - "DASHBOARD_TAB_DISCHARGE_SUMMARY_KEY": "Resumo de Alta", - "DASHBOARD_TAB_ORDERS_KEY": "Pedidos", - - "LAB_INVESTIGATIONS_KEY":"Investigações Lab", - "PACS_ORDERS_VISIT_PAGE_KEY": "Pág. Visita Pedidos PACS", - - "DISCHARGE_SUMMARY_DIAGNOSIS_KEY" :"Diagnóstico", - - "DISCHARGE_SUMMARY_ADVICE_ON_DISCHARGE_KEY": "Conselhos de Alta", - "DISCHARGE_SUMMARY_AT_ADMISSION_KEY": "Na Admissão", - "DISCHARGE_SUMMARY_ADMISSION_DETAILS_KEY": "Detalhes Admissão", - "DISCHARGE_SUMMARY_CLINICAL_NOTES_KEY": "Anotações Clínicas", - "DISCHARGE_SUMMARY_AT_DISCHARGE_KEY": "Na Alta", - "DISCHARGE_SUMMARY_TREATMENTS_KEY": "Tratamentos", - "DISCHARGE_SUMMARY_ADMISSION_DETAILS_KEY": "Detalhes Admissão", - - "OBSERVATIONS_BOARD_LABEL_KEY":"Observações", - "MEDICATIONS_BOARD_LABEL_KEY":"Medicação", - "ORDERS_BOARD_LABEL_KEY":"Pedidos", - "BACTERIOLOGY_BOARD_LABEL_KEY":"Bacteriologia", - "CONSULTATION_BOARD_LABEL_KEY":"Consulta", - "DISPOSITION_BOARD_LABEL_KEY":"Terapêutica", - "DIAGNOSIS_BOARD_LABEL_KEY":"Diagnóstico", - - "CONSULTATION_PAGE_KEY" :"Consulta", - "PROGRAM_MANAGEMENT_PAGE_KEY":"Pág. Gerenciamento Programa", - "DISCHARGE_SUMMARY_PAGE_KEY":"Pág. Resumo Alta", - "PATIENT_ADT_PAGE_KEY":"Pág. Paciente Internado", - "PATIENT_DASHBOARD_KEY":"Painel de Paciente", - "PATIENT_VISIT_PAGE_KEY":"Pág. Visita de Paciente", - "HOME_DASHBOARD_KEY":"Início Painel", - "MEDICATION_CHANGE_DURATION_BUTTON": "Alterar Duração", - "DASHBOARD_TITLE_Consultation_KEY": "Anotações da Consulta" -} +"BACTERIOLOGY_BOARD_LABEL_KEY":"Bacteriologia", +"CLINICAL_ORDER_RADIOLOGY_NEED_PRINT_BUTTON":" Precisa de impressão", +"CLINICAL_ORDER_RADIOLOGY_NEED_PRINT":" Precisa de impressão para esta requisição", +"CONSULTATION_BOARD_LABEL_KEY":"Consulta", +"CONSULTATION_PAGE_KEY":"Consulta", +"DASHBOARD_APPOINTMENTS_DATE_KEY":"Data", +"DASHBOARD_APPOINTMENTS_PROVIDER_KEY":"Médico", +"DASHBOARD_APPOINTMENTS_SERVICE_KEY":"Serviço", +"DASHBOARD_APPOINTMENTS_SERVICE_TYPE_KEY":"Tipos de serviços de marcação", +"DASHBOARD_APPOINTMENTS_SLOT_KEY":"Bloco", +"DASHBOARD_APPOINTMENTS_STATUS_KEY":"Estado", +"DASHBOARD_NO_PAST_APPOINTMENTS_KEY":"Nenhuma marcação anterior", +"DASHBOARD_NO_UPCOMING_APPOINTMENTS_KEY":"Sem marcações futuras", +"DASHBOARD_PAST_APPOINTMENTS_KEY":"Marcações passadas", +"DASHBOARD_TAB_DISCHARGE_SUMMARY_KEY":"Resumo de alta", +"DASHBOARD_TAB_GENERAL_KEY":"Geral", +"DASHBOARD_TAB_ORDERS_KEY":"Requisições", +"DASHBOARD_TAB_PATIENT_SUMMARY_KEY":"Resumo do paciente", +"DASHBOARD_TAB_TRENDS_KEY":"Tendências", +"DASHBOARD_TITLE_ADMISSION_DETAILS_KEY":"Detalhes de admissão", +"DASHBOARD_TITLE_APPOINTMENTS_KEY":"Outras marcações", +"DASHBOARD_TITLE_BACTERIOLOGY_RESULTS_KEY":"Resultados bacteriologia", +"DASHBOARD_TITLE_BLOOD_PRESSURE":"Pressão sanguínea", +"DASHBOARD_TITLE_Consultation_KEY":"Notas da consulta", +"DASHBOARD_TITLE_DIABETES_BLOOD_SUGAR":"Diabetes/Açucar no Sangue", +"DASHBOARD_TITLE_DIAGNOSIS_KEY":"Diagnóstico", +"DASHBOARD_TITLE_DISPOSITION_KEY":"Terapêutica", +"DASHBOARD_TITLE_FORMS_DISPLAY_CONTROL_KEY":"Formulários", +"DASHBOARD_TITLE_GROWTH_CHART":"Gráfico de evolução", +"DASHBOARD_TITLE_GYNAECOLOGY_KEY":"Ginecologia", +"DASHBOARD_TITLE_HISTORY_AND_EXAMINATIONS_KEY":"Histórico e Exames", +"DASHBOARD_TITLE_LAB_ORDERS_DISPLAY_CONTROL_KEY":"Requisições laboratoriais", +"DASHBOARD_TITLE_LAB_RESULTS_KEY":"Resultados laboratoriais", +"DASHBOARD_TITLE_NAVIGATION_LINKS_CONTROL_KEY":"Controle ligações de navegação", +"DASHBOARD_TITLE_NUTRITIONAL_VALUES_KEY":"Dados antropométricos", +"DASHBOARD_TITLE_OBSTETRICS_KEY":"Obstetrícia", +"DASHBOARD_TITLE_PACS_KEY":"PACS", +"DASHBOARD_TITLE_PATIENT_INFORMATION_KEY":"Informações do paciente", +"DASHBOARD_TITLE_PROGRAMS_KEY":"Programas", +"DASHBOARD_TITLE_PULSE":"Pulsação", +"DASHBOARD_TITLE_RADIOLOGY_KEY":"Radiologia", +"DASHBOARD_TITLE_RADIOLOGY_ORDERS_KEY":"Requisições de radiologia", +"DASHBOARD_TITLE_SECOND_VITALS_KEY":"Segundos Vitais", +"DASHBOARD_TITLE_TREATMENTS_KEY":"Tratamentos", +"DASHBOARD_TITLE_VISITS_KEY":"Consultas clínicas", +"DASHBOARD_TITLE_VITALS_KEY":"Sinais Vitais", +"DASHBOARD_TITLE_WEIGHT_BMI":"Peso/IMC", +"DASHBOARD_UPCOMING_APPOINTMENTS_KEY_LINK":"Visualização em lista", +"DASHBOARD_UPCOMING_APPOINTMENTS_KEY":"Próximas marcações", +"DIAGNOSIS_BOARD_LABEL_KEY":"Diagnóstico", +"DISCHARGE_SUMMARY_ADMISSION_DETAILS_KEY":"Detalhes de admissão", +"DISCHARGE_SUMMARY_ADVICE_ON_DISCHARGE_KEY":"Conselhos de alta", +"DISCHARGE_SUMMARY_AT_ADMISSION_KEY":"Na admissão", +"DISCHARGE_SUMMARY_AT_DISCHARGE_KEY":"Na alta", +"DISCHARGE_SUMMARY_CLINICAL_NOTES_KEY":"Notas clínicas", +"DISCHARGE_SUMMARY_DIAGNOSIS_KEY":"Diagnóstico", +"DISCHARGE_SUMMARY_PAGE_KEY":"Pág. Resumo de alta", +"DISCHARGE_SUMMARY_TREATMENTS_KEY":"Tratamentos", +"DISPOSITION_BOARD_LABEL_KEY":"Terapêutica", +"HOME_DASHBOARD_KEY":"Painel inicial", +"LAB_INVESTIGATIONS_KEY":"Investigações laboratoriais", +"MEDICATION_CHANGE_DURATION_BUTTON":"Alterar duração", +"MEDICATIONS_BOARD_LABEL_KEY":"Prescrições", +"MODULE_LABEL_ACTIVE_KEY":"Activar", +"MODULE_LABEL_ACTIVE_PATIENTS_BY_LOCATION":"PacientesPorLocal", +"MODULE_LABEL_ALL_KEY":"Todos", +"MODULE_LABEL_ALL_PROGRAMS_KEY":"Todos programas", +"MODULE_LABEL_ART_PROGRAMS_KEY":"Programa HIV", +"MODULE_LABEL_MY_PATIENTS_KEY":"Meus pacientes", +"MODULE_LABEL_OPD_1_KEY":"Ambulatório-1", +"MODULE_LABEL_PROGRAMS_KEY":"Programas", +"MODULE_LABEL_TB_PROGRAMS_KEY":"Programa TB", +"OBSERVATIONS_BOARD_LABEL_KEY":"Observações", +"ORDERS_BOARD_LABEL_KEY":"Requisições laboratoriais", +"PACS_ORDERS_VISIT_PAGE_KEY":"Pág. de visita requisições PACS", +"PATIENT_ADT_PAGE_KEY":"Pág. Paciente internado", +"PATIENT_DASHBOARD_KEY":"Painel do paciente", +"PATIENT_VISIT_PAGE_KEY":"Pág. Marcação do paciente", +"PROGRAM_MANAGEMENT_PAGE_KEY":"Pág. Gestão do programa" +} \ No newline at end of file diff --git a/openmrs/i18n/document-upload/locale_en.json b/openmrs/i18n/document-upload/locale_en.json old mode 100644 new mode 100755 diff --git a/openmrs/i18n/document-upload/locale_fr.json b/openmrs/i18n/document-upload/locale_fr.json old mode 100644 new mode 100755 diff --git a/openmrs/i18n/document-upload/locale_pt_BR.json b/openmrs/i18n/document-upload/locale_pt_BR.json old mode 100644 new mode 100755 diff --git a/openmrs/i18n/home/locale_en.json b/openmrs/i18n/home/locale_en.json old mode 100644 new mode 100755 diff --git a/openmrs/i18n/home/locale_es.json b/openmrs/i18n/home/locale_es.json old mode 100644 new mode 100755 diff --git a/openmrs/i18n/home/locale_fr.json b/openmrs/i18n/home/locale_fr.json old mode 100644 new mode 100755 diff --git a/openmrs/i18n/home/locale_pt_BR.json b/openmrs/i18n/home/locale_pt_BR.json old mode 100644 new mode 100755 index e6d23742ba..90cab315b7 --- a/openmrs/i18n/home/locale_pt_BR.json +++ b/openmrs/i18n/home/locale_pt_BR.json @@ -1,12 +1,16 @@ { - "MODULE_LABEL_REGISTRATION_KEY": "Registro", - "MODULE_LABEL_CLINICAL_KEY": "Cl\u00EDnico", - "MODULE_LABEL_INPATIENT_KEY": "Internado", - "MODULE_LABEL_RADIOLOGY_UPLOAD_KEY": "Carregar Radiologia", - "MODULE_LABEL_PATIENT_DOCUMENTS_KEY": "Documentos do Paciente", - "MODULE_LABEL_ADMIN_KEY": "Admin", - "MODULE_LABEL_REPORTS_KEY": "Relat\u00F3rios", - "MODULE_LABEL_APOOINTMENTS_KEY": "Agendamentos", - "MODULE_LABEL_ORDERS_KEY": "Pedidos", - "MODULE_LABEL_PROGRAMS_KEY": "Programas" -} +"MODULE_LABEL_REGISTRATION_KEY":"Registo de Paciente", +"MODULE_LABEL_CLINICAL_KEY":"Clínico", +"MODULE_LABEL_INPATIENT_KEY":"Internamento", +"MODULE_LABEL_RADIOLOGY_UPLOAD_KEY":"Radiografia", +"MODULE_LABEL_PATIENT_DOCUMENTS_KEY":"Documentos do Paciente", +"MODULE_LABEL_ADMIN_KEY":"Administração", +"MODULE_LABEL_REPORTS_KEY":"Relatórios", +"MODULE_LABEL_APOOINTMENTS_KEY":"Consultas", +"MODULE_LABEL_ORDERS_KEY":"Laboratório", +"MODULE_LABEL_PROGRAMS_KEY":"Programas", +"MODULE_LABEL_IMPLEMENTER_INTERFACE_KEY":"Interface do Implementador", +"MODULE_LABEL_ATOMFEED_CONSOLE_KEY":"Consola do AtomFeed", +"MODULE_LABEL_APPOINTMENT_SCHEDULING_KEY":"Marcações", +"MODULE_LABEL_BED_MANAGEMENT_KEY":"Gestão de Camas" +} \ No newline at end of file diff --git a/openmrs/i18n/ipd/locale_en.json b/openmrs/i18n/ipd/locale_en.json old mode 100644 new mode 100755 diff --git a/openmrs/i18n/orders/locale_en.json b/openmrs/i18n/orders/locale_en.json old mode 100644 new mode 100755 diff --git a/openmrs/i18n/orders/locale_fr.json b/openmrs/i18n/orders/locale_fr.json old mode 100644 new mode 100755 diff --git a/openmrs/i18n/orders/locale_pt_BR.json b/openmrs/i18n/orders/locale_pt_BR.json old mode 100644 new mode 100755 diff --git a/openmrs/i18n/ot/locale_en.json b/openmrs/i18n/ot/locale_en.json old mode 100644 new mode 100755 diff --git a/openmrs/i18n/registration/locale_en.json b/openmrs/i18n/registration/locale_en.json old mode 100644 new mode 100755 index f3141e655b..5a66cd26bc --- a/openmrs/i18n/registration/locale_en.json +++ b/openmrs/i18n/registration/locale_en.json @@ -16,10 +16,28 @@ "REGISTRATION_OPD_DAYS_TEXT_KEY" : "OPD days are on Monday, Wednesday, Friday.", "REGISTRATION_SUNDAYS_HOLIDAY_TEXT_KEY": "Sundays are holidays.", "REGISTRATION_SMOKING_INJURIOUS_TEXT_KEY" : "Smoking, Tobacco chewing can cause cancer, heart diseases and ASTHMA.", - "REGISTRATION_INSTITUTE_NAME_TEXT_KEY": "Jan Swasthya Sahyog", + "REGISTRATION_INSTITUTE_NAME_TEXT_KEY": "POC HF 01", "REGISTRATION_INSTITUTE_REGISTERED_TEXT_KEY": "(Registered)", "REGISTRATION_INSTITUTE_ADDRESS": "Ganiyari, District - Bilaspur", - "FEE_INFORMATION_LOCALE_KEY": "Fee Information", + "PATIENT_OBS_INFORMATION_LOCALE_KEY": "Patient Information", "NUTRITIONAL_VALUES_LOCALE_KEY": "Nutritional Values", - "REGISTRATION_PRINT_WITH_BARCODE": "Barcode Print" -} \ No newline at end of file + "REGISTRATION_PRINT_WITH_BARCODE": "Barcode Print", + "REGISTRATION_ADDITIONAL_INFO_KEY": "Additional Patient Information", + "REGISTRATION_REFERENCE_INFO_KEY":"Reference People", + "REGISTRATION_TRANSFERENCE_INFO_KEY": "Transference Information", + "REGISTRATION_HIVTEST_INFO_KEY":"HIV Test", + "REGISTRATION_HIV_TEST": "HIV Test", + "country_locale":"Country", + "province_locale":"Province", + "district_locale":"District", + "administrative_locale":"Administrative", + "locality_locale":"Locality", + "ADDRESS_CLOSE_OF_LOCALE":"Close of", + "ADDRESS_AVENUE_STREET_LOCALE":"Avenue / Street", + "ADDRESS_BLOCK_LOCALE":"Block", + "ADDRESS_FLOOR_FLAT_LOCALE":"Floor / Flat", + "ADDRESS_HOUSE_NUMBER_LOCALE":"House Number", + "REGISTRATION_EDUCATION_KEY":"Education Details", + "ADDRESS_POVOADO_ALDEIA_NUMBER_LOCALE":"Village/Town", + "REGISTRATION_CONTACT_INFORMATION":"Contact Information" +} diff --git a/openmrs/i18n/registration/locale_fr.json b/openmrs/i18n/registration/locale_fr.json old mode 100644 new mode 100755 diff --git a/openmrs/i18n/registration/locale_pt_BR.json b/openmrs/i18n/registration/locale_pt_BR.json old mode 100644 new mode 100755 index e961c41bc0..bb9a7c9af2 --- a/openmrs/i18n/registration/locale_pt_BR.json +++ b/openmrs/i18n/registration/locale_pt_BR.json @@ -1,24 +1,44 @@ { - "REGISTRATION_SEARCH_CONFIG_KEY": "Pesquisar", - "REGISTRATION_CREATE_NEW_CONFIG_KEY":"Criar Novo", - "REGISTRATION_SEARCH_CONFIG_ACCESS_KEY": "e", - "REGISTRATION_CREATE_NEW_CONFIG_ACCESS_KEY": "n", - "REGISTRATION_VIEW_CONFIG_KEY": "Exibir", - "REGISTRATION_PRINT_REG_CARD_LOCAL_KEY" : "Imprimir Carto Reg. (Local)", - "REGISTRATION_PRINT_REG_CARD_KEY":"Imprimir Carto Registro", - "REGISTRATION_PRINT_SUPPLEMENTAL_PAPER":"Imprimir Papel Suplementar", - "REGISTRATION_AGE_ERROR_KEY":"Idade deve ser um valor positivo", - "REGISTRATION_TELEPHONE_NUMBER_ERROR_KEY":"Nmero do telefone deve ter no mnimo 8 dgitos", - "REGISTRATION_CASTE_TEXT_ERROR_KEY":"Casta deve contar somente caracteres alfanumricos", - "REGISTRATION_BRING_CARD_TEXT_KEY":" muito importante trazer o carto para o hospital.", - "REGISTRATION_TAKE_MEDICINES_TEXT_KEY": "Tomar medicamentos de acordo com as instrues do mdico.", - "REGISTRATION_TIMINGS_TEXT_KEY":"Horrio de inscrio das 8h30 s 12:00.", - "REGISTRATION_OPD_DAYS_TEXT_KEY" : "Dias de AMB so Segunda, Quarta, Sexta.", - "REGISTRATION_SUNDAYS_HOLIDAY_TEXT_KEY": "Domingos so feriados.", - "REGISTRATION_SMOKING_INJURIOUS_TEXT_KEY" : "Fumar e marcar tabaco pode causar cncer, doenas cardacas e asma.", - "REGISTRATION_INSTITUTE_NAME_TEXT_KEY": "Clnica Mdica", - "REGISTRATION_INSTITUTE_REGISTERED_TEXT_KEY": "(Registrado)", - "REGISTRATION_INSTITUTE_ADDRESS": "Cidade - Pas", - "FEE_INFORMATION_LOCALE_KEY": "Informao Livre", - "NUTRITIONAL_VALUES_LOCALE_KEY": "Valores Nutricionais" + "REGISTRATION_SEARCH_CONFIG_KEY":"Pesquisar", + "REGISTRATION_CREATE_NEW_CONFIG_KEY":"Criar Novo", + "REGISTRATION_SEARCH_CONFIG_ACCESS_KEY":"e", + "REGISTRATION_CREATE_NEW_CONFIG_ACCESS_KEY":"n", + "REGISTRATION_VIEW_CONFIG_KEY":"Ver", + "REGISTRATION_PRINT_REG_CARD_LOCAL_KEY":"Imprimir Cartão Reg. (Local)", + "REGISTRATION_PRINT_REG_CARD_KEY":"ImPrimir Cartão de Registo", + "REGISTRATION_PRINT_SUPPLEMENTAL_PAPER":"Imprimir Papel Suplementar", + "REGISTRATION_AGE_ERROR_KEY":"Idade deve ser um valor positivo", + "REGISTRATION_TELEPHONE_NUMBER_ERROR_KEY":"Número de Telefone deve ter no mínimo 6 digitos", + "REGISTRATION_CASTE_TEXT_ERROR_KEY":"Casta deve tter apenas caracteres alfanúmericos", + "REGISTRATION_BRING_CARD_TEXT_KEY":"É importante trazer o cartão do paciente para o hospital", + "REGISTRATION_TAKE_MEDICINES_TEXT_KEY":"Tomar medicamentos de acordo com as instruções do médico.", + "REGISTRATION_TIMINGS_TEXT_KEY":"Os horários de registo são das 7:30 às 15:30", + "REGISTRATION_OPD_DAYS_TEXT_KEY":"Consultas externas são nas 2as, 4as e 6as.", + "REGISTRATION_SUNDAYS_HOLIDAY_TEXT_KEY":"Domingos são feriados.", + "REGISTRATION_SMOKING_INJURIOUS_TEXT_KEY":"Fumar, mascar tabaco pode causar cancro, doenças cardíacas e ASMA.", + "REGISTRATION_INSTITUTE_NAME_TEXT_KEY":"Nome do Hospital", + "REGISTRATION_INSTITUTE_REGISTERED_TEXT_KEY":"(Registado)", + "REGISTRATION_INSTITUTE_ADDRESS":"Endereço do Hospital", + "PATIENT_OBS_INFORMATION_LOCALE_KEY":"Informação do paciente", + "NUTRITIONAL_VALUES_LOCALE_KEY":"Dados Antropométricos", + "REGISTRATION_PRINT_WITH_BARCODE":"Imprimir com Código de Barras", + + "REGISTRATION_ADDITIONAL_INFO_KEY": "Informação Adicional ao Paciente", + "REGISTRATION_REFERENCE_INFO_KEY":"Confidente", + "REGISTRATION_TRANSFERENCE_INFO_KEY": "Transferência", + "REGISTRATION_HIVTEST_INFO_KEY":"Teste de HIV", + "REGISTRATION_HIV_TEST": "HIV Test", + "country_locale":"País", + "province_locale":"Província", + "district_locale":"Distrito", + "administrative_locale":"Administrativo", + "locality_locale":"Localidade/Bairro", + "education":"Nivel de Escolaridade", + "ADDRESS_CLOSE_OF_LOCALE":"Perto De", + "ADDRESS_AVENUE_STREET_LOCALE":"Avenida/Rua", + "ADDRESS_BLOCK_LOCALE":"Quarteirão", + "ADDRESS_FLOOR_FLAT_LOCALE":"Andar/Flat", + "ADDRESS_HOUSE_NUMBER_LOCALE":"Nº da Casa", + "ADDRESS_POVOADO_ALDEIA_NUMBER_LOCALE":"Povoado/Aldeia", + "REGISTRATION_CONTACT_INFORMATION":"Contactos" } diff --git a/openmrs/migrations/bedManagement/PatientWardDetails.sql b/openmrs/migrations/bedManagement/PatientWardDetails.sql deleted file mode 100644 index 9c0b463b1a..0000000000 --- a/openmrs/migrations/bedManagement/PatientWardDetails.sql +++ /dev/null @@ -1,29 +0,0 @@ -DELETE FROM global_property WHERE property = 'emrapi.sqlGet.allWardsListDetails'; -SELECT uuid() INTO @uuid; -INSERT INTO global_property (`property`, `property_value`, `description`, `uuid`) -VALUES ('emrapi.sqlGet.allWardsListDetails', -"SELECT - bed_tags.bed_tags AS 'Bed Tags', - bed.bed_number AS 'Bed Number', - patient_identifier.identifier AS 'Patient ID', - CONCAT(pn.given_name, ' ', pn.family_name) AS 'Patient Name', - TIMESTAMPDIFF(YEAR, p.birthdate, CURDATE()) AS 'Age' -FROM - bed - INNER JOIN bed_location_map blm ON blm.bed_id = bed.bed_id - INNER JOIN location l ON l.location_id = blm.location_id AND l.name = ${location_name} AND l.name LIKE '%Ward%' AND l.retired IS FALSE - LEFT OUTER JOIN bed_patient_assignment_map bpam ON bpam.bed_id = bed.bed_id AND bpam.date_stopped IS NULL - LEFT OUTER JOIN person p ON p.person_id = bpam.patient_id AND p.voided IS FALSE - LEFT OUTER JOIN person_name pn ON pn.person_id = p.person_id AND pn.voided IS FALSE - LEFT OUTER JOIN patient_identifier ON patient_identifier.patient_id = p.person_id AND patient_identifier.voided IS FALSE - LEFT OUTER JOIN person_address address ON address.person_id = p.person_id AND address.voided IS FALSE - LEFT OUTER JOIN ( - SELECT - bed_tag_map.bed_id AS 'bed_id', - GROUP_CONCAT(DISTINCT bed_tag.name ORDER BY bed_tag.name) AS 'bed_tags' - FROM - bed_tag_map - INNER JOIN bed_tag ON bed_tag.bed_tag_id = bed_tag_map.bed_tag_id AND bed_tag_map.voided IS FALSE - GROUP BY bed_tag_map.bed_id - ) bed_tags ON bed_tags.bed_id = bed.bed_id -GROUP BY bed.bed_number;",'SQL query to get list of bed details in ward',@uuid); diff --git a/openmrs/migrations/liquibase.xml b/openmrs/migrations/liquibase.xml old mode 100644 new mode 100755 index a70d1c277c..064dc3d4fa --- a/openmrs/migrations/liquibase.xml +++ b/openmrs/migrations/liquibase.xml @@ -49,10 +49,6 @@ ); - - Updating SQL query for Bed Management List View - - diff --git a/openmrs/migrations/updatePatientProgramToEpisode.sql b/openmrs/migrations/updatePatientProgramToEpisode.sql old mode 100644 new mode 100755 diff --git a/openmrs/obscalculator/BMI_chart.csv b/openmrs/obscalculator/BMI_chart.csv old mode 100644 new mode 100755 diff --git a/openmrs/obscalculator/BahmniObsValueCalculator.groovy b/openmrs/obscalculator/BahmniObsValueCalculator.groovy old mode 100644 new mode 100755 diff --git a/openmrs/ordertemplates/templates.json b/openmrs/ordertemplates/templates.json old mode 100644 new mode 100755 diff --git a/openmrs/patientMatchingAlgorithm/DefaultPatientMatchingAlgorithm b/openmrs/patientMatchingAlgorithm/DefaultPatientMatchingAlgorithm old mode 100644 new mode 100755 diff --git a/openmrs/rulesengine/drugorderrules/Fever.csv b/openmrs/rulesengine/drugorderrules/Fever.csv old mode 100644 new mode 100755 diff --git a/openmrs/rulesengine/drugorderrules/Tuberculosis.csv b/openmrs/rulesengine/drugorderrules/Tuberculosis.csv old mode 100644 new mode 100755 diff --git a/openmrs/rulesengine/rulesengineextension/Chemotherapy.groovy b/openmrs/rulesengine/rulesengineextension/Chemotherapy.groovy old mode 100644 new mode 100755 diff --git a/openmrs/templates/All_templates_generic_concepts.csv b/openmrs/templates/All_templates_generic_concepts.csv old mode 100644 new mode 100755 diff --git a/openmrs/templates/Anaemia_concept_sets.csv b/openmrs/templates/Anaemia_concept_sets.csv old mode 100644 new mode 100755 diff --git a/openmrs/templates/Anaemia_concepts.csv b/openmrs/templates/Anaemia_concepts.csv old mode 100644 new mode 100755 diff --git a/openmrs/templates/Arthritis_concept_sets.csv b/openmrs/templates/Arthritis_concept_sets.csv old mode 100644 new mode 100755 diff --git a/openmrs/templates/Arthritis_concepts.csv b/openmrs/templates/Arthritis_concepts.csv old mode 100644 new mode 100755 diff --git a/openmrs/templates/Breast_cancer_concept_sets.csv b/openmrs/templates/Breast_cancer_concept_sets.csv old mode 100644 new mode 100755 diff --git a/openmrs/templates/Breast_cancer_concepts.csv b/openmrs/templates/Breast_cancer_concepts.csv old mode 100644 new mode 100755 diff --git a/openmrs/templates/Breast_cancer_generic_concepts.csv b/openmrs/templates/Breast_cancer_generic_concepts.csv old mode 100644 new mode 100755 diff --git a/openmrs/templates/COPD_intake_concept_sets.csv b/openmrs/templates/COPD_intake_concept_sets.csv old mode 100644 new mode 100755 diff --git a/openmrs/templates/COPD_intake_concepts.csv b/openmrs/templates/COPD_intake_concepts.csv old mode 100644 new mode 100755 diff --git a/openmrs/templates/COPD_progress_concept_sets.csv b/openmrs/templates/COPD_progress_concept_sets.csv old mode 100644 new mode 100755 diff --git a/openmrs/templates/COPD_progress_concepts.csv b/openmrs/templates/COPD_progress_concepts.csv old mode 100644 new mode 100755 diff --git a/openmrs/templates/Cervical_cancer_concept_sets.csv b/openmrs/templates/Cervical_cancer_concept_sets.csv old mode 100644 new mode 100755 diff --git a/openmrs/templates/Cervical_cancer_concepts.csv b/openmrs/templates/Cervical_cancer_concepts.csv old mode 100644 new mode 100755 diff --git a/openmrs/templates/Cervical_cancer_generic_concepts.csv b/openmrs/templates/Cervical_cancer_generic_concepts.csv old mode 100644 new mode 100755 diff --git a/openmrs/templates/Colon_cancer_concept_sets.csv b/openmrs/templates/Colon_cancer_concept_sets.csv old mode 100644 new mode 100755 diff --git a/openmrs/templates/Colon_cancer_concepts.csv b/openmrs/templates/Colon_cancer_concepts.csv old mode 100644 new mode 100755 diff --git a/openmrs/templates/Colon_cancer_generic_concepts.csv b/openmrs/templates/Colon_cancer_generic_concepts.csv old mode 100644 new mode 100755 diff --git a/openmrs/templates/Congetive_heart_failure_intake_concept_sets.csv b/openmrs/templates/Congetive_heart_failure_intake_concept_sets.csv old mode 100644 new mode 100755 diff --git a/openmrs/templates/Congetive_heart_failure_intake_concepts.csv b/openmrs/templates/Congetive_heart_failure_intake_concepts.csv old mode 100644 new mode 100755 diff --git a/openmrs/templates/Congetive_heart_failure_progress_concept_sets.csv b/openmrs/templates/Congetive_heart_failure_progress_concept_sets.csv old mode 100644 new mode 100755 diff --git a/openmrs/templates/Congetive_heart_failure_progress_concepts.csv b/openmrs/templates/Congetive_heart_failure_progress_concepts.csv old mode 100644 new mode 100755 diff --git a/openmrs/templates/Coronary_heart_disease_intake_concept_set.csv b/openmrs/templates/Coronary_heart_disease_intake_concept_set.csv old mode 100644 new mode 100755 diff --git a/openmrs/templates/Coronary_heart_disease_intake_concept_sets.csv b/openmrs/templates/Coronary_heart_disease_intake_concept_sets.csv old mode 100644 new mode 100755 diff --git a/openmrs/templates/Coronary_heart_disease_progress_concept_sets.csv b/openmrs/templates/Coronary_heart_disease_progress_concept_sets.csv old mode 100644 new mode 100755 diff --git a/openmrs/templates/Coronary_heart_disease_progress_concepts.csv b/openmrs/templates/Coronary_heart_disease_progress_concepts.csv old mode 100644 new mode 100755 diff --git a/openmrs/templates/Detailed_history_concept_sets.csv b/openmrs/templates/Detailed_history_concept_sets.csv old mode 100644 new mode 100755 diff --git a/openmrs/templates/Detailed_history_concepts.csv b/openmrs/templates/Detailed_history_concepts.csv old mode 100644 new mode 100755 diff --git a/openmrs/templates/Diabetes_concept_sets.csv b/openmrs/templates/Diabetes_concept_sets.csv old mode 100644 new mode 100755 diff --git a/openmrs/templates/Diabetes_concepts.csv b/openmrs/templates/Diabetes_concepts.csv old mode 100644 new mode 100755 diff --git a/openmrs/templates/Epilepsy_concept_sets.csv b/openmrs/templates/Epilepsy_concept_sets.csv old mode 100644 new mode 100755 diff --git a/openmrs/templates/Epilepsy_concepts.csv b/openmrs/templates/Epilepsy_concepts.csv old mode 100644 new mode 100755 diff --git a/openmrs/templates/Gastric_cancer_concept_sets.csv b/openmrs/templates/Gastric_cancer_concept_sets.csv old mode 100644 new mode 100755 diff --git a/openmrs/templates/Gastric_cancer_concepts.csv b/openmrs/templates/Gastric_cancer_concepts.csv old mode 100644 new mode 100755 diff --git a/openmrs/templates/Gastric_generic_concepts.csv b/openmrs/templates/Gastric_generic_concepts.csv old mode 100644 new mode 100755 diff --git a/openmrs/templates/Generic_concepts.csv b/openmrs/templates/Generic_concepts.csv old mode 100644 new mode 100755 diff --git a/openmrs/templates/Hyperthyroidism_concept_sets.csv b/openmrs/templates/Hyperthyroidism_concept_sets.csv old mode 100644 new mode 100755 diff --git a/openmrs/templates/Hyperthyroidism_concepts.csv b/openmrs/templates/Hyperthyroidism_concepts.csv old mode 100644 new mode 100755 diff --git a/openmrs/templates/Kaposis_sarcoma_concept_sets.csv b/openmrs/templates/Kaposis_sarcoma_concept_sets.csv old mode 100644 new mode 100755 diff --git a/openmrs/templates/Kaposis_sarcoma_concepts.csv b/openmrs/templates/Kaposis_sarcoma_concepts.csv old mode 100644 new mode 100755 diff --git a/openmrs/templates/Kaposis_sarcoma_generic_concepts.csv b/openmrs/templates/Kaposis_sarcoma_generic_concepts.csv old mode 100644 new mode 100755 diff --git a/openmrs/templates/Leprosy_concept_sets.csv b/openmrs/templates/Leprosy_concept_sets.csv old mode 100644 new mode 100755 diff --git a/openmrs/templates/Leprosy_concepts.csv b/openmrs/templates/Leprosy_concepts.csv old mode 100644 new mode 100755 diff --git a/openmrs/templates/Leprosy_generic_concepts.csv b/openmrs/templates/Leprosy_generic_concepts.csv old mode 100644 new mode 100755 diff --git a/openmrs/templates/Nephroblastoma_concept_sets.csv b/openmrs/templates/Nephroblastoma_concept_sets.csv old mode 100644 new mode 100755 diff --git a/openmrs/templates/Nephroblastoma_concepts.csv b/openmrs/templates/Nephroblastoma_concepts.csv old mode 100644 new mode 100755 diff --git a/openmrs/templates/Nephroblastoma_generic_concepts.csv b/openmrs/templates/Nephroblastoma_generic_concepts.csv old mode 100644 new mode 100755 diff --git a/openmrs/templates/Neurological_disorder_concept_sets.csv b/openmrs/templates/Neurological_disorder_concept_sets.csv old mode 100644 new mode 100755 diff --git a/openmrs/templates/Neurological_disorder_concepts.csv b/openmrs/templates/Neurological_disorder_concepts.csv old mode 100644 new mode 100755 diff --git a/openmrs/templates/Operation_notes_concept_sets.csv b/openmrs/templates/Operation_notes_concept_sets.csv old mode 100644 new mode 100755 diff --git a/openmrs/templates/Operation_notes_concepts.csv b/openmrs/templates/Operation_notes_concepts.csv old mode 100644 new mode 100755 diff --git a/openmrs/templates/Operation_notes_generic_concepts.csv b/openmrs/templates/Operation_notes_generic_concepts.csv old mode 100644 new mode 100755 diff --git a/openmrs/templates/Rheumatic_heart_disease_intake_concept_sets.csv b/openmrs/templates/Rheumatic_heart_disease_intake_concept_sets.csv old mode 100644 new mode 100755 diff --git a/openmrs/templates/Rheumatic_heart_disease_intake_concepts.csv b/openmrs/templates/Rheumatic_heart_disease_intake_concepts.csv old mode 100644 new mode 100755 diff --git a/openmrs/templates/Sickle_cell_concept_sets.csv b/openmrs/templates/Sickle_cell_concept_sets.csv old mode 100644 new mode 100755 diff --git a/openmrs/templates/Sickle_cell_concepts.csv b/openmrs/templates/Sickle_cell_concepts.csv old mode 100644 new mode 100755 diff --git a/openmrs/templates/Sickle_cell_generic_concepts.csv b/openmrs/templates/Sickle_cell_generic_concepts.csv old mode 100644 new mode 100755 diff --git a/openmrs/templates/Tuberculosis_MDR_concepts.csv b/openmrs/templates/Tuberculosis_MDR_concepts.csv old mode 100644 new mode 100755 diff --git a/openmrs/templates/Tuberculosis_concept_sets.csv b/openmrs/templates/Tuberculosis_concept_sets.csv old mode 100644 new mode 100755 diff --git a/openmrs/templates/Tuberculosis_generic_concepts.csv b/openmrs/templates/Tuberculosis_generic_concepts.csv old mode 100644 new mode 100755 diff --git a/openmrs/templates/Tuberculosis_intake_concepts.csv b/openmrs/templates/Tuberculosis_intake_concepts.csv old mode 100644 new mode 100755 diff --git a/openmrs/templates/Tuberculosis_outcome_concepts.csv b/openmrs/templates/Tuberculosis_outcome_concepts.csv old mode 100644 new mode 100755 diff --git a/openmrs/templates/Tuberculosis_progress_concepts.csv b/openmrs/templates/Tuberculosis_progress_concepts.csv old mode 100644 new mode 100755 diff --git a/openmrs/templates/Tuberculosis_retreatment_concepts.csv b/openmrs/templates/Tuberculosis_retreatment_concepts.csv old mode 100644 new mode 100755 diff --git a/openmrs/templates/Undernutrition_concept_sets.csv b/openmrs/templates/Undernutrition_concept_sets.csv old mode 100644 new mode 100755 diff --git a/openmrs/templates/Undernutrition_concepts.csv b/openmrs/templates/Undernutrition_concepts.csv old mode 100644 new mode 100755 diff --git a/openmrs/treatmentRegimenExtension/TreatmentRegimenExtension.groovy b/openmrs/treatmentRegimenExtension/TreatmentRegimenExtension.groovy old mode 100644 new mode 100755