UHM-9167 - Add links to navigate between order list page and lab reception page (#21)

Author: mseaton

omod/src/main/webapp/pages/labs/labOrderList.gsp

@@ -8,6 +8,8 @@
     ui.includeJavascript("pihapps", "dateUtils.js")
 
     def now = new Date()
+    def patientListPage = ui.pageLink("pihapps", "labs/labPatientList")
+    def orderLabsPage = ui.pageLink("coreapps", "findpatient/findPatient", ["app": "pih.app.labs.ordering"])
 %>
 
 <script type="text/javascript">
@@ -130,16 +132,29 @@
         padding-left: 10px;
         cursor: pointer;
     }
+    .dropdown {
+        background: unset;
+        top: unset;
+        div {
+            display: none;
+        }
+    }
 </style>
 
 <div class="row justify-content-between">
     <div class="col-6">
         <h3>${ ui.message("pihapps.labOrderList") }</h3>
     </div>
     <div class="col-6 text-right">
-        <a href="${ui.pageLink("coreapps", "findpatient/findPatient", ["app": "pih.app.labs.ordering"])}">
-            <input type="button" value="${ui.message("pihapps.addLabOrders")}" style="max-width: unset;"/>
-        </a>
+        <div class="dropdown show">
+            <a class="btn btn-secondary dropdown-toggle" href="#" role="button" id="dropdownMenuLink" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+                ${ ui.message("pihapps.actions") }
+            </a>
+            <div class="dropdown-menu dropdown-menu-right" aria-labelledby="dropdownMenuLink">
+                <a class="dropdown-item" href="${ patientListPage }">${ ui.message("pihapps.labPatientReception") }</a>
+                <a class="dropdown-item" href="${ orderLabsPage }">${ ui.message("pihapps.addLabOrders") }</a>
+            </div>
+        </div>
     </div>
 </div>
 <form method="get" id="test-filter-form">

omod/src/main/webapp/pages/labs/labPatientList.gsp

@@ -8,7 +8,8 @@
     ui.includeJavascript("pihapps", "dateUtils.js")
 
     def now = new Date()
-    def collectionPage = ui.pageLink("pihapps", "labs/labPatientReception");
+    def collectionPage = ui.pageLink("pihapps", "labs/labPatientReception")
+    def orderListPage = ui.pageLink("pihapps", "labs/labOrderList")
 %>
 
 <script type="text/javascript">
@@ -113,12 +114,32 @@
         font-weight: bold;
         color: red;
     }
+    .dropdown {
+        background: unset;
+        top: unset;
+        div {
+            display: none;
+        }
+    }
 </style>
 
 <div class="row justify-content-between">
     <div class="col-6">
         <h3>${ ui.message("pihapps.labPatientList") }</h3>
     </div>
+    <div class="col-6 text-right">
+        <div class="dropdown show">
+            <a class="btn btn-secondary dropdown-toggle" href="#" role="button" id="dropdownMenuLink" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+                ${ ui.message("pihapps.actions") }
+            </a>
+            <div class="dropdown-menu dropdown-menu-right" aria-labelledby="dropdownMenuLink">
+                <a class="dropdown-item" href="${ orderListPage }">${ ui.message("pihapps.labOrderList") }</a>
+            </div>
+        </div>
+    </div>
+    <div class="col-6 text-right">
+        <a href="${}">${ ui.message("pihapps.") }</a>
+    </div>
 </div>
 <form method="get" id="test-filter-form">
     <div class="row justify-content-start align-items-end">