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 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 ad88678de..06fbf7d12 --- 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 2f0150229..5038824e4 --- a/openmrs/apps/clinical/app.json +++ b/openmrs/apps/clinical/app.json @@ -1,10 +1,6 @@ { "id": "bahmni.clinical", "extensionPoints": [ - { - "id": "org.bahmni.clinical.consultation.board", - "description": "Bahmni Clinical Consultation Page" - }, { "id": "org.bahmni.clinical.conceptSetGroup.*", "description": "Define conceptsets part of a conceptset group" @@ -44,11 +40,8 @@ "ID_Number": { "required" : true }, - "Co-morbidites": { - "excludeFrom": ["HIV Program"] - }, - "Doctor": { - "excludeFrom": ["TB Program"] + "Stage": { + "excludeFrom": ["ART","TB Program","PTV program"] } }, "patientContext": { @@ -113,6 +106,10 @@ "Set1": { "allowAddMore": true }, + "Home equipment": { + "dropdown": true, + "disableAddNotes": true + }, "Set2": { "allowAddMore": true }, diff --git a/openmrs/apps/clinical/dashboard.json b/openmrs/apps/clinical/dashboard.json old mode 100644 new mode 100755 index 7febca3b0..271a6b2db --- a/openmrs/apps/clinical/dashboard.json +++ b/openmrs/apps/clinical/dashboard.json @@ -1,399 +1,60 @@ -{ - "general":{ +{ + "general":{ "translationKey":"DASHBOARD_TAB_GENERAL_KEY", "displayByDefault":true, "maxRecentlyViewedPatients":10, - "sections":{ - "patientInformation":{ + "sections":{ + "patientInformation":{ "translationKey":"DASHBOARD_TITLE_PATIENT_INFORMATION_KEY", "type":"patientInformation", "displayOrder":0, "ageLimit":100, - "patientAttributes":[ + "patientAttributes":[ ], - "addressFields":[ + "addressFields":[ "address1", "address2", "cityVillage", "countyDistrict" ] }, - "diagnosis":{ - "translationKey":"DASHBOARD_TITLE_DIAGNOSIS_KEY", - "type":"diagnosis", - "showCertainty":true, - "showOrder":true, - "showDetailsButton":true, - "displayOrder":1 - }, - "navigationLinksControl":{ + "navigationLinksControl":{ "translationKey":"DASHBOARD_TITLE_NAVIGATION_LINKS_CONTROL_KEY", "type":"navigationLinksControl", "displayOrder":2, - "showLinks":[ + "showLinks":[ "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", - "displayOrder":4, - "dashboardConfig":{ - "showFlowSheet":true, - "showListView":true, - "showRoute":true, - "showDrugForm":true, - "numberOfVisits":5, - "showOtherActive":true, - "showDetailsButton":true - }, - "expandedViewConfig":{ - "translationKey":"DASHBOARD_TITLE_TREATMENTS_KEY", - "showFlowSheet":true, - "showListView":true, - "showRoute":true, - "showDrugForm":true, - "numberOfVisits":10, - "showOtherActive":true, - "showDetailsButton":true - } - }, - "radiology":{ - "translationKey":"DASHBOARD_TITLE_RADIOLOGY_KEY", - "type":"radiology", - "showDetailsButton":true, - "displayOrder":5 - }, - "programs":{ + + + + + "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", - "orderType":"Lab Order", - "showDetailsButton":true, - "displayOrder":9, - "dashboardConfig":{ - "conceptNames":[ - "Systolic", - "Diastolic", - "Posture", - "Temperature" - ] - }, - "expandedViewConfig":{ - "conceptNames":[ - "Systolic", - "Diastolic", - "Posture", - "Temperature" - ], - "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", - "displayOrder":6, - "dashboardConfig":{ - "title":null, - "numberOfVisits":6, - "showChart":false, - "showTable":true, - "showNormalLabResults": true, - "showCommentsExpanded": true, - "showAccessionNotes": true, - "showDetailsButton":false - }, - "expandedViewConfig":{ - "numberOfVisits":10 - } - }, - "nutritionalValues":{ - "translationKey":"DASHBOARD_TITLE_NUTRITIONAL_VALUES_KEY", - "type":"vitals", - "isObservation":true, - "displayOrder":11, - "dashboardConfig":{ - "conceptNames":[ - "HEIGHT", - "Weight", - "BMI Data", - "BMI Status Data" - ], - "showDetailsButton":true, - "numberOfVisits":2 - }, - "expandedViewConfig":{ - "conceptNames":[ - "HEIGHT", - "Weight", - "BMI", - "BMI STATUS" - ], - "numberOfVisits":2, - "scope":"latest", - "showDetailsButton":true, - "pivotTable":{ - - } - } - }, - "vitals":{ - "translationKey":"DASHBOARD_TITLE_VITALS_KEY", - "type":"vitals", - "isObservation":true, - "displayOrder":12, - "dashboardConfig":{ - "showDetailsButton":true, - "conceptNames":[ - "Vitals" - ], - "numberOfVisits":2 - }, - "expandedViewConfig":{ - "conceptNames":[ - "Vitals" - ], - "numberOfVisits":2, - "showDetailsButton":true, - "pivotTable":{ - "numberOfVisits":"10", - "groupBy":"encounters", - "obsConcepts":[ - "Weight", - "Vitals" - ], - "drugConcepts":[ - - ], - "labConcepts":[ - - ] - } - } - }, - "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", - "isObservation":true, - "displayOrder":14, - "dashboardConfig":{ - "showDetailsButton":true, - "conceptNames":[ - "History and Examination" - ], - "numberOfVisits":2 - }, - "expandedViewConfig":{ - "conceptNames":[ - "History and Examination" - ], - "numberOfVisits":2, - "showDetailsButton":true, - "pivotTable":{ - - } - } - }, - "gynaecology":{ - "translationKey":"DASHBOARD_TITLE_GYNAECOLOGY_KEY", - "type":"gynaecology", - "isObservation":true, - "displayOrder":15, - "dashboardConfig":{ - "conceptNames":[ - "Gynaecology" - ], - "showDetailsButton":true, - "numberOfVisits":2 - }, - "expandedViewConfig":{ - "conceptNames":[ - "Gynaecology" - ], - "numberOfVisits":2, - "showDetailsButton":true, - "pivotTable":{ - - } - } - }, - "obstetrics":{ - "translationKey":"DASHBOARD_TITLE_OBSTETRICS_KEY", - "type":"obstetrics", - "isObservation":true, - "displayOrder":16, - "dashboardConfig":{ - "showDetailsButton":true, - "conceptNames":[ - "Obstetrics" - ], - "numberOfVisits":2 - }, - "expandedViewConfig":{ - "conceptNames":[ - "Obstetrics" - ], - "numberOfVisits":2, - "showDetailsButton":true, - "pivotTable":{ - - } - } - }, - "visits":{ + + + + + + + "visits":{ "translationKey":"DASHBOARD_TITLE_VISITS_KEY", "type":"visits", "displayOrder":3, - "dashboardConfig":{ + "dashboardConfig":{ "title":null, "maximumNoOfVisits":8, "groupByVisits":true } }, - "diabetes":{ - "title":"Diabetes", - "templateName":"Diabetes Templates", - "type":"diseaseTemplate", - "displayOrder":18, - "dashboardConfig":{ - "showOnly":[ - - ] - }, - "expandedViewConfig":{ - "showDetailsButton":true, - "pivotTable":{ - "numberOfVisits":"15", - "groupBy":"encounters", - "obsConcepts":[ - "Weight", - "Height", - "Systolic", - "Diastolic", - "Diabetes, Foot Exam", - "Diabetes, Eye Exam" - ], - "drugConcepts":[ - "Ipratropium Pressurised", - "Garbhpal Rasa" - ], - "labConcepts":[ - "RBS", - "FBS", - "PP2BS", - "Hb1AC", - "Creatinine", - "Albumin", - "Polymorph" - ] - } - } - }, - "admissionDetails":{ - "translationKey":"DASHBOARD_TITLE_ADMISSION_DETAILS_KEY", - "type":"admissionDetails", - "displayOrder":19, - "showDetailsButton":true - }, - "conditions": { - "translationKey":"CONDITION_LIST_DISPLAY_CONTROL_TITLE", - "type": "conditionsList", - "displayOrder": 20 - }, - "formsDisplay": { - "type": "forms", - "displayOrder": 21, - "dashboardConfig": { - "title": null, - "maximumNoOfVisits": 10 - }, - "formGroup": [ ], - "translationKey": "DASHBOARD_TITLE_FORMS_DISPLAY_CONTROL_KEY" - }, + "patientAppointments": { "type": "custom", "displayOrder": 22, @@ -404,26 +65,17 @@ } } }, - "trends":{ + "trends":{ "translationKey":"DASHBOARD_TAB_TRENDS_KEY", "maxRecentlyViewedPatients":10, - "sections":{ - "patientInformation":{ + "sections":{ + "patientInformation":{ "translationKey":"DASHBOARD_TITLE_PATIENT_INFORMATION_KEY", "type":"patientInformation", - "patientAttributes":[ - "caste", - "class", - "education", - "occupation", - "debt", - "distanceFromCenter", - "isUrban", - "cluster", - "RationCard", + "patientAttributes":[ "familyIncome" ], - "addressFields":[ + "addressFields":[ "address1", "address2", "cityVillage", @@ -431,11 +83,11 @@ ], "displayOrder":0 }, - "growthChart":{ + "growthChart":{ "type":"observationGraph", "translationKey": "DASHBOARD_TITLE_GROWTH_CHART", - "config":{ - "yAxisConcepts":[ + "config":{ + "yAxisConcepts":[ "Weight" ], "referenceData":"growthChartReference.csv", @@ -443,24 +95,11 @@ }, "displayOrder":1 }, - "BP":{ - "type":"observationGraph", - "translationKey": "DASHBOARD_TITLE_BLOOD_PRESSURE", - "config":{ - "yAxisConcepts":[ - "Systolic Data", - "Diastolic Data" - ], - "xAxisConcept":"observationDateTime", - "numberOfVisits":10 - }, - "displayOrder":2 - }, - "weight/BMI":{ + "weight/BMI":{ "type":"observationGraph", "translationKey": "DASHBOARD_TITLE_WEIGHT_BMI", - "config":{ - "yAxisConcepts":[ + "config":{ + "yAxisConcepts":[ "Weight", "BMI" ], @@ -468,148 +107,15 @@ "numberOfVisits":10 }, "displayOrder":3 - }, - "diabetes/BloodSugar":{ - "type":"observationGraph", - "translationKey": "DASHBOARD_TITLE_DIABETES_BLOOD_SUGAR", - "config":{ - "yAxisConcepts":[ - "Blood Sugar Fasting", - "Blood Sugar P.P" - ], - "xAxisConcept":"observationDateTime", - "numberOfVisits":10 - }, - "displayOrder":4 - }, - "observationGraph":{ - "type":"observationGraph", - "translationKey": "DASHBOARD_TITLE_PULSE", - "config":{ - "yAxisConcepts":[ - "Pulse Data" - ], - "xAxisConcept":"observationDateTime", - "numberOfVisits":10 - }, - "displayOrder":5 - }, - "diabetes":{ - "title":"Diabetes", - "templateName":"Diabetes, Progress", - "type":"diseaseTemplate", - "dashboardConfig":{ - "showOnly":[ - - ] - }, - "expandedViewConfig":{ - "showDetailsButton":true, - "pivotTable":{ - "numberOfVisits":"10", - "groupBy":"visits", - "obsConcepts":[ - "Diabetes, Blood Pressure", - "Diabetes, A1C", - "Diabetes, LDL", - "Diabetes, Ulcers on Feet", - "Blood Sugar Fasting", - "Blood Sugar PP" - ], - "labConcepts":[ - "RBS", - "FBS", - "PP2BS", - "Hb1AC", - "Creatinine", - "Cholesterol" - ] - } - }, - "displayOrder":6 } } - }, - "patientSummary":{ - "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, - "displayType":"Full-Page", - "dashboardConfig":{ - "showGroupDateTime":false, - "conceptNames":[ - "Chief Complaint Data", - "Examination Notes", - "Smoking History", - "Clief COmplaint Notes", - "Blood Pressure" - ] - }, - "displayOrder":6, - "translationKey":"DASHBOARD_TITLE_HISTORY_AND_EXAMINATIONS_KEY" - }, - "drugOther":{ - "translationKey":"DASHBOARD_TITLE_TREATMENTS_KEY", - "type":"drugOrderDetails", - "displayType":"Full-Page", - "showDetailsButton":true, - "displayOrder":24, - "dashboardConfig":{ - "showOnlyActive":true, - "drugConceptSet":"All Other Drugs" - } - }, - "malaria":{ - "title":"Malaria", - "type":"obsToObsFlowSheet", - "displayType":"Full-Page", - "displayOrder":26, - "dashboardConfig":{ - "groupByConcept":"Malaria, Treatment Start Date", - "templateName":"Malaria", - "conceptNames":[ - "Malaria, Parents Name", - "Malaria, drug regimen", - "Malaria, Malaria Type", - "Malaria, Source" - ] - } - }, - "Chronic Treatment Chart":{ - "displayType":"Full-Page", - "title":"Chronic Treatment Chart", - "type":"chronicTreatmentChart", - "dashboardConfig":{ - "drugs":[ + } + + + + + - ] - }, - "expandedViewConfig":{ - "drugs":[ - ] - } - } - } - } } + diff --git a/openmrs/apps/clinical/extension-programs.json b/openmrs/apps/clinical/extension-programs.json old mode 100644 new mode 100755 index 31400109a..566d1b07b --- a/openmrs/apps/clinical/extension-programs.json +++ b/openmrs/apps/clinical/extension-programs.json @@ -1,16 +1,44 @@ { + "bahmniClinicalPatientsSearchActivePatientsForPrograms": { - "id": "bahmni.clinical.patients.search.activePatients", + "id": "bahmni.clinical.patients.search.activePatientsforprograms", "extensionPointId": "org.bahmni.patient.search", "type": "config", "extensionParams": { - "searchHandler": "emrapi.sqlSearch.activePatients", - "translationKey": "MODULE_LABEL_PROGRAMS_KEY", + "searchHandler": "emrapi.sqlSearch.activePatientsallprogram", + "translationKey": "MODULE_LABEL_ALL_PROGRAMS_KEY", "forwardUrl": "#/programs/patient/{{patientUuid}}/consultationContext" }, - "label": "Active", + "label": "ALL Program", "order": 1, "requiredPrivilege": "app:clinical" + }, + + "bahmniClinicalPatientsSearchActivePatientsForartPrograms": { + "id": "bahmni.clinical.patients.search.activePatientsartprogram", + "extensionPointId": "org.bahmni.patient.search", + "type": "config", + "extensionParams": { + "searchHandler": "emrapi.sqlSearch.activePatientsartprogram", + "translationKey": "MODULE_LABEL_ART_PROGRAMS_KEY", + "forwardUrl": "#/programs/patient/{{patientUuid}}/consultationContext" + }, + "label": "ART Program", + "order": 2, + "requiredPrivilege": "app:clinical" + }, + "bahmniClinicalPatientsSearchActivePatientsFortbPrograms": { + "id": "bahmni.clinical.patients.search.activePatientstbprogram", + "extensionPointId": "org.bahmni.patient.search", + "type": "config", + "extensionParams": { + "searchHandler": "emrapi.sqlSearch.activePatientstbprogram", + "translationKey": "MODULE_LABEL_TB_PROGRAMS_KEY", + "forwardUrl": "#/programs/patient/{{patientUuid}}/consultationContext" + }, + "label": "TB Program", + "order": 3, + "requiredPrivilege": "app:clinical" }, "bahmniClinicalPatientsSearchAllPatients": { "id": "bahmni.clinical.patients.search.allPatients", @@ -21,7 +49,7 @@ "forwardUrl": "#/programs/patient/{{patientUuid}}/consultationContext" }, "label": "All", - "order": 2, + "order": 4, "requiredPrivilege": "app:clinical" }, "bahmniClinicalConceptSetGroupObservationsHistory": { @@ -62,6 +90,7 @@ "order": 3, "requiredPrivilege": "app:clinical" }, + "bahmniClinicalConceptSetGroupObservationsObstetrics": { "id": "bahmni.clinical.conceptSetGroup.observations.obstetrics", "extensionPointId": "org.bahmni.clinical.conceptSetGroup.observations", @@ -104,6 +133,11 @@ "order": 1, "requiredPrivilege": "app:clinical:observationTab" }, + + + + + "diagnosis": { "id": "bahmni.clinical.consultation.diagnosis", "extensionPointId": "org.bahmni.clinical.consultation.board", @@ -136,4 +170,4 @@ "order": 5, "requiredPrivilege": "app:clinical:consultationTab" } -} \ No newline at end of file +} diff --git a/openmrs/apps/clinical/extension.json b/openmrs/apps/clinical/extension.json old mode 100644 new mode 100755 index 8dd401c45..a99023316 --- a/openmrs/apps/clinical/extension.json +++ b/openmrs/apps/clinical/extension.json @@ -67,58 +67,6 @@ "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", @@ -235,4 +183,4 @@ "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 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 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 4f282dc65..c3dc10d68 --- 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 78059ef2a..deedd408e --- 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 10305921f..68ab1eb37 --- 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 diff --git a/openmrs/apps/ipd/extension.json b/openmrs/apps/ipd/extension.json old mode 100644 new mode 100755 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 915502784..13686e58f --- 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}}", - "showMiddleName": true, + "afterVisitSaveForwardUrl": "../registration/index.html#/search", + "showMiddleName": false, "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,11 @@ "FHS": { "buttonSelect": true }, + "Home equipment": { + "dropdown": true, + "disableAddNotes": true + }, + "defaults":{ "FHS": "Present" } @@ -99,19 +119,33 @@ "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"} + "latitude" : {"pattern" : "[a-zA-Z]{0,}", "errorMessage" : "Should contain characters"}, + "address3" : {"pattern" : "[a-zA-Z0-9\\s]{0,}", "errorMessage" : "Should contain Characters, Numbers"}, + "address4" : {"pattern" : "[a-zA-Z0-9\\s)-(]{0,}", "errorMessage" : "Should contain Characters, Numbers,-,(,)"}, + "address5" : {"pattern" : "[a-zA-Z0-9\\s-]{0,}", "errorMessage" : "Should contain Characters, Numbers, -"}, + "address6" : {"pattern" : "[a-zA-Z0-9\\s-]{0,}", "errorMessage" : "Should contain Characters, Numbers, -"}, + "postalCode" : {"pattern" : "[a-zA-Z0-9\\s)-(]{0,}", "errorMessage" : "Should contain Characters, Numbers,-,(,)"} + }, - "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" + ] } - } + }, + "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 000000000..e69de29bb diff --git a/openmrs/apps/registration/extension.json b/openmrs/apps/registration/extension.json old mode 100644 new mode 100755 index f42906ff8..78d22e533 --- 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 a7cb28cc1..59f26a586 --- 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 39279bc2c..050d96074 --- 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 000000000..5f40a97fb --- /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 aeae74e36..5b1542f91 --- 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 670ceead7..b0b22d02d --- a/openmrs/i18n/clinical/locale_pt_BR.json +++ b/openmrs/i18n/clinical/locale_pt_BR.json @@ -63,5 +63,13 @@ "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" + "DASHBOARD_TITLE_Consultation_KEY": "Anotações da Consulta", + "DASHBOARD_TITLE_APPOINTMENTS_KEY": "Compromissos", + "DASHBOARD_UPCOMING_APPOINTMENTS_KEY": "Próximos compromissos", + "DASHBOARD_NO_UPCOMING_APPOINTMENTS_KEY": "No upcoming appointments", + "DASHBOARD_PAST_APPOINTMENTS_KEY": "Nomeações passadas", + "DASHBOARD_NO_PAST_APPOINTMENTS_KEY": "Nenhum compromisso passado", + "MODULE_LABEL_ART_PROGRAMS_KEY": "ART Programa", + "MODULE_LABEL_TB_PROGRAMS_KEY": "TB Programa", + "MODULE_LABEL_ALL_PROGRAMS_KEY": "ALL Programa" } 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 e6d23742b..90cab315b --- 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 f3141e655..5a66cd26b --- 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 e961c41bc..bb9a7c9af --- 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/liquibase.xml b/openmrs/migrations/liquibase.xml old mode 100644 new mode 100755 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