@dhis2/analytics 26.0.8 → 26.0.10

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

@@ -25,10 +25,8 @@ export default function (layout, series, isStacked) {
     return getDefaultTrendLines(layout, series, isStacked);
   }
 }
-
 function getDefaultTrendLines(layout, series, isStacked) {
   const newSeries = [];
-
   if (isStacked) {
     newSeries.push(...series, Object.assign({}, getRegressionObj(getStackedData(series, layout), layout.regressionType)));
   } else {
@@ -41,29 +39,25 @@ function getDefaultTrendLines(layout, series, isStacked) {
       }));
     });
   }
-
   return newSeries;
 }
-
 function getTwoCategoryTrendlineConfig(groupObj, groupIndex, groupRegressionObject, regressionType, trendlineId) {
   const trendlineConfig = getRegressionObj(groupObj, regressionType);
   groupRegressionObject.splice(groupIndex * groupObj.length, groupObj.length, ...trendlineConfig.data.map(point => point[1]));
-  trendlineConfig.data = groupRegressionObject; // link trendlines
+  trendlineConfig.data = groupRegressionObject;
+
+  // link trendlines
   // so only 1 label in the legend is shown and all linked trendlines
   // can be toggled simultaneously
-
   if (groupIndex === 0) {
     trendlineConfig.id = trendlineId;
   } else {
     trendlineConfig.linkedTo = trendlineId;
   }
-
   return trendlineConfig;
 }
-
 function getTwoCategoryTrendLines(layout, series, isStacked) {
   const newSeries = [];
-
   if (isStacked) {
     newSeries.push(...series);
     const stackedData = getStackedData(series, layout);
@@ -76,9 +70,8 @@ function getTwoCategoryTrendLines(layout, series, isStacked) {
     });
   } else {
     series.forEach(seriesObj => {
-      const trendlineSerieId = "trendline-".concat(seriesObj.id);
+      const trendlineSerieId = `trendline-${seriesObj.id}`;
       newSeries.push(seriesObj);
-
       if (!seriesObj.custom.isTwoCategoryFakeSerie) {
         const groupRegressionTemplate = Array.from({
           length: seriesObj.custom.data.flat().length
@@ -95,10 +88,8 @@ function getTwoCategoryTrendLines(layout, series, isStacked) {
       }
     });
   }
-
   return newSeries;
 }
-
 function getDarkerColor(color) {
   // For patterns, color is an object containing patternIndex.
   // patternIndex can be 0, thus the need to check for the presence of the key in the object.
@@ -107,16 +98,13 @@ function getDarkerColor(color) {
     const colorSetPatterns = colorSets[COLOR_SET_PATTERNS].patterns;
     color = colorSetPatterns[color.patternIndex].color || DEFAULT_TRENDLINE.color;
   }
-
   return rgb(color).darker(0.5).toString();
 }
-
 function getRegressionData(data) {
   return data.map((value, index) => {
     return [index, value];
   });
 }
-
 function getRegressionObj(data, regressionType) {
   // LINEAR:
   // - decimalPlaces (default = 2)
@@ -126,10 +114,10 @@ function getRegressionObj(data, regressionType) {
   // - order (default = 2)
   // - extrapolate (default = 0)
   // - decimalPlaces (default = 2)
+
   let regression;
   const regressionTypeOptions = {};
   const regressionData = data.some(i => Array.isArray(i)) ? data : getRegressionData(data);
-
   switch (regressionType) {
     case 'POLYNOMIAL':
       // polynomial(data, order, extrapolate)
@@ -141,14 +129,11 @@ function getRegressionObj(data, regressionType) {
           points: []
         };
       }
-
       break;
-
     case 'LOESS':
       // loess(data, smoothing)
       regression = loess(regressionData, 0.25);
       break;
-
     case 'LINEAR':
     default:
       // linear(data, decimalPlaces)
@@ -156,53 +141,46 @@ function getRegressionObj(data, regressionType) {
       regressionTypeOptions.type = 'line';
       break;
   }
-
   return Object.assign({}, DEFAULT_TRENDLINE, regressionTypeOptions, {
     data: regression.points
   });
-} // Code extracted from https://github.com/Tom-Alexander/regression-js/
-
+}
 
+// Code extracted from https://github.com/Tom-Alexander/regression-js/
 function gaussianElimination(a, o) {
   let maxrow = 0,
-      tmp = 0;
+    tmp = 0;
   const n = a.length - 1,
-        x = new Array(o);
-
+    x = new Array(o);
   for (let i = 0; i < n; i++) {
     maxrow = i;
-
     for (let j = i + 1; j < n; j++) {
       if (Math.abs(a[i][j]) > Math.abs(a[i][maxrow])) {
         maxrow = j;
       }
     }
-
     for (let k = i; k < n + 1; k++) {
       tmp = a[k][i];
       a[k][i] = a[k][maxrow];
       a[k][maxrow] = tmp;
     }
-
     for (let j = i + 1; j < n; j++) {
       for (let k = n; k >= i; k--) {
         a[k][j] -= a[k][i] * a[i][j] / a[i][i];
       }
     }
   }
-
   for (let j = n - 1; j >= 0; j--) {
     tmp = 0;
-
     for (let k = j + 1; k < n; k++) {
       tmp += a[k][j] * x[k];
     }
-
     x[j] = (a[n][j] - tmp) / a[j][j];
   }
-
   return x;
-} // Code extracted from https://github.com/Tom-Alexander/regression-js/
+}
+
+// Code extracted from https://github.com/Tom-Alexander/regression-js/
 // Human readable formulas:
 //
 //              N * Σ(XY) - Σ(X)
@@ -210,58 +188,45 @@ function gaussianElimination(a, o) {
 //              N * Σ(X^2) - Σ(X)^2
 //
 // correlation = N * Σ(XY) - Σ(X) * Σ (Y) / √ (  N * Σ(X^2) - Σ(X) ) * ( N * Σ(Y^2) - Σ(Y)^2 ) ) )
-
-
 export function linear(data) {
   let decimalPlaces = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 2;
   const sum = [0, 0, 0, 0, 0],
-        results = [];
+    results = [];
   let N = data.length;
-
   for (let n = 0, len = data.length; n < len; n++) {
     if (data[n]['x'] != null) {
       data[n][0] = data[n].x;
       data[n][1] = data[n].y;
     }
-
     if (data[n][1] != null) {
       sum[0] += data[n][0]; // Σ(X)
-
       sum[1] += data[n][1]; // Σ(Y)
-
       sum[2] += data[n][0] * data[n][0]; // Σ(X^2)
-
       sum[3] += data[n][0] * data[n][1]; // Σ(XY)
-
       sum[4] += data[n][1] * data[n][1]; // Σ(Y^2)
     } else {
       N -= 1;
     }
   }
-
   const gradient = (N * sum[3] - sum[0] * sum[1]) / (N * sum[2] - sum[0] * sum[0]);
-  const intercept = sum[1] / N - gradient * sum[0] / N; // let correlation = (N * sum[3] - sum[0] * sum[1]) / Math.sqrt((N * sum[2] - sum[0] * sum[0]) * (N * sum[4] - sum[1] * sum[1]));
+  const intercept = sum[1] / N - gradient * sum[0] / N;
+  // let correlation = (N * sum[3] - sum[0] * sum[1]) / Math.sqrt((N * sum[2] - sum[0] * sum[0]) * (N * sum[4] - sum[1] * sum[1]));
 
   for (let i = 0, len = data.length; i < len; i++) {
     let coorY = data[i][0] * gradient + intercept;
-
     if (decimalPlaces) {
       coorY = parseFloat(coorY.toFixed(decimalPlaces));
     }
-
     const coordinate = [data[i][0], coorY];
     results.push(coordinate);
   }
-
   results.sort((a, b) => {
     if (a[0] > b[0]) {
       return 1;
     }
-
     if (a[0] < b[0]) {
       return -1;
     }
-
     return 0;
   });
   const string = 'y = ' + Math.round(gradient * 100) / 100 + 'x + ' + Math.round(intercept * 100) / 100;
@@ -270,88 +235,73 @@ export function linear(data) {
     points: results,
     string: string
   };
-} // Code extracted from https://github.com/Tom-Alexander/regression-js/
+}
 
+// Code extracted from https://github.com/Tom-Alexander/regression-js/
 function polynomial(data) {
   let order = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 2;
   let extrapolate = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 0;
   let decimalPlaces = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : 2;
   const lhs = [],
-        rhs = [],
-        results = [],
-        k = order + 1;
+    rhs = [],
+    results = [],
+    k = order + 1;
   let a = 0,
-      b = 0;
-
+    b = 0;
   for (let i = 0; i < k; i++) {
     for (let l = 0, len = data.length; l < len; l++) {
       if (data[l].x != null) {
         data[l][0] = data[l].x;
         data[l][1] = data[l].y;
       }
-
       if (data[l][1] != null) {
         a += Math.pow(data[l][0], i) * data[l][1];
       }
     }
-
     lhs.push(a);
     a = 0;
     const c = [];
-
     for (let j = 0; j < k; j++) {
       for (let l = 0, len = data.length; l < len; l++) {
         if (data[l][1]) {
           b += Math.pow(data[l][0], i + j);
         }
       }
-
       c.push(b);
       b = 0;
     }
-
     rhs.push(c);
   }
-
   rhs.push(lhs);
   const equation = gaussianElimination(rhs, k);
   const resultLength = data.length + extrapolate;
   const step = data[data.length - 1][0] - data[data.length - 2][0];
-
   for (let i = 0, len = resultLength; i < len; i++) {
     let answer = 0,
-        x = 0;
-
+      x = 0;
     if (typeof data[i] !== 'undefined') {
       x = data[i][0];
     } else {
       x = data[data.length - 1][0] + (i - data.length) * step;
     }
-
     for (let w = 0; w < equation.length; w++) {
       answer += equation[w] * Math.pow(x, w);
-
       if (decimalPlaces) {
         answer = parseFloat(answer.toFixed(decimalPlaces));
       }
     }
-
     results.push([x, answer]);
   }
-
   results.sort((a, b) => {
     if (a[0] > b[0]) {
       return 1;
     }
-
     if (a[0] < b[0]) {
       return -1;
     }
-
     return 0;
   });
   let string = 'y = ';
-
   for (let i = equation.length - 1; i >= 0; i--) {
     if (i > 1) {
       string += Math.round(equation[i] * 100) / 100 + 'x^' + i + ' + ';
@@ -361,95 +311,78 @@ function polynomial(data) {
       string += Math.round(equation[i] * 100) / 100;
     }
   }
-
   return {
     equation: equation,
     points: results,
     string: string
   };
-} // @author: Ignacio Vazquez
+}
+
+// @author: Ignacio Vazquez
 // Based on
 // - http://commons.apache.org/proper/commons-math/download_math.cgi LoesInterpolator.java
 // - https://gist.github.com/avibryant/1151823
-
-
 function loess(data) {
   let bandwidth = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 0.25;
   const xval = data.map(pair => {
     return pair[0];
   });
   const distinctX = array_unique(xval);
-
   if (2 / distinctX.length > bandwidth) {
     bandwidth = Math.min(2 / distinctX.length, 1);
   }
-
   const yval = data.map(pair => {
     return pair[1];
   });
-
   function array_unique(values) {
     const o = {},
-          l = values.length,
-          r = [];
-
+      l = values.length,
+      r = [];
     for (let i = 0; i < l; i += 1) {
       o[values[i]] = values[i];
     }
-
     for (const i in o) {
       r.push(o[i]);
     }
-
     return r;
   }
-
   function tricube(x) {
     const tmp = 1 - x * x * x;
     return tmp * tmp * tmp;
   }
-
   const res = [];
   let left = 0;
   let right = Math.floor(bandwidth * xval.length) - 1;
-
   for (const i in xval) {
     const x = xval[i];
-
     if (i > 0) {
       if (right < xval.length - 1 && xval[right + 1] - xval[i] < xval[i] - xval[left]) {
         left++;
         right++;
       }
     }
-
     let edge;
-
     if (xval[i] - xval[left] > xval[right] - xval[i]) {
       edge = left;
     } else {
       edge = right;
     }
-
     const denom = Math.abs(1.0 / (xval[edge] - x));
     let sumWeights = 0;
     let sumX = 0,
-        sumXSquared = 0,
-        sumY = 0,
-        sumXY = 0;
+      sumXSquared = 0,
+      sumY = 0,
+      sumXY = 0;
     let k = left;
-
     while (k <= right) {
       const xk = xval[k];
       const yk = yval[k];
       let dist;
-
       if (k < i) {
         dist = x - xk;
       } else {
         dist = xk - x;
       }
-
       const w = tricube(dist * denom);
       const xkw = xk * w;
       sumWeights += w;
@@ -459,23 +392,19 @@ function loess(data) {
       sumXY += yk * xkw;
       k++;
     }
-
     const meanX = sumX / sumWeights;
     const meanY = sumY / sumWeights;
     const meanXY = sumXY / sumWeights;
     const meanXSquared = sumXSquared / sumWeights;
     let beta;
-
     if (meanXSquared === meanX * meanX) {
       beta = 0;
     } else {
       beta = (meanXY - meanX * meanY) / (meanXSquared - meanX * meanX);
     }
-
     const alpha = meanY - beta * meanX;
     res[i] = beta * x + alpha;
   }
-
   return {
     equation: '',
     points: xval.map((x, i) => {

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

@@ -7,37 +7,31 @@ import getFormatter from './getFormatter.js';
 import { getTextAlignOption } from './getTextAlignOption.js';
 const DEFAULT_MIN_VALUE = 0;
 const DEFAULT_GRIDLINE_COLOR = '#F1F1F1';
-
 const getPlotLineStyle = fontStyle => ({
   color: fontStyle[FONT_STYLE_OPTION_TEXT_COLOR] || '#000',
   width: 2,
   zIndex: 4
 });
-
 const getPlotLineLabelStyle = fontStyle => ({
   y: -7,
   style: {
     color: fontStyle[FONT_STYLE_OPTION_TEXT_COLOR],
-    fontSize: "".concat(fontStyle[FONT_STYLE_OPTION_FONT_SIZE], "px"),
+    fontSize: `${fontStyle[FONT_STYLE_OPTION_FONT_SIZE]}px`,
     fontWeight: fontStyle[FONT_STYLE_OPTION_BOLD] ? FONT_STYLE_OPTION_BOLD : 'normal',
     fontStyle: fontStyle[FONT_STYLE_OPTION_ITALIC] ? FONT_STYLE_OPTION_ITALIC : 'normal'
   }
 });
-
 const getLabelOffsetFromTextAlign = textAlign => {
   switch (textAlign) {
     case TEXT_ALIGN_LEFT:
       return 10;
-
     case TEXT_ALIGN_RIGHT:
       return -10;
-
     case TEXT_ALIGN_CENTER:
     default:
       return 0;
   }
 };
-
 const getLineLabelStyle = (textAlign, fontStyleType, isVertical) => {
   const alignKey = isVertical ? 'verticalAlign' : 'align';
   const alignValue = getTextAlignOption(textAlign, fontStyleType, isVertical);
@@ -47,41 +41,35 @@ const getLineLabelStyle = (textAlign, fontStyleType, isVertical) => {
     [alignKey]: alignValue,
     [offsetKey]: offsetValue
   };
-
   if (isVertical) {
     result.align = getTextAlignOption(textAlign, fontStyleType);
   }
-
   return result;
-}; // outlierLineMin: if there are lines with smaller x or y than the data
-
+};
 
+// outlierLineMin: if there are lines with smaller x or y than the data
 export const getMinValue = (minValue, dataValues, outlierLineMin) => {
   if (isNumeric(minValue)) {
     return minValue;
   }
-
   if (isNumeric(outlierLineMin)) {
     return outlierLineMin;
   }
-
   return dataValues !== null && dataValues !== void 0 && dataValues.some(value => value < DEFAULT_MIN_VALUE) ? undefined : DEFAULT_MIN_VALUE;
-}; // outlierLineMax: if there are lines with larger x or y than the data
+};
 
+// outlierLineMax: if there are lines with larger x or y than the data
 export const getMaxValue = (maxValue, dataValues, outlierLineMax) => {
   if (isNumeric(maxValue)) {
     return maxValue;
   }
-
   if (isNumeric(outlierLineMax)) {
     return outlierLineMax;
   }
-
   return dataValues !== null && dataValues !== void 0 && dataValues.every(value => value < DEFAULT_MIN_VALUE) ? DEFAULT_MIN_VALUE : undefined;
 };
 export const getRegressionLine = function () {
   var _regressionLine$title, _regressionLine$title2;
-
   let regressionLine = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
   let visType = arguments.length > 1 ? arguments[1] : undefined;
   let isVertical = arguments.length > 2 ? arguments[2] : undefined;
@@ -101,12 +89,11 @@ export const getRegressionLine = function () {
 };
 export const getLabels = axis => {
   var _axis$label;
-
   const fontStyle = mergeFontStyleWithDefault((_axis$label = axis.label) === null || _axis$label === void 0 ? void 0 : _axis$label.fontStyle, FONT_STYLE_AXIS_LABELS);
   return {
     style: {
       color: fontStyle[FONT_STYLE_OPTION_TEXT_COLOR],
-      fontSize: "".concat(fontStyle[FONT_STYLE_OPTION_FONT_SIZE], "px"),
+      fontSize: `${fontStyle[FONT_STYLE_OPTION_FONT_SIZE]}px`,
       fontWeight: fontStyle[FONT_STYLE_OPTION_BOLD] ? FONT_STYLE_OPTION_BOLD : 'normal',
       fontStyle: fontStyle[FONT_STYLE_OPTION_ITALIC] ? FONT_STYLE_OPTION_ITALIC : 'normal'
     },

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

@@ -11,7 +11,6 @@ const DASHBOARD_CHART = {
   spacingBottom: 2,
   spacingLeft: 5
 };
-
 const getEvents = () => ({
   events: {
     load: function () {
@@ -26,7 +25,6 @@ const getEvents = () => ({
     }
   }
 });
-
 export default function (layout, el, dashboard) {
   return Object.assign({}, getType(layout.type), {
     renderTo: el || layout.el

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

@@ -1,10 +1,11 @@
 export const CUSTOM_AXES_DIMENSION_ITEM = 'dimensionItem';
-export const CUSTOM_AXES_AXIS = 'axis'; // returns:
+export const CUSTOM_AXES_AXIS = 'axis';
+
+// returns:
 // {
 //     a: 1,
 //     b: 1,
 // }
-
 export function getIdAxisMap(customAxes) {
   return customAxes.reduce((map, item) => {
     map[item[CUSTOM_AXES_DIMENSION_ITEM]] = item[CUSTOM_AXES_AXIS];
@@ -14,29 +15,29 @@ export function getIdAxisMap(customAxes) {
 export function getFullIdAxisMap() {
   let customAxes = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
   let series = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
-  const idAxisMap = getIdAxisMap(customAxes.filter(axisItem => series.find(seriesItem => seriesItem.id === axisItem.dimensionItem))); // adds first axis ids to seriesAxisMap
+  const idAxisMap = getIdAxisMap(customAxes.filter(axisItem => series.find(seriesItem => seriesItem.id === axisItem.dimensionItem)));
 
+  // adds first axis ids to seriesAxisMap
   series.forEach(s => {
     if (!(s.id in idAxisMap)) {
       idAxisMap[s.id] = 0;
     }
   });
   return idAxisMap;
-} // returns:
+}
+
+// returns:
 // {
 //     0: ['a', 'b'],
 //     1: ['c'],
 // }
-
 export function getAxisIdsMap(customAxes, series) {
   const fullIdAxisMap = getFullIdAxisMap(customAxes, series);
   return Object.entries(fullIdAxisMap).reduce((map, _ref) => {
     let [id, axis] = _ref;
-
     if (!(axis in map)) {
       map[axis] = [];
     }
-
     map[axis].push(id);
     return map;
   }, {});

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

@@ -2,18 +2,16 @@ import isString from 'd2-utilizr/lib/isString';
 import { FONT_STYLE_OPTION_FONT_SIZE, FONT_STYLE_OPTION_TEXT_COLOR, FONT_STYLE_OPTION_BOLD, FONT_STYLE_OPTION_ITALIC, FONT_STYLE_OPTION_TEXT_ALIGN } from '../../../../modules/fontStyle.js';
 import { isVerticalType } from '../../../../modules/visTypes.js';
 import { getTextAlignOption } from './getTextAlignOption.js';
-
 const getTitleStyle = (fontStyle, titleType, visType) => fontStyle ? {
   align: getTextAlignOption(fontStyle[FONT_STYLE_OPTION_TEXT_ALIGN], titleType, isVerticalType(visType)),
   margin: 15,
   style: {
     color: fontStyle[FONT_STYLE_OPTION_TEXT_COLOR],
-    fontSize: "".concat(fontStyle[FONT_STYLE_OPTION_FONT_SIZE], "px"),
+    fontSize: `${fontStyle[FONT_STYLE_OPTION_FONT_SIZE]}px`,
     fontWeight: fontStyle[FONT_STYLE_OPTION_BOLD] ? FONT_STYLE_OPTION_BOLD : 'normal',
     fontStyle: fontStyle[FONT_STYLE_OPTION_ITALIC] ? FONT_STYLE_OPTION_ITALIC : 'normal'
   }
 } : {};
-
 export default function (title, fontStyle, titleType, visType) {
   return isString(title) ? Object.assign({}, getTitleStyle(fontStyle, titleType, visType), {
     text: title

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

@@ -1,24 +1,22 @@
 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 = [];
   series.forEach(seriesObj => {
     cumulativeValues = seriesObj.data.reduce((accumulator, value, index) => {
       decimals = Math.max(decimals, numberDecimals(value));
-
       if (index > 0) {
         value += accumulator[index - 1];
       }
-
       accumulator.push(value);
       return accumulator;
-    }, []); // round values to the largest number of decimals found in the serie
+    }, []);
+
+    // 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;
     });
@@ -26,7 +24,6 @@ function getDefaultCumulativeData(series) {
   });
   return series;
 }
-
 function getTwoCategoryCumulativeData(series) {
   let decimals = 0;
   series.filter(seriesObj => !seriesObj.custom.isTwoCategoryFakeSerie).forEach(seriesObj => {
@@ -35,25 +32,23 @@ function getTwoCategoryCumulativeData(series) {
       const cumulativeGroupValues = [];
       groupObj.forEach((value, index) => {
         decimals = Math.max(decimals, numberDecimals(value));
-
         if (index > 0) {
           value += cumulativeGroupValues[index - 1];
         }
-
         cumulativeGroupValues.push(value);
       });
       cumulativeValues.push(cumulativeGroupValues);
-    }); // round values to the largest number of decimals found in the serie
+    });
+
+    // 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.data = getTwoCategorySplitSerieData(seriesObj.custom.data);
     decimals = 0;
   });
   return series;
 }
-
 export default function (series, layout) {
   if (isTwoCategoryChartType(layout.type) && layout.rows.length > 1) {
     return getTwoCategoryCumulativeData(series);