Merge pull request #7 from OpenLMIS/OLMIS-6917

OLMIS-6917: Disabled autoselect for supplying facility
OpenLMIS · Jul 15, 2024 · c9d979c · c9d979c
2 parents 5747a71 + baec72c
commit c9d979c
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 9 deletions.
diff --git a/src/proof-of-delivery-manage/proof-of-delivery-manage.html b/src/proof-of-delivery-manage/proof-of-delivery-manage.html
@@ -14,7 +14,9 @@ <h2 ng-if="!vm.facilityName && !vm.programName">{{'proofOfDeliveryManage.manageP
         <select id="supplyingFacility"
                 ng-model="vm.supplyingFacility"
                 ng-required="!vm.requestingFacility"
-                ng-options="facility.name for facility in vm.supplyingFacilities | orderBy:'name'"></select>
+                ng-options="facility.name for facility in vm.supplyingFacilities | orderBy:'name'"
+                no-auto-select
+        ></select>
     </fieldset>
     <fieldset class="form-group">
         <label for="program">{{'proofOfDeliveryManage.program' | message}}</label>

diff --git a/src/proof-of-delivery-manage/proof-of-delivery-manage.routes.js b/src/proof-of-delivery-manage/proof-of-delivery-manage.routes.js
@@ -53,18 +53,14 @@
                         FULFILLMENT_RIGHTS.PODS_VIEW
                     ]);
                 },
-                pods: function(paginationService, orderRepository, $stateParams, programs, requestingFacilities,
-                    supplyingFacilities) {
+                pods: function(paginationService, orderRepository, $stateParams, programs, requestingFacilities) {
                     return paginationService.registerUrl($stateParams, function(stateParams) {
                         if (programs.length === 1 && !stateParams.programId) {
                             stateParams.programId = programs[0].id;
                         }
                         if (requestingFacilities.length === 1 && !stateParams.requestingFacilityId) {
                             stateParams.requestingFacilityId = requestingFacilities[0].id;
                         }
-                        if (supplyingFacilities.length === 1 && !stateParams.supplyingFacilityId) {
-                            stateParams.supplyingFacilityId = supplyingFacilities[0].id;
-                        }
 
                         if (stateParams.programId &&
                             (stateParams.supplyingFacilityId || stateParams.requestingFacilityId)) {

diff --git a/src/proof-of-delivery-manage/proof-of-delivery-manage.routes.spec.js b/src/proof-of-delivery-manage/proof-of-delivery-manage.routes.spec.js
@@ -63,7 +63,6 @@ describe('openlmis.orders.podManage state', function() {
     it('should resolve pods with default selection when lists have 1 element', function() {
         programService.getUserPrograms.andReturn($q.when([programs[0]]));
         requestingFacilities = [requestingFacilities[0]];
-        supplyingFacilities = [supplyingFacilities[0]];
 
         goToUrl('/orders/manage?page=0&size=10');
 
@@ -75,8 +74,7 @@ describe('openlmis.orders.podManage state', function() {
             page: '0',
             size: '10',
             programId: programs[0].id,
-            requestingFacilityId: requestingFacilities[0].id,
-            supplyingFacilityId: supplyingFacilities[0].id
+            requestingFacilityId: requestingFacilities[0].id
         });
     });