@dhis2/analytics 26.12.1 → 26.12.2

package/build/cjs/visualizations/config/adapters/dhis_highcharts/__tests__/getCumulativeData.spec.js

@@ -0,0 +1,54 @@
+"use strict";
+
+var _visTypes = require("../../../../../modules/visTypes.js");
+var _getCumulativeData = _interopRequireDefault(require("../getCumulativeData.js"));
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
+const testData = [{
+  data: [1, 1, 1],
+  accData: [1, 2, 3]
+}, {
+  data: [1.5, 2.5, 3.5],
+  accData: [1.5, 4, 7.5]
+}, {
+  data: [-1, -1, -1],
+  accData: [-1, -2, -3]
+}, {
+  data: [null, 1],
+  accData: [null, 1]
+}, {
+  data: [1, null],
+  accData: [1, null]
+}, {
+  data: [null, null],
+  accData: [null, null]
+}, {
+  data: [1, null, 2],
+  accData: [1, null, 3]
+}];
+describe('getDefaultCumulativeData', () => {
+  const getDefaultSeries = (test, prop) => [{
+    data: test[prop]
+  }];
+  test('series get correct cumulative values', () => {
+    testData.forEach(test => {
+      expect((0, _getCumulativeData.default)(getDefaultSeries(test, 'data'), {})).toEqual(getDefaultSeries(test, 'accData'));
+    });
+  });
+});
+describe('getTwoCategoryCumulativeData', () => {
+  const getTwoCategorySeries = (test, prop) => [{
+    data: test[prop].map((value, index) => [index, value]),
+    custom: {
+      data: [test[prop]]
+    }
+  }];
+  const layout = {
+    type: _visTypes.VIS_TYPE_COLUMN,
+    rows: [{}, {}]
+  };
+  test('series get correct cumulative values', () => {
+    testData.forEach(test => {
+      expect((0, _getCumulativeData.default)(getTwoCategorySeries(test, 'data'), layout)).toEqual(getTwoCategorySeries(test, 'accData'));
+    });
+  });
+});

package/build/cjs/visualizations/config/adapters/dhis_highcharts/getCumulativeData.js

@@ -9,50 +9,58 @@ var _visTypes = require("../../../../modules/visTypes.js");
 var _getTwoCategorySplitSerieData = _interopRequireDefault(require("./getTwoCategorySplitSerieData.js"));
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 function getDefaultCumulativeData(series) {
-  let decimals = 0;
-  let cumulativeValues = [];
+  let decimals;
+  let accValue;
+  let accData;
   series.forEach(seriesObj => {
-    cumulativeValues = seriesObj.data.reduce((accumulator, value, index) => {
-      decimals = Math.max(decimals, (0, _numberDecimals.default)(value));
-      if (index > 0) {
-        value += accumulator[index - 1];
+    decimals = 0;
+    accValue = null;
+    accData = seriesObj.data.reduce((accSeriesData, value) => {
+      if (value === null) {
+        accSeriesData.push(value);
+      } else {
+        decimals = Math.max(decimals, (0, _numberDecimals.default)(value));
+        accValue += value;
+        accSeriesData.push(accValue);
       }
-      accumulator.push(value);
-      return accumulator;
+      return accSeriesData;
     }, []);
 
     // round values to the largest number of decimals found in the serie
     // this is to avoid the floating-point problems in JavaScript
     // the condition in the return statement is because sometimes value can be null
-    seriesObj.data = cumulativeValues.map(value => {
-      return value ? parseFloat(value.toFixed(decimals)) : value;
-    });
-    decimals = 0;
+    seriesObj.data = accData.map(value => value ? parseFloat(value.toFixed(decimals)) : value);
   });
   return series;
 }
 function getTwoCategoryCumulativeData(series) {
-  let decimals = 0;
+  let decimals;
+  let accValue;
+  let accSeriesData;
+  let accSeriesDataByCategory;
   series.filter(seriesObj => !seriesObj.custom.isTwoCategoryFakeSerie).forEach(seriesObj => {
-    const cumulativeValues = [];
-    seriesObj.custom.data.forEach(groupObj => {
-      const cumulativeGroupValues = [];
-      groupObj.forEach((value, index) => {
-        decimals = Math.max(decimals, (0, _numberDecimals.default)(value));
-        if (index > 0) {
-          value += cumulativeGroupValues[index - 1];
+    decimals = 0;
+    accSeriesData = [];
+    seriesObj.custom.data.forEach(seriesDataByCategory => {
+      accValue = null;
+      accSeriesDataByCategory = [];
+      seriesDataByCategory.forEach(value => {
+        if (value === null) {
+          accSeriesDataByCategory.push(value);
+        } else {
+          decimals = Math.max(decimals, (0, _numberDecimals.default)(value));
+          accValue += value;
+          accSeriesDataByCategory.push(accValue);
         }
-        cumulativeGroupValues.push(value);
       });
-      cumulativeValues.push(cumulativeGroupValues);
+      accSeriesData.push(accSeriesDataByCategory);
     });
 
     // round values to the largest number of decimals found in the serie
     // this is to avoid the floating-point problems in JavaScript
     // the condition in the return statement is because sometimes value can be null
-    seriesObj.custom.data = cumulativeValues.map(groupObj => groupObj.map(value => value ? parseFloat(value.toFixed(decimals)) : value));
+    seriesObj.custom.data = accSeriesData.map(seriesDataByCategory => seriesDataByCategory.map(value => value ? parseFloat(value.toFixed(decimals)) : value));
     seriesObj.data = (0, _getTwoCategorySplitSerieData.default)(seriesObj.custom.data);
-    decimals = 0;
   });
   return series;
 }

package/build/es/visualizations/config/adapters/dhis_highcharts/__tests__/getCumulativeData.spec.js

@@ -0,0 +1,51 @@
+import { VIS_TYPE_COLUMN } from '../../../../../modules/visTypes.js';
+import getCumulativeData from '../getCumulativeData.js';
+const testData = [{
+  data: [1, 1, 1],
+  accData: [1, 2, 3]
+}, {
+  data: [1.5, 2.5, 3.5],
+  accData: [1.5, 4, 7.5]
+}, {
+  data: [-1, -1, -1],
+  accData: [-1, -2, -3]
+}, {
+  data: [null, 1],
+  accData: [null, 1]
+}, {
+  data: [1, null],
+  accData: [1, null]
+}, {
+  data: [null, null],
+  accData: [null, null]
+}, {
+  data: [1, null, 2],
+  accData: [1, null, 3]
+}];
+describe('getDefaultCumulativeData', () => {
+  const getDefaultSeries = (test, prop) => [{
+    data: test[prop]
+  }];
+  test('series get correct cumulative values', () => {
+    testData.forEach(test => {
+      expect(getCumulativeData(getDefaultSeries(test, 'data'), {})).toEqual(getDefaultSeries(test, 'accData'));
+    });
+  });
+});
+describe('getTwoCategoryCumulativeData', () => {
+  const getTwoCategorySeries = (test, prop) => [{
+    data: test[prop].map((value, index) => [index, value]),
+    custom: {
+      data: [test[prop]]
+    }
+  }];
+  const layout = {
+    type: VIS_TYPE_COLUMN,
+    rows: [{}, {}]
+  };
+  test('series get correct cumulative values', () => {
+    testData.forEach(test => {
+      expect(getCumulativeData(getTwoCategorySeries(test, 'data'), layout)).toEqual(getTwoCategorySeries(test, 'accData'));
+    });
+  });
+});

package/build/es/visualizations/config/adapters/dhis_highcharts/getCumulativeData.js

@@ -2,50 +2,58 @@ import numberDecimals from 'd2-utilizr/lib/numberDecimals';
 import { isTwoCategoryChartType } from '../../../../modules/visTypes.js';
 import getTwoCategorySplitSerieData from './getTwoCategorySplitSerieData.js';
 function getDefaultCumulativeData(series) {
-  let decimals = 0;
-  let cumulativeValues = [];
+  let decimals;
+  let accValue;
+  let accData;
   series.forEach(seriesObj => {
-    cumulativeValues = seriesObj.data.reduce((accumulator, value, index) => {
-      decimals = Math.max(decimals, numberDecimals(value));
-      if (index > 0) {
-        value += accumulator[index - 1];
+    decimals = 0;
+    accValue = null;
+    accData = seriesObj.data.reduce((accSeriesData, value) => {
+      if (value === null) {
+        accSeriesData.push(value);
+      } else {
+        decimals = Math.max(decimals, numberDecimals(value));
+        accValue += value;
+        accSeriesData.push(accValue);
       }
-      accumulator.push(value);
-      return accumulator;
+      return accSeriesData;
     }, []);
 
     // round values to the largest number of decimals found in the serie
     // this is to avoid the floating-point problems in JavaScript
     // the condition in the return statement is because sometimes value can be null
-    seriesObj.data = cumulativeValues.map(value => {
-      return value ? parseFloat(value.toFixed(decimals)) : value;
-    });
-    decimals = 0;
+    seriesObj.data = accData.map(value => value ? parseFloat(value.toFixed(decimals)) : value);
   });
   return series;
 }
 function getTwoCategoryCumulativeData(series) {
-  let decimals = 0;
+  let decimals;
+  let accValue;
+  let accSeriesData;
+  let accSeriesDataByCategory;
   series.filter(seriesObj => !seriesObj.custom.isTwoCategoryFakeSerie).forEach(seriesObj => {
-    const cumulativeValues = [];
-    seriesObj.custom.data.forEach(groupObj => {
-      const cumulativeGroupValues = [];
-      groupObj.forEach((value, index) => {
-        decimals = Math.max(decimals, numberDecimals(value));
-        if (index > 0) {
-          value += cumulativeGroupValues[index - 1];
+    decimals = 0;
+    accSeriesData = [];
+    seriesObj.custom.data.forEach(seriesDataByCategory => {
+      accValue = null;
+      accSeriesDataByCategory = [];
+      seriesDataByCategory.forEach(value => {
+        if (value === null) {
+          accSeriesDataByCategory.push(value);
+        } else {
+          decimals = Math.max(decimals, numberDecimals(value));
+          accValue += value;
+          accSeriesDataByCategory.push(accValue);
         }
-        cumulativeGroupValues.push(value);
       });
-      cumulativeValues.push(cumulativeGroupValues);
+      accSeriesData.push(accSeriesDataByCategory);
     });
 
     // round values to the largest number of decimals found in the serie
     // this is to avoid the floating-point problems in JavaScript
     // the condition in the return statement is because sometimes value can be null
-    seriesObj.custom.data = cumulativeValues.map(groupObj => groupObj.map(value => value ? parseFloat(value.toFixed(decimals)) : value));
+    seriesObj.custom.data = accSeriesData.map(seriesDataByCategory => seriesDataByCategory.map(value => value ? parseFloat(value.toFixed(decimals)) : value));
     seriesObj.data = getTwoCategorySplitSerieData(seriesObj.custom.data);
-    decimals = 0;
   });
   return series;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@dhis2/analytics",
-    "version": "26.12.1",
+    "version": "26.12.2",
     "main": "./build/cjs/index.js",
     "module": "./build/es/index.js",
     "exports": {