3
0
Fork 0

Merge PR #2471 into 15.0

Signed-off-by pedrobaeza
15.0-ocabot-merge-pr-2789-by-pedrobaeza-bump-patch
OCA-git-bot 2023-03-29 14:11:21 +00:00
commit 25521aa1da
16 changed files with 1177 additions and 0 deletions

View File

@ -0,0 +1 @@
../../../../web_time_range_menu_custom

View File

@ -0,0 +1,6 @@
import setuptools
setuptools.setup(
setup_requires=['setuptools-odoo'],
odoo_addon=True,
)

View File

@ -0,0 +1,77 @@
==========================
Web Time Range Menu Custom
==========================
.. !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
!! This file is generated by oca-gen-addon-readme !!
!! changes will be overwritten. !!
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
.. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png
:target: https://odoo-community.org/page/development-status
:alt: Beta
.. |badge2| image:: https://img.shields.io/badge/licence-AGPL--3-blue.png
:target: http://www.gnu.org/licenses/agpl-3.0-standalone.html
:alt: License: AGPL-3
.. |badge3| image:: https://img.shields.io/badge/github-OCA%2Fweb-lightgray.png?logo=github
:target: https://github.com/OCA/web/tree/15.0/web_time_range_menu_custom
:alt: OCA/web
.. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png
:target: https://translation.odoo-community.org/projects/web-15-0/web-15-0-web_time_range_menu_custom
:alt: Translate me on Weblate
.. |badge5| image:: https://img.shields.io/badge/runboat-Try%20me-875A7B.png
:target: https://runboat.odoo-community.org/webui/builds.html?repo=OCA/web&target_branch=15.0
:alt: Try me on Runboat
|badge1| |badge2| |badge3| |badge4| |badge5|
Extend period and comparison period options for the date and datetime fields filted menu
adding a new option called "Custom Period".
**Table of contents**
.. contents::
:local:
Bug Tracker
===========
Bugs are tracked on `GitHub Issues <https://github.com/OCA/web/issues>`_.
In case of trouble, please check there if your issue has already been reported.
If you spotted it first, help us smashing it by providing a detailed and welcomed
`feedback <https://github.com/OCA/web/issues/new?body=module:%20web_time_range_menu_custom%0Aversion:%2015.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
Do not contact contributors directly about support or help with technical issues.
Credits
=======
Authors
~~~~~~~
* Tecnativa
Contributors
~~~~~~~~~~~~
* `Tecnativa <https://www.tecnativa.com>`__:
* Alexandre D. Díaz
* Carlos Roca
Maintainers
~~~~~~~~~~~
This module is maintained by the OCA.
.. image:: https://odoo-community.org/logo.png
:alt: Odoo Community Association
:target: https://odoo-community.org
OCA, or the Odoo Community Association, is a nonprofit organization whose
mission is to support the collaborative development of Odoo features and
promote its widespread use.
This module is part of the `OCA/web <https://github.com/OCA/web/tree/15.0/web_time_range_menu_custom>`_ project on GitHub.
You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.

View File

@ -0,0 +1 @@
# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).

View File

@ -0,0 +1,21 @@
# License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html).
{
"name": "Web Time Range Menu Custom",
"version": "15.0.1.0.0",
"author": "Tecnativa, Odoo Community Association (OCA)",
"license": "AGPL-3",
"website": "https://github.com/OCA/web",
"depends": ["web"],
"installable": True,
"auto_install": False,
"assets": {
"web.assets_backend": [
"/web_time_range_menu_custom/static/src/js/*.esm.js",
"/web_time_range_menu_custom/static/src/scss/*.scss",
],
"web.assets_qweb": [
"/web_time_range_menu_custom/static/src/xml/*.xml",
],
},
}

View File

@ -0,0 +1,66 @@
# Translation of Odoo Server.
# This file contains the translation of the following modules:
# * web_time_range_menu_custom
#
msgid ""
msgstr ""
"Project-Id-Version: Odoo Server 13.0\n"
"Report-Msgid-Bugs-To: \n"
"Last-Translator: \n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: \n"
"Plural-Forms: \n"
#. module: web_time_range_menu_custom
#. openerp-web
#: code:addons/web_time_range_menu_custom/static/src/js/control_panel_view_parameters.js:0
#: code:addons/web_time_range_menu_custom/static/src/js/control_panel_view_parameters.js:0
#, python-format
msgid "Custom Period"
msgstr ""
#. module: web_time_range_menu_custom
#. openerp-web
#: code:addons/web_time_range_menu_custom/static/src/xml/time_range_menu.xml:0
#, python-format
msgid "Day"
msgstr ""
#. module: web_time_range_menu_custom
#. openerp-web
#: code:addons/web_time_range_menu_custom/static/src/js/control_panel_model.js:0
#: code:addons/web_time_range_menu_custom/static/src/js/search_facet.js:0
#, python-format
msgid "Last "
msgstr ""
#. module: web_time_range_menu_custom
#. openerp-web
#: code:addons/web_time_range_menu_custom/static/src/xml/time_range_menu.xml:0
#, python-format
msgid "Month"
msgstr ""
#. module: web_time_range_menu_custom
#. openerp-web
#: code:addons/web_time_range_menu_custom/static/src/js/control_panel_model.js:0
#: code:addons/web_time_range_menu_custom/static/src/js/search_facet.js:0
#, python-format
msgid "Previous "
msgstr ""
#. module: web_time_range_menu_custom
#. openerp-web
#: code:addons/web_time_range_menu_custom/static/src/xml/time_range_menu.xml:0
#, python-format
msgid "Week"
msgstr ""
#. module: web_time_range_menu_custom
#. openerp-web
#: code:addons/web_time_range_menu_custom/static/src/xml/time_range_menu.xml:0
#, python-format
msgid "Year"
msgstr ""

View File

@ -0,0 +1,4 @@
* `Tecnativa <https://www.tecnativa.com>`__:
* Alexandre D. Díaz
* Carlos Roca

View File

@ -0,0 +1,2 @@
Extend period and comparison period options for the date and datetime fields filted menu
adding a new option called "Custom Period".

Binary file not shown.

After

Width:  |  Height:  |  Size: 9.2 KiB

View File

@ -0,0 +1,424 @@
<?xml version="1.0" encoding="utf-8" ?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<meta name="generator" content="Docutils: http://docutils.sourceforge.net/" />
<title>Web Time Range Menu Custom</title>
<style type="text/css">
/*
:Author: David Goodger (goodger@python.org)
:Id: $Id: html4css1.css 7952 2016-07-26 18:15:59Z milde $
:Copyright: This stylesheet has been placed in the public domain.
Default cascading style sheet for the HTML output of Docutils.
See http://docutils.sf.net/docs/howto/html-stylesheets.html for how to
customize this style sheet.
*/
/* used to remove borders from tables and images */
.borderless, table.borderless td, table.borderless th {
border: 0 }
table.borderless td, table.borderless th {
/* Override padding for "table.docutils td" with "! important".
The right padding separates the table cells. */
padding: 0 0.5em 0 0 ! important }
.first {
/* Override more specific margin styles with "! important". */
margin-top: 0 ! important }
.last, .with-subtitle {
margin-bottom: 0 ! important }
.hidden {
display: none }
.subscript {
vertical-align: sub;
font-size: smaller }
.superscript {
vertical-align: super;
font-size: smaller }
a.toc-backref {
text-decoration: none ;
color: black }
blockquote.epigraph {
margin: 2em 5em ; }
dl.docutils dd {
margin-bottom: 0.5em }
object[type="image/svg+xml"], object[type="application/x-shockwave-flash"] {
overflow: hidden;
}
/* Uncomment (and remove this text!) to get bold-faced definition list terms
dl.docutils dt {
font-weight: bold }
*/
div.abstract {
margin: 2em 5em }
div.abstract p.topic-title {
font-weight: bold ;
text-align: center }
div.admonition, div.attention, div.caution, div.danger, div.error,
div.hint, div.important, div.note, div.tip, div.warning {
margin: 2em ;
border: medium outset ;
padding: 1em }
div.admonition p.admonition-title, div.hint p.admonition-title,
div.important p.admonition-title, div.note p.admonition-title,
div.tip p.admonition-title {
font-weight: bold ;
font-family: sans-serif }
div.attention p.admonition-title, div.caution p.admonition-title,
div.danger p.admonition-title, div.error p.admonition-title,
div.warning p.admonition-title, .code .error {
color: red ;
font-weight: bold ;
font-family: sans-serif }
/* Uncomment (and remove this text!) to get reduced vertical space in
compound paragraphs.
div.compound .compound-first, div.compound .compound-middle {
margin-bottom: 0.5em }
div.compound .compound-last, div.compound .compound-middle {
margin-top: 0.5em }
*/
div.dedication {
margin: 2em 5em ;
text-align: center ;
font-style: italic }
div.dedication p.topic-title {
font-weight: bold ;
font-style: normal }
div.figure {
margin-left: 2em ;
margin-right: 2em }
div.footer, div.header {
clear: both;
font-size: smaller }
div.line-block {
display: block ;
margin-top: 1em ;
margin-bottom: 1em }
div.line-block div.line-block {
margin-top: 0 ;
margin-bottom: 0 ;
margin-left: 1.5em }
div.sidebar {
margin: 0 0 0.5em 1em ;
border: medium outset ;
padding: 1em ;
background-color: #ffffee ;
width: 40% ;
float: right ;
clear: right }
div.sidebar p.rubric {
font-family: sans-serif ;
font-size: medium }
div.system-messages {
margin: 5em }
div.system-messages h1 {
color: red }
div.system-message {
border: medium outset ;
padding: 1em }
div.system-message p.system-message-title {
color: red ;
font-weight: bold }
div.topic {
margin: 2em }
h1.section-subtitle, h2.section-subtitle, h3.section-subtitle,
h4.section-subtitle, h5.section-subtitle, h6.section-subtitle {
margin-top: 0.4em }
h1.title {
text-align: center }
h2.subtitle {
text-align: center }
hr.docutils {
width: 75% }
img.align-left, .figure.align-left, object.align-left, table.align-left {
clear: left ;
float: left ;
margin-right: 1em }
img.align-right, .figure.align-right, object.align-right, table.align-right {
clear: right ;
float: right ;
margin-left: 1em }
img.align-center, .figure.align-center, object.align-center {
display: block;
margin-left: auto;
margin-right: auto;
}
table.align-center {
margin-left: auto;
margin-right: auto;
}
.align-left {
text-align: left }
.align-center {
clear: both ;
text-align: center }
.align-right {
text-align: right }
/* reset inner alignment in figures */
div.align-right {
text-align: inherit }
/* div.align-center * { */
/* text-align: left } */
.align-top {
vertical-align: top }
.align-middle {
vertical-align: middle }
.align-bottom {
vertical-align: bottom }
ol.simple, ul.simple {
margin-bottom: 1em }
ol.arabic {
list-style: decimal }
ol.loweralpha {
list-style: lower-alpha }
ol.upperalpha {
list-style: upper-alpha }
ol.lowerroman {
list-style: lower-roman }
ol.upperroman {
list-style: upper-roman }
p.attribution {
text-align: right ;
margin-left: 50% }
p.caption {
font-style: italic }
p.credits {
font-style: italic ;
font-size: smaller }
p.label {
white-space: nowrap }
p.rubric {
font-weight: bold ;
font-size: larger ;
color: maroon ;
text-align: center }
p.sidebar-title {
font-family: sans-serif ;
font-weight: bold ;
font-size: larger }
p.sidebar-subtitle {
font-family: sans-serif ;
font-weight: bold }
p.topic-title {
font-weight: bold }
pre.address {
margin-bottom: 0 ;
margin-top: 0 ;
font: inherit }
pre.literal-block, pre.doctest-block, pre.math, pre.code {
margin-left: 2em ;
margin-right: 2em }
pre.code .ln { color: grey; } /* line numbers */
pre.code, code { background-color: #eeeeee }
pre.code .comment, code .comment { color: #5C6576 }
pre.code .keyword, code .keyword { color: #3B0D06; font-weight: bold }
pre.code .literal.string, code .literal.string { color: #0C5404 }
pre.code .name.builtin, code .name.builtin { color: #352B84 }
pre.code .deleted, code .deleted { background-color: #DEB0A1}
pre.code .inserted, code .inserted { background-color: #A3D289}
span.classifier {
font-family: sans-serif ;
font-style: oblique }
span.classifier-delimiter {
font-family: sans-serif ;
font-weight: bold }
span.interpreted {
font-family: sans-serif }
span.option {
white-space: nowrap }
span.pre {
white-space: pre }
span.problematic {
color: red }
span.section-subtitle {
/* font-size relative to parent (h1..h6 element) */
font-size: 80% }
table.citation {
border-left: solid 1px gray;
margin-left: 1px }
table.docinfo {
margin: 2em 4em }
table.docutils {
margin-top: 0.5em ;
margin-bottom: 0.5em }
table.footnote {
border-left: solid 1px black;
margin-left: 1px }
table.docutils td, table.docutils th,
table.docinfo td, table.docinfo th {
padding-left: 0.5em ;
padding-right: 0.5em ;
vertical-align: top }
table.docutils th.field-name, table.docinfo th.docinfo-name {
font-weight: bold ;
text-align: left ;
white-space: nowrap ;
padding-left: 0 }
/* "booktabs" style (no vertical lines) */
table.docutils.booktabs {
border: 0px;
border-top: 2px solid;
border-bottom: 2px solid;
border-collapse: collapse;
}
table.docutils.booktabs * {
border: 0px;
}
table.docutils.booktabs th {
border-bottom: thin solid;
text-align: left;
}
h1 tt.docutils, h2 tt.docutils, h3 tt.docutils,
h4 tt.docutils, h5 tt.docutils, h6 tt.docutils {
font-size: 100% }
ul.auto-toc {
list-style-type: none }
</style>
</head>
<body>
<div class="document" id="web-time-range-menu-custom">
<h1 class="title">Web Time Range Menu Custom</h1>
<!-- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
!! This file is generated by oca-gen-addon-readme !!
!! changes will be overwritten. !!
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
<p><a class="reference external" href="https://odoo-community.org/page/development-status"><img alt="Beta" src="https://img.shields.io/badge/maturity-Beta-yellow.png" /></a> <a class="reference external" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/licence-AGPL--3-blue.png" /></a> <a class="reference external" href="https://github.com/OCA/web/tree/15.0/web_time_range_menu_custom"><img alt="OCA/web" src="https://img.shields.io/badge/github-OCA%2Fweb-lightgray.png?logo=github" /></a> <a class="reference external" href="https://translation.odoo-community.org/projects/web-15-0/web-15-0-web_time_range_menu_custom"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external" href="https://runboat.odoo-community.org/webui/builds.html?repo=OCA/web&amp;target_branch=15.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
<p>Extend period and comparison period options for the date and datetime fields filted menu
adding a new option called “Custom Period”.</p>
<p><strong>Table of contents</strong></p>
<div class="contents local topic" id="contents">
<ul class="simple">
<li><a class="reference internal" href="#bug-tracker" id="id1">Bug Tracker</a></li>
<li><a class="reference internal" href="#credits" id="id2">Credits</a><ul>
<li><a class="reference internal" href="#authors" id="id3">Authors</a></li>
<li><a class="reference internal" href="#contributors" id="id4">Contributors</a></li>
<li><a class="reference internal" href="#maintainers" id="id5">Maintainers</a></li>
</ul>
</li>
</ul>
</div>
<div class="section" id="bug-tracker">
<h1><a class="toc-backref" href="#id1">Bug Tracker</a></h1>
<p>Bugs are tracked on <a class="reference external" href="https://github.com/OCA/web/issues">GitHub Issues</a>.
In case of trouble, please check there if your issue has already been reported.
If you spotted it first, help us smashing it by providing a detailed and welcomed
<a class="reference external" href="https://github.com/OCA/web/issues/new?body=module:%20web_time_range_menu_custom%0Aversion:%2015.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**">feedback</a>.</p>
<p>Do not contact contributors directly about support or help with technical issues.</p>
</div>
<div class="section" id="credits">
<h1><a class="toc-backref" href="#id2">Credits</a></h1>
<div class="section" id="authors">
<h2><a class="toc-backref" href="#id3">Authors</a></h2>
<ul class="simple">
<li>Tecnativa</li>
</ul>
</div>
<div class="section" id="contributors">
<h2><a class="toc-backref" href="#id4">Contributors</a></h2>
<ul class="simple">
<li><a class="reference external" href="https://www.tecnativa.com">Tecnativa</a>:<ul>
<li>Alexandre D. Díaz</li>
<li>Carlos Roca</li>
</ul>
</li>
</ul>
</div>
<div class="section" id="maintainers">
<h2><a class="toc-backref" href="#id5">Maintainers</a></h2>
<p>This module is maintained by the OCA.</p>
<a class="reference external image-reference" href="https://odoo-community.org"><img alt="Odoo Community Association" src="https://odoo-community.org/logo.png" /></a>
<p>OCA, or the Odoo Community Association, is a nonprofit organization whose
mission is to support the collaborative development of Odoo features and
promote its widespread use.</p>
<p>This module is part of the <a class="reference external" href="https://github.com/OCA/web/tree/15.0/web_time_range_menu_custom">OCA/web</a> project on GitHub.</p>
<p>You are welcome to contribute. To learn how please visit <a class="reference external" href="https://odoo-community.org/page/Contribute">https://odoo-community.org/page/Contribute</a>.</p>
</div>
</div>
</div>
</body>
</html>

View File

@ -0,0 +1,123 @@
/** @odoo-module **/
/* Copyright 2022 Tecnativa - Carlos Roca
* License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html) */
import {useBus} from "@web/core/utils/hooks";
const {Component, QWeb} = owl;
const {useState} = owl.hooks;
import * as dates from "@web/search/utils/dates";
const {DateTime} = luxon; // eslint-disable-line no-undef
var ID_CUSTOM_DATE = 0;
/**
* @extends Component
*/
export class DropdownItemCustomPeriod extends Component {
setup() {
this.isOpen = useState({value: false});
this.type = useState({value: "day"});
this.quantity = useState({value: 0});
this.referenceMoment = DateTime.local();
var fieldsSelected = new Set();
for (var selected in this.props.comparisonItems) {
fieldsSelected.add(this.props.comparisonItems[selected].dateFilterId);
}
this.fields_selected = Array.from(fieldsSelected);
this.field = useState({
value: (this.props.field && this.props.field.id) || this.fields_selected[0],
});
useBus(this.env.searchModel, "update", this.render);
}
onClickCustomPeriod() {
this.isOpen.value = !this.isOpen.value;
}
onClickAdd() {
if (this.props.type === "filter") {
this.addRange();
} else if (this.props.type === "comparison") {
this.addComparison();
}
}
addRange() {
const field_id = this.field.value;
const key = "custom_" + ID_CUSTOM_DATE++;
const plusParamID = this.type.value + "s";
var formatSearch = "";
switch (this.type.value) {
case "day":
formatSearch = "dd MMMM yyyy";
break;
case "week":
formatSearch = "'W'WW yyyy";
break;
case "month":
formatSearch = "MMMM";
break;
case "year":
formatSearch = "yyyy";
break;
}
const periodSearch = {
[key]: {
id: key,
groupNumber: 3,
description:
"Last " + this.quantity.value + " " + this.type.value + "s",
format: formatSearch,
plusParam: {[plusParamID]: -this.quantity.value},
granularity: this.type.value,
custom_period: {
is_custom_period: true,
last_period: this.quantity.value,
},
},
};
Object.assign(dates.PERIOD_OPTIONS, periodSearch);
this.env.searchModel.optionGenerators = dates.getPeriodOptions(
this.referenceMoment
);
this.env.searchModel.toggleDateFilter(field_id, key);
}
addComparison() {
const key = "custom_" + ID_CUSTOM_DATE++;
const plusParamID = this.type.value + "s";
Object.assign(dates.COMPARISON_OPTIONS, {
[key]: {
description:
"Previous " + this.quantity.value + " " + this.type.value + "s",
id: key,
plusParam: {[plusParamID]: -this.quantity.value},
},
});
const comparisonId = this.env.searchModel.nextId;
this.env.searchModel.searchItems[comparisonId] = {
comparisonOptionId: key,
dateFilterId: this.field.value,
description:
this.env.searchModel.searchItems[this.field.value].description +
": Previous " +
this.quantity.value +
" " +
this.type.value +
"s",
groupId: 14,
id: comparisonId,
type: "comparison",
};
this.env.searchModel.nextId++;
this.env.searchModel.toggleSearchItem(comparisonId);
}
}
DropdownItemCustomPeriod.template =
"web_time_range_menu_custom.DropdownItemCustomPeriod";
DropdownItemCustomPeriod.props = {
type: {type: String},
field: {type: Object, optional: true},
comparisonItems: {type: Object, optional: true},
};
QWeb.registerComponent("DropdownItemCustomPeriod", DropdownItemCustomPeriod);

View File

@ -0,0 +1,347 @@
/** @odoo-module **/
/* eslint-disable init-declarations */
/* Copyright 2022 Tecnativa - Carlos Roca
* License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html) */
import {patch} from "@web/core/utils/patch";
import {Domain} from "@web/core/domain";
import {serializeDate, serializeDateTime} from "@web/core/l10n/dates";
import {localization} from "@web/core/l10n/localization";
/* Redefine some methods of dates.js from web.static.src.utils to
add support to days and weeks periods */
import * as dates from "@web/search/utils/dates";
/**
* Method used to calculate the quantity of days and weeks of the
* actual year.
*/
function _getQtyOfCurrentYear(option) {
const now = new Date();
const startOfYear = new Date(now.getFullYear(), 0, 1);
const endOfYear = new Date(now.getFullYear(), 11, 31);
let millisecondsPerWeek = 0;
if (option === "week") {
millisecondsPerWeek = 604800000;
} else if (option === "day") {
millisecondsPerWeek = 86400000;
} else {
return;
}
const weeks = Math.ceil((endOfYear - startOfYear) / millisecondsPerWeek);
return weeks;
}
Object.assign(dates.PER_YEAR, {
week: _getQtyOfCurrentYear("week"),
day: _getQtyOfCurrentYear("day"),
});
// This is needed to call the super functions on @web/search/utils/dates
const _getSetParam = dates.getSetParam;
// Patch of functions defined before
patch(dates, "patch dates", {
/*
* Redefine function to avoid the exclusion of days and weeks.
*/
constructDateDomain(
referenceMoment,
fieldName,
fieldType,
selectedOptionIds,
comparisonOptionId
) {
let plusParam;
let selectedOptions;
if (comparisonOptionId) {
[plusParam, selectedOptions] = dates.getComparisonParams(
referenceMoment,
selectedOptionIds,
comparisonOptionId
);
} else {
selectedOptions = dates.getSelectedOptions(
referenceMoment,
selectedOptionIds
);
}
const yearOptions = selectedOptions.year;
const otherOptions = [
...(selectedOptions.quarter || []),
...(selectedOptions.month || []),
...(selectedOptions.day || []),
...(selectedOptions.week || []),
];
dates.sortPeriodOptions(yearOptions);
dates.sortPeriodOptions(otherOptions);
const ranges = [];
for (const yearOption of yearOptions) {
const constructRangeParams = {
referenceMoment,
fieldName,
fieldType,
plusParam,
};
if (otherOptions.length) {
for (const option of otherOptions) {
const setParam = Object.assign(
{},
yearOption.setParam,
option ? option.setParam : {}
);
const {granularity, custom_period} = option;
if (comparisonOptionId && custom_period.is_custom_period) {
custom_period.is_comparison = true;
}
const range = dates.constructDateRange(
Object.assign(
{granularity, custom_period, setParam},
constructRangeParams
)
);
ranges.push(range);
}
} else {
const {granularity, custom_period, setParam} = yearOption;
if (comparisonOptionId && custom_period.is_custom_period) {
custom_period.is_comparison = true;
}
const range = dates.constructDateRange(
Object.assign(
{granularity, custom_period, setParam},
constructRangeParams
)
);
ranges.push(range);
}
}
const domain = Domain.combine(
ranges.map((range) => range.domain),
"OR"
);
const description = ranges.map((range) => range.description).join("/");
return {domain, description};
},
constructDateRange(params) {
const {
referenceMoment,
fieldName,
fieldType,
granularity,
setParam,
plusParam,
custom_period,
} = params;
if ("quarter" in setParam) {
// Luxon does not consider quarter key in setParam (like moment did)
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 rightDate = date.endOf(granularity);
if (custom_period.is_custom_period) {
rightDate = plusParamReferenceMoment;
}
let leftBound;
let rightBound;
if (fieldType === "date") {
leftBound = serializeDate(leftDate);
rightBound = serializeDate(rightDate);
} else {
leftBound = serializeDateTime(leftDate);
rightBound = serializeDateTime(rightDate);
}
const domain = new Domain([
"&",
[fieldName, ">=", leftBound],
[fieldName, "<=", rightBound],
]);
// Compute description
var description = "";
if (custom_period.is_custom_period) {
if (plusParam) {
const key = Object.keys(plusParam)[0];
description = "Previous " + Math.abs(plusParam[key]) + " " + key;
} else {
description =
"Last " + custom_period.last_period + " " + granularity + "s";
}
} else {
var descriptions = [date.toFormat("yyyy")];
const method = localization.direction === "rtl" ? "push" : "unshift";
if (granularity === "month") {
descriptions[method](date.toFormat("MMMM"));
} else if (granularity === "quarter") {
const quarter = date.quarter;
descriptions[method](dates.QUARTERS[quarter].description.toString());
} else if (granularity === "day") {
descriptions[method](date.toFormat("dd MMMM"));
} else if (granularity === "week") {
descriptions[method](date.toFormat("'W'WW"));
}
description = descriptions.join(" ");
}
return {domain, description};
},
/*
* Redefine function to allow process days and weeks.
*/
getPeriodOptions(referenceMoment) {
const options = [];
const originalOptions = Object.values(dates.PERIOD_OPTIONS);
for (const option of originalOptions) {
const {id, groupNumber} = option;
let description;
let defaultYear;
switch (option.granularity) {
case "quarter":
description = option.description.toString();
defaultYear = referenceMoment.set(option.setParam).year;
break;
case "day":
case "week":
case "month":
case "year":
const date = referenceMoment.plus(option.plusParam);
description = option.description || date.toFormat(option.format);
defaultYear = date.year;
break;
}
const setParam = dates.getSetParam(option, referenceMoment);
options.push({id, groupNumber, description, defaultYear, setParam});
}
const periodOptions = [];
for (const option of options) {
const {id, groupNumber, description, defaultYear} = option;
const yearOption = options.find(
(o) => o.setParam && o.setParam.year === defaultYear
);
periodOptions.push({
id,
groupNumber,
description,
defaultYearId: yearOption.id,
});
}
return periodOptions;
},
/*
* Add selection of month when week or day selected.
*
* @override
*/
getSetParam(periodOption, referenceMoment) {
if (periodOption.granularity === "day") {
const date = referenceMoment.plus(periodOption.plusParam);
return {
day: date.day,
month: date.month,
};
} else if (periodOption.granularity === "week") {
const date = referenceMoment.plus(periodOption.plusParam);
return {
weekNumber: date.weekNumber,
};
}
return _getSetParam(...arguments);
},
getSelectedOptions(referenceMoment, selectedOptionIds) {
const selectedOptions = {year: []};
for (const optionId of selectedOptionIds) {
const option = dates.PERIOD_OPTIONS[optionId];
const setParam = dates.getSetParam(option, referenceMoment);
const custom_period = option.custom_period || {};
const granularity = option.granularity;
if (!selectedOptions[granularity]) {
selectedOptions[granularity] = [];
}
selectedOptions[granularity].push({granularity, setParam, custom_period});
}
return selectedOptions;
},
/*
* Add support to day and week options.
*
*/
getComparisonParams(referenceMoment, selectedOptionIds, comparisonOptionId) {
const comparisonOption = dates.COMPARISON_OPTIONS[comparisonOptionId];
const selectedOptions = dates.getSelectedOptions(
referenceMoment,
selectedOptionIds
);
if (comparisonOption.plusParam) {
return [comparisonOption.plusParam, selectedOptions];
}
const plusParam = {};
let globalGranularity = "year";
if (selectedOptions.day) {
globalGranularity = "day";
} else if (selectedOptions.week) {
globalGranularity = "week";
} else if (selectedOptions.month) {
globalGranularity = "month";
} else if (selectedOptions.quarter) {
globalGranularity = "quarter";
}
const granularityFactor = dates.PER_YEAR[globalGranularity];
const years = selectedOptions.year.map((o) => o.setParam.year);
const yearMin = Math.min(...years);
const yearMax = Math.max(...years);
let optionMin = 0;
let optionMax = 0;
if (selectedOptions.quarter) {
const quarters = selectedOptions.quarter.map((o) => o.setParam.quarter);
if (globalGranularity === "month") {
delete selectedOptions.quarter;
for (const quarter of quarters) {
for (const month of dates.QUARTERS[quarter].coveredMonths) {
const monthOption = selectedOptions.month.find(
(o) => o.setParam.month === month
);
if (!monthOption) {
selectedOptions.month.push({
setParam: {month},
granularity: "month",
});
}
}
}
} else {
optionMin = Math.min(...quarters);
optionMax = Math.max(...quarters);
}
}
if (selectedOptions.month) {
const months = selectedOptions.month.map((o) => o.setParam.month);
optionMin = Math.min(...months);
optionMax = Math.max(...months);
}
if (selectedOptions.week) {
const weeks = selectedOptions.week.map((o) => o.setParam.weekNumber);
optionMin = Math.min(...weeks);
optionMax = Math.max(...weeks);
}
if (selectedOptions.day) {
const days = selectedOptions.day.map((o) => o.setParam.day);
optionMin = Math.min(...days);
optionMax = Math.max(...days);
}
const num =
-1 + granularityFactor * (yearMin - yearMax) + optionMin - optionMax;
const key =
globalGranularity === "year"
? "years"
: globalGranularity === "month"
? "months"
: globalGranularity === "week"
? "weeks"
: globalGranularity === "day"
? "days"
: "quarters";
plusParam[key] = num;
return [plusParam, selectedOptions];
},
});

View File

@ -0,0 +1,8 @@
#add_custom_period_wrapper {
padding: 0 20px;
white-space: nowrap;
.d-table-cell {
vertical-align: middle;
padding: 3px 0;
}
}

View File

@ -0,0 +1,10 @@
<?xml version="1.0" encoding="UTF-8" ?>
<templates xml:space="preserve">
<t t-inherit="web.ComparisonMenu" t-inherit-mode="extension" owl="1">
<xpath expr="//t[@t-foreach='items']" position="after">
<DropdownItemCustomPeriod comparisonItems="items" type="'comparison'" />
</xpath>
</t>
</templates>

View File

@ -0,0 +1,72 @@
<?xml version="1.0" encoding="UTF-8" ?>
<templates xml:space="preserve">
<t t-name="web_time_range_menu_custom.DropdownItemCustomPeriod" owl="1">
<div class="o_menu_item dropdown-item" data-id="__computed__">
<a href="#" role="menuitem" t-on-click="onClickCustomPeriod">
Custom period
<span class="o_submenu_switcher" data-id="__computed__">
<span
t-att-class="isOpen.value ? 'fa fa-caret-down' : 'fa fa-caret-right'"
/>
</span>
</a>
<t t-if="isOpen.value">
<div id="add_custom_period_wrapper" class="d-table">
<div class="d-table-row" t-if="props.type === 'comparison'">
<div class="d-table-cell">
<select
id="field_comparison"
class="o_input o_date_field_selector"
t-model="field.value"
>
<t
t-foreach="fields_selected"
t-as="field_item"
t-key="field_item"
>
<option t-att-value="field_item"><span
t-esc="env.searchModel.searchItems[field_item].description"
/></option>
</t>
</select>
</div>
</div>
<div class="d-table-row">
<div class="d-table-cell" style="width: 50%">
<input
type="number"
min="0"
id="period_quantity"
class="o_input"
t-model="quantity.value"
/>
</div>
<div class="d-table-cell">
<select
id="period_type"
class="o_input o_date_field_selector"
t-model="type.value"
>
<option value="day">Day</option>
<option value="week">Week</option>
<option value="month">Month</option>
<option value="year">Year</option>
</select>
</div>
</div>
<div class="d-table-row">
<div class="d-table-cell">
<button
class="btn btn-primary o_add_computed_measure"
type="button"
t-on-click="onClickAdd"
>Add</button>
</div>
</div>
</div>
</t>
</div>
</t>
</templates>

View File

@ -0,0 +1,15 @@
<?xml version="1.0" encoding="UTF-8" ?>
<templates xml:space="preserve">
<t t-inherit="web.FilterMenu" t-inherit-mode="extension" owl="1">
<xpath
expr="//t[@t-if='item.options']//t[@t-foreach='item.options']"
position="after"
>
<t t-if="item.type === 'dateFilter'">
<DropdownItemCustomPeriod field="item" type="'filter'" />
</t>
</xpath>
</t>
</templates>