From c842c43e15c3262a7b505070efd9f96ac0ce8531 Mon Sep 17 00:00:00 2001 From: Rasmoss Date: Tue, 19 Nov 2019 21:10:49 -0800 Subject: [PATCH] Amharic registeration page support --- offline/openmrs/apps/clinical/visit.json | 2 +- offline/openmrs/apps/registration/app.json | 24 +++++++++++----------- openmrs/apps/adt/app.json | 2 +- openmrs/apps/clinical/dashboard.json | 4 +--- openmrs/apps/clinical/visit.json | 2 +- openmrs/apps/home/locale_languages.json | 1 + openmrs/apps/ipd/app.json | 2 -- openmrs/apps/registration/app.json | 24 +++++++++++++--------- openmrs/apps/registration/appTemplate.json | 4 ++-- openmrs/apps/reports/reports.json | 2 +- 10 files changed, 34 insertions(+), 33 deletions(-) diff --git a/offline/openmrs/apps/clinical/visit.json b/offline/openmrs/apps/clinical/visit.json index 2da1e54d7..7a90d7a3b 100755 --- a/offline/openmrs/apps/clinical/visit.json +++ b/offline/openmrs/apps/clinical/visit.json @@ -58,7 +58,7 @@ "displayOrder": 0, "config": { "title": "PatientInformation", - "patientAttributes": ["caste", "class", "education", "occupation", "debt", "distanceFromCenter", "isUrban", "cluster","RationCard", "familyIncome"], + "patientAttributes": ["education", "occupation", "debt", "distanceFromCenter", "isUrban","RationCard", "familyIncome"], "addressFields": ["address1", "address2", "cityVillage", "countyDistrict"] } }, diff --git a/offline/openmrs/apps/registration/app.json b/offline/openmrs/apps/registration/app.json index d3bf8688f..1caf80515 100755 --- a/offline/openmrs/apps/registration/app.json +++ b/offline/openmrs/apps/registration/app.json @@ -21,23 +21,22 @@ "additionalPatientInformation": { "title": "Additional Patient Information", "attributes": [ - "distanceFromCenter", - "isUrban", - "cluster", - "RationCard", - "familyIncome", - "debt", - "cluster" + "distanceFromCenter", + "isUrban", + "RationCard", + "familyIncome", + "debt", + "landHolding" ] }, "hidden": { "attributes": [ - "primaryContact" + ] }, "defaults": { "class": "General", - "landHolding": 2 + "landHolding": 0 } }, "addressHierarchy": { @@ -59,6 +58,7 @@ "showMiddleName": true, "showBirthTime": true, "showCasteSameAsLastNameCheckbox": false, + "mandatoryPersonAttributes": ["primaryContact", "emergencyContPhone", "emergencyContName"], "printOptions": [ { "translationKey": "REGISTRATION_PRINT_REG_CARD_LOCAL_KEY", @@ -95,7 +95,7 @@ }, "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"}, + "landHolding" : {"pattern" : "[0-9]{0,3}", "errorMessage" : "Should be between 0 to 999 Hectares"}, "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"}, @@ -108,8 +108,8 @@ "field": "address2" }, "customAttributes": { - "label": "रुग्णाचे नाव", - "placeholder": "रुग्णाचे नाव", + "placeholder": "የታካሚ ስም", + "label": "የታካሚ ስም" "fields": ["givenNameLocal", "middleNameLocal", "familyNameLocal"] } } diff --git a/openmrs/apps/adt/app.json b/openmrs/apps/adt/app.json index 7fa36b947..e4638f4ff 100644 --- a/openmrs/apps/adt/app.json +++ b/openmrs/apps/adt/app.json @@ -61,7 +61,7 @@ "translationKey": "DASHBOARD_TITLE_PATIENT_INFORMATION_KEY", "type": "patientInformation", "displayOrder": 3, - "patientAttributes": ["caste", "class", "education", "occupation", "debt", "distanceFromCenter", "isUrban", "cluster","RationCard", "familyIncome"], + "patientAttributes": ["education", "occupation", "debt", "distanceFromCenter", "RationCard", "familyIncome","isUrban"], "addressFields": ["address1", "address2", "cityVillage", "countyDistrict"] }, "admissionDetails":{ diff --git a/openmrs/apps/clinical/dashboard.json b/openmrs/apps/clinical/dashboard.json index 7febca3b0..47a11dfc1 100644 --- a/openmrs/apps/clinical/dashboard.json +++ b/openmrs/apps/clinical/dashboard.json @@ -411,9 +411,7 @@ "patientInformation":{ "translationKey":"DASHBOARD_TITLE_PATIENT_INFORMATION_KEY", "type":"patientInformation", - "patientAttributes":[ - "caste", - "class", + "patientAttributes":[ "education", "occupation", "debt", diff --git a/openmrs/apps/clinical/visit.json b/openmrs/apps/clinical/visit.json index 2da1e54d7..7a90d7a3b 100644 --- a/openmrs/apps/clinical/visit.json +++ b/openmrs/apps/clinical/visit.json @@ -58,7 +58,7 @@ "displayOrder": 0, "config": { "title": "PatientInformation", - "patientAttributes": ["caste", "class", "education", "occupation", "debt", "distanceFromCenter", "isUrban", "cluster","RationCard", "familyIncome"], + "patientAttributes": ["education", "occupation", "debt", "distanceFromCenter", "isUrban","RationCard", "familyIncome"], "addressFields": ["address1", "address2", "cityVillage", "countyDistrict"] } }, diff --git a/openmrs/apps/home/locale_languages.json b/openmrs/apps/home/locale_languages.json index 78059ef2a..bc0f256f9 100644 --- a/openmrs/apps/home/locale_languages.json +++ b/openmrs/apps/home/locale_languages.json @@ -2,5 +2,6 @@ {"code": "es", "nativeName": "Español"}, {"code": "fr", "nativeName": "Français"}, {"code": "it", "nativeName": "Italiano"}, + {"code": "am", "nativeName": "Amharic"}, {"code": "pt_BR", "nativeName": "Português"}] } \ No newline at end of file diff --git a/openmrs/apps/ipd/app.json b/openmrs/apps/ipd/app.json index 0298372e3..6d5c42111 100644 --- a/openmrs/apps/ipd/app.json +++ b/openmrs/apps/ipd/app.json @@ -35,8 +35,6 @@ "type": "patientInformation", "displayOrder": 0, "patientAttributes": [ - "caste", - "class", "education", "occupation", "debt", diff --git a/openmrs/apps/registration/app.json b/openmrs/apps/registration/app.json index 09474f86a..e2c13042b 100644 --- a/openmrs/apps/registration/app.json +++ b/openmrs/apps/registration/app.json @@ -31,21 +31,23 @@ "attributes": [ "distanceFromCenter", "isUrban", - "cluster", "RationCard", "familyIncome", "debt", - "cluster" - ] + "landHolding" + ], + "canShow":false }, "hidden": { "attributes": [ - "primaryContact" + "caste", + "class", + "cluster" ] }, "defaults": { "class": "General", - "landHolding": 2 + "landHolding": 0 } }, "addressHierarchy": { @@ -58,7 +60,7 @@ }, "autoCompleteFields":["familyName", "caste"], - "defaultIdentifierPrefix": "GAN", + "defaultIdentifierPrefix": "SPH", "defaultVisitType": "OPD", "searchByIdForwardUrl": "/patient/{{patientUuid}}", "showMiddleName": true, @@ -67,6 +69,7 @@ "showSaveConfirmDialog": false, "showBirthTime": true, "showCasteSameAsLastNameCheckbox": false, + "mandatoryPersonAttributes": ["primaryContact", "emergencyContPhone", "emergencyContName"], "printOptions": [ { "translationKey": "REGISTRATION_PRINT_REG_CARD_LOCAL_KEY", @@ -102,8 +105,9 @@ } }, "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"}, + "primaryContact" : {"pattern" : "[0-9]{8,10}", "errorMessage" : "Should be 12 characters starting with area code like 0911 (country code)"}, + "emergencyContPhone" : {"pattern" : "[0-9]{8,10}", "errorMessage" : "Should be 12 characters starting with area code like 0911 (country code)"}, + "landHolding" : {"pattern" : "[0-9]{0,3}", "errorMessage" : "Should be between 0 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"}, @@ -116,8 +120,8 @@ "field": "address2" }, "customAttributes": { - "label": "रुग्णाचे नाव", - "placeholder": "रुग्णाचे नाव", + "label": "የታካሚው ስም", + "placeholder": "የታካሚው ስም", "fields": ["givenNameLocal", "middleNameLocal", "familyNameLocal"] } } diff --git a/openmrs/apps/registration/appTemplate.json b/openmrs/apps/registration/appTemplate.json index 219174016..2b8335f18 100644 --- a/openmrs/apps/registration/appTemplate.json +++ b/openmrs/apps/registration/appTemplate.json @@ -7,8 +7,8 @@ "configOptions": { "autoCompleteFields":{ "name": "autoCompleteFields", - "description": "auto complete fields in patient create page. eg. givenName, familyName, caste, primaryContact, secondaryContact, primaryRelative, secondaryIdentifier", - "defaultValue": ["givenName", "familyName", "caste", "primaryContact", "secondaryContact", "primaryRelative", "secondaryIdentifier"] + "description": "auto complete fields in patient create page. eg. givenName, familyName, primaryContact, emergencyContPhone, primaryRelative, emergencyConName", + "defaultValue": ["givenName", "familyName", "primaryContact", "emergencyContPhone", "primaryRelative", "emergencyConName"] }, "defaultIdentifierPrefix":{ "name": "defaultIdentifierPrefix", diff --git a/openmrs/apps/reports/reports.json b/openmrs/apps/reports/reports.json index 056c565d6..345516bef 100644 --- a/openmrs/apps/reports/reports.json +++ b/openmrs/apps/reports/reports.json @@ -419,7 +419,7 @@ "patientAttributes": [ "education", "primaryContact", - "secondaryContact", + "emergencyContPhone", "class", "cluster" ],