From 61f21520415fafafbbcc711f33576bb3580d27e4 Mon Sep 17 00:00:00 2001 From: angshu Date: Thu, 30 Aug 2018 15:53:31 +0530 Subject: [PATCH 01/67] BAH-621 | updated IPD ward list view search handler - wardListSqlSearchHandler --- LICENSE | 5 +++-- openmrs/apps/ipd/app.json | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/LICENSE b/LICENSE index 722fa17693..d7d3aaaf34 100644 --- 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/openmrs/apps/ipd/app.json b/openmrs/apps/ipd/app.json index 5fd572af80..a95e338598 100644 --- 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}}", From e6bb1ecceb4000c2bc97227337ca9d4ccbef806d Mon Sep 17 00:00:00 2001 From: tbindu Date: Fri, 31 Aug 2018 16:10:29 +0530 Subject: [PATCH 02/67] Bindu | BAH-621 | Removed patientWardDetails.sql as this migration already moved to Bedmanagement and bahmni-core modules --- .../bedManagement/PatientWardDetails.sql | 29 ------------------- openmrs/migrations/liquibase.xml | 4 --- 2 files changed, 33 deletions(-) delete mode 100644 openmrs/migrations/bedManagement/PatientWardDetails.sql 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 index a70d1c277c..064dc3d4fa 100644 --- a/openmrs/migrations/liquibase.xml +++ b/openmrs/migrations/liquibase.xml @@ -49,10 +49,6 @@ ); - - Updating SQL query for Bed Management List View - - From 5c7938f3b6805d77b2c3594b0af6b42a1c1ebfd8 Mon Sep 17 00:00:00 2001 From: angshu Date: Fri, 31 Aug 2018 18:52:34 +0530 Subject: [PATCH 03/67] removing unused extensions, correcting typo and invalid URL for link --- openmrs/apps/ipd/app.json | 4 +- openmrs/apps/ipd/extension.json | 89 --------------------------------- 2 files changed, 2 insertions(+), 91 deletions(-) diff --git a/openmrs/apps/ipd/app.json b/openmrs/apps/ipd/app.json index a95e338598..056a4e689a 100644 --- a/openmrs/apps/ipd/app.json +++ b/openmrs/apps/ipd/app.json @@ -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 index b27a9cca72..4c1b0181f1 100644 --- 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", From 44a7fb818a252c9a0ff4402a4219063d40075f1d Mon Sep 17 00:00:00 2001 From: Amol Chavan Date: Mon, 15 Oct 2018 10:57:27 +0530 Subject: [PATCH 04/67] Amol | Removed marathi patient search configuration --- openmrs/apps/registration/app.json | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/openmrs/apps/registration/app.json b/openmrs/apps/registration/app.json index 9155027840..695ac817bb 100644 --- a/openmrs/apps/registration/app.json +++ b/openmrs/apps/registration/app.json @@ -50,7 +50,7 @@ }, "autoCompleteFields":["familyName", "caste"], - "defaultIdentifierPrefix": "GAN", + "defaultIdentifierPrefix": "MOZ", "defaultVisitType": "OPD", "searchByIdForwardUrl": "/patient/{{patientUuid}}", "showMiddleName": true, @@ -103,15 +103,11 @@ }, "patientSearch": { "address": { - "label": "Rural Ward", - "placeholder": "Enter ward", - "field": "address2" + "label": "Tehsil", + "placeholder": "Enter Tehsil", + "field": "address3" }, - "customAttributes": { - "label": "रुग्णाचे नाव", - "placeholder": "रुग्णाचे नाव", - "fields": ["givenNameLocal", "middleNameLocal", "familyNameLocal"] - } + "customAttributes": { } } } } From 240786ae9a07ceebbda983fbafc1e913dff65fe0 Mon Sep 17 00:00:00 2001 From: Amol Chavan Date: Mon, 15 Oct 2018 17:47:57 +0530 Subject: [PATCH 05/67] Amol | Kept Rural Ward as it is --- openmrs/apps/registration/app.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/openmrs/apps/registration/app.json b/openmrs/apps/registration/app.json index 695ac817bb..3fca79195e 100644 --- a/openmrs/apps/registration/app.json +++ b/openmrs/apps/registration/app.json @@ -103,9 +103,9 @@ }, "patientSearch": { "address": { - "label": "Tehsil", - "placeholder": "Enter Tehsil", - "field": "address3" + "label": "Rural Ward", + "placeholder": "Enter ward", + "field": "address2" }, "customAttributes": { } } From 906adbbe3b4de73e96795d6ce48edbd90a2154ad Mon Sep 17 00:00:00 2001 From: Amol Chavan Date: Mon, 28 Jan 2019 17:16:59 +0530 Subject: [PATCH 06/67] Amol | Added Bahmni config changes --- openmrs/apps/clinical/app.json | 15 +- openmrs/apps/clinical/dashboard.json | 576 ++---------------- openmrs/apps/clinical/extension-programs.json | 46 +- openmrs/apps/clinical/extension.json | 54 +- openmrs/apps/home/extension.json | 123 +--- openmrs/apps/home/locale_languages.json | 8 +- openmrs/apps/registration/app.json | 87 +-- .../apps/registration/attributesConditions.js | 0 openmrs/apps/registration/extension.json | 9 +- .../registrationCardLayout/print.html | 96 ++- .../printWithBarcode.html | 34 +- .../print_registration.html | 101 +++ openmrs/i18n/clinical/locale_en.json | 5 +- openmrs/i18n/clinical/locale_pt_BR.json | 10 +- openmrs/i18n/home/locale_pt_BR.json | 26 +- openmrs/i18n/registration/locale_en.json | 19 +- openmrs/i18n/registration/locale_pt_BR.json | 57 +- 17 files changed, 405 insertions(+), 861 deletions(-) create mode 100644 openmrs/apps/registration/attributesConditions.js create mode 100644 openmrs/apps/registration/registrationCardLayout/print_registration.html diff --git a/openmrs/apps/clinical/app.json b/openmrs/apps/clinical/app.json index 2f01502297..5038824e43 100644 --- 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 index 7febca3b0f..271a6b2db0 100644 --- 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 index 31400109ae..13d1c6cab4 100644 --- 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": 12, + "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": 13, + "requiredPrivilege": "app:clinical" }, "bahmniClinicalPatientsSearchAllPatients": { "id": "bahmni.clinical.patients.search.allPatients", @@ -21,7 +49,7 @@ "forwardUrl": "#/programs/patient/{{patientUuid}}/consultationContext" }, "label": "All", - "order": 2, + "order": 22, "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 index 8dd401c45d..a990233161 100644 --- 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/home/extension.json b/openmrs/apps/home/extension.json index 4f282dc65b..c3dc10d689 100644 --- 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 index 78059ef2ad..deedd408eb 100644 --- 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/registration/app.json b/openmrs/apps/registration/app.json index 3fca79195e..0b3e626f60 100644 --- a/openmrs/apps/registration/app.json +++ b/openmrs/apps/registration/app.json @@ -17,20 +17,31 @@ "activeVisitUuid" ], "config" : { - "patientInformation": { - "additionalPatientInformation": { - "title": "Additional Patient Information", - "attributes": [ - "distanceFromCenter", - "isUrban", - "cluster", - "RationCard", - "familyIncome", - "debt", - "cluster" - ] - }, - "hidden": { + "patientInformation": { + + "patientReferenceInformation": { + "title": "patientReferenceInformation", + "translationKey": "REGISTRATION_REFERENCE_INFO_KEY", + "attributes": ["Nome","Apelido","Phone_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 stage"], + "order" : 3, + "expanded": true + }, + + "patientHIVTestInformation": { + "title": "patientHIVTestInformation", + "translationKey": "REGISTRATION_HIVTEST_INFO_KEY", + "attributes": ["DateofHIVDiagnosis","Typeoftest","TestResult"], + "order" : 4, + "expanded": true + }, + "hidden": { "attributes": [ "primaryContact" ] @@ -48,33 +59,24 @@ "Doctor":"provider", "Parent":"patient" }, - "autoCompleteFields":["familyName", "caste"], "defaultIdentifierPrefix": "MOZ", - "defaultVisitType": "OPD", + "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, "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 +91,11 @@ "FHS": { "buttonSelect": true }, + "Home equipment": { + "dropdown": true, + "disableAddNotes": true + }, + "defaults":{ "FHS": "Present" } @@ -98,16 +105,26 @@ "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"} + "middleName" : {"pattern" : "[a-zA-Z]{0,}", "errorMessage" : "Should contain characters"} + }, - "patientSearch": { + "patientSearchResults": { "address": { - "label": "Rural Ward", - "placeholder": "Enter ward", - "field": "address2" + "fields" : [] }, - "customAttributes": { } - } + "personAttributes": { + "fields": [ + "nick_name" + ] + } + }, + "patientSearch": { + "address": {}, + "customAttributes": { + "label": "Alcunha", + "placeholder": "Alcunha", + "fields": ["nick_name"] + } + } } } diff --git a/openmrs/apps/registration/attributesConditions.js b/openmrs/apps/registration/attributesConditions.js new file mode 100644 index 0000000000..e69de29bb2 diff --git a/openmrs/apps/registration/extension.json b/openmrs/apps/registration/extension.json index f42906ff8b..d258e0c021 100644 --- 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", + "conceptName": "Patient_information", "translationKey": "FEE_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/registrationCardLayout/print.html b/openmrs/apps/registration/registrationCardLayout/print.html index a7cb28cc12..759219a8c6 100644 --- 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,33 @@

{{ "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 + NID + : {{patient.extraIdentifiers[0].identifier}}
+ {{ "REGISTRATION_LABEL_PATIENT_NAME" | translate }} : @@ -87,38 +51,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 +113,4 @@

{{ "REGISTRATION_INSTITUTE_REGISTERED_TEXT_KEY" | tran

+ diff --git a/openmrs/apps/registration/registrationCardLayout/printWithBarcode.html b/openmrs/apps/registration/registrationCardLayout/printWithBarcode.html index 39279bc2c5..9246e9df7f 100644 --- a/openmrs/apps/registration/registrationCardLayout/printWithBarcode.html +++ b/openmrs/apps/registration/registrationCardLayout/printWithBarcode.html @@ -5,13 +5,9 @@ - + @@ -31,23 +27,30 @@

Bahmni Hospital

+ + + + + @@ -55,7 +58,7 @@

Bahmni Hospital

@@ -63,9 +66,9 @@

Bahmni Hospital

@@ -90,3 +93,4 @@

Bahmni Hospital

JsBarcode("#barcode").init(); })(); + diff --git a/openmrs/apps/registration/registrationCardLayout/print_registration.html b/openmrs/apps/registration/registrationCardLayout/print_registration.html new file mode 100644 index 0000000000..4eb6f2ec27 --- /dev/null +++ b/openmrs/apps/registration/registrationCardLayout/print_registration.html @@ -0,0 +1,101 @@ + +
-

Bahmni Hospital

+

POC HF 01

 Bahmni Hospital
- Registration Date + data de registro : {{patient.registrationDate | bahmniDate}}
- Full Name + Nome completo : {{patient.fullNameLocal()}}
+ NID + : {{patient.extraIdentifiers[0].identifier}}
- 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}}
+ NID + : {{patient.extraIdentifiers[0].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/i18n/clinical/locale_en.json b/openmrs/i18n/clinical/locale_en.json index aeae74e360..5b1542f91f 100644 --- 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_pt_BR.json b/openmrs/i18n/clinical/locale_pt_BR.json index 670ceead75..b0b22d02d2 100644 --- 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/home/locale_pt_BR.json b/openmrs/i18n/home/locale_pt_BR.json index e6d23742ba..e7632c66ec 100644 --- 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":"Cadastro", +"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ção de Consultas", +"MODULE_LABEL_BED_MANAGEMENT_KEY":"Gestão de Camas" +} \ No newline at end of file diff --git a/openmrs/i18n/registration/locale_en.json b/openmrs/i18n/registration/locale_en.json index f3141e655b..da23a3413b 100644 --- a/openmrs/i18n/registration/locale_en.json +++ b/openmrs/i18n/registration/locale_en.json @@ -16,10 +16,21 @@ "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", + "FEE_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", + "REGISTRATION_EDUCATION_KEY":"Education Details" +} diff --git a/openmrs/i18n/registration/locale_pt_BR.json b/openmrs/i18n/registration/locale_pt_BR.json index e961c41bc0..93f80e7a85 100644 --- a/openmrs/i18n/registration/locale_pt_BR.json +++ b/openmrs/i18n/registration/locale_pt_BR.json @@ -1,24 +1,37 @@ { - "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 Carto Reg. (Local)", + "REGISTRATION_PRINT_REG_CARD_KEY":"ImPrimir Carto de Registo", + "REGISTRATION_PRINT_SUPPLEMENTAL_PAPER":"Imprimir Papel Suplementar", + "REGISTRATION_AGE_ERROR_KEY":"Idade deve ser um valor positivo", + "REGISTRATION_TELEPHONE_NUMBER_ERROR_KEY":"Nmero de Telefone deve ter no mnimo 6 nmero", + "REGISTRATION_CASTE_TEXT_ERROR_KEY":"Casta deve tter apenas caracteres alfanmericos", + "REGISTRATION_BRING_CARD_TEXT_KEY":" importante trazer o carto do paciente para o hospital", + "REGISTRATION_TAKE_MEDICINES_TEXT_KEY":"Tomar medicamentos de acordo com as instrues do mdico.", + "REGISTRATION_TIMINGS_TEXT_KEY":"Os horrios de registo so das 7:30 s 15:30", + "REGISTRATION_OPD_DAYS_TEXT_KEY":"Consultas externas so nas 2as, 4as e 6as.", + "REGISTRATION_SUNDAYS_HOLIDAY_TEXT_KEY":"Domingos so feriados.", + "REGISTRATION_SMOKING_INJURIOUS_TEXT_KEY":"Fumar, mascar tabaco pode causar cancro, doenas cardacas e ASMA.", + "REGISTRATION_INSTITUTE_NAME_TEXT_KEY":"Nome do Hospital", + "REGISTRATION_INSTITUTE_REGISTERED_TEXT_KEY":"(Registado)", + "REGISTRATION_INSTITUTE_ADDRESS":"Endereo do Hospital", + "FEE_INFORMATION_LOCALE_KEY":"Informao das Taxas", + "NUTRITIONAL_VALUES_LOCALE_KEY":"Valores Nutricionais", + "REGISTRATION_PRINT_WITH_BARCODE":"Imprimir com Cdigo de Barras", + + "REGISTRATION_ADDITIONAL_INFO_KEY": "Informao Adicional ao Paciente", + "REGISTRATION_REFERENCE_INFO_KEY":"Pessoas de referncia", + "REGISTRATION_TRANSFERENCE_INFO_KEY": "Transferncia", + "REGISTRATION_HIVTEST_INFO_KEY":"Teste de HIV", + "REGISTRATION_HIV_TEST": "HIV Test", + "country_locale":"Pais", + "province_locale":"Provincia", + "district_locale":"Distrito", + "administrative_locale":"Administrativo", + "locality_locale":"Localidade", + "education":"Nivel de Escolaridade" } From 0f6823083b4588e45ca292609359c32d823bb023 Mon Sep 17 00:00:00 2001 From: Amol Chavan Date: Thu, 31 Jan 2019 15:41:10 +0530 Subject: [PATCH 07/67] Amol | Updated order sequence of Program patient queue --- openmrs/apps/clinical/extension-programs.json | 6 +++--- openmrs/apps/registration/extension.json | 2 +- openmrs/i18n/registration/locale_en.json | 2 +- openmrs/i18n/registration/locale_pt_BR.json | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/openmrs/apps/clinical/extension-programs.json b/openmrs/apps/clinical/extension-programs.json index 13d1c6cab4..566d1b07bf 100644 --- a/openmrs/apps/clinical/extension-programs.json +++ b/openmrs/apps/clinical/extension-programs.json @@ -24,7 +24,7 @@ "forwardUrl": "#/programs/patient/{{patientUuid}}/consultationContext" }, "label": "ART Program", - "order": 12, + "order": 2, "requiredPrivilege": "app:clinical" }, "bahmniClinicalPatientsSearchActivePatientsFortbPrograms": { @@ -37,7 +37,7 @@ "forwardUrl": "#/programs/patient/{{patientUuid}}/consultationContext" }, "label": "TB Program", - "order": 13, + "order": 3, "requiredPrivilege": "app:clinical" }, "bahmniClinicalPatientsSearchAllPatients": { @@ -49,7 +49,7 @@ "forwardUrl": "#/programs/patient/{{patientUuid}}/consultationContext" }, "label": "All", - "order": 22, + "order": 4, "requiredPrivilege": "app:clinical" }, "bahmniClinicalConceptSetGroupObservationsHistory": { diff --git a/openmrs/apps/registration/extension.json b/openmrs/apps/registration/extension.json index d258e0c021..78d22e5336 100644 --- a/openmrs/apps/registration/extension.json +++ b/openmrs/apps/registration/extension.json @@ -52,7 +52,7 @@ "type": "config", "extensionParams": { "conceptName": "Patient_information", - "translationKey": "FEE_INFORMATION_LOCALE_KEY", + "translationKey": "PATIENT_OBS_INFORMATION_LOCALE_KEY", "required":true }, "order": 2, diff --git a/openmrs/i18n/registration/locale_en.json b/openmrs/i18n/registration/locale_en.json index da23a3413b..c04cac65cd 100644 --- a/openmrs/i18n/registration/locale_en.json +++ b/openmrs/i18n/registration/locale_en.json @@ -19,7 +19,7 @@ "REGISTRATION_INSTITUTE_NAME_TEXT_KEY": "POC HF 01", "REGISTRATION_INSTITUTE_REGISTERED_TEXT_KEY": "(Registered)", "REGISTRATION_INSTITUTE_ADDRESS": "Ganiyari, District - Bilaspur", - "FEE_INFORMATION_LOCALE_KEY": "Patient Information", + "PATIENT_OBS_INFORMATION_LOCALE_KEY": "Patient Information", "NUTRITIONAL_VALUES_LOCALE_KEY": "Nutritional Values", "REGISTRATION_PRINT_WITH_BARCODE": "Barcode Print", "REGISTRATION_ADDITIONAL_INFO_KEY": "Additional Patient Information", diff --git a/openmrs/i18n/registration/locale_pt_BR.json b/openmrs/i18n/registration/locale_pt_BR.json index 93f80e7a85..dad85d1f8b 100644 --- a/openmrs/i18n/registration/locale_pt_BR.json +++ b/openmrs/i18n/registration/locale_pt_BR.json @@ -19,7 +19,7 @@ "REGISTRATION_INSTITUTE_NAME_TEXT_KEY":"Nome do Hospital", "REGISTRATION_INSTITUTE_REGISTERED_TEXT_KEY":"(Registado)", "REGISTRATION_INSTITUTE_ADDRESS":"Endereo do Hospital", - "FEE_INFORMATION_LOCALE_KEY":"Informao das Taxas", + "PATIENT_OBS_INFORMATION_LOCALE_KEY":"Informao do paciente", "NUTRITIONAL_VALUES_LOCALE_KEY":"Valores Nutricionais", "REGISTRATION_PRINT_WITH_BARCODE":"Imprimir com Cdigo de Barras", From 6eb54a86214cd6ccbef3b607586435c2534dd327 Mon Sep 17 00:00:00 2001 From: Joao Machiana Date: Tue, 19 Feb 2019 18:44:56 +0200 Subject: [PATCH 08/67] Changeg the logo and title text on landing and login page of Bahmni --- openmrs/apps/home/whiteLabel.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/openmrs/apps/home/whiteLabel.json b/openmrs/apps/home/whiteLabel.json index 10305921fc..21da43406c 100644 --- a/openmrs/apps/home/whiteLabel.json +++ b/openmrs/apps/home/whiteLabel.json @@ -1,11 +1,11 @@ { "homePage": { - "header_text": "WELCOME TO
BAHMNI EMR & HOSPITAL SERVICE", - "logo": "/bahmni/images/bahmniLogoFull.png", + "header_text": "BEM VINDO AO
SISTEMA ELECTRÓNICO DE SEGUIMENTO DE PACIENTES (SESP)
POINT OF CARE (POC)", + "logo": "/bahmni/images/emblem_of_mozambique.png", "title_text": " " }, "loginPage": { - "logo": "/bahmni/images/bahmniLogoFull.png", + "logo": "/bahmni/images/emblem_of_mozambique.png", "showHeaderText": true, "showTitleText": false }, From aed0633e5d7e60c5706f486d518f9d452d9c5ff7 Mon Sep 17 00:00:00 2001 From: Amol Chavan Date: Tue, 26 Feb 2019 14:58:55 +0530 Subject: [PATCH 09/67] MPOC-85-Add Patient Address Details --- openmrs/i18n/registration/locale_en.json | 7 ++++++- openmrs/i18n/registration/locale_pt_BR.json | 7 ++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/openmrs/i18n/registration/locale_en.json b/openmrs/i18n/registration/locale_en.json index c04cac65cd..e800882882 100644 --- a/openmrs/i18n/registration/locale_en.json +++ b/openmrs/i18n/registration/locale_en.json @@ -32,5 +32,10 @@ "district_locale":"District", "administrative_locale":"Administrative", "locality_locale":"Locality", - "REGISTRATION_EDUCATION_KEY":"Education Details" + "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" } diff --git a/openmrs/i18n/registration/locale_pt_BR.json b/openmrs/i18n/registration/locale_pt_BR.json index dad85d1f8b..4f0b74796f 100644 --- a/openmrs/i18n/registration/locale_pt_BR.json +++ b/openmrs/i18n/registration/locale_pt_BR.json @@ -33,5 +33,10 @@ "district_locale":"Distrito", "administrative_locale":"Administrativo", "locality_locale":"Localidade", - "education":"Nivel de Escolaridade" + "education":"Nivel de Escolaridade", + "ADDRESS_CLOSE_OF_LOCALE":"Perto De", + "ADDRESS_AVENUE_STREET_LOCALE":"Avenida/Rua", + "ADDRESS_BLOCK_LOCALE":"Quateiro", + "ADDRESS_FLOOR_FLAT_LOCALE":"Andar / Flat", + "ADDRESS_HOUSE_NUMBER_LOCALE":"N^o^ da Casa" } From 0dcf58287d01a14f3f03d73e2dd141296d19c6f0 Mon Sep 17 00:00:00 2001 From: Joao Machiana Date: Tue, 26 Feb 2019 17:27:41 +0200 Subject: [PATCH 10/67] . --- openmrs/i18n/registration/locale_pt_BR.json | 32 ++++++++++----------- 1 file changed, 16 insertions(+), 16 deletions(-) mode change 100644 => 100755 openmrs/i18n/registration/locale_pt_BR.json 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 4f0b74796f..994e0b1670 --- a/openmrs/i18n/registration/locale_pt_BR.json +++ b/openmrs/i18n/registration/locale_pt_BR.json @@ -4,28 +4,28 @@ "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 Carto Reg. (Local)", - "REGISTRATION_PRINT_REG_CARD_KEY":"ImPrimir Carto de Registo", + "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":"Nmero de Telefone deve ter no mnimo 6 nmero", - "REGISTRATION_CASTE_TEXT_ERROR_KEY":"Casta deve tter apenas caracteres alfanmericos", - "REGISTRATION_BRING_CARD_TEXT_KEY":" importante trazer o carto do paciente para o hospital", - "REGISTRATION_TAKE_MEDICINES_TEXT_KEY":"Tomar medicamentos de acordo com as instrues do mdico.", - "REGISTRATION_TIMINGS_TEXT_KEY":"Os horrios de registo so das 7:30 s 15:30", - "REGISTRATION_OPD_DAYS_TEXT_KEY":"Consultas externas so nas 2as, 4as e 6as.", - "REGISTRATION_SUNDAYS_HOLIDAY_TEXT_KEY":"Domingos so feriados.", - "REGISTRATION_SMOKING_INJURIOUS_TEXT_KEY":"Fumar, mascar tabaco pode causar cancro, doenas cardacas e ASMA.", + "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":"Endereo do Hospital", - "PATIENT_OBS_INFORMATION_LOCALE_KEY":"Informao do paciente", + "REGISTRATION_INSTITUTE_ADDRESS":"Endereço do Hospital", + "PATIENT_OBS_INFORMATION_LOCALE_KEY":"Informação do paciente", "NUTRITIONAL_VALUES_LOCALE_KEY":"Valores Nutricionais", - "REGISTRATION_PRINT_WITH_BARCODE":"Imprimir com Cdigo de Barras", + "REGISTRATION_PRINT_WITH_BARCODE":"Imprimir com Código de Barras", - "REGISTRATION_ADDITIONAL_INFO_KEY": "Informao Adicional ao Paciente", - "REGISTRATION_REFERENCE_INFO_KEY":"Pessoas de referncia", - "REGISTRATION_TRANSFERENCE_INFO_KEY": "Transferncia", + "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":"Pais", From 1b90a0a8085958095b008cbe88af197e60670a80 Mon Sep 17 00:00:00 2001 From: Joao Machiana Date: Tue, 26 Feb 2019 17:29:39 +0200 Subject: [PATCH 11/67] MPOC-96 Fixed the words not being displayed correctly --- .gitignore | 0 .tx/config | 0 LICENSE | 0 README.md | 0 offline/openmrs/apps/clinical/.extension.json.swp | Bin openelis/images/labLogo.jpg | Bin openelis/migrations/liquibase.xml | 0 openmrs/apps/JsBarcode.all.min.js | 0 openmrs/apps/admin/app.json | 0 openmrs/apps/admin/extension.json | 0 openmrs/apps/adt/app.json | 0 openmrs/apps/adt/extension.json | 0 openmrs/apps/appointments/app.json | 0 openmrs/apps/appointments/extension.json | 0 openmrs/apps/appointments/printListView.html | 0 openmrs/apps/clinical/app.json | 0 openmrs/apps/clinical/dashboard.json | 0 openmrs/apps/clinical/extension-programs.json | 0 openmrs/apps/clinical/extension.json | 0 openmrs/apps/clinical/formConditions.js | 0 openmrs/apps/clinical/growthChartReference.csv | 0 openmrs/apps/clinical/medication.json | 0 openmrs/apps/clinical/visit.json | 0 .../apps/customDisplayControl/js/customControl.js | 0 .../views/birthCertificate.html | 0 .../views/customTreatmentChart.html | 0 .../views/deathCertificate.html | 0 .../views/patientAppointmentsDashboard.html | 0 openmrs/apps/dbNameCondition/dbNameCondition.js | 0 openmrs/apps/documentUpload/app.json | 0 .../documentUpload/extension-Patient Document.json | 0 .../apps/documentUpload/extension-RADIOLOGY.json | 0 openmrs/apps/home/app.json | 0 openmrs/apps/home/extension.json | 0 openmrs/apps/home/locale_languages.json | 0 openmrs/apps/home/offline-config.json | 0 openmrs/apps/home/whiteLabel.json | 0 openmrs/apps/ipd/app.json | 0 openmrs/apps/ipd/extension.json | 0 openmrs/apps/orders/app.json | 0 openmrs/apps/orders/extension.json | 0 openmrs/apps/ot/app.json | 0 openmrs/apps/ot/extension.json | 0 openmrs/apps/ot/printListView.html | 0 openmrs/apps/registration/app.json | 0 openmrs/apps/registration/appTemplate.json | 0 openmrs/apps/registration/attributesConditions.js | 0 openmrs/apps/registration/extension.json | 0 openmrs/apps/registration/fieldValidation.js | 0 .../registrationCardLayout/css/print.css | 0 .../registrationCardLayout/images/bahmni-icon.png | Bin .../registration/registrationCardLayout/print.html | 0 .../registrationCardLayout/printWithBarcode.html | 0 .../registrationCardLayout/print_local.html | 0 .../registrationCardLayout/print_registration.html | 0 .../supplementalPaperLayout/css/print.css | 0 .../registration/supplementalPaperLayout/print.html | 0 openmrs/apps/reports/app.json | 0 openmrs/apps/reports/extension.json | 0 openmrs/apps/reports/reports.json | 0 openmrs/apps/reports/sql/testCount.sql | 0 openmrs/aqs/aqs_query.json | 0 openmrs/beanshell/openelis-prefetch-eventfilter.bsh | 0 .../FilterDonorTestResults.groovy | 0 openmrs/i18n/admin/locale_en.json | 0 openmrs/i18n/adt/locale_en.json | 0 openmrs/i18n/adt/locale_pt_BR.json | 0 openmrs/i18n/clinical/locale_en.json | 0 openmrs/i18n/clinical/locale_es.json | 0 openmrs/i18n/clinical/locale_fr.json | 0 openmrs/i18n/clinical/locale_pt_BR.json | 0 openmrs/i18n/document-upload/locale_en.json | 0 openmrs/i18n/document-upload/locale_fr.json | 0 openmrs/i18n/document-upload/locale_pt_BR.json | 0 openmrs/i18n/home/locale_en.json | 0 openmrs/i18n/home/locale_es.json | 0 openmrs/i18n/home/locale_fr.json | 0 openmrs/i18n/home/locale_pt_BR.json | 0 openmrs/i18n/ipd/locale_en.json | 0 openmrs/i18n/orders/locale_en.json | 0 openmrs/i18n/orders/locale_fr.json | 0 openmrs/i18n/orders/locale_pt_BR.json | 0 openmrs/i18n/ot/locale_en.json | 0 openmrs/i18n/registration/locale_en.json | 0 openmrs/i18n/registration/locale_fr.json | 0 openmrs/migrations/liquibase.xml | 0 .../migrations/updatePatientProgramToEpisode.sql | 0 openmrs/obscalculator/BMI_chart.csv | 0 .../obscalculator/BahmniObsValueCalculator.groovy | 0 openmrs/ordertemplates/templates.json | 0 .../DefaultPatientMatchingAlgorithm | 0 openmrs/rulesengine/drugorderrules/Fever.csv | 0 openmrs/rulesengine/drugorderrules/Tuberculosis.csv | 0 .../rulesengineextension/Chemotherapy.groovy | 0 .../templates/All_templates_generic_concepts.csv | 0 openmrs/templates/Anaemia_concept_sets.csv | 0 openmrs/templates/Anaemia_concepts.csv | 0 openmrs/templates/Arthritis_concept_sets.csv | 0 openmrs/templates/Arthritis_concepts.csv | 0 openmrs/templates/Breast_cancer_concept_sets.csv | 0 openmrs/templates/Breast_cancer_concepts.csv | 0 .../templates/Breast_cancer_generic_concepts.csv | 0 openmrs/templates/COPD_intake_concept_sets.csv | 0 openmrs/templates/COPD_intake_concepts.csv | 0 openmrs/templates/COPD_progress_concept_sets.csv | 0 openmrs/templates/COPD_progress_concepts.csv | 0 openmrs/templates/Cervical_cancer_concept_sets.csv | 0 openmrs/templates/Cervical_cancer_concepts.csv | 0 .../templates/Cervical_cancer_generic_concepts.csv | 0 openmrs/templates/Colon_cancer_concept_sets.csv | 0 openmrs/templates/Colon_cancer_concepts.csv | 0 openmrs/templates/Colon_cancer_generic_concepts.csv | 0 .../Congetive_heart_failure_intake_concept_sets.csv | 0 .../Congetive_heart_failure_intake_concepts.csv | 0 ...ongetive_heart_failure_progress_concept_sets.csv | 0 .../Congetive_heart_failure_progress_concepts.csv | 0 .../Coronary_heart_disease_intake_concept_set.csv | 0 .../Coronary_heart_disease_intake_concept_sets.csv | 0 ...Coronary_heart_disease_progress_concept_sets.csv | 0 .../Coronary_heart_disease_progress_concepts.csv | 0 openmrs/templates/Detailed_history_concept_sets.csv | 0 openmrs/templates/Detailed_history_concepts.csv | 0 openmrs/templates/Diabetes_concept_sets.csv | 0 openmrs/templates/Diabetes_concepts.csv | 0 openmrs/templates/Epilepsy_concept_sets.csv | 0 openmrs/templates/Epilepsy_concepts.csv | 0 openmrs/templates/Gastric_cancer_concept_sets.csv | 0 openmrs/templates/Gastric_cancer_concepts.csv | 0 openmrs/templates/Gastric_generic_concepts.csv | 0 openmrs/templates/Generic_concepts.csv | 0 openmrs/templates/Hyperthyroidism_concept_sets.csv | 0 openmrs/templates/Hyperthyroidism_concepts.csv | 0 openmrs/templates/Kaposis_sarcoma_concept_sets.csv | 0 openmrs/templates/Kaposis_sarcoma_concepts.csv | 0 .../templates/Kaposis_sarcoma_generic_concepts.csv | 0 openmrs/templates/Leprosy_concept_sets.csv | 0 openmrs/templates/Leprosy_concepts.csv | 0 openmrs/templates/Leprosy_generic_concepts.csv | 0 openmrs/templates/Nephroblastoma_concept_sets.csv | 0 openmrs/templates/Nephroblastoma_concepts.csv | 0 .../templates/Nephroblastoma_generic_concepts.csv | 0 .../Neurological_disorder_concept_sets.csv | 0 .../templates/Neurological_disorder_concepts.csv | 0 openmrs/templates/Operation_notes_concept_sets.csv | 0 openmrs/templates/Operation_notes_concepts.csv | 0 .../templates/Operation_notes_generic_concepts.csv | 0 .../Rheumatic_heart_disease_intake_concept_sets.csv | 0 .../Rheumatic_heart_disease_intake_concepts.csv | 0 openmrs/templates/Sickle_cell_concept_sets.csv | 0 openmrs/templates/Sickle_cell_concepts.csv | 0 openmrs/templates/Sickle_cell_generic_concepts.csv | 0 openmrs/templates/Tuberculosis_MDR_concepts.csv | 0 openmrs/templates/Tuberculosis_concept_sets.csv | 0 openmrs/templates/Tuberculosis_generic_concepts.csv | 0 openmrs/templates/Tuberculosis_intake_concepts.csv | 0 openmrs/templates/Tuberculosis_outcome_concepts.csv | 0 .../templates/Tuberculosis_progress_concepts.csv | 0 .../templates/Tuberculosis_retreatment_concepts.csv | 0 openmrs/templates/Undernutrition_concept_sets.csv | 0 openmrs/templates/Undernutrition_concepts.csv | 0 .../TreatmentRegimenExtension.groovy | 0 161 files changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 .gitignore mode change 100644 => 100755 .tx/config mode change 100644 => 100755 LICENSE mode change 100644 => 100755 README.md mode change 100644 => 100755 offline/openmrs/apps/clinical/.extension.json.swp mode change 100644 => 100755 openelis/images/labLogo.jpg mode change 100644 => 100755 openelis/migrations/liquibase.xml mode change 100644 => 100755 openmrs/apps/JsBarcode.all.min.js mode change 100644 => 100755 openmrs/apps/admin/app.json mode change 100644 => 100755 openmrs/apps/admin/extension.json mode change 100644 => 100755 openmrs/apps/adt/app.json mode change 100644 => 100755 openmrs/apps/adt/extension.json mode change 100644 => 100755 openmrs/apps/appointments/app.json mode change 100644 => 100755 openmrs/apps/appointments/extension.json mode change 100644 => 100755 openmrs/apps/appointments/printListView.html mode change 100644 => 100755 openmrs/apps/clinical/app.json mode change 100644 => 100755 openmrs/apps/clinical/dashboard.json mode change 100644 => 100755 openmrs/apps/clinical/extension-programs.json mode change 100644 => 100755 openmrs/apps/clinical/extension.json mode change 100644 => 100755 openmrs/apps/clinical/formConditions.js mode change 100644 => 100755 openmrs/apps/clinical/growthChartReference.csv mode change 100644 => 100755 openmrs/apps/clinical/medication.json mode change 100644 => 100755 openmrs/apps/clinical/visit.json mode change 100644 => 100755 openmrs/apps/customDisplayControl/js/customControl.js mode change 100644 => 100755 openmrs/apps/customDisplayControl/views/birthCertificate.html mode change 100644 => 100755 openmrs/apps/customDisplayControl/views/customTreatmentChart.html mode change 100644 => 100755 openmrs/apps/customDisplayControl/views/deathCertificate.html mode change 100644 => 100755 openmrs/apps/customDisplayControl/views/patientAppointmentsDashboard.html mode change 100644 => 100755 openmrs/apps/dbNameCondition/dbNameCondition.js mode change 100644 => 100755 openmrs/apps/documentUpload/app.json mode change 100644 => 100755 openmrs/apps/documentUpload/extension-Patient Document.json mode change 100644 => 100755 openmrs/apps/documentUpload/extension-RADIOLOGY.json mode change 100644 => 100755 openmrs/apps/home/app.json mode change 100644 => 100755 openmrs/apps/home/extension.json mode change 100644 => 100755 openmrs/apps/home/locale_languages.json mode change 100644 => 100755 openmrs/apps/home/offline-config.json mode change 100644 => 100755 openmrs/apps/home/whiteLabel.json mode change 100644 => 100755 openmrs/apps/ipd/app.json mode change 100644 => 100755 openmrs/apps/ipd/extension.json mode change 100644 => 100755 openmrs/apps/orders/app.json mode change 100644 => 100755 openmrs/apps/orders/extension.json mode change 100644 => 100755 openmrs/apps/ot/app.json mode change 100644 => 100755 openmrs/apps/ot/extension.json mode change 100644 => 100755 openmrs/apps/ot/printListView.html mode change 100644 => 100755 openmrs/apps/registration/app.json mode change 100644 => 100755 openmrs/apps/registration/appTemplate.json mode change 100644 => 100755 openmrs/apps/registration/attributesConditions.js mode change 100644 => 100755 openmrs/apps/registration/extension.json mode change 100644 => 100755 openmrs/apps/registration/fieldValidation.js mode change 100644 => 100755 openmrs/apps/registration/registrationCardLayout/css/print.css mode change 100644 => 100755 openmrs/apps/registration/registrationCardLayout/images/bahmni-icon.png mode change 100644 => 100755 openmrs/apps/registration/registrationCardLayout/print.html mode change 100644 => 100755 openmrs/apps/registration/registrationCardLayout/printWithBarcode.html mode change 100644 => 100755 openmrs/apps/registration/registrationCardLayout/print_local.html mode change 100644 => 100755 openmrs/apps/registration/registrationCardLayout/print_registration.html mode change 100644 => 100755 openmrs/apps/registration/supplementalPaperLayout/css/print.css mode change 100644 => 100755 openmrs/apps/registration/supplementalPaperLayout/print.html mode change 100644 => 100755 openmrs/apps/reports/app.json mode change 100644 => 100755 openmrs/apps/reports/extension.json mode change 100644 => 100755 openmrs/apps/reports/reports.json mode change 100644 => 100755 openmrs/apps/reports/sql/testCount.sql mode change 100644 => 100755 openmrs/aqs/aqs_query.json mode change 100644 => 100755 openmrs/beanshell/openelis-prefetch-eventfilter.bsh mode change 100644 => 100755 openmrs/elisFeedInterceptor/FilterDonorTestResults.groovy mode change 100644 => 100755 openmrs/i18n/admin/locale_en.json mode change 100644 => 100755 openmrs/i18n/adt/locale_en.json mode change 100644 => 100755 openmrs/i18n/adt/locale_pt_BR.json mode change 100644 => 100755 openmrs/i18n/clinical/locale_en.json mode change 100644 => 100755 openmrs/i18n/clinical/locale_es.json mode change 100644 => 100755 openmrs/i18n/clinical/locale_fr.json mode change 100644 => 100755 openmrs/i18n/clinical/locale_pt_BR.json mode change 100644 => 100755 openmrs/i18n/document-upload/locale_en.json mode change 100644 => 100755 openmrs/i18n/document-upload/locale_fr.json mode change 100644 => 100755 openmrs/i18n/document-upload/locale_pt_BR.json mode change 100644 => 100755 openmrs/i18n/home/locale_en.json mode change 100644 => 100755 openmrs/i18n/home/locale_es.json mode change 100644 => 100755 openmrs/i18n/home/locale_fr.json mode change 100644 => 100755 openmrs/i18n/home/locale_pt_BR.json mode change 100644 => 100755 openmrs/i18n/ipd/locale_en.json mode change 100644 => 100755 openmrs/i18n/orders/locale_en.json mode change 100644 => 100755 openmrs/i18n/orders/locale_fr.json mode change 100644 => 100755 openmrs/i18n/orders/locale_pt_BR.json mode change 100644 => 100755 openmrs/i18n/ot/locale_en.json mode change 100644 => 100755 openmrs/i18n/registration/locale_en.json mode change 100644 => 100755 openmrs/i18n/registration/locale_fr.json mode change 100644 => 100755 openmrs/migrations/liquibase.xml mode change 100644 => 100755 openmrs/migrations/updatePatientProgramToEpisode.sql mode change 100644 => 100755 openmrs/obscalculator/BMI_chart.csv mode change 100644 => 100755 openmrs/obscalculator/BahmniObsValueCalculator.groovy mode change 100644 => 100755 openmrs/ordertemplates/templates.json mode change 100644 => 100755 openmrs/patientMatchingAlgorithm/DefaultPatientMatchingAlgorithm mode change 100644 => 100755 openmrs/rulesengine/drugorderrules/Fever.csv mode change 100644 => 100755 openmrs/rulesengine/drugorderrules/Tuberculosis.csv mode change 100644 => 100755 openmrs/rulesengine/rulesengineextension/Chemotherapy.groovy mode change 100644 => 100755 openmrs/templates/All_templates_generic_concepts.csv mode change 100644 => 100755 openmrs/templates/Anaemia_concept_sets.csv mode change 100644 => 100755 openmrs/templates/Anaemia_concepts.csv mode change 100644 => 100755 openmrs/templates/Arthritis_concept_sets.csv mode change 100644 => 100755 openmrs/templates/Arthritis_concepts.csv mode change 100644 => 100755 openmrs/templates/Breast_cancer_concept_sets.csv mode change 100644 => 100755 openmrs/templates/Breast_cancer_concepts.csv mode change 100644 => 100755 openmrs/templates/Breast_cancer_generic_concepts.csv mode change 100644 => 100755 openmrs/templates/COPD_intake_concept_sets.csv mode change 100644 => 100755 openmrs/templates/COPD_intake_concepts.csv mode change 100644 => 100755 openmrs/templates/COPD_progress_concept_sets.csv mode change 100644 => 100755 openmrs/templates/COPD_progress_concepts.csv mode change 100644 => 100755 openmrs/templates/Cervical_cancer_concept_sets.csv mode change 100644 => 100755 openmrs/templates/Cervical_cancer_concepts.csv mode change 100644 => 100755 openmrs/templates/Cervical_cancer_generic_concepts.csv mode change 100644 => 100755 openmrs/templates/Colon_cancer_concept_sets.csv mode change 100644 => 100755 openmrs/templates/Colon_cancer_concepts.csv mode change 100644 => 100755 openmrs/templates/Colon_cancer_generic_concepts.csv mode change 100644 => 100755 openmrs/templates/Congetive_heart_failure_intake_concept_sets.csv mode change 100644 => 100755 openmrs/templates/Congetive_heart_failure_intake_concepts.csv mode change 100644 => 100755 openmrs/templates/Congetive_heart_failure_progress_concept_sets.csv mode change 100644 => 100755 openmrs/templates/Congetive_heart_failure_progress_concepts.csv mode change 100644 => 100755 openmrs/templates/Coronary_heart_disease_intake_concept_set.csv mode change 100644 => 100755 openmrs/templates/Coronary_heart_disease_intake_concept_sets.csv mode change 100644 => 100755 openmrs/templates/Coronary_heart_disease_progress_concept_sets.csv mode change 100644 => 100755 openmrs/templates/Coronary_heart_disease_progress_concepts.csv mode change 100644 => 100755 openmrs/templates/Detailed_history_concept_sets.csv mode change 100644 => 100755 openmrs/templates/Detailed_history_concepts.csv mode change 100644 => 100755 openmrs/templates/Diabetes_concept_sets.csv mode change 100644 => 100755 openmrs/templates/Diabetes_concepts.csv mode change 100644 => 100755 openmrs/templates/Epilepsy_concept_sets.csv mode change 100644 => 100755 openmrs/templates/Epilepsy_concepts.csv mode change 100644 => 100755 openmrs/templates/Gastric_cancer_concept_sets.csv mode change 100644 => 100755 openmrs/templates/Gastric_cancer_concepts.csv mode change 100644 => 100755 openmrs/templates/Gastric_generic_concepts.csv mode change 100644 => 100755 openmrs/templates/Generic_concepts.csv mode change 100644 => 100755 openmrs/templates/Hyperthyroidism_concept_sets.csv mode change 100644 => 100755 openmrs/templates/Hyperthyroidism_concepts.csv mode change 100644 => 100755 openmrs/templates/Kaposis_sarcoma_concept_sets.csv mode change 100644 => 100755 openmrs/templates/Kaposis_sarcoma_concepts.csv mode change 100644 => 100755 openmrs/templates/Kaposis_sarcoma_generic_concepts.csv mode change 100644 => 100755 openmrs/templates/Leprosy_concept_sets.csv mode change 100644 => 100755 openmrs/templates/Leprosy_concepts.csv mode change 100644 => 100755 openmrs/templates/Leprosy_generic_concepts.csv mode change 100644 => 100755 openmrs/templates/Nephroblastoma_concept_sets.csv mode change 100644 => 100755 openmrs/templates/Nephroblastoma_concepts.csv mode change 100644 => 100755 openmrs/templates/Nephroblastoma_generic_concepts.csv mode change 100644 => 100755 openmrs/templates/Neurological_disorder_concept_sets.csv mode change 100644 => 100755 openmrs/templates/Neurological_disorder_concepts.csv mode change 100644 => 100755 openmrs/templates/Operation_notes_concept_sets.csv mode change 100644 => 100755 openmrs/templates/Operation_notes_concepts.csv mode change 100644 => 100755 openmrs/templates/Operation_notes_generic_concepts.csv mode change 100644 => 100755 openmrs/templates/Rheumatic_heart_disease_intake_concept_sets.csv mode change 100644 => 100755 openmrs/templates/Rheumatic_heart_disease_intake_concepts.csv mode change 100644 => 100755 openmrs/templates/Sickle_cell_concept_sets.csv mode change 100644 => 100755 openmrs/templates/Sickle_cell_concepts.csv mode change 100644 => 100755 openmrs/templates/Sickle_cell_generic_concepts.csv mode change 100644 => 100755 openmrs/templates/Tuberculosis_MDR_concepts.csv mode change 100644 => 100755 openmrs/templates/Tuberculosis_concept_sets.csv mode change 100644 => 100755 openmrs/templates/Tuberculosis_generic_concepts.csv mode change 100644 => 100755 openmrs/templates/Tuberculosis_intake_concepts.csv mode change 100644 => 100755 openmrs/templates/Tuberculosis_outcome_concepts.csv mode change 100644 => 100755 openmrs/templates/Tuberculosis_progress_concepts.csv mode change 100644 => 100755 openmrs/templates/Tuberculosis_retreatment_concepts.csv mode change 100644 => 100755 openmrs/templates/Undernutrition_concept_sets.csv mode change 100644 => 100755 openmrs/templates/Undernutrition_concepts.csv mode change 100644 => 100755 openmrs/treatmentRegimenExtension/TreatmentRegimenExtension.groovy 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 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 diff --git a/openmrs/apps/clinical/dashboard.json b/openmrs/apps/clinical/dashboard.json old mode 100644 new mode 100755 diff --git a/openmrs/apps/clinical/extension-programs.json b/openmrs/apps/clinical/extension-programs.json old mode 100644 new mode 100755 diff --git a/openmrs/apps/clinical/extension.json b/openmrs/apps/clinical/extension.json old mode 100644 new mode 100755 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 diff --git a/openmrs/apps/home/locale_languages.json b/openmrs/apps/home/locale_languages.json old mode 100644 new mode 100755 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 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 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 old mode 100644 new mode 100755 diff --git a/openmrs/apps/registration/extension.json b/openmrs/apps/registration/extension.json old mode 100644 new mode 100755 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 diff --git a/openmrs/apps/registration/registrationCardLayout/printWithBarcode.html b/openmrs/apps/registration/registrationCardLayout/printWithBarcode.html old mode 100644 new mode 100755 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 old mode 100644 new mode 100755 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 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 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 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 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/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 From d374a5947a69acbcab9b001ccf5a8da22efd28fc Mon Sep 17 00:00:00 2001 From: Amol Chavan Date: Wed, 27 Feb 2019 11:51:04 +0530 Subject: [PATCH 12/67] MPOC-78-Remove fields from Registration Forms --- openmrs/apps/registration/app.json | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/openmrs/apps/registration/app.json b/openmrs/apps/registration/app.json index 0b3e626f60..3f66056704 100755 --- a/openmrs/apps/registration/app.json +++ b/openmrs/apps/registration/app.json @@ -19,13 +19,6 @@ "config" : { "patientInformation": { - "patientReferenceInformation": { - "title": "patientReferenceInformation", - "translationKey": "REGISTRATION_REFERENCE_INFO_KEY", - "attributes": ["Nome","Apelido","Phone_2"], - "order" : 2, - "expanded": true - }, "patientTransferenceInformation": { "title": "patientTransferenceInformation", "translationKey": "REGISTRATION_TRANSFERENCE_INFO_KEY", @@ -48,6 +41,7 @@ }, "defaults": { "class": "General", + "TestResult": "HIV_Positive", "landHolding": 2 } }, @@ -69,7 +63,7 @@ "showLastName": true, "isLastNameMandatory": true, "showSaveConfirmDialog": false, - "showBirthTime": true, + "showBirthTime": false, "showCasteSameAsLastNameCheckbox": false, "printOptions": [ { From 4b7daf52ddb39597f6fd8d934d629112f71b4e30 Mon Sep 17 00:00:00 2001 From: Joao Machiana Date: Wed, 27 Feb 2019 17:34:52 +0200 Subject: [PATCH 13/67] Fixed header text under the request of BA team --- openmrs/apps/home/whiteLabel.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openmrs/apps/home/whiteLabel.json b/openmrs/apps/home/whiteLabel.json index 21da43406c..702137544f 100755 --- a/openmrs/apps/home/whiteLabel.json +++ b/openmrs/apps/home/whiteLabel.json @@ -1,6 +1,6 @@ { "homePage": { - "header_text": "BEM VINDO AO
SISTEMA ELECTRÓNICO DE SEGUIMENTO DE PACIENTES (SESP)
POINT OF CARE (POC)", + "header_text": "BEM VINDO AO
SISTEMA ELECTRÓNICO DE SEGUIMENTO DE PACIENTES (SESP)", "logo": "/bahmni/images/emblem_of_mozambique.png", "title_text": " " }, From 3e1cf75fa8eed831d464e8338709d27e7c030730 Mon Sep 17 00:00:00 2001 From: Joao Machiana Date: Thu, 28 Feb 2019 16:44:58 +0200 Subject: [PATCH 14/67] added the Mozambique flag, and the footer logos --- openmrs/apps/home/whiteLabel.json | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/openmrs/apps/home/whiteLabel.json b/openmrs/apps/home/whiteLabel.json index 702137544f..9f7c014bd7 100755 --- a/openmrs/apps/home/whiteLabel.json +++ b/openmrs/apps/home/whiteLabel.json @@ -1,13 +1,17 @@ { "homePage": { - "header_text": "BEM VINDO AO
SISTEMA ELECTRÓNICO DE SEGUIMENTO DE PACIENTES (SESP)", + "header_text": "BEM VINDO AO
SISTEMA ELECTRÓNICO DE SEGUIMENTO DE PACIENTES
SESP - POC", "logo": "/bahmni/images/emblem_of_mozambique.png", - "title_text": " " + "title_text": " ", + "bottomBanner": "/bahmni/images/jembi_uem_moasis_logo.png" }, "loginPage": { - "logo": "/bahmni/images/emblem_of_mozambique.png", + "logo": "/bahmni/images/flag_of_mozambique.png", "showHeaderText": true, - "showTitleText": false + "showTitleText": true, + "bottomLogos" : [ + "/bahmni/images/jembi_uem_moasis_logo.png" + ] }, "helpLink": { "url": "https://bahmni.atlassian.net/wiki/display/BAH/Bahmni+Home" From 53090c54c5bd8528770f29163258210b01cc20ad Mon Sep 17 00:00:00 2001 From: Joao Machiana Date: Thu, 7 Mar 2019 13:52:42 +0200 Subject: [PATCH 15/67] mpoc-94 removed jembi logo, fixed the login page title --- openmrs/apps/home/whiteLabel.json | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/openmrs/apps/home/whiteLabel.json b/openmrs/apps/home/whiteLabel.json index 9f7c014bd7..3d85db3a83 100755 --- a/openmrs/apps/home/whiteLabel.json +++ b/openmrs/apps/home/whiteLabel.json @@ -1,17 +1,13 @@ { "homePage": { - "header_text": "BEM VINDO AO
SISTEMA ELECTRÓNICO DE SEGUIMENTO DE PACIENTES
SESP - POC", + "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": " ", - "bottomBanner": "/bahmni/images/jembi_uem_moasis_logo.png" + "title_text": " " }, "loginPage": { "logo": "/bahmni/images/flag_of_mozambique.png", "showHeaderText": true, - "showTitleText": true, - "bottomLogos" : [ - "/bahmni/images/jembi_uem_moasis_logo.png" - ] + "showTitleText": true }, "helpLink": { "url": "https://bahmni.atlassian.net/wiki/display/BAH/Bahmni+Home" From de0fe8ef94e4f660a898bd46f439c6f324403394 Mon Sep 17 00:00:00 2001 From: Amol Chavan Date: Wed, 13 Mar 2019 15:20:55 +0530 Subject: [PATCH 16/67] Amol | Hide the ability to capture the photo during patient registration --- openmrs/apps/registration/app.json | 1 + 1 file changed, 1 insertion(+) diff --git a/openmrs/apps/registration/app.json b/openmrs/apps/registration/app.json index 3f66056704..01d1a7bb30 100755 --- a/openmrs/apps/registration/app.json +++ b/openmrs/apps/registration/app.json @@ -64,6 +64,7 @@ "isLastNameMandatory": true, "showSaveConfirmDialog": false, "showBirthTime": false, + "disablePhotoCapture": true, "showCasteSameAsLastNameCheckbox": false, "printOptions": [ { From 93e72891e1a6f7159784d98f48a9d27bfd68346d Mon Sep 17 00:00:00 2001 From: joaomachiana Date: Fri, 15 Mar 2019 18:30:23 +0200 Subject: [PATCH 17/67] mpoc-123 Changed the text of the footer, and added a link to MISAU webpage instead of the Bahmni Help page --- openmrs/apps/home/whiteLabel.json | 3 +++ openmrs/i18n/home/locale_pt_BR.json | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/openmrs/apps/home/whiteLabel.json b/openmrs/apps/home/whiteLabel.json index 3d85db3a83..68ab1eb37b 100755 --- a/openmrs/apps/home/whiteLabel.json +++ b/openmrs/apps/home/whiteLabel.json @@ -11,5 +11,8 @@ }, "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/i18n/home/locale_pt_BR.json b/openmrs/i18n/home/locale_pt_BR.json index e7632c66ec..e437f299d9 100755 --- a/openmrs/i18n/home/locale_pt_BR.json +++ b/openmrs/i18n/home/locale_pt_BR.json @@ -11,6 +11,6 @@ "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ção de Consultas", +"MODULE_LABEL_APPOINTMENT_SCHEDULING_KEY":"Marcações", "MODULE_LABEL_BED_MANAGEMENT_KEY":"Gestão de Camas" } \ No newline at end of file From 75decbf11c2f1020596ffae48636b5b8f9f5f09b Mon Sep 17 00:00:00 2001 From: Amol Chavan Date: Mon, 18 Mar 2019 15:05:45 +0530 Subject: [PATCH 18/67] Amol | Must automatically flag the patient as Pre TARV --- openmrs/apps/registration/app.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/openmrs/apps/registration/app.json b/openmrs/apps/registration/app.json index 01d1a7bb30..4b8641bc56 100755 --- a/openmrs/apps/registration/app.json +++ b/openmrs/apps/registration/app.json @@ -30,7 +30,7 @@ "patientHIVTestInformation": { "title": "patientHIVTestInformation", "translationKey": "REGISTRATION_HIVTEST_INFO_KEY", - "attributes": ["DateofHIVDiagnosis","Typeoftest","TestResult"], + "attributes": ["DateofHIVDiagnosis","Typeoftest","TestResult","Patient Status"], "order" : 4, "expanded": true }, @@ -42,6 +42,7 @@ "defaults": { "class": "General", "TestResult": "HIV_Positive", + "Patient Status": "Pre TARV", "landHolding": 2 } }, From 80e091d9f5025f9f969df61634ea5cc4dc539ef5 Mon Sep 17 00:00:00 2001 From: Amol Chavan Date: Mon, 18 Mar 2019 15:22:23 +0530 Subject: [PATCH 19/67] Amol | Added quick fixes --- openmrs/apps/appointments/app.json | 2 +- openmrs/apps/registration/app.json | 7 +++---- openmrs/i18n/home/locale_pt_BR.json | 2 +- openmrs/i18n/registration/locale_pt_BR.json | 10 +++++----- 4 files changed, 10 insertions(+), 11 deletions(-) diff --git a/openmrs/apps/appointments/app.json b/openmrs/apps/appointments/app.json index ad88678de5..ac6f6257ab 100755 --- 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", diff --git a/openmrs/apps/registration/app.json b/openmrs/apps/registration/app.json index 01d1a7bb30..9e0ac22f1d 100755 --- a/openmrs/apps/registration/app.json +++ b/openmrs/apps/registration/app.json @@ -46,8 +46,7 @@ } }, "addressHierarchy": { - "showAddressFieldsTopDown": false, - "strictAutocompleteFromLevel": "stateProvince" + "showAddressFieldsTopDown": true }, "relationshipTypeMap": { "Doctor":"provider", @@ -109,7 +108,7 @@ }, "personAttributes": { "fields": [ - "nick_name" + "NICK_NAME" ] } }, @@ -118,7 +117,7 @@ "customAttributes": { "label": "Alcunha", "placeholder": "Alcunha", - "fields": ["nick_name"] + "fields": ["NICK_NAME"] } } } diff --git a/openmrs/i18n/home/locale_pt_BR.json b/openmrs/i18n/home/locale_pt_BR.json index e7632c66ec..7a108a7da2 100755 --- a/openmrs/i18n/home/locale_pt_BR.json +++ b/openmrs/i18n/home/locale_pt_BR.json @@ -1,5 +1,5 @@ { -"MODULE_LABEL_REGISTRATION_KEY":"Cadastro", +"MODULE_LABEL_REGISTRATION_KEY":"Registo de Paciente", "MODULE_LABEL_CLINICAL_KEY":"Clínico", "MODULE_LABEL_INPATIENT_KEY":"Internamento", "MODULE_LABEL_RADIOLOGY_UPLOAD_KEY":"Radiografia", diff --git a/openmrs/i18n/registration/locale_pt_BR.json b/openmrs/i18n/registration/locale_pt_BR.json index 994e0b1670..753222bbe5 100755 --- a/openmrs/i18n/registration/locale_pt_BR.json +++ b/openmrs/i18n/registration/locale_pt_BR.json @@ -28,15 +28,15 @@ "REGISTRATION_TRANSFERENCE_INFO_KEY": "Transferência", "REGISTRATION_HIVTEST_INFO_KEY":"Teste de HIV", "REGISTRATION_HIV_TEST": "HIV Test", - "country_locale":"Pais", - "province_locale":"Provincia", + "country_locale":"Pas", + "province_locale":"Provncia", "district_locale":"Distrito", "administrative_locale":"Administrativo", "locality_locale":"Localidade", "education":"Nivel de Escolaridade", "ADDRESS_CLOSE_OF_LOCALE":"Perto De", "ADDRESS_AVENUE_STREET_LOCALE":"Avenida/Rua", - "ADDRESS_BLOCK_LOCALE":"Quateiro", - "ADDRESS_FLOOR_FLAT_LOCALE":"Andar / Flat", - "ADDRESS_HOUSE_NUMBER_LOCALE":"N^o^ da Casa" + "ADDRESS_BLOCK_LOCALE":"Quarteiro", + "ADDRESS_FLOOR_FLAT_LOCALE":"Andar/Flat", + "ADDRESS_HOUSE_NUMBER_LOCALE":"No da Casa" } From ee562faff70e988cdd9c343d26efc5f171e5971d Mon Sep 17 00:00:00 2001 From: Krishnan Menon Date: Tue, 19 Mar 2019 11:46:57 +0530 Subject: [PATCH 20/67] Krishnan | MPOC-154 Remove NID as per feedback on ticket 103 --- .../apps/registration/registrationCardLayout/print.html | 7 ------- .../registrationCardLayout/printWithBarcode.html | 8 -------- .../registrationCardLayout/print_registration.html | 7 ------- 3 files changed, 22 deletions(-) diff --git a/openmrs/apps/registration/registrationCardLayout/print.html b/openmrs/apps/registration/registrationCardLayout/print.html index 759219a8c6..59f26a586a 100755 --- a/openmrs/apps/registration/registrationCardLayout/print.html +++ b/openmrs/apps/registration/registrationCardLayout/print.html @@ -33,13 +33,6 @@

{{ "REGISTRATION_INSTITUTE_REGISTERED_TEXT_KEY" | tran : {{patient.primaryIdentifier.identifier}} - - - NID - - : - {{patient.extraIdentifiers[0].identifier}} - {{ "REGISTRATION_LABEL_PATIENT_NAME" | translate }} diff --git a/openmrs/apps/registration/registrationCardLayout/printWithBarcode.html b/openmrs/apps/registration/registrationCardLayout/printWithBarcode.html index 9246e9df7f..050d960747 100755 --- a/openmrs/apps/registration/registrationCardLayout/printWithBarcode.html +++ b/openmrs/apps/registration/registrationCardLayout/printWithBarcode.html @@ -33,14 +33,6 @@

POC HF 01

{{patient.fullNameLocal()}} - - - - NID - - : - {{patient.extraIdentifiers[0].identifier}} - Era diff --git a/openmrs/apps/registration/registrationCardLayout/print_registration.html b/openmrs/apps/registration/registrationCardLayout/print_registration.html index 4eb6f2ec27..5f40a97fb5 100755 --- a/openmrs/apps/registration/registrationCardLayout/print_registration.html +++ b/openmrs/apps/registration/registrationCardLayout/print_registration.html @@ -33,13 +33,6 @@

{{ "REGISTRATION_INSTITUTE_REGISTERED_TEXT_KEY" | tran : {{patient.primaryIdentifier.identifier}} - - - NID - - : - {{patient.extraIdentifiers[0].identifier}} - Nome do Paciente From 9f445b73fa06418d5502263b1b41eec8314c06e8 Mon Sep 17 00:00:00 2001 From: Krishnan Menon Date: Wed, 20 Mar 2019 10:00:47 +0530 Subject: [PATCH 21/67] Krishnan | MPOC-106 Search Results List --- openmrs/apps/registration/app.json | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/openmrs/apps/registration/app.json b/openmrs/apps/registration/app.json index 8429e092a0..37f34b178b 100755 --- a/openmrs/apps/registration/app.json +++ b/openmrs/apps/registration/app.json @@ -109,7 +109,9 @@ }, "personAttributes": { "fields": [ - "NICK_NAME" + "NICK_NAME", + "PATIENT_STATUS", + "PRIMARY_CONTACT_NUMBER_1" ] } }, From 197c61fa9acbcf28e86beff423dfe26e126f9329 Mon Sep 17 00:00:00 2001 From: Krishnan Menon Date: Wed, 20 Mar 2019 12:08:25 +0530 Subject: [PATCH 22/67] Krishnan | MPOC-110 Update section Teste de HIV --- openmrs/apps/registration/app.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/openmrs/apps/registration/app.json b/openmrs/apps/registration/app.json index 8429e092a0..fc348f4c32 100755 --- a/openmrs/apps/registration/app.json +++ b/openmrs/apps/registration/app.json @@ -30,7 +30,7 @@ "patientHIVTestInformation": { "title": "patientHIVTestInformation", "translationKey": "REGISTRATION_HIVTEST_INFO_KEY", - "attributes": ["DateofHIVDiagnosis","Typeoftest","TestResult","Patient Status"], + "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 }, @@ -41,8 +41,8 @@ }, "defaults": { "class": "General", - "TestResult": "HIV_Positive", - "Patient Status": "Pre TARV", + "TEST_RESULT": "Positive", + "PATIENT_STATUS": "Pre TARV", "landHolding": 2 } }, From 69e3b61454717bb96831a45216dcbd793c1fa087 Mon Sep 17 00:00:00 2001 From: Krishnan Menon Date: Wed, 20 Mar 2019 12:22:40 +0530 Subject: [PATCH 23/67] Krishnan | MPOC-110 Hide the test result field --- openmrs/apps/registration/app.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/openmrs/apps/registration/app.json b/openmrs/apps/registration/app.json index fc348f4c32..b9be5e5261 100755 --- a/openmrs/apps/registration/app.json +++ b/openmrs/apps/registration/app.json @@ -36,7 +36,8 @@ }, "hidden": { "attributes": [ - "primaryContact" + "primaryContact", + "TEST_RESULT" ] }, "defaults": { From a652f1a4017ea4551fd1aa6a48047f84d00b280e Mon Sep 17 00:00:00 2001 From: Amol Chavan Date: Wed, 20 Mar 2019 14:58:44 +0530 Subject: [PATCH 24/67] Amol | MPOC-128 Update the patient registration fields --- openmrs/i18n/registration/locale_en.json | 3 ++- openmrs/i18n/registration/locale_pt_BR.json | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/openmrs/i18n/registration/locale_en.json b/openmrs/i18n/registration/locale_en.json index e800882882..27b5ee5d99 100755 --- a/openmrs/i18n/registration/locale_en.json +++ b/openmrs/i18n/registration/locale_en.json @@ -37,5 +37,6 @@ "ADDRESS_BLOCK_LOCALE":"Block", "ADDRESS_FLOOR_FLAT_LOCALE":"Floor / Flat", "ADDRESS_HOUSE_NUMBER_LOCALE":"House Number", - "REGISTRATION_EDUCATION_KEY":"Education Details" + "REGISTRATION_EDUCATION_KEY":"Education Details", + "ADDRESS_POVOADO_ALDEIA_NUMBER_LOCALE":"Povoado/Aldeia" } diff --git a/openmrs/i18n/registration/locale_pt_BR.json b/openmrs/i18n/registration/locale_pt_BR.json index 753222bbe5..c636302ba7 100755 --- a/openmrs/i18n/registration/locale_pt_BR.json +++ b/openmrs/i18n/registration/locale_pt_BR.json @@ -38,5 +38,6 @@ "ADDRESS_AVENUE_STREET_LOCALE":"Avenida/Rua", "ADDRESS_BLOCK_LOCALE":"Quarteiro", "ADDRESS_FLOOR_FLAT_LOCALE":"Andar/Flat", - "ADDRESS_HOUSE_NUMBER_LOCALE":"No da Casa" + "ADDRESS_HOUSE_NUMBER_LOCALE":"No da Casa", + "ADDRESS_POVOADO_ALDEIA_NUMBER_LOCALE":"Povoado/Aldeia" } From 311017c878ebb37ed9fa1c7bcd9db58670d28f69 Mon Sep 17 00:00:00 2001 From: Joao Machiana Date: Thu, 21 Mar 2019 10:04:21 +0200 Subject: [PATCH 25/67] Update locale_en.json --- openmrs/i18n/registration/locale_en.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openmrs/i18n/registration/locale_en.json b/openmrs/i18n/registration/locale_en.json index 27b5ee5d99..6fb97ce776 100755 --- a/openmrs/i18n/registration/locale_en.json +++ b/openmrs/i18n/registration/locale_en.json @@ -38,5 +38,5 @@ "ADDRESS_FLOOR_FLAT_LOCALE":"Floor / Flat", "ADDRESS_HOUSE_NUMBER_LOCALE":"House Number", "REGISTRATION_EDUCATION_KEY":"Education Details", - "ADDRESS_POVOADO_ALDEIA_NUMBER_LOCALE":"Povoado/Aldeia" + "ADDRESS_POVOADO_ALDEIA_NUMBER_LOCALE":"Village/Town" } From f02c9c8d95feda4b76ae3701ae568b1bfb4f3d28 Mon Sep 17 00:00:00 2001 From: Amol Chavan Date: Fri, 22 Mar 2019 12:59:15 +0530 Subject: [PATCH 26/67] Amol | MPOC-129 --- openmrs/apps/registration/app.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/openmrs/apps/registration/app.json b/openmrs/apps/registration/app.json index 37f34b178b..8000f31cd6 100755 --- a/openmrs/apps/registration/app.json +++ b/openmrs/apps/registration/app.json @@ -22,7 +22,7 @@ "patientTransferenceInformation": { "title": "patientTransferenceInformation", "translationKey": "REGISTRATION_TRANSFERENCE_INFO_KEY", - "attributes": ["Transferred from another HF","Date of transference","Transferred out HF name","Patient stage"], + "attributes": ["Transferred from another HF","Date of transference","Transferred out HF name","Patient Status"], "order" : 3, "expanded": true }, @@ -30,7 +30,7 @@ "patientHIVTestInformation": { "title": "patientHIVTestInformation", "translationKey": "REGISTRATION_HIVTEST_INFO_KEY", - "attributes": ["DateofHIVDiagnosis","Typeoftest","TestResult","Patient Status"], + "attributes": ["DateofHIVDiagnosis","Typeoftest","TestResult"], "order" : 4, "expanded": true }, From eaa2b9827372d9d1453936791a3976c6c7a49c2c Mon Sep 17 00:00:00 2001 From: Amol Chavan Date: Fri, 22 Mar 2019 17:35:11 +0530 Subject: [PATCH 27/67] Amol | MPOC-129 - updated Patient Status to PATIENT_STATUS --- openmrs/apps/registration/app.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openmrs/apps/registration/app.json b/openmrs/apps/registration/app.json index 8000f31cd6..632cfd57c6 100755 --- a/openmrs/apps/registration/app.json +++ b/openmrs/apps/registration/app.json @@ -22,7 +22,7 @@ "patientTransferenceInformation": { "title": "patientTransferenceInformation", "translationKey": "REGISTRATION_TRANSFERENCE_INFO_KEY", - "attributes": ["Transferred from another HF","Date of transference","Transferred out HF name","Patient Status"], + "attributes": ["Transferred from another HF","Date of transference","Transferred out HF name","PATIENT_STATUS"], "order" : 3, "expanded": true }, From c897249d33e21b6a98d61b36abf1ac0038e3f94f Mon Sep 17 00:00:00 2001 From: Krishnan Menon Date: Tue, 26 Mar 2019 17:42:01 +0530 Subject: [PATCH 28/67] Krishnan | MPOC-164 Changed the translation for Nutritional Values and changed the file encoding to UTF-8 --- openmrs/i18n/registration/locale_pt_BR.json | 38 ++++++++++----------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/openmrs/i18n/registration/locale_pt_BR.json b/openmrs/i18n/registration/locale_pt_BR.json index c636302ba7..691240278c 100755 --- a/openmrs/i18n/registration/locale_pt_BR.json +++ b/openmrs/i18n/registration/locale_pt_BR.json @@ -4,39 +4,39 @@ "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_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_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":"Valores Nutricionais", - "REGISTRATION_PRINT_WITH_BARCODE":"Imprimir com Código de Barras", + "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_ADDITIONAL_INFO_KEY": "Informação Adicional ao Paciente", "REGISTRATION_REFERENCE_INFO_KEY":"Confidente", - "REGISTRATION_TRANSFERENCE_INFO_KEY": "Transferência", + "REGISTRATION_TRANSFERENCE_INFO_KEY": "Transferência", "REGISTRATION_HIVTEST_INFO_KEY":"Teste de HIV", "REGISTRATION_HIV_TEST": "HIV Test", - "country_locale":"Pas", - "province_locale":"Provncia", + "country_locale":"País", + "province_locale":"Província", "district_locale":"Distrito", "administrative_locale":"Administrativo", "locality_locale":"Localidade", "education":"Nivel de Escolaridade", "ADDRESS_CLOSE_OF_LOCALE":"Perto De", "ADDRESS_AVENUE_STREET_LOCALE":"Avenida/Rua", - "ADDRESS_BLOCK_LOCALE":"Quarteiro", + "ADDRESS_BLOCK_LOCALE":"Quarteirão", "ADDRESS_FLOOR_FLAT_LOCALE":"Andar/Flat", "ADDRESS_HOUSE_NUMBER_LOCALE":"No da Casa", "ADDRESS_POVOADO_ALDEIA_NUMBER_LOCALE":"Povoado/Aldeia" From 7b53219e20434fab5cbf3f06172fe3e5dc12a6e6 Mon Sep 17 00:00:00 2001 From: Joao Machiana Date: Tue, 26 Mar 2019 14:42:01 +0200 Subject: [PATCH 29/67] Update locale_pt_BR.json --- openmrs/i18n/registration/locale_pt_BR.json | 30 ++++++++++----------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/openmrs/i18n/registration/locale_pt_BR.json b/openmrs/i18n/registration/locale_pt_BR.json index 691240278c..f60857344e 100755 --- a/openmrs/i18n/registration/locale_pt_BR.json +++ b/openmrs/i18n/registration/locale_pt_BR.json @@ -4,28 +4,28 @@ "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_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_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", + "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_PRINT_WITH_BARCODE":"Imprimir com Código de Barras", - "REGISTRATION_ADDITIONAL_INFO_KEY": "Informação Adicional ao Paciente", + "REGISTRATION_ADDITIONAL_INFO_KEY": "Informação Adicional ao Paciente", "REGISTRATION_REFERENCE_INFO_KEY":"Confidente", - "REGISTRATION_TRANSFERENCE_INFO_KEY": "Transferência", + "REGISTRATION_TRANSFERENCE_INFO_KEY": "Transferência", "REGISTRATION_HIVTEST_INFO_KEY":"Teste de HIV", "REGISTRATION_HIV_TEST": "HIV Test", "country_locale":"País", From b00a05a23aa58788be0a2b0617915cb8b9139f4a Mon Sep 17 00:00:00 2001 From: Krishnan Menon Date: Tue, 2 Apr 2019 13:29:09 +0530 Subject: [PATCH 30/67] Krishnan | Added the config to use only Autocomplete values --- openmrs/apps/registration/app.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/openmrs/apps/registration/app.json b/openmrs/apps/registration/app.json index 40467034da..8c6c546163 100755 --- a/openmrs/apps/registration/app.json +++ b/openmrs/apps/registration/app.json @@ -48,7 +48,8 @@ } }, "addressHierarchy": { - "showAddressFieldsTopDown": true + "showAddressFieldsTopDown": true, + "strictAutocompleteFromLevel": "address1" }, "relationshipTypeMap": { "Doctor":"provider", From 76bb9fd5a9cd86a0082c6b0d375a55b54998a469 Mon Sep 17 00:00:00 2001 From: Amol Chavan Date: Mon, 8 Apr 2019 16:41:28 +0530 Subject: [PATCH 31/67] Amol | MPOC-85 - Add Patient Address Details --- openmrs/apps/registration/app.json | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/openmrs/apps/registration/app.json b/openmrs/apps/registration/app.json index 40467034da..79059fff33 100755 --- a/openmrs/apps/registration/app.json +++ b/openmrs/apps/registration/app.json @@ -101,7 +101,13 @@ "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"} + "middleName" : {"pattern" : "[a-zA-Z]{0,}", "errorMessage" : "Should contain characters"}, + "latitude" : {"pattern" : "[a-zA-Z]{0,}", "errorMessage" : "Should contain characters"}, + "address3" : {"pattern" : "[0-9]{0}", "errorMessage" : "Should contain number"}, + "address4" : {"pattern" : "[a-zA-Z]{0,}", "errorMessage" : "Should contain characters"}, + "address5" : {"pattern" : "[a-zA-Z]{0,}", "errorMessage" : "Should contain characters"}, + "address6" : {"pattern" : "[a-zA-Z]{0,}", "errorMessage" : "Should contain characters"}, + "postalCode" : {"pattern" : "[a-zA-Z]{0,}", "errorMessage" : "Should contain characters"} }, "patientSearchResults": { From e7ec25d48ecd869fdb0ccc2eafce9193eef18940 Mon Sep 17 00:00:00 2001 From: Krishnan Menon Date: Tue, 9 Apr 2019 10:31:18 +0530 Subject: [PATCH 32/67] Krishnan | MPOC-116 Move Patient Contact Section --- openmrs/apps/registration/app.json | 8 ++++++++ openmrs/i18n/registration/locale_en.json | 3 ++- openmrs/i18n/registration/locale_pt_BR.json | 3 ++- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/openmrs/apps/registration/app.json b/openmrs/apps/registration/app.json index 40467034da..fabb4bef20 100755 --- a/openmrs/apps/registration/app.json +++ b/openmrs/apps/registration/app.json @@ -18,6 +18,14 @@ ], "config" : { "patientInformation": { + + "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", diff --git a/openmrs/i18n/registration/locale_en.json b/openmrs/i18n/registration/locale_en.json index 6fb97ce776..5a66cd26bc 100755 --- a/openmrs/i18n/registration/locale_en.json +++ b/openmrs/i18n/registration/locale_en.json @@ -38,5 +38,6 @@ "ADDRESS_FLOOR_FLAT_LOCALE":"Floor / Flat", "ADDRESS_HOUSE_NUMBER_LOCALE":"House Number", "REGISTRATION_EDUCATION_KEY":"Education Details", - "ADDRESS_POVOADO_ALDEIA_NUMBER_LOCALE":"Village/Town" + "ADDRESS_POVOADO_ALDEIA_NUMBER_LOCALE":"Village/Town", + "REGISTRATION_CONTACT_INFORMATION":"Contact Information" } diff --git a/openmrs/i18n/registration/locale_pt_BR.json b/openmrs/i18n/registration/locale_pt_BR.json index f60857344e..8a88b23196 100755 --- a/openmrs/i18n/registration/locale_pt_BR.json +++ b/openmrs/i18n/registration/locale_pt_BR.json @@ -39,5 +39,6 @@ "ADDRESS_BLOCK_LOCALE":"Quarteirão", "ADDRESS_FLOOR_FLAT_LOCALE":"Andar/Flat", "ADDRESS_HOUSE_NUMBER_LOCALE":"No da Casa", - "ADDRESS_POVOADO_ALDEIA_NUMBER_LOCALE":"Povoado/Aldeia" + "ADDRESS_POVOADO_ALDEIA_NUMBER_LOCALE":"Povoado/Aldeia", + "REGISTRATION_CONTACT_INFORMATION":"Contactos" } From b80eb6cf0a2bf7effea0835035f2c3dc36ac8158 Mon Sep 17 00:00:00 2001 From: Krishnan Menon Date: Tue, 16 Apr 2019 16:24:18 +0530 Subject: [PATCH 33/67] Krishnan | MPOC-143 Allow the appointment to be made in one of 4 time blocks --- openmrs/apps/appointments/app.json | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/openmrs/apps/appointments/app.json b/openmrs/apps/appointments/app.json index ac6f6257ab..06fbf7d12b 100755 --- a/openmrs/apps/appointments/app.json +++ b/openmrs/apps/appointments/app.json @@ -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"], From 0255dae1f7f846e9a69e69dd83540d46db80579d Mon Sep 17 00:00:00 2001 From: Krishnan Menon Date: Tue, 23 Apr 2019 17:09:52 +0530 Subject: [PATCH 34/67] Krishnan | MPOC-160 Placement of Patient Marital Status, Occupation and Education --- openmrs/apps/registration/app.json | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/openmrs/apps/registration/app.json b/openmrs/apps/registration/app.json index a8e451e37e..4ed4ec7d07 100755 --- a/openmrs/apps/registration/app.json +++ b/openmrs/apps/registration/app.json @@ -19,6 +19,14 @@ "config" : { "patientInformation": { + "patientProfessionInformation": { + "title": "patientProfessionInformation", + "translationKey": "REGISTRATION_PROFESSIONAL_INFORMATION", + "attributes": ["PATIENT_OCCUPATION","PATIENT_EDUCATION"], + "order" : 1, + "expanded": true + }, + "patientContactInformation": { "title": "patientContactInformation", "translationKey": "REGISTRATION_CONTACT_INFORMATION", From 381ef6fe55f7929a5a7913a2d9050ddf6e9167f5 Mon Sep 17 00:00:00 2001 From: Amol Chavan Date: Wed, 24 Apr 2019 18:28:51 +0530 Subject: [PATCH 35/67] Amol | Done changes as per new requirement --- openmrs/apps/registration/app.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/openmrs/apps/registration/app.json b/openmrs/apps/registration/app.json index 79059fff33..e691f6bb19 100755 --- a/openmrs/apps/registration/app.json +++ b/openmrs/apps/registration/app.json @@ -103,11 +103,11 @@ "givenName" : {"pattern" : "[a-zA-Z]{0,}", "errorMessage" : "Should contain characters"}, "middleName" : {"pattern" : "[a-zA-Z]{0,}", "errorMessage" : "Should contain characters"}, "latitude" : {"pattern" : "[a-zA-Z]{0,}", "errorMessage" : "Should contain characters"}, - "address3" : {"pattern" : "[0-9]{0}", "errorMessage" : "Should contain number"}, - "address4" : {"pattern" : "[a-zA-Z]{0,}", "errorMessage" : "Should contain characters"}, - "address5" : {"pattern" : "[a-zA-Z]{0,}", "errorMessage" : "Should contain characters"}, - "address6" : {"pattern" : "[a-zA-Z]{0,}", "errorMessage" : "Should contain characters"}, - "postalCode" : {"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,-,(,)"} }, "patientSearchResults": { From 2f231c7067ff9c2f0c5aa7d01d4a1240805eea04 Mon Sep 17 00:00:00 2001 From: Amol Chavan Date: Thu, 25 Apr 2019 16:52:44 +0530 Subject: [PATCH 36/67] Amol | Quick fix --- openmrs/apps/registration/app.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openmrs/apps/registration/app.json b/openmrs/apps/registration/app.json index dcee8af392..13686e58f1 100755 --- a/openmrs/apps/registration/app.json +++ b/openmrs/apps/registration/app.json @@ -120,7 +120,7 @@ "givenName" : {"pattern" : "[a-zA-Z]{0,}", "errorMessage" : "Should contain characters"}, "middleName" : {"pattern" : "[a-zA-Z]{0,}", "errorMessage" : "Should contain characters"}, "latitude" : {"pattern" : "[a-zA-Z]{0,}", "errorMessage" : "Should contain characters"}, - "address3" : {"pattern" : "[a-zA-Z0-9\\s]{0}", "errorMessage" : "Should contain Characters, Numbers"}, + "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, -"}, From 78834b54bf848555407586fc8cf0bd986ac7e960 Mon Sep 17 00:00:00 2001 From: Simao Mazive Date: Mon, 6 May 2019 16:08:12 +0200 Subject: [PATCH 37/67] Change Label Localidade to Localidade/Bairro This changes was made in address address section --- openmrs/i18n/registration/locale_pt_BR.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openmrs/i18n/registration/locale_pt_BR.json b/openmrs/i18n/registration/locale_pt_BR.json index 8a88b23196..f43aebc324 100755 --- a/openmrs/i18n/registration/locale_pt_BR.json +++ b/openmrs/i18n/registration/locale_pt_BR.json @@ -32,7 +32,7 @@ "province_locale":"Província", "district_locale":"Distrito", "administrative_locale":"Administrativo", - "locality_locale":"Localidade", + "locality_locale":"Localidade/Bairro", "education":"Nivel de Escolaridade", "ADDRESS_CLOSE_OF_LOCALE":"Perto De", "ADDRESS_AVENUE_STREET_LOCALE":"Avenida/Rua", From 8fbbbf9cc5eb117d35d5b68aa9c288d98ab46c7b Mon Sep 17 00:00:00 2001 From: Simao Mazive Date: Mon, 6 May 2019 16:17:18 +0200 Subject: [PATCH 38/67] =?UTF-8?q?Change=20No=20to=20N=C2=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This change was made in address section in "No da casa/house number". --- openmrs/i18n/registration/locale_pt_BR.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openmrs/i18n/registration/locale_pt_BR.json b/openmrs/i18n/registration/locale_pt_BR.json index 8a88b23196..c8d003f837 100755 --- a/openmrs/i18n/registration/locale_pt_BR.json +++ b/openmrs/i18n/registration/locale_pt_BR.json @@ -38,7 +38,7 @@ "ADDRESS_AVENUE_STREET_LOCALE":"Avenida/Rua", "ADDRESS_BLOCK_LOCALE":"Quarteirão", "ADDRESS_FLOOR_FLAT_LOCALE":"Andar/Flat", - "ADDRESS_HOUSE_NUMBER_LOCALE":"No da Casa", + "ADDRESS_HOUSE_NUMBER_LOCALE":"Nº da Casa", "ADDRESS_POVOADO_ALDEIA_NUMBER_LOCALE":"Povoado/Aldeia", "REGISTRATION_CONTACT_INFORMATION":"Contactos" } From 7e6e9e20908afccbf2a6ab44e15b155c11de63fa Mon Sep 17 00:00:00 2001 From: Simao Mazive Date: Fri, 10 May 2019 10:04:39 +0200 Subject: [PATCH 39/67] MPOC-239 Allow to Capture special character Name Fields I just updated regex expression on openmrs and on my json file. --- openmrs/apps/registration/app.json | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/openmrs/apps/registration/app.json b/openmrs/apps/registration/app.json index 13686e58f1..35080ee826 100755 --- a/openmrs/apps/registration/app.json +++ b/openmrs/apps/registration/app.json @@ -116,16 +116,15 @@ "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"}, - "latitude" : {"pattern" : "[a-zA-Z]{0,}", "errorMessage" : "Should contain 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"}, + "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,-,(,)"} - }, "patientSearchResults": { "address": { From 3300ec5b1ff3c0ecc6cd0a65583dec8e283ce991 Mon Sep 17 00:00:00 2001 From: Amol Chavan Date: Mon, 13 May 2019 09:57:07 +0530 Subject: [PATCH 40/67] Amol | Updated clinical module files for clinical Demo --- openmrs/apps/clinical/app.json | 25 +- openmrs/apps/clinical/dashboard.json | 468 ++++++++++++++++-- openmrs/apps/clinical/extension-programs.json | 50 +- openmrs/apps/clinical/extension.json | 38 +- openmrs/apps/clinical/visit.json | 49 +- 5 files changed, 456 insertions(+), 174 deletions(-) diff --git a/openmrs/apps/clinical/app.json b/openmrs/apps/clinical/app.json index 5038824e43..d7029b2063 100755 --- a/openmrs/apps/clinical/app.json +++ b/openmrs/apps/clinical/app.json @@ -1,6 +1,10 @@ { "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" @@ -20,7 +24,6 @@ ], "config": { "hideConditions": false, - "enableRadiologyOrderOptions":["Urgent","NeedsPrint"], "enableLabOrderOptions":["Urgent", "NeedsPrint"], "quickPrints":false, "networkConnectivity" : { @@ -40,8 +43,11 @@ "ID_Number": { "required" : true }, - "Stage": { - "excludeFrom": ["ART","TB Program","PTV program"] + "Co-morbidites": { + "excludeFrom": ["HIV Program"] + }, + "Doctor": { + "excludeFrom": ["TB Program"] } }, "patientContext": { @@ -51,11 +57,10 @@ "Stage" ], "personAttributes": [ - "class", - "caste" + ], "additionalPatientIdentifiers": [ - "National ID" + ], "preferredIdentifier": "Id_Number" }, @@ -65,9 +70,7 @@ "Patient file" ], "otherInvestigationsMap": { - "Radiology": "Radiology Order", - "Endoscopy": "Endoscopy Order" - }, + }, "allowConsultationWhenNoOpenVisit": false, "defaultVisitType": "OPD", "visitTypeForRetrospectiveEntries": "Special OPD", @@ -106,10 +109,6 @@ "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 index 271a6b2db0..6bb8d13df2 100755 --- a/openmrs/apps/clinical/dashboard.json +++ b/openmrs/apps/clinical/dashboard.json @@ -1,60 +1,319 @@ -{ - "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" ] }, - "navigationLinksControl":{ + "diagnosis":{ + "translationKey":"DASHBOARD_TITLE_DIAGNOSIS_KEY", + "type":"diagnosis", + "showCertainty":true, + "showOrder":true, + "showDetailsButton":true, + "displayOrder":1 + }, + "navigationLinksControl":{ "translationKey":"DASHBOARD_TITLE_NAVIGATION_LINKS_CONTROL_KEY", "type":"navigationLinksControl", "displayOrder":2, - "showLinks":[ + "showLinks":[ "home", + "visit", "registration", "enrolment" ] }, + + "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 + } + }, - - - "programs":{ + "programs":{ "translationKey":"DASHBOARD_TITLE_PROGRAMS_KEY", "type":"programs", "displayOrder":10 }, - - - + "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 + } + }, - "visits":{ + "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":[ + + ] + } + } + }, + + "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":{ "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" + ] + } + } + }, + + "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, @@ -65,17 +324,26 @@ } } }, - "trends":{ + "trends":{ "translationKey":"DASHBOARD_TAB_TRENDS_KEY", "maxRecentlyViewedPatients":10, - "sections":{ - "patientInformation":{ + "sections":{ + "patientInformation":{ "translationKey":"DASHBOARD_TITLE_PATIENT_INFORMATION_KEY", "type":"patientInformation", - "patientAttributes":[ + "patientAttributes":[ + "caste", + "class", + "education", + "occupation", + "debt", + "distanceFromCenter", + "isUrban", + "cluster", + "RationCard", "familyIncome" ], - "addressFields":[ + "addressFields":[ "address1", "address2", "cityVillage", @@ -83,11 +351,11 @@ ], "displayOrder":0 }, - "growthChart":{ + "growthChart":{ "type":"observationGraph", "translationKey": "DASHBOARD_TITLE_GROWTH_CHART", - "config":{ - "yAxisConcepts":[ + "config":{ + "yAxisConcepts":[ "Weight" ], "referenceData":"growthChartReference.csv", @@ -95,11 +363,24 @@ }, "displayOrder":1 }, - "weight/BMI":{ + "BP":{ + "type":"observationGraph", + "translationKey": "DASHBOARD_TITLE_BLOOD_PRESSURE", + "config":{ + "yAxisConcepts":[ + "Systolic Data", + "Diastolic Data" + ], + "xAxisConcept":"observationDateTime", + "numberOfVisits":10 + }, + "displayOrder":2 + }, + "weight/BMI":{ "type":"observationGraph", "translationKey": "DASHBOARD_TITLE_WEIGHT_BMI", - "config":{ - "yAxisConcepts":[ + "config":{ + "yAxisConcepts":[ "Weight", "BMI" ], @@ -107,15 +388,132 @@ "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":{ + + "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 index 566d1b07bf..94522add10 100755 --- a/openmrs/apps/clinical/extension-programs.json +++ b/openmrs/apps/clinical/extension-programs.json @@ -1,45 +1,5 @@ { - "bahmniClinicalPatientsSearchActivePatientsForPrograms": { - "id": "bahmni.clinical.patients.search.activePatientsforprograms", - "extensionPointId": "org.bahmni.patient.search", - "type": "config", - "extensionParams": { - "searchHandler": "emrapi.sqlSearch.activePatientsallprogram", - "translationKey": "MODULE_LABEL_ALL_PROGRAMS_KEY", - "forwardUrl": "#/programs/patient/{{patientUuid}}/consultationContext" - }, - "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", "extensionPointId": "org.bahmni.patient.search", @@ -49,7 +9,7 @@ "forwardUrl": "#/programs/patient/{{patientUuid}}/consultationContext" }, "label": "All", - "order": 4, + "order": 2, "requiredPrivilege": "app:clinical" }, "bahmniClinicalConceptSetGroupObservationsHistory": { @@ -90,7 +50,6 @@ "order": 3, "requiredPrivilege": "app:clinical" }, - "bahmniClinicalConceptSetGroupObservationsObstetrics": { "id": "bahmni.clinical.conceptSetGroup.observations.obstetrics", "extensionPointId": "org.bahmni.clinical.conceptSetGroup.observations", @@ -133,11 +92,6 @@ "order": 1, "requiredPrivilege": "app:clinical:observationTab" }, - - - - - "diagnosis": { "id": "bahmni.clinical.consultation.diagnosis", "extensionPointId": "org.bahmni.clinical.consultation.board", @@ -170,4 +124,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 index a990233161..9f90354187 100755 --- 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,6 +57,8 @@ "order": 1, "requiredPrivilege": "app:clinical" }, + + "bahmniClinicalPatientsSearchAllPatients": { "id": "bahmni.clinical.patients.search.allPatients", "extensionPointId": "org.bahmni.patient.search", @@ -137,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", @@ -171,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/visit.json b/openmrs/apps/clinical/visit.json index 2da1e54d73..a62fb1fad0 100755 --- 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" - ] - } - } + } } From 883813a41b96e75f16a957d3e6ba69d2a59c4f7d Mon Sep 17 00:00:00 2001 From: Amol Chavan Date: Mon, 13 May 2019 16:49:51 +0530 Subject: [PATCH 41/67] Amol | Implemented clinical module translation --- openmrs/i18n/clinical/locale_pt_BR.json | 154 ++++++++++++------------ 1 file changed, 80 insertions(+), 74 deletions(-) diff --git a/openmrs/i18n/clinical/locale_pt_BR.json b/openmrs/i18n/clinical/locale_pt_BR.json index b0b22d02d2..d1d0348c73 100755 --- a/openmrs/i18n/clinical/locale_pt_BR.json +++ b/openmrs/i18n/clinical/locale_pt_BR.json @@ -1,75 +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", - "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" -} +"MODULE_LABEL_ACTIVE_KEY":"Activar", +"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":"Tratamentos", +"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":"Sinais Vitais", +"DASHBOARD_TITLE_PATIENT_INFORMATION_KEY":"Informações do Paciente", +"DASHBOARD_TITLE_BACTERIOLOGY_RESULTS_KEY":"Resultados Bacteriologia", +"DASHBOARD_TITLE_FORMS_DISPLAY_CONTROL_KEY":"Formulários", +"DASHBOARD_TITLE_GROWTH_CHART":"Gráfico de Evolução", +"DASHBOARD_TITLE_BLOOD_PRESSURE":"Pressão Sanguínea", +"DASHBOARD_TITLE_WEIGHT_BMI":"Peso/IMC", +"DASHBOARD_TITLE_DIABETES_BLOOD_SUGAR":"Diabetes/Açucar no Sangue", +"DASHBOARD_TITLE_PULSE":"Pulsação", +"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", +"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", +"CLINICAL_ORDER_RADIOLOGY_NEED_PRINT":" Precisa de impressão para este pedido", +"CLINICAL_ORDER_RADIOLOGY_NEED_PRINT_BUTTON":" Precisa de impressão", +"CONSULTATION_PAGE_KEY":"Consulta", +"PROGRAM_MANAGEMENT_PAGE_KEY":"Pág. Gestão do 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":"Painel Inicial", +"MEDICATION_CHANGE_DURATION_BUTTON":"Alterar Duração", +"DASHBOARD_TITLE_Consultation_KEY":"Notas da Consulta", +"DASHBOARD_TITLE_APPOINTMENTS_KEY":"Marcações", +"DASHBOARD_APPOINTMENTS_SLOT_KEY":"Grupo", +"DASHBOARD_APPOINTMENTS_SERVICE_KEY":"Serviço", +"DASHBOARD_APPOINTMENTS_SERVICE_TYPE_KEY":"Tipo de Serviço Marcação", +"DASHBOARD_APPOINTMENTS_DATE_KEY":"Data", +"DASHBOARD_APPOINTMENTS_PROVIDER_KEY":"Provedor", +"DASHBOARD_APPOINTMENTS_STATUS_KEY":"Estado", +"DASHBOARD_PAST_APPOINTMENTS_KEY":"Marcações passadas", +"DASHBOARD_UPCOMING_APPOINTMENTS_KEY":"Próximos marcações", +"DASHBOARD_UPCOMING_APPOINTMENTS_KEY_LINK":"Visualização em Lista", +"DASHBOARD_NO_PAST_APPOINTMENTS_KEY":"Nenhum compromisso anterior", +"DASHBOARD_NO_UPCOMING_APPOINTMENTS_KEY":"Sem Próxima Marcação", +"MODULE_LABEL_ART_PROGRAMS_KEY":"Programa HIV", +"MODULE_LABEL_TB_PROGRAMS_KEY":"Programa TB", +"MODULE_LABEL_ALL_PROGRAMS_KEY":"Todos Programas" +} \ No newline at end of file From 84356332836e66b3e432dd72190434f0594c0e41 Mon Sep 17 00:00:00 2001 From: amosh101 Date: Wed, 15 May 2019 11:32:08 +0200 Subject: [PATCH 42/67] Amos | MPOC 248 --- openmrs/apps/registration/app.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openmrs/apps/registration/app.json b/openmrs/apps/registration/app.json index 35080ee826..0403eeeba1 100755 --- a/openmrs/apps/registration/app.json +++ b/openmrs/apps/registration/app.json @@ -77,7 +77,7 @@ "defaultVisitType": "FIRST CONSULTATION", "searchByIdForwardUrl": "/patient/{{patientUuid}}", "afterVisitSaveForwardUrl": "../registration/index.html#/search", - "showMiddleName": false, + "showMiddleName": true, "showLastName": true, "isLastNameMandatory": true, "showSaveConfirmDialog": false, From e856c5471e98c79757bce99dd6246b0eb5514b27 Mon Sep 17 00:00:00 2001 From: Amol Chavan Date: Thu, 16 May 2019 12:49:43 +0530 Subject: [PATCH 43/67] Amol | Added form condition for MPOC-252 --- openmrs/apps/clinical/formConditions.js | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/openmrs/apps/clinical/formConditions.js b/openmrs/apps/clinical/formConditions.js index 9179a948a4..0ee4aa6faa 100755 --- a/openmrs/apps/clinical/formConditions.js +++ b/openmrs/apps/clinical/formConditions.js @@ -12,6 +12,30 @@ Bahmni.ConceptSet.FormConditions.rules = { } } }, + 'PP_Key_population' : function (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' : function (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']; From 687d0c1edd9c9ac2226cd9211f77edb093b93950 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Am=C3=B3s?= <49514817+amosh101@users.noreply.github.com> Date: Thu, 16 May 2019 11:02:48 +0200 Subject: [PATCH 44/67] Amos | MPOC 222 add search attribute field (#36) --- openmrs/apps/registration/app.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/openmrs/apps/registration/app.json b/openmrs/apps/registration/app.json index 0403eeeba1..bdac3c180b 100755 --- a/openmrs/apps/registration/app.json +++ b/openmrs/apps/registration/app.json @@ -134,7 +134,8 @@ "fields": [ "NICK_NAME", "PATIENT_STATUS", - "PRIMARY_CONTACT_NUMBER_1" + "PRIMARY_CONTACT_NUMBER_1", + "US_REG_DATE" ] } }, From e01772fd9901e910e74df0636831a97cf16e9502 Mon Sep 17 00:00:00 2001 From: Sushant Patil Date: Mon, 20 May 2019 13:19:54 +0530 Subject: [PATCH 45/67] Sushant Patil | MPOC-16 Observation Form Anamnesis --- openmrs/apps/clinical/app.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/openmrs/apps/clinical/app.json b/openmrs/apps/clinical/app.json index d7029b2063..c78d2a29e5 100755 --- a/openmrs/apps/clinical/app.json +++ b/openmrs/apps/clinical/app.json @@ -84,6 +84,9 @@ "durationRequired": false, "allowAddMore": true }, + "Probable delivery date": { + "allowFutureDates":true + }, "Tuberculosis, Adverse Effects" :{ "multiSelect" : true, "autocomplete" : true From e61e1ba3eb38698cc80975bb378461fd6ee80749 Mon Sep 17 00:00:00 2001 From: Amol Chavan Date: Mon, 20 May 2019 20:08:08 +0530 Subject: [PATCH 46/67] Amol | Added Conduct obs form condition for Family planning --- openmrs/apps/clinical/formConditions.js | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/openmrs/apps/clinical/formConditions.js b/openmrs/apps/clinical/formConditions.js index 9179a948a4..c7cd8a0415 100755 --- a/openmrs/apps/clinical/formConditions.js +++ b/openmrs/apps/clinical/formConditions.js @@ -12,6 +12,24 @@ Bahmni.ConceptSet.FormConditions.rules = { } } }, + 'Conduct_Family_planning' : function (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"] + } + } + }, 'Systolic Data' : function (formName, formFieldValues) { var systolic = formFieldValues['Systolic']; var diastolic = formFieldValues['Diastolic']; From 970b7d1b834ffaed75cc3b5a7735e762fd216ee1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Edg=C3=AAncio=20da=20Calista?= Date: Tue, 21 May 2019 14:24:10 +0200 Subject: [PATCH 47/67] Removes Address Fields Validation --- openmrs/apps/registration/app.json | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/openmrs/apps/registration/app.json b/openmrs/apps/registration/app.json index bdac3c180b..a6f08af129 100755 --- a/openmrs/apps/registration/app.json +++ b/openmrs/apps/registration/app.json @@ -118,13 +118,7 @@ "landHolding" : {"pattern" : "[0-9]{0,3}", "errorMessage" : "Should be between 1 to 999 acres"}, "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"}, - "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,-,(,)"} + "middleName" : {"pattern" : "[a-záàãâéèêẽíìóòõôúùçA-ZÁÀÃÂÉÈÊẼÍÌÓÒÔÕÚÙÇ]{0,}", "errorMessage" : "Should contain characters"} }, "patientSearchResults": { "address": { From f3cfd623802b12f910baabd5a9ff254de2e6a66f Mon Sep 17 00:00:00 2001 From: Sushant Patil Date: Wed, 22 May 2019 11:20:03 +0530 Subject: [PATCH 48/67] Sushant Patil | MPOC-260 Observation Form Anamnesis --- openmrs/apps/clinical/app.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openmrs/apps/clinical/app.json b/openmrs/apps/clinical/app.json index c78d2a29e5..dd62e6113b 100755 --- a/openmrs/apps/clinical/app.json +++ b/openmrs/apps/clinical/app.json @@ -84,7 +84,7 @@ "durationRequired": false, "allowAddMore": true }, - "Probable delivery date": { + "Probable delivery date": { "allowFutureDates":true }, "Tuberculosis, Adverse Effects" :{ From 0f121c16598727b196cb7c3de301df48c63b4c0a Mon Sep 17 00:00:00 2001 From: Amol Chavan Date: Wed, 22 May 2019 13:46:56 +0530 Subject: [PATCH 49/67] Amol | Upadetd formConditions.js format --- openmrs/apps/clinical/formConditions.js | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/openmrs/apps/clinical/formConditions.js b/openmrs/apps/clinical/formConditions.js index 0ee4aa6faa..c4107e3226 100755 --- 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) { + 'Diastolic Data': function(formName, formFieldValues) { var systolic = formFieldValues['Systolic']; var diastolic = formFieldValues['Diastolic']; if (systolic || diastolic) { @@ -12,9 +12,9 @@ Bahmni.ConceptSet.FormConditions.rules = { } } }, - 'PP_Key_population' : function (formName, formFieldValues) { + 'PP_Key_population': function(formName, formFieldValues) { var dia = formFieldValues['PP_Key_population']; - if (dia == "PP_Key_population_Yes") { + if (dia == "PP_Key_population_Yes") { return { show: ["PP_If_Key_population_yes"] } @@ -23,10 +23,10 @@ Bahmni.ConceptSet.FormConditions.rules = { hide: ["PP_If_Key_population_yes"] } } - }, - 'PP_Vulnerable_Population' : function (formName, formFieldValues) { + }, + 'PP_Vulnerable_Population': function(formName, formFieldValues) { var dia = formFieldValues['PP_Vulnerable_Population']; - if (dia == "PP_Vulnerable_Population_Yes") { + if (dia == "PP_Vulnerable_Population_Yes") { return { show: ["PP_IF_Vulnerable_Population_Yes"] } @@ -35,8 +35,8 @@ Bahmni.ConceptSet.FormConditions.rules = { hide: ["PP_IF_Vulnerable_Population_Yes"] } } - }, - 'Systolic Data' : function (formName, formFieldValues) { + }, + 'Systolic Data': function(formName, formFieldValues) { var systolic = formFieldValues['Systolic']; var diastolic = formFieldValues['Diastolic']; if (systolic || diastolic) { From 543c19efb2066dc4512a631ca53fb54a23e96525 Mon Sep 17 00:00:00 2001 From: Amol Chavan Date: Wed, 22 May 2019 14:06:50 +0530 Subject: [PATCH 50/67] Amol | Upadetd formConditions.js format --- openmrs/apps/clinical/formConditions.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/openmrs/apps/clinical/formConditions.js b/openmrs/apps/clinical/formConditions.js index c4107e3226..2dad6516bb 100755 --- a/openmrs/apps/clinical/formConditions.js +++ b/openmrs/apps/clinical/formConditions.js @@ -12,9 +12,9 @@ Bahmni.ConceptSet.FormConditions.rules = { } } }, - 'PP_Key_population': function(formName, formFieldValues) { - var dia = formFieldValues['PP_Key_population']; - if (dia == "PP_Key_population_Yes") { + "PP_Key_population": function(formName, formFieldValues) { + var dia = formFieldValues["PP_Key_population"]; + if (dia === "PP_Key_population_Yes") { return { show: ["PP_If_Key_population_yes"] } @@ -24,9 +24,9 @@ Bahmni.ConceptSet.FormConditions.rules = { } } }, - 'PP_Vulnerable_Population': function(formName, formFieldValues) { - var dia = formFieldValues['PP_Vulnerable_Population']; - if (dia == "PP_Vulnerable_Population_Yes") { + "PP_Vulnerable_Population": function(formName, formFieldValues) { + var dia = formFieldValues["PP_Vulnerable_Population"]; + if (dia === "PP_Vulnerable_Population_Yes") { return { show: ["PP_IF_Vulnerable_Population_Yes"] } From c8b6fd8c481edbacfd180c7776497af97726d417 Mon Sep 17 00:00:00 2001 From: Amol Chavan Date: Wed, 22 May 2019 14:14:13 +0530 Subject: [PATCH 51/67] Amol | Upadetd formConditions.js format --- openmrs/apps/clinical/formConditions.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/openmrs/apps/clinical/formConditions.js b/openmrs/apps/clinical/formConditions.js index 2dad6516bb..a580d32b7f 100755 --- a/openmrs/apps/clinical/formConditions.js +++ b/openmrs/apps/clinical/formConditions.js @@ -12,7 +12,7 @@ Bahmni.ConceptSet.FormConditions.rules = { } } }, - "PP_Key_population": function(formName, formFieldValues) { + "PP_Key_population" (formName, formFieldValues) { var dia = formFieldValues["PP_Key_population"]; if (dia === "PP_Key_population_Yes") { return { @@ -24,7 +24,7 @@ Bahmni.ConceptSet.FormConditions.rules = { } } }, - "PP_Vulnerable_Population": function(formName, formFieldValues) { + "PP_Vulnerable_Population" (formName, formFieldValues) { var dia = formFieldValues["PP_Vulnerable_Population"]; if (dia === "PP_Vulnerable_Population_Yes") { return { From fea2993c28eaa11df93d8a89af1f1a0e66da7b01 Mon Sep 17 00:00:00 2001 From: Amol Chavan Date: Wed, 22 May 2019 15:11:03 +0530 Subject: [PATCH 52/67] Amol | Upadetd formConditions.js format --- openmrs/apps/clinical/formConditions.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/openmrs/apps/clinical/formConditions.js b/openmrs/apps/clinical/formConditions.js index c7cd8a0415..809630a3b6 100755 --- a/openmrs/apps/clinical/formConditions.js +++ b/openmrs/apps/clinical/formConditions.js @@ -12,9 +12,9 @@ Bahmni.ConceptSet.FormConditions.rules = { } } }, - 'Conduct_Family_planning' : function (formName, formFieldValues) { - var yes = formFieldValues['Conduct_Family_planning']; - if (yes == "Conduct_Family_planning_Yes") { + "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", From 45fc602c9aa4c531b52876c236bfd2b8b7ec9bed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Edg=C3=AAncio=20da=20Calista?= Date: Wed, 22 May 2019 12:03:00 +0200 Subject: [PATCH 53/67] Improves validation rules (allows special characters input) --- openmrs/apps/registration/app.json | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/openmrs/apps/registration/app.json b/openmrs/apps/registration/app.json index a6f08af129..8ca93830f4 100755 --- a/openmrs/apps/registration/app.json +++ b/openmrs/apps/registration/app.json @@ -118,7 +118,11 @@ "landHolding" : {"pattern" : "[0-9]{0,3}", "errorMessage" : "Should be between 1 to 999 acres"}, "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"} + "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"}, + "postalCode" : {"pattern" : "[a-záàãâéèêẽíìóòõôúùçA-ZÁÀÃÂÉÈÊẼÍÌÓÒÔÕÚÙÇ0-9_-]*", "errorMessage" : "Should contain characters"} }, "patientSearchResults": { "address": { From fae2ffb6edaeeed27e81eca6f4fc4df2d0bfa9f3 Mon Sep 17 00:00:00 2001 From: Sushant Patil Date: Wed, 22 May 2019 15:38:09 +0530 Subject: [PATCH 54/67] Sushant Patil | MPOC-236 Group V-Screening / Prophylaxis --- openmrs/apps/clinical/app.json | 99 +++++++++++++++++--- openmrs/apps/clinical/formConditions.js | 114 ++++++++++++++++++++++++ 2 files changed, 199 insertions(+), 14 deletions(-) diff --git a/openmrs/apps/clinical/app.json b/openmrs/apps/clinical/app.json index d7029b2063..077b82916d 100755 --- a/openmrs/apps/clinical/app.json +++ b/openmrs/apps/clinical/app.json @@ -35,7 +35,7 @@ { "locale" : "pt", "css": "offline-language-portuguese-brazil"} ] }, - "diagnosisStatus": "Inactive", + "diagnosisStatus": "Inactive", "program": { "patientInformation": { "ageLimit": 100 @@ -51,19 +51,19 @@ } }, "patientContext": { - "programAttributes": [ - "Id_Number", - "Doctor", - "Stage" - ], - "personAttributes": [ - - ], - "additionalPatientIdentifiers": [ - - ], - "preferredIdentifier": "Id_Number" - }, + "programAttributes": [ + "Id_Number", + "Doctor", + "Stage" + ], + "personAttributes": [ + + ], + "additionalPatientIdentifiers": [ + + ], + "preferredIdentifier": "Id_Number" + }, "obsIgnoreList": [ "REGISTRATION FEES", "COMMENTS", @@ -84,6 +84,77 @@ "durationRequired": false, "allowAddMore": 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, "autocomplete" : true diff --git a/openmrs/apps/clinical/formConditions.js b/openmrs/apps/clinical/formConditions.js index 9179a948a4..7ef96c08a8 100755 --- a/openmrs/apps/clinical/formConditions.js +++ b/openmrs/apps/clinical/formConditions.js @@ -12,6 +12,120 @@ Bahmni.ConceptSet.FormConditions.rules = { } } }, + "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 = new Array(); + var returnHideValue = new Array(); + if (dia && dia.length) { + + 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 + } + + } else { + + return { + hide: ["CTZ_Details", "INH_Details", "Fluconazol_Details"] + + } + } +}, 'Systolic Data' : function (formName, formFieldValues) { var systolic = formFieldValues['Systolic']; var diastolic = formFieldValues['Diastolic']; From d7bcf7f88f60184132d5ea0abc6d29711d6d91a2 Mon Sep 17 00:00:00 2001 From: Sushant Patil Date: Wed, 22 May 2019 15:53:24 +0530 Subject: [PATCH 55/67] Sushant Patil | MPOC-236 Group V-Screening / Prophylaxis --- openmrs/apps/clinical/formConditions.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/openmrs/apps/clinical/formConditions.js b/openmrs/apps/clinical/formConditions.js index 7ef96c08a8..6382e58e01 100755 --- a/openmrs/apps/clinical/formConditions.js +++ b/openmrs/apps/clinical/formConditions.js @@ -54,7 +54,7 @@ Bahmni.ConceptSet.FormConditions.rules = { } }, "Received nutritional support" (formName, formFieldValues) { - var dia = formFieldValues['Received nutritional support']; + var dia = formFieldValues["Received nutritional support"]; if (dia === true) { return { @@ -83,8 +83,8 @@ Bahmni.ConceptSet.FormConditions.rules = { }, "Type_Prophylaxis" (formName, formFieldValues) { var dia = formFieldValues["Type_Prophylaxis"]; - var returnShowValue = new Array(); - var returnHideValue = new Array(); + var returnShowValue = []; + var returnHideValue = []; if (dia && dia.length) { if (dia.includes("INH")) { From 41a732ca6ef0c9262aa0349b70846f940b15be11 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Edg=C3=AAncio=20da=20Calista?= Date: Wed, 22 May 2019 12:26:53 +0200 Subject: [PATCH 56/67] Allows semi-colon and colons --- openmrs/apps/registration/app.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/openmrs/apps/registration/app.json b/openmrs/apps/registration/app.json index 8ca93830f4..6b125b7211 100755 --- a/openmrs/apps/registration/app.json +++ b/openmrs/apps/registration/app.json @@ -119,10 +119,10 @@ "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"}, - "postalCode" : {"pattern" : "[a-záàãâéèêẽíìóòõôúùçA-ZÁÀÃÂÉÈÊẼÍÌÓÒÔÕÚÙÇ0-9_-]*", "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"}, + "postalCode" : {"pattern" : "[a-záàãâéèêẽíìóòõôúùçA-ZÁÀÃÂÉÈÊẼÍÌÓÒÔÕÚÙÇ0-9_-;,:.]*", "errorMessage" : "Should contain characters"} }, "patientSearchResults": { "address": { From 95091f40c81f5f5ed63341a18940c5d51fb715f2 Mon Sep 17 00:00:00 2001 From: Sushant Patil Date: Wed, 22 May 2019 17:05:26 +0530 Subject: [PATCH 57/67] Sushant Patil | MPOC-236 Group V-Screening / Prophylaxis --- openmrs/apps/clinical/formConditions.js | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/openmrs/apps/clinical/formConditions.js b/openmrs/apps/clinical/formConditions.js index 6382e58e01..1ab03b53e2 100755 --- a/openmrs/apps/clinical/formConditions.js +++ b/openmrs/apps/clinical/formConditions.js @@ -85,7 +85,7 @@ Bahmni.ConceptSet.FormConditions.rules = { var dia = formFieldValues["Type_Prophylaxis"]; var returnShowValue = []; var returnHideValue = []; - if (dia && dia.length) { + if (dia.includes("INH")) { @@ -118,13 +118,8 @@ Bahmni.ConceptSet.FormConditions.rules = { hide: returnHideValue } - } else { - - return { - hide: ["CTZ_Details", "INH_Details", "Fluconazol_Details"] - - } - } + + }, 'Systolic Data' : function (formName, formFieldValues) { var systolic = formFieldValues['Systolic']; @@ -136,7 +131,7 @@ Bahmni.ConceptSet.FormConditions.rules = { } else { return { disable: ["Posture"] - } + }; } } }; \ No newline at end of file From 1603b2e9449b73a349d702e79a6636591e437e06 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Edg=C3=AAncio=20da=20Calista?= Date: Thu, 23 May 2019 10:44:17 +0200 Subject: [PATCH 58/67] Puts back the validation pattern for address6 --- openmrs/apps/registration/app.json | 1 + 1 file changed, 1 insertion(+) diff --git a/openmrs/apps/registration/app.json b/openmrs/apps/registration/app.json index 6b125b7211..62ce226b90 100755 --- a/openmrs/apps/registration/app.json +++ b/openmrs/apps/registration/app.json @@ -122,6 +122,7 @@ "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"} }, "patientSearchResults": { From b3981ef50689750b47be23b13310b35def8246b1 Mon Sep 17 00:00:00 2001 From: krishnanspace Date: Thu, 23 May 2019 15:30:42 +0530 Subject: [PATCH 59/67] Krishnan | MPOC-265 Observation form Group IX-Reference --- openmrs/apps/clinical/formConditions.js | 26 +++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/openmrs/apps/clinical/formConditions.js b/openmrs/apps/clinical/formConditions.js index a580d32b7f..c8def07c8b 100755 --- a/openmrs/apps/clinical/formConditions.js +++ b/openmrs/apps/clinical/formConditions.js @@ -48,5 +48,31 @@ Bahmni.ConceptSet.FormConditions.rules = { disable: ["Posture"] } } + }, + 'Reference_Other_Services' : function (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' : function (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"] + } + } } }; \ No newline at end of file From c5e9271bdb4a2f7026cd433b48058de2cbb1e0c0 Mon Sep 17 00:00:00 2001 From: krishnanspace Date: Thu, 23 May 2019 15:36:20 +0530 Subject: [PATCH 60/67] Krishnan | Corrected the codacy errors --- openmrs/apps/clinical/formConditions.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/openmrs/apps/clinical/formConditions.js b/openmrs/apps/clinical/formConditions.js index c8def07c8b..d8c8389516 100755 --- a/openmrs/apps/clinical/formConditions.js +++ b/openmrs/apps/clinical/formConditions.js @@ -49,7 +49,7 @@ Bahmni.ConceptSet.FormConditions.rules = { } } }, - 'Reference_Other_Services' : function (formName, formFieldValues) { + "Reference_Other_Services" (formName, formFieldValues) { var value = formFieldValues["Reference_Other_Services"]; if (value === "Reference_Other") { @@ -62,7 +62,7 @@ Bahmni.ConceptSet.FormConditions.rules = { } } }, - 'Reference_Eligible' : function (formName, formFieldValues) { + "Reference_Eligible" (formName, formFieldValues) { var value = formFieldValues["Reference_Eligible"]; if (value) { From ece1d199b0c0509d407ebd6d74ab5a9869ee44a8 Mon Sep 17 00:00:00 2001 From: Simao Mazive Date: Thu, 23 May 2019 13:26:52 +0200 Subject: [PATCH 61/67] MPOC-279 Update approach for Visit Details Bug Fix with boolean buttons. --- openmrs/apps/registration/app.json | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/openmrs/apps/registration/app.json b/openmrs/apps/registration/app.json index bdac3c180b..bfa72b588d 100755 --- a/openmrs/apps/registration/app.json +++ b/openmrs/apps/registration/app.json @@ -104,10 +104,23 @@ "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" From a4f72b6907af003fb708e443e55fb9e2cf27622c Mon Sep 17 00:00:00 2001 From: Amol Chavan Date: Thu, 23 May 2019 17:41:14 +0530 Subject: [PATCH 62/67] Amol | Formated form Conditions js --- openmrs/apps/clinical/formConditions.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openmrs/apps/clinical/formConditions.js b/openmrs/apps/clinical/formConditions.js index d8c8389516..62b3996cf0 100755 --- a/openmrs/apps/clinical/formConditions.js +++ b/openmrs/apps/clinical/formConditions.js @@ -1,4 +1,4 @@ -Bahmni.ConceptSet.FormConditions.rules = { +Bahmni.ConceptSet.FormConditions.rulesOverride = { 'Diastolic Data': function(formName, formFieldValues) { var systolic = formFieldValues['Systolic']; var diastolic = formFieldValues['Diastolic']; From 989248ca713280473ea4c7f0bbd6b454a2bde033 Mon Sep 17 00:00:00 2001 From: joaomachiana Date: Thu, 23 May 2019 17:31:34 +0200 Subject: [PATCH 63/67] MPOC-209 fixed translations for clinical module --- openmrs/i18n/clinical/locale_pt_BR.json | 136 ++++++++++++------------ 1 file changed, 68 insertions(+), 68 deletions(-) diff --git a/openmrs/i18n/clinical/locale_pt_BR.json b/openmrs/i18n/clinical/locale_pt_BR.json index d1d0348c73..472ffee29a 100755 --- a/openmrs/i18n/clinical/locale_pt_BR.json +++ b/openmrs/i18n/clinical/locale_pt_BR.json @@ -1,81 +1,81 @@ { -"MODULE_LABEL_ACTIVE_KEY":"Activar", -"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":"Tratamentos", -"DASHBOARD_TITLE_DISPOSITION_KEY":"Terapêutica", +"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":"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_ADMISSION_DETAILS_KEY":"Detalhes Admissão", -"DASHBOARD_TITLE_NUTRITIONAL_VALUES_KEY":"Valores Nutricionais", -"DASHBOARD_TITLE_SECOND_VITALS_KEY":"Segundo Vitais", +"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":"Cumprimento das 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":"Valores Nutricionais", "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_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":"Marcações", "DASHBOARD_TITLE_VITALS_KEY":"Sinais Vitais", -"DASHBOARD_TITLE_PATIENT_INFORMATION_KEY":"Informações do Paciente", -"DASHBOARD_TITLE_BACTERIOLOGY_RESULTS_KEY":"Resultados Bacteriologia", -"DASHBOARD_TITLE_FORMS_DISPLAY_CONTROL_KEY":"Formulários", -"DASHBOARD_TITLE_GROWTH_CHART":"Gráfico de Evolução", -"DASHBOARD_TITLE_BLOOD_PRESSURE":"Pressão Sanguínea", "DASHBOARD_TITLE_WEIGHT_BMI":"Peso/IMC", -"DASHBOARD_TITLE_DIABETES_BLOOD_SUGAR":"Diabetes/Açucar no Sangue", -"DASHBOARD_TITLE_PULSE":"Pulsação", -"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", +"DASHBOARD_UPCOMING_APPOINTMENTS_KEY_LINK":"Visualização em lista", +"DASHBOARD_UPCOMING_APPOINTMENTS_KEY":"Próximos 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_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_PAGE_KEY":"Pág. Resumo de alta", "DISCHARGE_SUMMARY_TREATMENTS_KEY":"Tratamentos", -"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", -"CLINICAL_ORDER_RADIOLOGY_NEED_PRINT":" Precisa de impressão para este pedido", -"CLINICAL_ORDER_RADIOLOGY_NEED_PRINT_BUTTON":" Precisa de impressão", -"CONSULTATION_PAGE_KEY":"Consulta", -"PROGRAM_MANAGEMENT_PAGE_KEY":"Pág. Gestão do 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":"Painel Inicial", -"MEDICATION_CHANGE_DURATION_BUTTON":"Alterar Duração", -"DASHBOARD_TITLE_Consultation_KEY":"Notas da Consulta", -"DASHBOARD_TITLE_APPOINTMENTS_KEY":"Marcações", -"DASHBOARD_APPOINTMENTS_SLOT_KEY":"Grupo", -"DASHBOARD_APPOINTMENTS_SERVICE_KEY":"Serviço", -"DASHBOARD_APPOINTMENTS_SERVICE_TYPE_KEY":"Tipo de Serviço Marcação", -"DASHBOARD_APPOINTMENTS_DATE_KEY":"Data", -"DASHBOARD_APPOINTMENTS_PROVIDER_KEY":"Provedor", -"DASHBOARD_APPOINTMENTS_STATUS_KEY":"Estado", -"DASHBOARD_PAST_APPOINTMENTS_KEY":"Marcações passadas", -"DASHBOARD_UPCOMING_APPOINTMENTS_KEY":"Próximos marcações", -"DASHBOARD_UPCOMING_APPOINTMENTS_KEY_LINK":"Visualização em Lista", -"DASHBOARD_NO_PAST_APPOINTMENTS_KEY":"Nenhum compromisso anterior", -"DASHBOARD_NO_UPCOMING_APPOINTMENTS_KEY":"Sem Próxima Marcação", +"HOME_DASHBOARD_KEY":"Painel inicial", +"LAB_INVESTIGATIONS_KEY":"Investigações laboratoriais", +"MEDICATION_CHANGE_DURATION_BUTTON":"Alterar duração", +"MEDICATIONS_BOARD_LABEL_KEY":"Medicação", +"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", -"MODULE_LABEL_ALL_PROGRAMS_KEY":"Todos Programas" +"OBSERVATIONS_BOARD_LABEL_KEY":"Observações", +"ORDERS_BOARD_LABEL_KEY":"Pedidos", +"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 From 5324e7ac63c97d8f30849c51445c3fc9026c4df0 Mon Sep 17 00:00:00 2001 From: joaomachiana Date: Thu, 23 May 2019 18:25:19 +0200 Subject: [PATCH 64/67] MPOC-209 fixed translations --- openmrs/i18n/clinical/locale_pt_BR.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/openmrs/i18n/clinical/locale_pt_BR.json b/openmrs/i18n/clinical/locale_pt_BR.json index 472ffee29a..73aa4e6b19 100755 --- a/openmrs/i18n/clinical/locale_pt_BR.json +++ b/openmrs/i18n/clinical/locale_pt_BR.json @@ -61,7 +61,7 @@ "HOME_DASHBOARD_KEY":"Painel inicial", "LAB_INVESTIGATIONS_KEY":"Investigações laboratoriais", "MEDICATION_CHANGE_DURATION_BUTTON":"Alterar duração", -"MEDICATIONS_BOARD_LABEL_KEY":"Medicação", +"MEDICATIONS_BOARD_LABEL_KEY":"Prescrições", "MODULE_LABEL_ACTIVE_KEY":"Activar", "MODULE_LABEL_ACTIVE_PATIENTS_BY_LOCATION":"PacientesPorLocal", "MODULE_LABEL_ALL_KEY":"Todos", @@ -72,10 +72,10 @@ "MODULE_LABEL_PROGRAMS_KEY":"Programas", "MODULE_LABEL_TB_PROGRAMS_KEY":"Programa TB", "OBSERVATIONS_BOARD_LABEL_KEY":"Observações", -"ORDERS_BOARD_LABEL_KEY":"Pedidos", +"ORDERS_BOARD_LABEL_KEY":"Requisições", "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", +"PROGRAM_MANAGEMENT_PAGE_KEY":"Pág. Gestão do programa" } \ No newline at end of file From 29e740521d296e716593657aac16c5d71fc37675 Mon Sep 17 00:00:00 2001 From: joaomachiana Date: Thu, 23 May 2019 18:56:08 +0200 Subject: [PATCH 65/67] MPOC-209 fixed translations --- openmrs/i18n/clinical/locale_pt_BR.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openmrs/i18n/clinical/locale_pt_BR.json b/openmrs/i18n/clinical/locale_pt_BR.json index 73aa4e6b19..83212d4d03 100755 --- a/openmrs/i18n/clinical/locale_pt_BR.json +++ b/openmrs/i18n/clinical/locale_pt_BR.json @@ -72,7 +72,7 @@ "MODULE_LABEL_PROGRAMS_KEY":"Programas", "MODULE_LABEL_TB_PROGRAMS_KEY":"Programa TB", "OBSERVATIONS_BOARD_LABEL_KEY":"Observações", -"ORDERS_BOARD_LABEL_KEY":"Requisiçõ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", From 6e0701415d100c2f8b69cc773ff687016846efe6 Mon Sep 17 00:00:00 2001 From: joaomachiana Date: Fri, 24 May 2019 09:47:41 +0200 Subject: [PATCH 66/67] fixed translations --- openmrs/i18n/clinical/locale_pt_BR.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/openmrs/i18n/clinical/locale_pt_BR.json b/openmrs/i18n/clinical/locale_pt_BR.json index 83212d4d03..eb7c470481 100755 --- a/openmrs/i18n/clinical/locale_pt_BR.json +++ b/openmrs/i18n/clinical/locale_pt_BR.json @@ -19,7 +19,7 @@ "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":"Marcações", +"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", @@ -30,10 +30,10 @@ "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":"Cumprimento das requisições laboratoriais", +"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":"Valores Nutricionais", +"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", @@ -43,11 +43,11 @@ "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":"Marcações", +"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óximos marcações", +"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", From 57be2b540815c5b00bd47c9a260a0c0d788ac2c5 Mon Sep 17 00:00:00 2001 From: Amol Chavan Date: Mon, 27 May 2019 10:38:48 +0530 Subject: [PATCH 67/67] Amol | Removed Add Notes from the Group II-Priority Population --- openmrs/apps/clinical/app.json | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/openmrs/apps/clinical/app.json b/openmrs/apps/clinical/app.json index dd62e6113b..3cf3742eb0 100755 --- a/openmrs/apps/clinical/app.json +++ b/openmrs/apps/clinical/app.json @@ -84,6 +84,21 @@ "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 },