Merge branch 'master' of https://github.com/PIH/openmrs-distro-rwanda…

…emr-imb
PIH · Dec 4, 2024 · 277ac0d · 277ac0d
2 parents 4a7eae5 + fa00e43
commit 277ac0d
Show file tree

Hide file tree

Showing 14 changed files with 263 additions and 142 deletions.
diff --git 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
@@ -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
@@ -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
     }
 ]
diff --git 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"
     }
 ]
diff --git 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
@@ -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/attributetypes/locationattributetypes.csv b/configuration/attributetypes/locationattributetypes.csv
@@ -0,0 +1,2 @@
+UUID,Entity name,Name,Description,Datatype classname,Datatype config,Min occurs,Max occurs,Preferred handler classname
+eb844bfb-b1d9-11ef-8756-0242ac120002,Location,FOSA ID,Unique facility identiifer defined nationally,org.openmrs.customdatatype.datatype.FreeTextDatatype,,0,1,
diff --git a/configuration/globalproperties/gp.xml b/configuration/globalproperties/gp.xml
@@ -1,6 +1,12 @@
 <config>
     <globalProperties>
 
+        <!-- IMB EMR -->
+        <globalProperty>
+            <property>imbemr.autoCreateInsuranceType</property>
+            <value>NONE(PRIVATE)</value>
+        </globalProperty>
+
         <!-- EMR API -->
         <globalProperty>
             <property>emrapi.visitExpireHours</property>
@@ -30,6 +36,14 @@
             <property>patient.listingAttributeTypes</property>
             <value>Health Center,Phone number</value>
         </globalProperty>
+        <globalProperty>
+            <property>default_locale</property>
+            <value>en</value>
+        </globalProperty>
+        <globalProperty>
+            <property>locale.allowed.list</property>
+            <value>en,fr,rw</value>
+        </globalProperty>
 
         <!-- Registration Core -->
         <globalProperty>
@@ -48,6 +62,10 @@
             <property>registrationcore.preciseSimilarPatientSearchAlgorithm</property>
             <value>imbemr.RwandaPrecisePatientSearchAlgorithm</value>
         </globalProperty>
+        <globalProperty>
+            <property>registrationcore.mpi.implementation</property>
+            <value></value>
+        </globalProperty>
 
         <!-- HFE -->
         <globalProperty>

diff --git 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;
 }
diff --git a/configuration/locations/locations-butaro.csv b/configuration/locations/locations-butaro.csv
@@ -1,50 +1,50 @@
-UUID,Void/Retire,Name,Description,Parent,_order:1
-a0b8cb5e-31ea-4c73-b949-91e25f20bc52,,Bungwe,Bungwe HC,Butaro Hospital
-7acb633d-df4d-4548-bc93-4ee1227f806d,,Burera District,Burera District,
-236c4f15-662b-45cb-8be2-2c2efa4e7a46,,Bushenge Hospital,Pathology Samples Submission,
-41ccdc96-5845-11df-b810-001e68a9fdcf,TRUE,Butaro,Imported location from excel spreadsheet,
-50debab9-620c-4e8b-be32-cdfae52a0d60,,Butaro Health Center,This is in addition to the Butaro tag that had referred to Butaro non-oncology for both the hospital and health center,Butaro Hospital
-a62fd59a-6577-43e0-b39c-ba42ac8cfbc9,,Butaro Hospital,Butaro District Hospital Fosa ID 322,Burera District
-7f9024a1-7f2b-4b0b-8cb1-293f2b102614,,Byumba Hospital,Pathology Samples Submission,
-96a13db6-27e3-4e41-a7ba-ac1e7c6c9dba,,CHUB,CHUB,
-d7203e80-cc52-40ef-a15f-d7a4f3e89f32,,Cyanika,Cyanika health center- Butaro hospital catchment area,Butaro Hospital
-42e57a11-0959-4147-9a6e-52917bbc905f,,Gahini Hospital,Pathology Samples Submission,
-9d53dff9-abee-46fa-a325-506b46b08338,,Gahunga,Gahunga Health Center- A MoH Health Center supported by PIH which is in the Butaro Hospital catchment area,Butaro Hospital
-41ccd9da-5845-11df-b810-001e68a9fdcf,,Gasiza,Gasiza is one of Ruhengeri ART sites.,
-e644bf77-62b2-4dde-9073-c1f275d2e2f9,,Gatebe,Gatebe HC,Butaro Hospital
-ec098275-651d-4852-9603-aa0e1d88297f,,Gihinga,FOSAID: 448 TYPE: CS,
-41ccddea-5845-11df-b810-001e68a9fdcf,,Gitare,Imported location from excel spreadsheet,Butaro Hospital
-becb5692-c6b0-4163-936b-0a2f8e435658,,Kabgayi Eye Unit,Pathology Samples Submission,
-e94264c2-5869-4fcf-8396-501a962b0fda,,Kanombe Oncology Clinic,,
-64d78f9f-88c7-4346-b696-59eb3a944ceb,,Kibogora Hospital,Pathology Samples Submission,
-b6016241-a85c-4008-8694-7e017d26479f,,Kibuye Hospital,Pathology Samples Submission,
-41cce0a6-5845-11df-b810-001e68a9fdcf,,Kinoni,Imported location from excel spreadsheet,Butaro Hospital
-ab431ba0-d92f-4ae3-af0c-94bbc458a91f,,Kinyababa,Kinyababa Health Center - A MoH health center supported by PIH which is in the Butaro Hospital catchment area,Butaro Hospital
-41ccdf48-5845-11df-b810-001e68a9fdcf,,Kirambo,Imported location from excel spreadsheet,Butaro Hospital
-41ccd32c-5845-11df-b810-001e68a9fdcf,TRUE,Kirehe,Eastern Province,
-6f67d054-a230-448d-8b05-c6f2da655497,,Kirehe Hospital,Pathology Samples Submission,
-9d563ee1-7510-4ec7-a65b-4b8c698206aa,,Kivuye,Kivuye HC,Butaro Hospital
-3ffc4b41-328c-4e63-8e7e-c5e55cb79387,,Mucaca,Mucaca Health Center,Butaro Hospital
-9496a55d-bb9e-41ec-bdac-5c0c0dd50e2b,,Muhima,FOSAID: 7 TYPE: CS,
-41cce204-5845-11df-b810-001e68a9fdcf,,Muhoza,Imported location from excel spreadsheet,
-41ccd098-5845-11df-b810-001e68a9fdcf,,Mulindi,,
-41ccdb38-5845-11df-b810-001e68a9fdcf,,Ndego,Ndego - the new site near Rwinkwavu and Mulindi,
-185741b2-0d82-4188-8916-64970a92a422,,Ndongozi,Ndongozi HC,Butaro Hospital
-626d773c-f5bf-44d7-b7cf-e613ce34b277,,Ntaruka,Ntaruka Health Center- A MoH Health Center supported by PIH which is in the Butaro Hospital catchment area,Butaro Hospital
-41cce36c-5845-11df-b810-001e68a9fdcf,,Nyamugali,Imported location from excel spreadsheet,Butaro Hospital
-41cccddc-5845-11df-b810-001e68a9fdcf,TRUE,Nyarubuye,Located in Eastern Province,
-360fb3e7-e48d-4a54-80e7-20a38fd03502,,Rugarama,Rugarama HC,Butaro Hospital
-41ccd728-5845-11df-b810-001e68a9fdcf,,Ruhengeri Hospital,Ruhengeri Hospital,
-fcca7ccb-0f08-45f5-975a-f6cd866946cf,,Ruhombo,Ruhombo HC,Butaro Hospital
-3f9e1eb4-d5a8-4704-969f-266a1da232c8,,Ruhunde,Ruhunde health center- Butaro hospital catchment area,Butaro Hospital
-41ccd1e2-5845-11df-b810-001e68a9fdcf,TRUE,Rukira,Located in Eastern Province,
-9ba86641-005c-4acb-83dc-6416b4e8ab6f,,Rusasa,Rusasa HC,Butaro Hospital
-41ccd476-5845-11df-b810-001e68a9fdcf,,Rusumo,,
-41ccd5ca-5845-11df-b810-001e68a9fdcf,,Rwanda,The country of Rwanda,
-50575f63-0818-4ef6-bd26-59cf044ab63b,,Rwanda Charity Eye Hospital,Pathology Samples Submission,
-41ccd886-5845-11df-b810-001e68a9fdcf,,Rwaza,Rwaza is one of Ruhengeri ART sites.,
-313b153c-16ac-4bec-9229-051e1cfd1f46,,Rwerere,Rwerere Health Center- A MoH Health Center supported by PIH which is in the Butaro Hospital catchment area,Butaro Hospital
-41cccf44-5845-11df-b810-001e68a9fdcf,TRUE,Rwinkwavu,Located in Eastern Province,
-ed4ad47a-5a1c-4764-b4be-96d000ccab1c,,Rwinkwavu Hospital,Pathology Samples Submission,
-598f2646-05de-4d2a-a62e-480746adf4e8,,Shyira Hospital,Pathology Samples Submission,
-8d6c993e-c2cc-11de-8d13-0010c6dffd0f,,Unknown Location,Unknown location,
+UUID,Void/Retire,Name,Attribute|FOSA ID,Description,Parent,_order:1
+a0b8cb5e-31ea-4c73-b949-91e25f20bc52,,Bungwe,,Bungwe HC,Butaro Hospital,
+7acb633d-df4d-4548-bc93-4ee1227f806d,,Burera District,,Burera District,,
+236c4f15-662b-45cb-8be2-2c2efa4e7a46,,Bushenge Hospital,,Pathology Samples Submission,,
+41ccdc96-5845-11df-b810-001e68a9fdcf,TRUE,Butaro,,Imported location from excel spreadsheet,,
+50debab9-620c-4e8b-be32-cdfae52a0d60,,Butaro Health Center,,This is in addition to the Butaro tag that had referred to Butaro non-oncology for both the hospital and health center,Butaro Hospital,
+a62fd59a-6577-43e0-b39c-ba42ac8cfbc9,,Butaro Hospital,,Butaro District Hospital Fosa ID 322,Burera District,
+7f9024a1-7f2b-4b0b-8cb1-293f2b102614,,Byumba Hospital,,Pathology Samples Submission,,
+96a13db6-27e3-4e41-a7ba-ac1e7c6c9dba,,CHUB,,CHUB,,
+d7203e80-cc52-40ef-a15f-d7a4f3e89f32,,Cyanika,,Cyanika health center- Butaro hospital catchment area,Butaro Hospital,
+42e57a11-0959-4147-9a6e-52917bbc905f,,Gahini Hospital,,Pathology Samples Submission,,
+9d53dff9-abee-46fa-a325-506b46b08338,,Gahunga,,Gahunga Health Center- A MoH Health Center supported by PIH which is in the Butaro Hospital catchment area,Butaro Hospital,
+41ccd9da-5845-11df-b810-001e68a9fdcf,,Gasiza,,Gasiza is one of Ruhengeri ART sites.,,
+e644bf77-62b2-4dde-9073-c1f275d2e2f9,,Gatebe,,Gatebe HC,Butaro Hospital,
+ec098275-651d-4852-9603-aa0e1d88297f,,Gihinga,,FOSAID: 448 TYPE: CS,,
+41ccddea-5845-11df-b810-001e68a9fdcf,,Gitare,,Imported location from excel spreadsheet,Butaro Hospital,
+becb5692-c6b0-4163-936b-0a2f8e435658,,Kabgayi Eye Unit,,Pathology Samples Submission,,
+e94264c2-5869-4fcf-8396-501a962b0fda,,Kanombe Oncology Clinic,,,,
+64d78f9f-88c7-4346-b696-59eb3a944ceb,,Kibogora Hospital,,Pathology Samples Submission,,
+b6016241-a85c-4008-8694-7e017d26479f,,Kibuye Hospital,,Pathology Samples Submission,,
+41cce0a6-5845-11df-b810-001e68a9fdcf,,Kinoni,,Imported location from excel spreadsheet,Butaro Hospital,
+ab431ba0-d92f-4ae3-af0c-94bbc458a91f,,Kinyababa,,Kinyababa Health Center - A MoH health center supported by PIH which is in the Butaro Hospital catchment area,Butaro Hospital,
+41ccdf48-5845-11df-b810-001e68a9fdcf,,Kirambo,,Imported location from excel spreadsheet,Butaro Hospital,
+41ccd32c-5845-11df-b810-001e68a9fdcf,TRUE,Kirehe,,Eastern Province,,
+6f67d054-a230-448d-8b05-c6f2da655497,,Kirehe Hospital,,Pathology Samples Submission,,
+9d563ee1-7510-4ec7-a65b-4b8c698206aa,,Kivuye,,Kivuye HC,Butaro Hospital,
+3ffc4b41-328c-4e63-8e7e-c5e55cb79387,,Mucaca,,Mucaca Health Center,Butaro Hospital,
+9496a55d-bb9e-41ec-bdac-5c0c0dd50e2b,,Muhima,,FOSAID: 7 TYPE: CS,,
+41cce204-5845-11df-b810-001e68a9fdcf,,Muhoza,,Imported location from excel spreadsheet,,
+41ccd098-5845-11df-b810-001e68a9fdcf,,Mulindi,,,,
+41ccdb38-5845-11df-b810-001e68a9fdcf,,Ndego,,Ndego - the new site near Rwinkwavu and Mulindi,,
+185741b2-0d82-4188-8916-64970a92a422,,Ndongozi,,Ndongozi HC,Butaro Hospital,
+626d773c-f5bf-44d7-b7cf-e613ce34b277,,Ntaruka,,Ntaruka Health Center- A MoH Health Center supported by PIH which is in the Butaro Hospital catchment area,Butaro Hospital,
+41cce36c-5845-11df-b810-001e68a9fdcf,,Nyamugali,,Imported location from excel spreadsheet,Butaro Hospital,
+41cccddc-5845-11df-b810-001e68a9fdcf,TRUE,Nyarubuye,,Located in Eastern Province,,
+360fb3e7-e48d-4a54-80e7-20a38fd03502,,Rugarama,,Rugarama HC,Butaro Hospital,
+41ccd728-5845-11df-b810-001e68a9fdcf,,Ruhengeri Hospital,,Ruhengeri Hospital,,
+fcca7ccb-0f08-45f5-975a-f6cd866946cf,,Ruhombo,,Ruhombo HC,Butaro Hospital,
+3f9e1eb4-d5a8-4704-969f-266a1da232c8,,Ruhunde,,Ruhunde health center- Butaro hospital catchment area,Butaro Hospital,
+41ccd1e2-5845-11df-b810-001e68a9fdcf,TRUE,Rukira,,Located in Eastern Province,,
+9ba86641-005c-4acb-83dc-6416b4e8ab6f,,Rusasa,,Rusasa HC,Butaro Hospital,
+41ccd476-5845-11df-b810-001e68a9fdcf,,Rusumo,,,,
+41ccd5ca-5845-11df-b810-001e68a9fdcf,,Rwanda,,The country of Rwanda,,
+50575f63-0818-4ef6-bd26-59cf044ab63b,,Rwanda Charity Eye Hospital,,Pathology Samples Submission,,
+41ccd886-5845-11df-b810-001e68a9fdcf,,Rwaza,,Rwaza is one of Ruhengeri ART sites.,,
+313b153c-16ac-4bec-9229-051e1cfd1f46,,Rwerere,,Rwerere Health Center- A MoH Health Center supported by PIH which is in the Butaro Hospital catchment area,Butaro Hospital,
+41cccf44-5845-11df-b810-001e68a9fdcf,TRUE,Rwinkwavu,,Located in Eastern Province,,
+ed4ad47a-5a1c-4764-b4be-96d000ccab1c,,Rwinkwavu Hospital,,Pathology Samples Submission,,
+598f2646-05de-4d2a-a62e-480746adf4e8,,Shyira Hospital,,Pathology Samples Submission,,
+8d6c993e-c2cc-11de-8d13-0010c6dffd0f,,Unknown Location,,Unknown location,,
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		UUID,Entity name,Name,Description,Datatype classname,Datatype config,Min occurs,Max occurs,Preferred handler classname
		eb844bfb-b1d9-11ef-8756-0242ac120002,Location,FOSA ID,Unique facility identiifer defined nationally,org.openmrs.customdatatype.datatype.FreeTextDatatype,,0,1,