@sis-cc/dotstatsuite-components 13.5.0 → 13.5.1
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/lib/rules/src/date.js
CHANGED
|
@@ -120,14 +120,14 @@ var getReportedTimePeriodLabel = exports.getReportedTimePeriodLabel = function g
|
|
|
120
120
|
};
|
|
121
121
|
|
|
122
122
|
var getReportedTimePeriod = exports.getReportedTimePeriod = function getReportedTimePeriod(reportYearStart, value, freq) {
|
|
123
|
+
var start = new Date(R.prop('start', value));
|
|
124
|
+
var end = new Date(R.prop('end', value));
|
|
123
125
|
if (reportYearStart.month === '01' && reportYearStart.day === '01') {
|
|
124
|
-
return
|
|
126
|
+
return { start: start, end: end };
|
|
125
127
|
}
|
|
126
|
-
var start = new Date(R.prop('start', value));
|
|
127
128
|
start = _dateFns2.default.addMinutes(start, start.getTimezoneOffset());
|
|
128
129
|
start = _dateFns2.default.addMonths(start, reportYearStart.month - 1);
|
|
129
130
|
start = _dateFns2.default.addDays(start, reportYearStart.day - 1);
|
|
130
|
-
var end = void 0;
|
|
131
131
|
if (freq === 'A') {
|
|
132
132
|
end = _dateFns2.default.addYears(start, 1);
|
|
133
133
|
}
|
|
@@ -70,14 +70,6 @@ var dataTransformer = exports.dataTransformer = function dataTransformer(dataNew
|
|
|
70
70
|
var start = null;
|
|
71
71
|
var end = null;
|
|
72
72
|
if (isTimeDimension) {
|
|
73
|
-
/*start = new Date(R.prop('start', value));
|
|
74
|
-
start = Date.UTC(dateFns.getYear(start), dateFns.getMonth(start), dateFns.getDate(start), dateFns.getHours(start), dateFns.getMinutes(start), dateFns.getSeconds(start));
|
|
75
|
-
start = dateFns.addMonths(start, reportYearStart.month - 1);
|
|
76
|
-
start = dateFns.addDays(start, reportYearStart.day - 1);
|
|
77
|
-
end = new Date(R.prop('end', value));
|
|
78
|
-
end = Date.UTC(dateFns.getYear(end), dateFns.getMonth(end), dateFns.getDate(end), dateFns.getHours(end), dateFns.getMinutes(end), dateFns.getSeconds(end));
|
|
79
|
-
end = dateFns.addMonths(end, reportYearStart.month - 1);
|
|
80
|
-
end = dateFns.addDays(end, reportYearStart.day - 1);*/
|
|
81
73
|
var reported = (0, _date.getReportedTimePeriod)(reportYearStart, value, options.frequency);
|
|
82
74
|
start = reported.start;
|
|
83
75
|
end = reported.end;
|
package/package.json
CHANGED
package/src/rules/src/date.js
CHANGED
|
@@ -58,14 +58,14 @@ export const getReportedTimePeriodLabel = (freq, _format, locale) => (reportYear
|
|
|
58
58
|
};
|
|
59
59
|
|
|
60
60
|
export const getReportedTimePeriod = (reportYearStart, value, freq) => {
|
|
61
|
+
let start = new Date(R.prop('start', value));
|
|
62
|
+
let end = new Date(R.prop('end', value));
|
|
61
63
|
if(reportYearStart.month === '01' && reportYearStart.day === '01') {
|
|
62
|
-
return
|
|
64
|
+
return ({ start, end });
|
|
63
65
|
}
|
|
64
|
-
let start = new Date(R.prop('start', value));
|
|
65
66
|
start = dateFns.addMinutes(start, start.getTimezoneOffset());
|
|
66
67
|
start = dateFns.addMonths(start, reportYearStart.month - 1);
|
|
67
68
|
start = dateFns.addDays(start, reportYearStart.day - 1);
|
|
68
|
-
let end;
|
|
69
69
|
if (freq === 'A') {
|
|
70
70
|
end = dateFns.addYears(start, 1);
|
|
71
71
|
}
|
|
@@ -47,14 +47,6 @@ export const dataTransformer = (dataNew, options = {}) => {
|
|
|
47
47
|
let start = null;
|
|
48
48
|
let end = null;
|
|
49
49
|
if (isTimeDimension) {
|
|
50
|
-
/*start = new Date(R.prop('start', value));
|
|
51
|
-
start = Date.UTC(dateFns.getYear(start), dateFns.getMonth(start), dateFns.getDate(start), dateFns.getHours(start), dateFns.getMinutes(start), dateFns.getSeconds(start));
|
|
52
|
-
start = dateFns.addMonths(start, reportYearStart.month - 1);
|
|
53
|
-
start = dateFns.addDays(start, reportYearStart.day - 1);
|
|
54
|
-
end = new Date(R.prop('end', value));
|
|
55
|
-
end = Date.UTC(dateFns.getYear(end), dateFns.getMonth(end), dateFns.getDate(end), dateFns.getHours(end), dateFns.getMinutes(end), dateFns.getSeconds(end));
|
|
56
|
-
end = dateFns.addMonths(end, reportYearStart.month - 1);
|
|
57
|
-
end = dateFns.addDays(end, reportYearStart.day - 1);*/
|
|
58
50
|
const reported = getReportedTimePeriod(reportYearStart, value, options.frequency);
|
|
59
51
|
start = reported.start;
|
|
60
52
|
end = reported.end;
|