@dhis2/analytics 23.7.9 → 23.7.10
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.7.10](https://github.com/dhis2/analytics/compare/v23.7.9...v23.7.10) (2022-04-28)
|
|
2
|
+
|
|
3
|
+
|
|
4
|
+
### Bug Fixes
|
|
5
|
+
|
|
6
|
+
* set repetition in filter ([#1212](https://github.com/dhis2/analytics/issues/1212)) ([8510cba](https://github.com/dhis2/analytics/commit/8510cbaa68eac3902215d6db8508478b046d59b2))
|
|
7
|
+
|
|
1
8
|
## [23.7.9](https://github.com/dhis2/analytics/compare/v23.7.8...v23.7.9) (2022-04-26)
|
|
2
9
|
|
|
3
10
|
|
|
@@ -92,7 +92,7 @@ class AnalyticsRequest extends (0, _AnalyticsRequestDimensionsMixin.default)((0,
|
|
|
92
92
|
|
|
93
93
|
request = request.addDimension(f.dimension, (_f$items = f.items) === null || _f$items === void 0 ? void 0 : _f$items.map(item => item.id));
|
|
94
94
|
} else {
|
|
95
|
-
var _f$programStage, _f$
|
|
95
|
+
var _f$programStage, _f$repetition, _f$repetition$indexes;
|
|
96
96
|
|
|
97
97
|
let filterString = (_f$programStage = f.programStage) !== null && _f$programStage !== void 0 && _f$programStage.id ? "".concat(f.programStage.id, ".").concat(f.dimension) : f.dimension;
|
|
98
98
|
|
|
@@ -100,7 +100,15 @@ class AnalyticsRequest extends (0, _AnalyticsRequestDimensionsMixin.default)((0,
|
|
|
100
100
|
filterString += ":".concat(f.filter);
|
|
101
101
|
}
|
|
102
102
|
|
|
103
|
-
|
|
103
|
+
if ((_f$repetition = f.repetition) !== null && _f$repetition !== void 0 && (_f$repetition$indexes = _f$repetition.indexes) !== null && _f$repetition$indexes !== void 0 && _f$repetition$indexes.length) {
|
|
104
|
+
f.repetition.indexes.forEach(index => {
|
|
105
|
+
request = request.addFilter(filterString.replace(/\./, "[".concat(index, "].")));
|
|
106
|
+
});
|
|
107
|
+
} else {
|
|
108
|
+
var _f$items2;
|
|
109
|
+
|
|
110
|
+
request = request.addFilter(filterString, (_f$items2 = f.items) === null || _f$items2 === void 0 ? void 0 : _f$items2.map(item => item.id));
|
|
111
|
+
}
|
|
104
112
|
}
|
|
105
113
|
});
|
|
106
114
|
return request;
|
|
@@ -79,7 +79,7 @@ class AnalyticsRequest extends AnalyticsRequestDimensionsMixin(AnalyticsRequestF
|
|
|
79
79
|
|
|
80
80
|
request = request.addDimension(f.dimension, (_f$items = f.items) === null || _f$items === void 0 ? void 0 : _f$items.map(item => item.id));
|
|
81
81
|
} else {
|
|
82
|
-
var _f$programStage, _f$
|
|
82
|
+
var _f$programStage, _f$repetition, _f$repetition$indexes;
|
|
83
83
|
|
|
84
84
|
let filterString = (_f$programStage = f.programStage) !== null && _f$programStage !== void 0 && _f$programStage.id ? "".concat(f.programStage.id, ".").concat(f.dimension) : f.dimension;
|
|
85
85
|
|
|
@@ -87,7 +87,15 @@ class AnalyticsRequest extends AnalyticsRequestDimensionsMixin(AnalyticsRequestF
|
|
|
87
87
|
filterString += ":".concat(f.filter);
|
|
88
88
|
}
|
|
89
89
|
|
|
90
|
-
|
|
90
|
+
if ((_f$repetition = f.repetition) !== null && _f$repetition !== void 0 && (_f$repetition$indexes = _f$repetition.indexes) !== null && _f$repetition$indexes !== void 0 && _f$repetition$indexes.length) {
|
|
91
|
+
f.repetition.indexes.forEach(index => {
|
|
92
|
+
request = request.addFilter(filterString.replace(/\./, "[".concat(index, "].")));
|
|
93
|
+
});
|
|
94
|
+
} else {
|
|
95
|
+
var _f$items2;
|
|
96
|
+
|
|
97
|
+
request = request.addFilter(filterString, (_f$items2 = f.items) === null || _f$items2 === void 0 ? void 0 : _f$items2.map(item => item.id));
|
|
98
|
+
}
|
|
91
99
|
}
|
|
92
100
|
});
|
|
93
101
|
return request;
|