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

Merge PR #2499 into 15.0 

Signed-off-by pedrobaeza
pull/2497/head
OCA-git-bot 2023-05-15 10:46:21 +00:00
parent 8592d3fc75 52124d85d3
commit bb87fdc9fd
1 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
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];
delete setParam.quarter;
}
const plusParamReferenceMoment = referenceMoment.plus(plusParam || {});
const date = referenceMoment.set(setParam).plus(plusParam || {});
// Compute domain
const leftDate = date.startOf(granularity);
var leftDate = date.startOf(granularity);
var rightDate = date.endOf(granularity);
if (custom_period.is_custom_period) {
rightDate = plusParamReferenceMoment;
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;
} else {
var customPlusParam = {};
customPlusParam[granularity + "s"] = parseInt(
custom_period.last_period
);
rightDate = leftDate.plus(customPlusParam);
}
}
let leftBound;
let rightBound;