@dhis2/analytics 23.8.8 → 23.10.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/CHANGELOG.md +21 -0
- 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 +6 -0
- package/build/cjs/visualizations/util/colors/colorSets.js +11 -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 +1 -1
- package/build/es/visualizations/util/colors/colorSets.js +8 -0
- package/package.json +1 -1
package/CHANGELOG.md
CHANGED
|
@@ -1,3 +1,24 @@
|
|
|
1
|
+
# [23.10.0](https://github.com/dhis2/analytics/compare/v23.9.1...v23.10.0) (2022-05-24)
|
|
2
|
+
|
|
3
|
+
|
|
4
|
+
### Features
|
|
5
|
+
|
|
6
|
+
* add basic and extended color sets ([#1242](https://github.com/dhis2/analytics/issues/1242)) ([a856a11](https://github.com/dhis2/analytics/commit/a856a115aeaedc8da0a0fc137ca11e4b7cd8af4a))
|
|
7
|
+
|
|
8
|
+
## [23.9.1](https://github.com/dhis2/analytics/compare/v23.9.0...v23.9.1) (2022-05-24)
|
|
9
|
+
|
|
10
|
+
|
|
11
|
+
### Bug Fixes
|
|
12
|
+
|
|
13
|
+
* **translations:** sync translations from transifex (master) ([5c25b7d](https://github.com/dhis2/analytics/commit/5c25b7d6f9431bdf578cb896864183a722ca17df))
|
|
14
|
+
|
|
15
|
+
# [23.9.0](https://github.com/dhis2/analytics/compare/v23.8.8...v23.9.0) (2022-05-20)
|
|
16
|
+
|
|
17
|
+
|
|
18
|
+
### Features
|
|
19
|
+
|
|
20
|
+
* export WEEKS_THIS_YEAR constant DHIS2-12580 ([#1238](https://github.com/dhis2/analytics/issues/1238)) ([2896cdb](https://github.com/dhis2/analytics/commit/2896cdb908252f3276dfa893e71c20fac1ad1ae4))
|
|
21
|
+
|
|
1
22
|
## [23.8.8](https://github.com/dhis2/analytics/compare/v23.8.7...v23.8.8) (2022-05-19)
|
|
2
23
|
|
|
3
24
|
|
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
Object.defineProperty(exports, "__esModule", {
|
|
4
4
|
value: true
|
|
5
5
|
});
|
|
6
|
-
exports.filterPeriodTypesById = exports.YEARLY = exports.WEEKLYWED = exports.WEEKLYTHU = exports.WEEKLYSUN = exports.WEEKLYSAT = exports.WEEKLY = exports.SIXMONTHLYAPR = exports.SIXMONTHLY = exports.QUARTERLY = exports.MONTHLY = exports.FYOCT = exports.FYNOV = exports.FYJUL = exports.FYAPR = exports.FINANCIAL = exports.DAILY = exports.BIWEEKLY = exports.BIMONTHLY = void 0;
|
|
6
|
+
exports.filterPeriodTypesById = exports.YEARLY = exports.WEEKS_THIS_YEAR = exports.WEEKLYWED = exports.WEEKLYTHU = exports.WEEKLYSUN = exports.WEEKLYSAT = exports.WEEKLY = exports.SIXMONTHLYAPR = exports.SIXMONTHLY = exports.QUARTERLY = exports.MONTHLY = exports.FYOCT = exports.FYNOV = exports.FYJUL = exports.FYAPR = exports.FINANCIAL = exports.DAILY = exports.BIWEEKLY = exports.BIMONTHLY = 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
|
@@ -873,6 +873,12 @@ Object.defineProperty(exports, "WEEKLYWED", {
|
|
|
873
873
|
return _index7.WEEKLYWED;
|
|
874
874
|
}
|
|
875
875
|
});
|
|
876
|
+
Object.defineProperty(exports, "WEEKS_THIS_YEAR", {
|
|
877
|
+
enumerable: true,
|
|
878
|
+
get: function () {
|
|
879
|
+
return _index7.WEEKS_THIS_YEAR;
|
|
880
|
+
}
|
|
881
|
+
});
|
|
876
882
|
Object.defineProperty(exports, "YEARLY", {
|
|
877
883
|
enumerable: true,
|
|
878
884
|
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_GRAY = exports.COLOR_SET_DEFAULT = exports.COLOR_SET_DARK = exports.COLOR_SET_COLOR_BLIND = exports.COLOR_SET_BRIGHT = void 0;
|
|
6
|
+
exports.colorSets = exports.COLOR_SET_PATTERNS = exports.COLOR_SET_GRAY = exports.COLOR_SET_EXTENDED = exports.COLOR_SET_DEFAULT = exports.COLOR_SET_DARK = exports.COLOR_SET_COLOR_BLIND = exports.COLOR_SET_BRIGHT = exports.COLOR_SET_BASIC = 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
|
},
|
|
@@ -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
|
@@ -87,7 +87,7 @@ export { renderValue as formatValue } from './modules/renderValue.js'; // Utils:
|
|
|
87
87
|
|
|
88
88
|
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
|
|
89
89
|
|
|
90
|
-
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';
|
|
90
|
+
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';
|
|
91
91
|
export { getRelativePeriodsOptionsById } from './components/PeriodDimension/utils/relativePeriods.js';
|
|
92
92
|
export { getFixedPeriodsOptionsById } from './components/PeriodDimension/utils/fixedPeriods.js';
|
|
93
93
|
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
|
},
|