Merge pull request #101 from OpenLMIS-Angola/feature/OAM-127-2

OAM-127: show quarantined by default, add checkbox to hide quarantined
OpenLMIS-Angola · May 27, 2024 · d7e7c5f · d7e7c5f
2 parents c059873 + f6c5767
commit d7e7c5f
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 4 deletions.
diff --git a/src/admin-orderable-list/admin-orderable-list.routes.js b/src/admin-orderable-list/admin-orderable-list.routes.js
@@ -26,7 +26,7 @@
         $stateProvider.state('openlmis.administration.orderables', {
             showInNavigation: true,
             label: 'adminOrderableList.products',
-            url: '/orderables?code&name&description&program&page&size&sort',
+            url: '/orderables?code&includeQuarantined&name&description&program&page&size&sort',
             controller: 'OrderableListController',
             templateUrl: 'admin-orderable-list/orderable-list.html',
             controllerAs: 'vm',
@@ -40,8 +40,12 @@
                     return new ProgramResource().query();
                 },
                 orderables: function(paginationService, OrderableResource, $stateParams) {
-                    return paginationService.registerUrl($stateParams, function(stateParams) {
-                        return new OrderableResource().query(stateParams);
+                    return paginationService.registerUrl($stateParams, function() {
+                        if (!$stateParams.includeQuarantined && $stateParams.includeQuarantined !== 'false') {
+                            $stateParams.includeQuarantined = 'true';
+                        }
+
+                        return new OrderableResource().query($stateParams);
                     });
                 },
                 canAdd: function(authorizationService, permissionService, ADMINISTRATION_RIGHTS) {

diff --git a/src/admin-orderable-list/messages_en.json b/src/admin-orderable-list/messages_en.json
@@ -1,5 +1,5 @@
 {
     "adminOrderableList.export": "Export",
-    "adminOrderableList.showQuarantined": "Show Quarantined",
+    "adminOrderableList.includeQuarantined": "Include Quarantined Products",
     "adminOrderableList.isQuarantined": "Quarantined"
 }
diff --git a/src/admin-orderable-list/orderable-list.controller.js b/src/admin-orderable-list/orderable-list.controller.js
@@ -59,6 +59,16 @@
          */
         vm.programs = undefined;
 
+        /**
+         * @ngdoc property
+         * @propertyOf admin-orderable-list.controller:OrderableListController
+         * @name includeQuarantined
+         * 
+         * @description
+         * Contains flag for including quarantined orderables. By default, quarantined products are listed.
+         */
+        vm.includeQuarantined = undefined;
+
         /**
          * @ngdoc property
          * @propertyOf admin-orderable-list.controller:OrderableListController
@@ -118,6 +128,7 @@
             vm.code = $stateParams.code;
             vm.name = $stateParams.name;
             vm.program = $stateParams.program;
+            vm.includeQuarantined = $stateParams.includeQuarantined;
 
             vm.canAdd = canAdd;
             vm.tableConfig = getTableConfig();
@@ -137,6 +148,7 @@
             stateParams.code = vm.code;
             stateParams.name = vm.name;
             stateParams.program = vm.program;
+            stateParams.includeQuarantined = vm.includeQuarantined;
 
             $state.go('openlmis.administration.orderables', stateParams, {
                 reload: true

diff --git a/src/admin-orderable-list/orderable-list.html b/src/admin-orderable-list/orderable-list.html
@@ -22,6 +22,12 @@ <h2>{{'adminOrderableList.products' | message}}</h2>
                     ng-model="vm.program">
             </select>
         </fieldset>
+        <fieldset class="form-group">
+            <label for="includeQuarantined" class="checkbox">
+                <input type="checkbox" id="includeQuarantined" ng-model="vm.includeQuarantined" ng-true-value="'true'" ng-false-value="'false'" />
+                {{:: 'adminOrderableList.includeQuarantined' | message}}
+            </label>
+        </fieldset>
         <input type="submit" value="{{'adminOrderableList.search' | message}}"/>
     </form>
     <openlmis-table table-config="vm.tableConfig"></openlmis-table>