@dhis2/analytics 23.2.1 → 23.2.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/CHANGELOG.md
CHANGED
|
@@ -1,3 +1,10 @@
|
|
|
1
|
+
## [23.2.2](https://github.com/dhis2/analytics/compare/v23.2.1...v23.2.2) (2022-02-11)
|
|
2
|
+
|
|
3
|
+
|
|
4
|
+
### Bug Fixes
|
|
5
|
+
|
|
6
|
+
* use stage id as prefix for dimensions in analytics request ([#1150](https://github.com/dhis2/analytics/issues/1150)) ([0a9253e](https://github.com/dhis2/analytics/commit/0a9253e0200a6bc93aa8499ad2c70e20dc09203d))
|
|
7
|
+
|
|
1
8
|
## [23.2.1](https://github.com/dhis2/analytics/compare/v23.2.0...v23.2.1) (2022-02-09)
|
|
2
9
|
|
|
3
10
|
|
|
@@ -56,7 +56,7 @@ class AnalyticsRequest extends (0, _AnalyticsRequestDimensionsMixin.default)((0,
|
|
|
56
56
|
const columns = visualization.columns || [];
|
|
57
57
|
const rows = visualization.rows || [];
|
|
58
58
|
columns.concat(rows).forEach(d => {
|
|
59
|
-
var _d$legendSet, _d$items;
|
|
59
|
+
var _d$legendSet, _d$programStage, _d$items;
|
|
60
60
|
|
|
61
61
|
let dimension = d.dimension;
|
|
62
62
|
|
|
@@ -64,6 +64,10 @@ class AnalyticsRequest extends (0, _AnalyticsRequestDimensionsMixin.default)((0,
|
|
|
64
64
|
dimension += "-".concat(d.legendSet.id);
|
|
65
65
|
}
|
|
66
66
|
|
|
67
|
+
if ((_d$programStage = d.programStage) !== null && _d$programStage !== void 0 && _d$programStage.id) {
|
|
68
|
+
dimension = "".concat(d.programStage.id, ".").concat(dimension);
|
|
69
|
+
}
|
|
70
|
+
|
|
67
71
|
if (d.filter) {
|
|
68
72
|
dimension += ":".concat(d.filter);
|
|
69
73
|
}
|
|
@@ -43,7 +43,7 @@ class AnalyticsRequest extends AnalyticsRequestDimensionsMixin(AnalyticsRequestF
|
|
|
43
43
|
const columns = visualization.columns || [];
|
|
44
44
|
const rows = visualization.rows || [];
|
|
45
45
|
columns.concat(rows).forEach(d => {
|
|
46
|
-
var _d$legendSet, _d$items;
|
|
46
|
+
var _d$legendSet, _d$programStage, _d$items;
|
|
47
47
|
|
|
48
48
|
let dimension = d.dimension;
|
|
49
49
|
|
|
@@ -51,6 +51,10 @@ class AnalyticsRequest extends AnalyticsRequestDimensionsMixin(AnalyticsRequestF
|
|
|
51
51
|
dimension += "-".concat(d.legendSet.id);
|
|
52
52
|
}
|
|
53
53
|
|
|
54
|
+
if ((_d$programStage = d.programStage) !== null && _d$programStage !== void 0 && _d$programStage.id) {
|
|
55
|
+
dimension = "".concat(d.programStage.id, ".").concat(dimension);
|
|
56
|
+
}
|
|
57
|
+
|
|
54
58
|
if (d.filter) {
|
|
55
59
|
dimension += ":".concat(d.filter);
|
|
56
60
|
}
|