@dhis2/analytics 21.5.1 → 21.7.0
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/build/cjs/components/OpenFileDialog/OpenFileDialog.js +1 -1
- package/build/cjs/components/PeriodDimension/utils/index.js +3 -1
- package/build/cjs/components/PeriodDimension/utils/relativePeriods.js +1 -1
- package/build/cjs/index.js +18 -0
- package/build/cjs/visualizations/util/colors/colorSets.js +11 -1
- package/build/es/components/OpenFileDialog/OpenFileDialog.js +1 -1
- package/build/es/components/PeriodDimension/utils/index.js +1 -0
- package/build/es/components/PeriodDimension/utils/relativePeriods.js +2 -2
- package/build/es/index.js +2 -2
- package/build/es/visualizations/util/colors/colorSets.js +8 -0
- package/package.json +1 -1
- package/CHANGELOG.md +0 -2978
|
@@ -122,7 +122,7 @@ const OpenFileDialog = ({
|
|
|
122
122
|
}
|
|
123
123
|
|
|
124
124
|
if (filters.searchTerm) {
|
|
125
|
-
queryFilters.push("
|
|
125
|
+
queryFilters.push("displayName:ilike:".concat(filters.searchTerm));
|
|
126
126
|
} // for ER 2.38 only show line list ER types
|
|
127
127
|
|
|
128
128
|
|
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
Object.defineProperty(exports, "__esModule", {
|
|
4
4
|
value: true
|
|
5
5
|
});
|
|
6
|
-
exports.filterPeriodTypesById = exports.FYAPR = exports.FYJUL = exports.FYOCT = exports.FYNOV = exports.FINANCIAL = exports.YEARLY = exports.SIXMONTHLYAPR = exports.SIXMONTHLY = exports.QUARTERLY = exports.BIMONTHLY = exports.MONTHLY = exports.BIWEEKLY = exports.WEEKLYSUN = exports.WEEKLYSAT = exports.WEEKLYTHU = exports.WEEKLYWED = exports.WEEKLY = exports.DAILY = void 0;
|
|
6
|
+
exports.filterPeriodTypesById = exports.FYAPR = exports.FYJUL = exports.FYOCT = exports.FYNOV = exports.FINANCIAL = exports.YEARLY = exports.SIXMONTHLYAPR = exports.SIXMONTHLY = exports.QUARTERLY = exports.BIMONTHLY = exports.MONTHLY = exports.BIWEEKLY = exports.WEEKS_THIS_YEAR = exports.WEEKLYSUN = exports.WEEKLYSAT = exports.WEEKLYTHU = exports.WEEKLYWED = exports.WEEKLY = exports.DAILY = void 0;
|
|
7
7
|
const DAILY = 'DAILY';
|
|
8
8
|
exports.DAILY = DAILY;
|
|
9
9
|
const WEEKLY = 'WEEKLY';
|
|
@@ -16,6 +16,8 @@ const WEEKLYSAT = 'WEEKLYSAT';
|
|
|
16
16
|
exports.WEEKLYSAT = WEEKLYSAT;
|
|
17
17
|
const WEEKLYSUN = 'WEEKLYSUN';
|
|
18
18
|
exports.WEEKLYSUN = WEEKLYSUN;
|
|
19
|
+
const WEEKS_THIS_YEAR = 'WEEKS_THIS_YEAR';
|
|
20
|
+
exports.WEEKS_THIS_YEAR = WEEKS_THIS_YEAR;
|
|
19
21
|
const BIWEEKLY = 'BIWEEKLY';
|
|
20
22
|
exports.BIWEEKLY = BIWEEKLY;
|
|
21
23
|
const MONTHLY = 'MONTHLY';
|
package/build/cjs/index.js
CHANGED
|
@@ -981,6 +981,18 @@ Object.defineProperty(exports, "COLOR_SET_DEFAULT", {
|
|
|
981
981
|
return _colorSets.COLOR_SET_DEFAULT;
|
|
982
982
|
}
|
|
983
983
|
});
|
|
984
|
+
Object.defineProperty(exports, "COLOR_SET_BASIC", {
|
|
985
|
+
enumerable: true,
|
|
986
|
+
get: function () {
|
|
987
|
+
return _colorSets.COLOR_SET_BASIC;
|
|
988
|
+
}
|
|
989
|
+
});
|
|
990
|
+
Object.defineProperty(exports, "COLOR_SET_EXTENDED", {
|
|
991
|
+
enumerable: true,
|
|
992
|
+
get: function () {
|
|
993
|
+
return _colorSets.COLOR_SET_EXTENDED;
|
|
994
|
+
}
|
|
995
|
+
});
|
|
984
996
|
Object.defineProperty(exports, "COLOR_SET_BRIGHT", {
|
|
985
997
|
enumerable: true,
|
|
986
998
|
get: function () {
|
|
@@ -1053,6 +1065,12 @@ Object.defineProperty(exports, "WEEKLYSUN", {
|
|
|
1053
1065
|
return _index7.WEEKLYSUN;
|
|
1054
1066
|
}
|
|
1055
1067
|
});
|
|
1068
|
+
Object.defineProperty(exports, "WEEKS_THIS_YEAR", {
|
|
1069
|
+
enumerable: true,
|
|
1070
|
+
get: function () {
|
|
1071
|
+
return _index7.WEEKS_THIS_YEAR;
|
|
1072
|
+
}
|
|
1073
|
+
});
|
|
1056
1074
|
Object.defineProperty(exports, "BIWEEKLY", {
|
|
1057
1075
|
enumerable: true,
|
|
1058
1076
|
get: function () {
|
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
Object.defineProperty(exports, "__esModule", {
|
|
4
4
|
value: true
|
|
5
5
|
});
|
|
6
|
-
exports.colorSets = exports.COLOR_SET_PATTERNS = exports.COLOR_SET_COLOR_BLIND = exports.COLOR_SET_GRAY = exports.COLOR_SET_DARK = exports.COLOR_SET_BRIGHT = exports.COLOR_SET_DEFAULT = void 0;
|
|
6
|
+
exports.colorSets = exports.COLOR_SET_PATTERNS = exports.COLOR_SET_COLOR_BLIND = exports.COLOR_SET_GRAY = exports.COLOR_SET_DARK = exports.COLOR_SET_BRIGHT = exports.COLOR_SET_EXTENDED = exports.COLOR_SET_BASIC = exports.COLOR_SET_DEFAULT = void 0;
|
|
7
7
|
|
|
8
8
|
var _highcharts = _interopRequireDefault(require("highcharts"));
|
|
9
9
|
|
|
@@ -14,6 +14,10 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
|
|
|
14
14
|
(0, _patternFill.default)(_highcharts.default);
|
|
15
15
|
const COLOR_SET_DEFAULT = 'DEFAULT';
|
|
16
16
|
exports.COLOR_SET_DEFAULT = COLOR_SET_DEFAULT;
|
|
17
|
+
const COLOR_SET_BASIC = 'BASIC';
|
|
18
|
+
exports.COLOR_SET_BASIC = COLOR_SET_BASIC;
|
|
19
|
+
const COLOR_SET_EXTENDED = 'EXTENDED';
|
|
20
|
+
exports.COLOR_SET_EXTENDED = COLOR_SET_EXTENDED;
|
|
17
21
|
const COLOR_SET_BRIGHT = 'BRIGHT';
|
|
18
22
|
exports.COLOR_SET_BRIGHT = COLOR_SET_BRIGHT;
|
|
19
23
|
const COLOR_SET_DARK = 'DARK';
|
|
@@ -28,6 +32,12 @@ const colorSets = {
|
|
|
28
32
|
[COLOR_SET_DEFAULT]: {
|
|
29
33
|
colors: ['#a8bf24', '#518cc3', '#d74554', '#ff9e21', '#968f8f', '#ba3ba1', '#ffda54', '#45beae', '#b98037', '#676767', '#6b2dd4', '#47792c', '#fcbdbd', '#830000', '#a5ffc0', '#000078', '#817c00', '#bdf023', '#fffac4']
|
|
30
34
|
},
|
|
35
|
+
[COLOR_SET_BASIC]: {
|
|
36
|
+
colors: ['#348F41', '#9F2241', '#DDDDDD', '#B4A269']
|
|
37
|
+
},
|
|
38
|
+
[COLOR_SET_EXTENDED]: {
|
|
39
|
+
colors: ['#194F90', '#AE1857', '#5B7E96', '#FFB71B', '#1DCAD3', '#FF5C35', '#8F4899', '#DAE343', '#385CAD', '#E81F76', '#009383', '#522B39']
|
|
40
|
+
},
|
|
31
41
|
[COLOR_SET_BRIGHT]: {
|
|
32
42
|
colors: ['#fd7f6f', '#8bd3c7', '#beb9db', '#7eb0d5', '#ffb55a', '#fdcce5', '#ffffaf', '#d9d9d9', '#bd7ebe', '#cbecc4', '#9fe778', '#ffef65']
|
|
33
43
|
},
|
|
@@ -96,7 +96,7 @@ export const OpenFileDialog = ({
|
|
|
96
96
|
}
|
|
97
97
|
|
|
98
98
|
if (filters.searchTerm) {
|
|
99
|
-
queryFilters.push("
|
|
99
|
+
queryFilters.push("displayName:ilike:".concat(filters.searchTerm));
|
|
100
100
|
} // for ER 2.38 only show line list ER types
|
|
101
101
|
|
|
102
102
|
|
|
@@ -4,6 +4,7 @@ export const WEEKLYWED = 'WEEKLYWED';
|
|
|
4
4
|
export const WEEKLYTHU = 'WEEKLYTHU';
|
|
5
5
|
export const WEEKLYSAT = 'WEEKLYSAT';
|
|
6
6
|
export const WEEKLYSUN = 'WEEKLYSUN';
|
|
7
|
+
export const WEEKS_THIS_YEAR = 'WEEKS_THIS_YEAR';
|
|
7
8
|
export const BIWEEKLY = 'BIWEEKLY';
|
|
8
9
|
export const MONTHLY = 'MONTHLY';
|
|
9
10
|
export const BIMONTHLY = 'BIMONTHLY';
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import i18n from '../../../locales/index.js';
|
|
2
|
-
import { DAILY, WEEKLY, BIWEEKLY, MONTHLY, BIMONTHLY, QUARTERLY, SIXMONTHLY, FINANCIAL, YEARLY } from './index.js';
|
|
2
|
+
import { DAILY, WEEKLY, BIWEEKLY, WEEKS_THIS_YEAR, MONTHLY, BIMONTHLY, QUARTERLY, SIXMONTHLY, FINANCIAL, YEARLY } from './index.js';
|
|
3
3
|
|
|
4
4
|
const getDaysPeriodType = () => [{
|
|
5
5
|
id: 'TODAY',
|
|
@@ -46,7 +46,7 @@ const getWeeksPeriodType = () => [{
|
|
|
46
46
|
id: 'LAST_52_WEEKS',
|
|
47
47
|
name: i18n.t('Last 52 weeks')
|
|
48
48
|
}, {
|
|
49
|
-
id:
|
|
49
|
+
id: WEEKS_THIS_YEAR,
|
|
50
50
|
name: i18n.t('Weeks this year')
|
|
51
51
|
}];
|
|
52
52
|
|
package/build/es/index.js
CHANGED
|
@@ -82,9 +82,9 @@ export { LEGEND_DISPLAY_STRATEGY_BY_DATA_ITEM, LEGEND_DISPLAY_STRATEGY_FIXED, LE
|
|
|
82
82
|
|
|
83
83
|
export { renderValue as formatValue } from './modules/pivotTable/renderValue.js'; // Utils: colorSets
|
|
84
84
|
|
|
85
|
-
export { COLOR_SET_DEFAULT, COLOR_SET_BRIGHT, COLOR_SET_DARK, COLOR_SET_GRAY, COLOR_SET_COLOR_BLIND, COLOR_SET_PATTERNS, colorSets } from './visualizations/util/colors/colorSets.js'; // Utils: periods
|
|
85
|
+
export { COLOR_SET_DEFAULT, COLOR_SET_BASIC, COLOR_SET_EXTENDED, COLOR_SET_BRIGHT, COLOR_SET_DARK, COLOR_SET_GRAY, COLOR_SET_COLOR_BLIND, COLOR_SET_PATTERNS, colorSets } from './visualizations/util/colors/colorSets.js'; // Utils: periods
|
|
86
86
|
|
|
87
|
-
export { DAILY, WEEKLY, WEEKLYWED, WEEKLYTHU, WEEKLYSAT, WEEKLYSUN, BIWEEKLY, MONTHLY, BIMONTHLY, QUARTERLY, SIXMONTHLY, SIXMONTHLYAPR, YEARLY, FINANCIAL, FYNOV, FYOCT, FYJUL, FYAPR } from './components/PeriodDimension/utils/index.js';
|
|
87
|
+
export { DAILY, WEEKLY, WEEKLYWED, WEEKLYTHU, WEEKLYSAT, WEEKLYSUN, WEEKS_THIS_YEAR, BIWEEKLY, MONTHLY, BIMONTHLY, QUARTERLY, SIXMONTHLY, SIXMONTHLYAPR, YEARLY, FINANCIAL, FYNOV, FYOCT, FYJUL, FYAPR } from './components/PeriodDimension/utils/index.js';
|
|
88
88
|
export { getRelativePeriodsOptionsById } from './components/PeriodDimension/utils/relativePeriods.js';
|
|
89
89
|
export { getFixedPeriodsOptionsById } from './components/PeriodDimension/utils/fixedPeriods.js';
|
|
90
90
|
export { default as VisualizationOptions } from './components/Options/VisualizationOptions.js';
|
|
@@ -2,6 +2,8 @@ import H from 'highcharts';
|
|
|
2
2
|
import HPF from 'highcharts/modules/pattern-fill';
|
|
3
3
|
HPF(H);
|
|
4
4
|
export const COLOR_SET_DEFAULT = 'DEFAULT';
|
|
5
|
+
export const COLOR_SET_BASIC = 'BASIC';
|
|
6
|
+
export const COLOR_SET_EXTENDED = 'EXTENDED';
|
|
5
7
|
export const COLOR_SET_BRIGHT = 'BRIGHT';
|
|
6
8
|
export const COLOR_SET_DARK = 'DARK';
|
|
7
9
|
export const COLOR_SET_GRAY = 'GRAY';
|
|
@@ -11,6 +13,12 @@ export const colorSets = {
|
|
|
11
13
|
[COLOR_SET_DEFAULT]: {
|
|
12
14
|
colors: ['#a8bf24', '#518cc3', '#d74554', '#ff9e21', '#968f8f', '#ba3ba1', '#ffda54', '#45beae', '#b98037', '#676767', '#6b2dd4', '#47792c', '#fcbdbd', '#830000', '#a5ffc0', '#000078', '#817c00', '#bdf023', '#fffac4']
|
|
13
15
|
},
|
|
16
|
+
[COLOR_SET_BASIC]: {
|
|
17
|
+
colors: ['#348F41', '#9F2241', '#DDDDDD', '#B4A269']
|
|
18
|
+
},
|
|
19
|
+
[COLOR_SET_EXTENDED]: {
|
|
20
|
+
colors: ['#194F90', '#AE1857', '#5B7E96', '#FFB71B', '#1DCAD3', '#FF5C35', '#8F4899', '#DAE343', '#385CAD', '#E81F76', '#009383', '#522B39']
|
|
21
|
+
},
|
|
14
22
|
[COLOR_SET_BRIGHT]: {
|
|
15
23
|
colors: ['#fd7f6f', '#8bd3c7', '#beb9db', '#7eb0d5', '#ffb55a', '#fdcce5', '#ffffaf', '#d9d9d9', '#bd7ebe', '#cbecc4', '#9fe778', '#ffef65']
|
|
16
24
|
},
|