RA-2046 - Registration app should support column config within the fi…

…nd patient component (#143)
openmrs · Sep 28, 2024 · aa5383d · aa5383d
1 parent d68fb44
commit aa5383d
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 6 deletions.
diff --git a/...in/java/org/openmrs/module/registrationapp/page/controller/FindPatientPageController.java b/...in/java/org/openmrs/module/registrationapp/page/controller/FindPatientPageController.java
@@ -2,11 +2,11 @@
 
 
 import org.apache.commons.lang.StringUtils;
+import org.codehaus.jackson.JsonNode;
 import org.joda.time.DateTime;
 import org.joda.time.Days;
 import org.openmrs.Encounter;
 import org.openmrs.EncounterType;
-import org.openmrs.GlobalProperty;
 import org.openmrs.Location;
 import org.openmrs.api.EncounterService;
 import org.openmrs.api.context.Context;
@@ -65,6 +65,12 @@ public void controller(UiSessionContext uiSessionContext,
             model.addAttribute("appId", null);
         }
 
+        JsonNode columnConfig = null;
+        if (app.getConfig() != null) {
+            columnConfig = app.getConfig().get("patientSearchColumnConfig");
+        }
+        model.addAttribute("patientSearchColumnConfig", columnConfig);
+
         List<Extension> includeFragments = appFrameworkService.getExtensionsForCurrentUser(RegistrationAppConstants.FIND_PATIENT_FRAGMENTS_EXTENSION_POINT);
         Collections.sort(includeFragments);
         model.addAttribute("includeFragments", includeFragments);

diff --git a/omod/src/main/webapp/pages/findPatient.gsp b/omod/src/main/webapp/pages/findPatient.gsp
@@ -45,11 +45,13 @@ ${ ui.includeFragment("uicommons", "validationMessages")}
         </div>
         <div class="col-12"><h3>${ ui.message("coreapps.searchPatientHeading") }</h3></div>
         <div class="col-12 col-md-8">
-            ${ ui.includeFragment("coreapps", "patientsearch/patientSearchWidget",
-                [ afterSelectedUrl: afterSelectedUrl,
-                rowSelectionHandler: "selectPatientHandler",
-                initialSearchFromParameter: "search",
-                showLastViewedPatients: 'false' ])}
+            ${ ui.includeFragment("coreapps", "patientsearch/patientSearchWidget", [
+                    afterSelectedUrl: afterSelectedUrl,
+                    rowSelectionHandler: "selectPatientHandler",
+                    initialSearchFromParameter: "search",
+                    showLastViewedPatients: 'false',
+                    columnConfig: patientSearchColumnConfig
+            ])}
         </div>
     </div>