ANGOLASUP-918: product name filter added

OpenLMIS-Angola · Sep 4, 2024 · d81339e · d81339e
1 parent 2da2026
commit d81339e
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 20 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
@@ -1,4 +1,3 @@
 {
-    "requisitionPatientsViewTab.name": "Name",
-    "requisitionPatientsViewTab.search": "Search"
+    "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
@@ -392,10 +392,9 @@
         }
 
         vm.filterByOrderableParams = function() {
-            console.log('filter works!');
-            console.log(vm.orderableFilterProperties);
             vm.filteredItems = vm.lineItems.filter(function(item) {
-                return item.name.includes(vm.orderableFilterProperties.name);
+                return item.orderable.fullProductName.toLowerCase()
+                    .includes(vm.orderableFilterProperties.name.toLowerCase());
             });
         };
 

diff --git a/src/requisition-view-tab/requisition-view-tab.html b/src/requisition-view-tab/requisition-view-tab.html
@@ -8,17 +8,10 @@ <h4 ng-show="vm.showSkipControls">{{'requisitionViewTab.skip' | message}}</h4>
 	<span ng-if="vm.showAddFullSupplyProductControls">
 		{{ vm.skippedFullSupplyProductCountMessage() }}
 	</span>
-	<form ng-submit="vm.filterByOrderableParams()">
-        <!-- <fieldset class="form-group">
-            <label for="code">{{'adminOrderableList.code' | message}}</label>
-            <input type="text" id="code" ng-model="vm.code" />
-        </fieldset> -->
-        <fieldset class="form-group">
-            <label for="name">{{'requisitionPatientsViewTab.name' | message}}</label>
-            <input type="text" id="name" ng-model="vm.orderableFilterProperties.name" />
-        </fieldset>
-        <input type="submit" value="{{'requisitionPatientsViewTab.search' | message}}" />
-    </form>
+	<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>
@@ -55,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"/>