Merge pull request #32 from fielded/no-zone-allocations-and-plans

fix: not working if zone stock counts have no version
fielded · Oct 4, 2016 · 9aacf1e · 9aacf1e
2 parents 1d7de72 + 9309da6
commit 9aacf1e
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 5 deletions.
diff --git a/dist/bundle.js b/dist/bundle.js
@@ -133,7 +133,9 @@
           var location = getLocation(lgas, states, zones, stockCount);
           var locationThresholds = void 0;
           if (location && location.level === 'zone') {
-            locationThresholds = _this2.thresholdsService.calculateThresholds(location, stockCount, products, requiredAllocations[location._id]);
+            // Temporary fix for https://github.com/fielded/nav-integrated-national-dashboard/issues/265
+            // This should be removed when https://github.com/fielded/nav-etl/issues/136 is fixed
+            locationThresholds = _this2.thresholdsService.calculateThresholds(location, stockCount, products, requiredAllocations[location._id], { version: 'last' });
           } else {
             locationThresholds = _this2.thresholdsService.calculateThresholds(location, stockCount, products);
           }

diff --git a/dist/bundle.min.js b/dist/bundle.min.js
diff --git a/src/state-indicators.service.js b/src/state-indicators.service.js
@@ -85,7 +85,9 @@ class StateIndicatorsService {
       const location = getLocation(lgas, states, zones, stockCount)
       let locationThresholds
       if (location && location.level === 'zone') {
-        locationThresholds = this.thresholdsService.calculateThresholds(location, stockCount, products, requiredAllocations[location._id])
+        // Temporary fix for https://github.com/fielded/nav-integrated-national-dashboard/issues/265
+        // This should be removed when https://github.com/fielded/nav-etl/issues/136 is fixed
+        locationThresholds = this.thresholdsService.calculateThresholds(location, stockCount, products, requiredAllocations[location._id], { version: 'last' })
       } else {
         locationThresholds = this.thresholdsService.calculateThresholds(location, stockCount, products)
       }

diff --git a/test/state-indicators.service.spec.js b/test/state-indicators.service.spec.js
@@ -382,7 +382,7 @@ describe('state indicators service', function () {
       stateIndicatorsService.decorateWithIndicators(stockCounts)
         .then(function (decoratedStockCounts) {
           expect(thresholdsService.calculateThresholds).toHaveBeenCalledWith(states[0], stockCounts[0], products)
-          expect(thresholdsService.calculateThresholds).toHaveBeenCalledWith(zones[0], stockCounts[1], products, requiredByState)
+          expect(thresholdsService.calculateThresholds).toHaveBeenCalledWith(zones[0], stockCounts[1], products, requiredByState, { version: 'last' })
           expect(decoratedStockCounts).toEqual(expected)
         })
       $rootScope.$digest()
@@ -427,7 +427,7 @@ describe('state indicators service', function () {
       stateIndicatorsService.decorateWithIndicators(stockCounts)
         .then(function (decoratedStockCounts) {
           expect(thresholdsService.calculateThresholds).toHaveBeenCalledWith(states[0], stockCounts[0], products)
-          expect(thresholdsService.calculateThresholds).toHaveBeenCalledWith(zones[0], stockCounts[1], products, undefined)
+          expect(thresholdsService.calculateThresholds).toHaveBeenCalledWith(zones[0], stockCounts[1], products, undefined, { version: 'last' })
           expect(decoratedStockCounts).toEqual(expected)
         })
       $rootScope.$digest()