Merge pull request #178 from OpenLMIS-Angola/ANGOLASUP-918

ANGOLASUP-918: product name filter added on requisition page
OpenLMIS-Angola · Sep 4, 2024 · 7eb048a · 7eb048a
2 parents 467f919 + d81339e
commit 7eb048a
Show file tree

Hide file tree

Showing 5 changed files with 38 additions and 5 deletions.
diff --git a/src/openlmis-facility-program-select/facility-program-cache.service.js b/src/openlmis-facility-program-select/facility-program-cache.service.js
@@ -30,11 +30,11 @@
 
     service.$inject = [
         '$q', 'programService', 'authorizationService', 'facilityService', 'currentUserService',
-        'permissionService'
+        'permissionService', 'loadingModalService'
     ];
 
     function service($q, programService, authorizationService, facilityService, currentUserService,
-                     permissionService) {
+                     permissionService, loadingModalService) {
 
         var modulesWithRights = {},
             facilities = [],
@@ -162,7 +162,7 @@
          */
         function loadData(moduleName) {
             var userId = authorizationService.getUser().user_id;
-
+            loadingModalService.open();
             return $q.all([
                 facilityService.getFacilitiesWithoutWards(),
                 programService.getUserPrograms(userId),
@@ -178,6 +178,7 @@
 
                     var currentUserDetails = responses[3];
                     homeFacility = getFacilityById(currentUserDetails.homeFacilityId);
+                    loadingModalService.close();
                 });
         }
 

diff --git a/src/requisition-view-tab/_requisition-view-tab.scss b/src/requisition-view-tab/_requisition-view-tab.scss
@@ -4,6 +4,16 @@
         flex-direction: row-reverse;
     }
 
+    .toolbar {
+        display: flex;
+        flex-direction: row;
+        align-items: center !important;
+
+        .requisition-indicator {
+            margin-left: auto;
+        }
+    }
+
     .hide-line-item {
     	@extend button.danger;
     	@include icon-only('remove');

diff --git a/src/requisition-view-tab/messages_en.json b/src/requisition-view-tab/messages_en.json
@@ -0,0 +1,3 @@
+{
+    "requisitionPatientsViewTab.filterPlaceholder": "Filter by product name"
+}
diff --git a/src/requisition-view-tab/requisition-view-tab.controller.js b/src/requisition-view-tab/requisition-view-tab.controller.js
@@ -143,9 +143,16 @@
          */
         vm.columns = undefined;
 
+        vm.orderableFilterProperties = {
+            name: undefined
+        };
+
+        vm.filteredItems = undefined;
+
         function onInit() {
             vm.lineItems = lineItems;
             vm.items = items;
+            vm.filteredItems = lineItems;
             vm.requisition = requisition;
             vm.columns = columns;
             vm.userCanEdit = canAuthorize || canSubmit || canUnskipRequisitionItemWhenApproving;
@@ -198,7 +205,7 @@
          *
          * @description
          * Caches given requisition in the local storage.
-         * 
+         *
          * @return {Promise} the promise resolved after adding requisition to the local storage
          */
         function cacheRequisition() {
@@ -384,6 +391,13 @@
             return vm.requisition.requisitionLineItems.filter(isSkippedFullSupply).length;
         }
 
+        vm.filterByOrderableParams = function() {
+            vm.filteredItems = vm.lineItems.filter(function(item) {
+                return item.orderable.fullProductName.toLowerCase()
+                    .includes(vm.orderableFilterProperties.name.toLowerCase());
+            });
+        };
+
         function getNoProductsMessage() {
             return fullSupply ?
                 'requisitionViewTab.noFullSupplyProducts' :

diff --git a/src/requisition-view-tab/requisition-view-tab.html b/src/requisition-view-tab/requisition-view-tab.html
@@ -1,12 +1,17 @@
 <div class="view-tab openlmis-table-container">
 	<h4 ng-show="vm.showSkipControls">{{'requisitionViewTab.skip' | message}}</h4>
+
 	<ul ng-show="vm.showSkipControls">
 		<li><a ng-click="vm.requisition.skipAllFullSupplyLineItems()">{{'requisitionViewTab.all' | message}}</a></li>
 		<li><a ng-click="vm.requisition.unskipAllFullSupplyLineItems()">{{'requisitionViewTab.none' | message}}</a></li>
 	</ul>
 	<span ng-if="vm.showAddFullSupplyProductControls">
 		{{ vm.skippedFullSupplyProductCountMessage() }}
 	</span>
+	<div class="productNameFilter">
+		<input type="text" placeholder="{{ 'requisitionPatientsViewTab.filterPlaceholder' | message}}"
+			ng-model="vm.orderableFilterProperties.name" ng-change="vm.filterByOrderableParams()">
+	</div>
 	<button class="add" ng-if="vm.showAddFullSupplyProductsButton" ng-click="vm.addFullSupplyProducts()" >{{'requisitionViewTab.addProduct' | message}}</button>
 	<button class="add" ng-if="vm.showAddNonFullSupplyProductsButton" ng-click="vm.addNonFullSupplyProducts()" >{{'requisitionViewTab.addProduct' | message}}</button>
 	<button class="add" ng-if="vm.showUnskipFullSupplyProductsButton" ng-click="vm.unskipFullSupplyProducts()" >{{'requisitionViewTab.addProduct' | message}}</button>
@@ -43,7 +48,7 @@ <h4 ng-show="vm.showSkipControls">{{'requisitionViewTab.skip' | message}}</h4>
 		</tbody>
 	</table>
 	<openlmis-pagination
-		list="vm.lineItems"
+		list="vm.filteredItems"
 		paged-list="vm.items"
 		pagination-id="vm.paginationId"
 		on-page-change="vm.cacheRequisition"/>