Techsystech
/
web
mirror of https://github.com/OCA/web.git
3
0
Fork 1
Code Issues Packages Projects Releases Wiki Activity

[IMP] web_time_range_menu_custom: Dates include today but other granularities not

pull/2499/head
Carlos Roca 2023-05-11 11:23:12 +02:00
parent 8592d3fc75
commit 52124d85d3
1 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
web_time_range_menu_custom/static/src/js/dates.esm.js
View File

@ -137,13 +137,25 @@ patch(dates, "patch dates", {
setParam.month = dates.QUARTERS[setParam.quarter].coveredMonths[0]; setParam.month = dates.QUARTERS[setParam.quarter].coveredMonths[0];
delete setParam.quarter; delete setParam.quarter;
} }
const plusParamReferenceMoment = referenceMoment.plus(plusParam || {});
const date = referenceMoment.set(setParam).plus(plusParam || {}); const date = referenceMoment.set(setParam).plus(plusParam || {});
// Compute domain // Compute domain
const leftDate = date.startOf(granularity); var leftDate = date.startOf(granularity);
var rightDate = date.endOf(granularity); var rightDate = date.endOf(granularity);
if (custom_period.is_custom_period) { if (
custom_period.is_custom_period &&
parseInt(custom_period.last_period) !== 0
) {
if (granularity === "day") {
const plusParamReferenceMoment = referenceMoment.plus(plusParam || {});
leftDate = leftDate.plus({days: 1});
rightDate = plusParamReferenceMoment; rightDate = plusParamReferenceMoment;
} else {
var customPlusParam = {};
customPlusParam[granularity + "s"] = parseInt(
custom_period.last_period
);
rightDate = leftDate.plus(customPlusParam);
}
} }
let leftBound; let leftBound;
let rightBound; let rightBound;