Merge pull request #643 from PIH/UHM-9198

UHM-9198: Awaiting Admission Page should limit to patients awaiting a…

Author: mogoodrich

omod/src/main/java/org/openmrs/module/pihcore/page/controller/adt/AwaitingAdmissionPageController.java

@@ -17,6 +17,7 @@
 import org.openmrs.module.appframework.domain.AppDescriptor;
 import org.openmrs.module.appframework.domain.Extension;
 import org.openmrs.module.appframework.service.AppFrameworkService;
+import org.openmrs.module.appui.UiSessionContext;
 import org.openmrs.module.coreapps.CoreAppsConstants;
 import org.openmrs.module.coreapps.CoreAppsProperties;
 import org.openmrs.module.emrapi.EmrApiConstants;
@@ -53,7 +54,13 @@ public void get(PageModel model,
                     @SpringBean("emrDiagnosisService") DiagnosisService diagnosisService,
                     @SpringBean("adminService") AdministrationService adminService,
                     @SpringBean CoreAppsProperties coreAppsProperties,
-                    @SpringBean("appFrameworkService") AppFrameworkService appFrameworkService) {
+                    @SpringBean("appFrameworkService") AppFrameworkService appFrameworkService,
+                    UiSessionContext uiSessionContext) {
+
+        // use the closest visit location associated with the session location if the location param is not specified
+        if (visitLocation == null) {
+            visitLocation= adtService.getLocationThatSupportsVisits(uiSessionContext.getSessionLocation());
+        }
 
         List<Extension> admissionActions = appFrameworkService.getExtensionsForCurrentUser("coreapps.app.awaitingAdmissionActions");
         Collections.sort(admissionActions);

omod/src/main/webapp/pages/adt/awaitingAdmission.gsp

@@ -8,9 +8,6 @@
         { label: "${ ui.message("coreapps.app.awaitingAdmission.label")}"}
     ];
 
-    var supportsAdmissionLocationTag = '${supportsAdmissionLocationTag}';
-    var supportsLoginLocationTag = '${supportsLoginLocationTag}';
-
     // TODO: probably want replace the whole thing with either ngGrid or the new datatable widget
     // TODO: make this more robust--kind of hacky to rely on column index now that it can change
     var admitToLocationColumnIndex = ${ paperRecordIdentifierDefinitionAvailable ? '5' : '4' };
@@ -103,20 +100,22 @@
 <h2>${ ui.message("coreapps.app.awaitingAdmission.title") }</h2>
 
 <div class="inpatient-current-location-filter">
-    ${ ui.includeFragment("uicommons", "field/location", [
+    ${ ui.includeFragment("pihapps", "field/location", [
             "id": "inpatients-filterByCurrentLocation",
             "formFieldName": "filterByCurentLocationId",
             "label": "coreapps.app.awaitingAdmission.filterByCurrent",
-            "withTag": supportsLoginLocationTag
+            "withTag": supportsLoginLocationTag,
+            "restrictToVisitLocationAndDescendants": true
     ] ) }
 </div>
 
 <div class="inpatient-admitTo-location-filter">
-    ${ ui.includeFragment("uicommons", "field/location", [
+    ${ ui.includeFragment("pihapps", "field/location", [
             "id": "inpatients-filterByAdmitToLocation",
             "formFieldName": "filterByAdmitToLocationId",
             "label": "coreapps.app.awaitingAdmission.filterByAdmittedTo",
             "withTag": supportsAdmissionLocationTag,
+            "restrictToVisitLocationAndDescendants": true,
             "initialValue": sessionContext.sessionLocation
     ] ) }
 </div>