diff --git a/configuration/appframework/adminmetadata/adminui_extension.json b/configuration/appframework/adminmetadata/adminui_extension.json index ace8007..2dd997d 100644 --- a/configuration/appframework/adminmetadata/adminui_extension.json +++ b/configuration/appframework/adminmetadata/adminui_extension.json @@ -1,11 +1,4 @@ [ - { - "id": "${project.parent.groupId}.${project.parent.artifactId}.myAccount.menuItem", - "extensionPointId": "org.openmrs.module.appui.header.userAccount.menuItems", - "type": "link", - "label": "adminui.app.myAccount.label", - "url": "adminui/myaccount/myAccount.page" - }, { "id": "${project.parent.groupId}.${project.parent.artifactId}.accounts", "extensionPointId": "systemAdministration.apps", diff --git a/configuration/appframework/authenticationui/authenticationui_extension.json b/configuration/appframework/authenticationui/authenticationui_extension.json index 565f4ca..47c3ead 100644 --- a/configuration/appframework/authenticationui/authenticationui_extension.json +++ b/configuration/appframework/authenticationui/authenticationui_extension.json @@ -17,8 +17,8 @@ "extensionPointId": "org.openmrs.module.authenticationui.loginPage.config", "type": "config", "extensionParams": { - "show-locations": true, - "require-location": true, + "show-locations": false, + "require-location": false, "allow-password-reset": true, "welcome-message": "Welcome to Rwanda EMR" } diff --git a/configuration/appframework/imbemr/admin_configuration_extension.json b/configuration/appframework/imbemr/admin_configuration_extension.json index 4df70f0..4d67adc 100644 --- a/configuration/appframework/imbemr/admin_configuration_extension.json +++ b/configuration/appframework/imbemr/admin_configuration_extension.json @@ -8,5 +8,15 @@ "icon": "icon-refresh", "requiredPrivilege": "App: coreapps.systemAdministration", "order": 95 + }, + { + "id": "imbemr.adminConfigureLoginLocations", + "extensionPointId": "systemAdministration.apps", + "type": "link", + "label": "imbemr.admin.configureLoginLocations", + "url": "imbemr/admin/configureLoginLocations.page", + "icon": "icon-hospital", + "requiredPrivilege": "App: coreapps.systemAdministration", + "order": 96 } ] \ No newline at end of file diff --git a/configuration/appframework/imbemr/header_extension.json b/configuration/appframework/imbemr/header_extension.json index 147a412..4f740a4 100644 --- a/configuration/appframework/imbemr/header_extension.json +++ b/configuration/appframework/imbemr/header_extension.json @@ -4,14 +4,9 @@ "extensionPointId": "org.openmrs.module.appui.header.config", "type": "config", "extensionParams": { - "logo-icon-url": "/ms/uiframework/resource/file/configuration/frontend/rwandaLogo.png" + "custom-provider": "imbemr", + "custom-fragment": "header", + "logo-icon-url": "file:configuration/frontend/rwandaLogo.png" } - }, - { - "id": "imbemr.myAccountHeaderLink", - "extensionPointId": "org.openmrs.module.appui.header.userAccount.menuItems", - "type": "link", - "label": "authenticationui.myAccount.title", - "url": "authenticationui/account/userAccount.page" } ] \ No newline at end of file diff --git a/configuration/appframework/referenceapplication/globalui_extension.json b/configuration/appframework/referenceapplication/globalui_extension.json deleted file mode 100644 index 1ab608c..0000000 --- a/configuration/appframework/referenceapplication/globalui_extension.json +++ /dev/null @@ -1,10 +0,0 @@ -[ - { - "id": "referenceapplication.configureStandardHeader", - "extensionPointId": "org.openmrs.module.appui.header.config", - "type": "config", - "extensionParams": { - "logo-link-url": "/" - } - } -] \ No newline at end of file diff --git a/configuration/appframework/registrationapp/registrationSummary_app.json b/configuration/appframework/registrationapp/registrationSummary_app.json index 2e39d6f..adcab5e 100644 --- a/configuration/appframework/registrationapp/registrationSummary_app.json +++ b/configuration/appframework/registrationapp/registrationSummary_app.json @@ -31,7 +31,8 @@ "provider": "registrationapp", "fragment": "summary/section", "fragmentConfig": { - "sectionId": "patient-identification-section" + "sectionId": "patient-identification-section", + "displayEachField": true } } } diff --git a/configuration/appframework/registrationapp/registration_app.json b/configuration/appframework/registrationapp/registration_app.json index b1dbfb9..cd3b5ca 100644 --- a/configuration/appframework/registrationapp/registration_app.json +++ b/configuration/appframework/registrationapp/registration_app.json @@ -25,6 +25,103 @@ ], "maxPatientSearchResults": 50, "sections": [ + { + "id": "patient-identification-section", + "label": "registrationapp.patient.identifiers.label", + "questions": [ + { + "id": "national-ids-questions", + "legend": "imbemr.registration.nationalIds.legend", + "fields": [ + { + "type": "patientIdentifier", + "label": "imbemr.identifer.nationalId.label", + "formFieldName": "nationalId", + "uuid": "ed52ec82-4b7c-411b-804a-13bd9651bb3e", + "cssClasses": ["regex"], + "widget": { + "providerName": "uicommons", + "fragmentId": "field/text", + "config": { + "size": "50", + "regex": "(^$)|(^\\d{16}$)" + } + } + }, + { + "type": "patientIdentifier", + "label": "imbemr.identifer.applicationNumber.label", + "formFieldName": "applicationNumber", + "uuid": "0f7d2e40-956a-11ef-93fa-0242ac120002", + "widget": { + "providerName": "uicommons", + "fragmentId": "field/text", + "config": { + "size": "50" + } + } + }, + { + "type": "patientIdentifier", + "label": "imbemr.identifer.upid.label", + "formFieldName": "upid", + "uuid": "01edaedd-956a-11ef-93fa-0242ac120002", + "widget": { + "providerName": "uicommons", + "fragmentId": "field/text", + "config": { + "size": "50" + } + } + }, + { + "type": "patientIdentifier", + "label": "imbemr.identifer.nin.label", + "formFieldName": "nin", + "uuid": "0c69d739-956a-11ef-93fa-0242ac120002", + "widget": { + "providerName": "uicommons", + "fragmentId": "field/text", + "config": { + "size": "50" + } + } + }, + { + "type": "patientIdentifier", + "label": "imbemr.identifer.passportNumber.label", + "formFieldName": "passportNumber", + "uuid": "12a72978-956a-11ef-93fa-0242ac120002", + "widget": { + "providerName": "uicommons", + "fragmentId": "field/text", + "config": { + "size": "50" + } + } + }, + { + "widget": { + "providerName": "imbemr", + "fragmentId": "field/searchClientRegistry", + "config": { + "formFields": [ + { "formFieldName": "nationalId", "identifierTypeUuid": "ed52ec82-4b7c-411b-804a-13bd9651bb3e" }, + { "formFieldName": "applicationNumber", "identifierTypeUuid": "0f7d2e40-956a-11ef-93fa-0242ac120002" }, + { "formFieldName": "upid", "identifierTypeUuid": "01edaedd-956a-11ef-93fa-0242ac120002" }, + { "formFieldName": "nin", "identifierTypeUuid": "0c69d739-956a-11ef-93fa-0242ac120002" }, + { "formFieldName": "passportNumber", "identifierTypeUuid": "12a72978-956a-11ef-93fa-0242ac120002" } + ] + } + } + } + ] + } + ] + }, + { + "id": "demographics" + }, { "id": "contactInfo", "label": "registrationapp.patient.contactInfo.label", @@ -188,33 +285,6 @@ ] } ] - }, - { - "id": "patient-identification-section", - "label": "registrationapp.patient.identifiers.label", - "questions": [ - { - "id": "nationalId", - "legend": "imbemr.registration.nationalId.legend", - "fields": [ - { - "type": "patientIdentifier", - "label": "imbemr.registration.nationalId.label", - "formFieldName": "nationalId", - "uuid": "ed52ec82-4b7c-411b-804a-13bd9651bb3e", - "cssClasses": ["regex"], - "widget": { - "providerName": "uicommons", - "fragmentId": "field/text", - "config": { - "size": "50", - "regex": "(^$)|(^\\d{16}$)" - } - } - } - ] - } - ] } ] } diff --git a/configuration/globalproperties/gp.xml b/configuration/globalproperties/gp.xml index b5ef2d4..aeac50b 100644 --- a/configuration/globalproperties/gp.xml +++ b/configuration/globalproperties/gp.xml @@ -48,6 +48,10 @@ registrationcore.preciseSimilarPatientSearchAlgorithm imbemr.RwandaPrecisePatientSearchAlgorithm + + registrationcore.mpi.implementation + + diff --git a/configuration/globalresources/styles/global.css b/configuration/globalresources/styles/global.css index 21fa0c5..ae631ea 100644 --- a/configuration/globalresources/styles/global.css +++ b/configuration/globalresources/styles/global.css @@ -1,6 +1,9 @@ header { background-color:#00473f; } +.login-header-image { + padding: 8px; +} body { max-width: unset !important; width: 1500px; @@ -47,4 +50,8 @@ label { background: #5b57a6; color: white; font-weight: bold; +} + +#national-ids-questions > h3 { + font-weight: bold; } \ No newline at end of file diff --git a/configuration/messageproperties/messages_en.properties b/configuration/messageproperties/messages_en.properties index 4d2c806..b0f8a05 100644 --- a/configuration/messageproperties/messages_en.properties +++ b/configuration/messageproperties/messages_en.properties @@ -396,6 +396,12 @@ adminui.concepts.label=Concepts authentication.2fa.enableMessage=Please enable two-factor authentication for enhanced account security coreapps.patientdashboard.activeDrugOrders=REGIMENS +imbemr.login.chooseLocation.title=Choose login location +imbemr.login.chooseVisitLocation.title=Choose your facility +imbemr.login.chooseLoginLocation.title=Choose the location at which you are providing services +imbemr.login.warning.invalidLoginLocations=Location tags are not properly configured in this system, click here to complete the necessary setup +imbemr.admin.configureLoginLocations=Configure Login Locations + imbemr.all=All imbemr.encounterList=List of Encounters imbemr.encounterList.encounterType=Encounter Type @@ -427,8 +433,18 @@ imbemr.registration.religion.legend=Religion imbemr.registration.religion.label=Religion imbemr.registration.healthCenter.legend=Health Facility imbemr.registration.healthCenter.label=Health Facility -imbemr.registration.nationalId.legend=National ID -imbemr.registration.nationalId.label=National ID + +imbemr.registration.nationalIds.legend=National Identifiers +imbemr.identifer.nationalId.label=National ID +imbemr.identifer.applicationNumber.label=NID Application Number +imbemr.identifer.upid.label=UPID +imbemr.identifer.nin.label=NIN +imbemr.identifer.passportNumber.label=Passport Number +imbemr.clientRegistry.search=Search National Registry +imbemr.clientRegistry.matchFound=Patient Match Found +imbemr.clientRegistry.noMatchFound=No Match Found +imbemr.clientRegistry.import=Import Patient Details +imbemr.clientRegistry.close=Close imbemr.startVisit=Start Patient Visit imbemr.startVisit.retrospective=Enter Past Visit @@ -473,3 +489,5 @@ imbemr.patientName=Patient Name imbemr.expired=Expired imbemr.todaysRegistration=Today's registration + +ui.i18n.PatientIdentifierType.name.4e458867-9a68-4e55-9fe0-fb49fac4e6b0=Primary Care ID \ No newline at end of file diff --git a/configuration/patientidentifiertypes/identifierTypes.csv b/configuration/patientidentifiertypes/identifierTypes.csv index 9f9c492..a92f8fe 100644 --- a/configuration/patientidentifiertypes/identifierTypes.csv +++ b/configuration/patientidentifiertypes/identifierTypes.csv @@ -1,2 +1,6 @@ Uuid,Name,Description,Required,Format,Format description,Validator,Location behavior,Uniqueness behavior,Void/Retire ed52ec82-4b7c-411b-804a-13bd9651bb3e,Rwanda National ID,National ID card with photo distributed to all Rwandan adults by the Rwandan Government from 2008,false,[0-9]{16},16 numbers found on the ID card,,NOT_USED,, +01edaedd-956a-11ef-93fa-0242ac120002,UPID,UPID,false,,,,NOT_USED,, +0c69d739-956a-11ef-93fa-0242ac120002,NIN,NIN,false,,,,NOT_USED,, +0f7d2e40-956a-11ef-93fa-0242ac120002,NID Application Number,National ID Application Number,false,,,,NOT_USED,, +12a72978-956a-11ef-93fa-0242ac120002,Passport Number,Passport Number,false,,,,NOT_USED,, diff --git a/pom.xml b/pom.xml index 781b301..a8ce55d 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ 1.7.0-SNAPSHOT 1.8.6-SNAPSHOT 2.18.0-SNAPSHOT - 1.17.0 + 1.18.0-SNAPSHOT 2.8.0 1.1.0-SNAPSHOT 1.1.0-SNAPSHOT