diff --git a/setup/web_time_range_menu_custom/odoo/addons/web_time_range_menu_custom b/setup/web_time_range_menu_custom/odoo/addons/web_time_range_menu_custom new file mode 120000 index 000000000000..ac6f76901ab0 --- /dev/null +++ b/setup/web_time_range_menu_custom/odoo/addons/web_time_range_menu_custom @@ -0,0 +1 @@ +../../../../web_time_range_menu_custom \ No newline at end of file diff --git a/setup/web_time_range_menu_custom/setup.py b/setup/web_time_range_menu_custom/setup.py new file mode 100644 index 000000000000..28c57bb64031 --- /dev/null +++ b/setup/web_time_range_menu_custom/setup.py @@ -0,0 +1,6 @@ +import setuptools + +setuptools.setup( + setup_requires=['setuptools-odoo'], + odoo_addon=True, +) diff --git a/web_time_range_menu_custom/README.rst b/web_time_range_menu_custom/README.rst new file mode 100644 index 000000000000..14142914d0be --- /dev/null +++ b/web_time_range_menu_custom/README.rst @@ -0,0 +1,78 @@ +============= +Web Refresher +============= + +.. !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + !! 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/13.0/web_refresher + :alt: OCA/web +.. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png + :target: https://translation.odoo-community.org/projects/web-13-0/web-13-0-web_refresher + :alt: Translate me on Weblate +.. |badge5| image:: https://img.shields.io/badge/runbot-Try%20me-875A7B.png + :target: https://runbot.odoo-community.org/runbot/162/13.0 + :alt: Try me on Runbot + +|badge1| |badge2| |badge3| |badge4| |badge5| + +Adds a button next to the pager (in trees/kanban views) to refresh the displayed list. + +.. image:: https://raw.githubusercontent.com/OCA/web/13.0/web_refresher/static/description/refresh.png + +**Table of contents** + +.. contents:: + :local: + +Bug Tracker +=========== + +Bugs are tracked on `GitHub 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 `_. + +Do not contact contributors directly about support or help with technical issues. + +Credits +======= + +Authors +~~~~~~~ + +* Compassion Switzerland + +Contributors +~~~~~~~~~~~~ + +* Samuel Fringeli +* `Tecnativa `__: + + * João Marques + +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 `_ project on GitHub. + +You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute. diff --git a/web_time_range_menu_custom/__init__.py b/web_time_range_menu_custom/__init__.py new file mode 100644 index 000000000000..ef5ae3587f59 --- /dev/null +++ b/web_time_range_menu_custom/__init__.py @@ -0,0 +1 @@ +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). diff --git a/web_time_range_menu_custom/__manifest__.py b/web_time_range_menu_custom/__manifest__.py new file mode 100644 index 000000000000..f1aa2ddcf22f --- /dev/null +++ b/web_time_range_menu_custom/__manifest__.py @@ -0,0 +1,14 @@ +# License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html). + +{ + "name": "Web Time Range Menu Custom", + "version": "13.0.1.0.0", + "author": "Tecnativa, Odoo Community Association (OCA)", + "license": "AGPL-3", + "website": "https://github.com/OCA/web", + "data": ["templates/assets.xml"], + "depends": ["web"], + "qweb": ["static/src/xml/time_range_menu.xml"], + "installable": True, + "auto_install": False, +} diff --git a/web_time_range_menu_custom/readme/CONTRIBUTORS.rst b/web_time_range_menu_custom/readme/CONTRIBUTORS.rst new file mode 100644 index 000000000000..4d7b0e818e17 --- /dev/null +++ b/web_time_range_menu_custom/readme/CONTRIBUTORS.rst @@ -0,0 +1,3 @@ +* `Tecnativa `__: + + * Alexandre D. Díaz diff --git a/web_time_range_menu_custom/readme/DESCRIPTION.rst b/web_time_range_menu_custom/readme/DESCRIPTION.rst new file mode 100644 index 000000000000..76c4a21b57ef --- /dev/null +++ b/web_time_range_menu_custom/readme/DESCRIPTION.rst @@ -0,0 +1,3 @@ +Extend dates options for the time range menu + +.. image:: ./static/description/time_range_menu.png diff --git a/web_time_range_menu_custom/static/description/icon.png b/web_time_range_menu_custom/static/description/icon.png new file mode 100644 index 000000000000..3a0328b516c4 Binary files /dev/null and b/web_time_range_menu_custom/static/description/icon.png differ diff --git a/web_time_range_menu_custom/static/description/index.html b/web_time_range_menu_custom/static/description/index.html new file mode 100644 index 000000000000..04b60705b309 --- /dev/null +++ b/web_time_range_menu_custom/static/description/index.html @@ -0,0 +1,424 @@ + + + + + + +Web Refresher + + + +
+

Web Refresher

+ + +

Beta License: AGPL-3 OCA/web Translate me on Weblate Try me on Runbot

+

Adds a button next to the pager (in trees/kanban views) to refresh the displayed list.

+https://raw.githubusercontent.com/OCA/web/13.0/web_refresher/static/description/refresh.png +

Table of contents

+ +
+

Bug Tracker

+

Bugs are tracked on GitHub 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.

+

Do not contact contributors directly about support or help with technical issues.

+
+
+

Credits

+
+

Authors

+
    +
  • Compassion Switzerland
    • +
+
+
+

Contributors

+
    +
  • Samuel Fringeli
    • +
  • Tecnativa:
      +
    • João Marques
      • +
    +
    • +
+
+
+

Maintainers

+

This module is maintained by the OCA.

+Odoo Community Association +

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 project on GitHub.

+

You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.

+
+
+
+ + diff --git a/web_time_range_menu_custom/static/description/refresh.png b/web_time_range_menu_custom/static/description/refresh.png new file mode 100644 index 000000000000..900f4a9898bc Binary files /dev/null and b/web_time_range_menu_custom/static/description/refresh.png differ diff --git a/web_time_range_menu_custom/static/src/js/control_panel_controller.js b/web_time_range_menu_custom/static/src/js/control_panel_controller.js new file mode 100644 index 000000000000..d309e8877aaf --- /dev/null +++ b/web_time_range_menu_custom/static/src/js/control_panel_controller.js @@ -0,0 +1,26 @@ +odoo.define("web_time_range_menu_custom.ControlPanelController", function(require) { + "use strict"; + + const ControlPanelController = require("web.ControlPanelController"); + + ControlPanelController.include({ + custom_events: _.extend({}, ControlPanelController.prototype.custom_events, { + activate_custom_time_range: "_onActivateCustomTimeRange", + }), + + /** + * @override + */ + _onActivateCustomTimeRange: function(ev) { + ev.stopPropagation(); + this.model.activateTimeRangeCustom( + ev.data.id, + ev.data.timeRangeId, + ev.data.comparisonTimeRangeId, + ev.data.timeRangeCustom, + ev.data.comparisonTimeRangeCustom + ); + this._reportNewQueryAndRender(); + }, + }); +}); diff --git a/web_time_range_menu_custom/static/src/js/control_panel_model.js b/web_time_range_menu_custom/static/src/js/control_panel_model.js new file mode 100644 index 000000000000..16e268cec1e8 --- /dev/null +++ b/web_time_range_menu_custom/static/src/js/control_panel_model.js @@ -0,0 +1,83 @@ +/* Copyright 2021 Tecnativa - Alexandre D. Díaz + * License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl). */ +odoo.define("web_time_range_menu_custom.ControlPanelModel", function(require) { + "use strict"; + + const core = require("web.core"); + const Domain = require("web.Domain"); + const ControlPanelModel = require("web.ControlPanelModel"); + + const _t = core._t; + + ControlPanelModel.include({ + activateTimeRangeCustom: function( + filterId, + timeRangeId, + comparisonTimeRangeId, + timeRangeCustom, + comparisonTimeRangeCustom + ) { + var filter = this.filters[filterId]; + filter.timeRangeCustom = timeRangeCustom; + filter.comparisonTimeRangeCustom = comparisonTimeRangeCustom; + this.activateTimeRange(filterId, timeRangeId, comparisonTimeRangeId); + }, + + /** + * @override + */ + _getTimeRangeMenuData: function(evaluation) { + const context = this._super.apply(this, arguments); + // GroupOfTimeRanges can be undefined in case with withSearchBar is false + var groupOfTimeRanges = this.groups[this._getGroupIdOfType("timeRange")]; + if (groupOfTimeRanges && groupOfTimeRanges.activeFilterIds.length) { + var filter = this.filters[groupOfTimeRanges.activeFilterIds[0][0]]; + if (filter.timeRangeId === "custom_period") { + context.timeRangeMenuData.timeRange = Domain.prototype.constructCustomDomain( + filter.fieldName, + filter.timeRangeId, + filter.fieldType, + undefined, + filter.timeRangeCustom + ); + context.timeRangeMenuData.timeRangeDescription = + _t("Last ") + + `${filter.timeRangeCustom.value} ${filter.timeRangeCustom.type}`; + context.timeRangeMenuData.timeRangeCustomValue = + filter.timeRangeCustom.value; + context.timeRangeMenuData.timeRangeCustomType = + filter.timeRangeCustom.type; + if (evaluation) { + context.timeRangeMenuData.timeRange = Domain.prototype.stringToArray( + context.timeRangeMenuData.timeRange + ); + } + } + if (filter.comparisonTimeRangeId === "custom_comparison_period") { + context.timeRangeMenuData.comparisonTimeRange = Domain.prototype.constructCustomDomain( + filter.fieldName, + filter.timeRangeId, + filter.fieldType, + filter.comparisonTimeRangeId, + filter.timeRangeCustom, + filter.comparisonTimeRangeCustom + ); + context.timeRangeMenuData.comparisonTimeRangeDescription = + _t("Previous ") + + `${filter.comparisonTimeRangeCustom.value} ${filter.comparisonTimeRangeCustom.type}`; + context.timeRangeMenuData.comparisonTimeRangeCustomValue = + filter.comparisonTimeRangeCustom.value; + context.timeRangeMenuData.comparisonTimeRangeCustomType = + filter.comparisonTimeRangeCustom.type; + + if (evaluation) { + context.timeRangeMenuData.comparisonTimeRange = Domain.prototype.stringToArray( + context.timeRangeMenuData.comparisonTimeRange + ); + } + } + } + return context; + }, + }); +}); diff --git a/web_time_range_menu_custom/static/src/js/control_panel_view_parameters.js b/web_time_range_menu_custom/static/src/js/control_panel_view_parameters.js new file mode 100644 index 000000000000..9e9acdcc8b3b --- /dev/null +++ b/web_time_range_menu_custom/static/src/js/control_panel_view_parameters.js @@ -0,0 +1,20 @@ +/* Copyright 2021 Tecnativa - Alexandre D. Díaz + * License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl). */ +odoo.define("web_time_range_menu_custom.controlPanelViewParameters", function(require) { + "use strict"; + + const controlPanelViewParameters = require("web.controlPanelViewParameters"); + const core = require("web.core"); + + const _lt = core._lt; + + controlPanelViewParameters.PERIOD_OPTIONS = controlPanelViewParameters.PERIOD_OPTIONS.concat( + [{description: _lt("Custom Period"), optionId: "custom_period", groupId: 4}] + ); + controlPanelViewParameters.TIME_RANGE_OPTIONS = + controlPanelViewParameters.PERIOD_OPTIONS; + + controlPanelViewParameters.COMPARISON_TIME_RANGE_OPTIONS = controlPanelViewParameters.COMPARISON_TIME_RANGE_OPTIONS.concat( + [{description: _lt("Custom Period"), optionId: "custom_comparison_period"}] + ); +}); diff --git a/web_time_range_menu_custom/static/src/js/domain.js b/web_time_range_menu_custom/static/src/js/domain.js new file mode 100644 index 000000000000..a4f4821b471f --- /dev/null +++ b/web_time_range_menu_custom/static/src/js/domain.js @@ -0,0 +1,236 @@ +/* Copyright 2021 Tecnativa - Alexandre D. Díaz + * License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl). */ +odoo.define("web_time_range_menu_custom.Domain", function(require) { + "use strict"; + + const Domain = require("web.Domain"); + + Domain.include({ + /** + * @override + */ + constructCustomDomain: function( + fieldName, + period, + type, + comparisonPeriod, + periodCustom, + comparisonPeriodCustom + ) { + let leftBoundaryParams = {}; + let rightBoundaryParams = {}; + let offsetPeriodParams = 0; + // Cloned function from web.domain + // Necessary because inner function usage + function makeInterval() { + switch (comparisonPeriod) { + case "previous_period": + _.each(offsetPeriodParams, function(value, key) { + if ( + !leftBoundaryParams[key] || + _.isNumber(leftBoundaryParams[key]) + ) { + leftBoundaryParams[key] = + value + (leftBoundaryParams[key] || 0); + } else { + leftBoundaryParams[key] = + value + " + " + leftBoundaryParams[key]; + } + if ( + !rightBoundaryParams[key] || + _.isNumber(rightBoundaryParams[key]) + ) { + rightBoundaryParams[key] = + value + (rightBoundaryParams[key] || 0); + } else { + rightBoundaryParams[key] = + value + " + " + rightBoundaryParams[key]; + } + }); + break; + case "previous_year": + leftBoundaryParams.years = leftBoundaryParams.years + ? leftBoundaryParams.years - 1 + : -1; + rightBoundaryParams.years = rightBoundaryParams.years + ? rightBoundaryParams.years - 1 + : -1; + break; + case "custom_comparison_period": + leftBoundaryParams[ + comparisonPeriodCustom.type + ] = leftBoundaryParams[comparisonPeriodCustom.type] + ? leftBoundaryParams[comparisonPeriodCustom.type] - + comparisonPeriodCustom.value + : -comparisonPeriodCustom.value; + rightBoundaryParams[ + comparisonPeriodCustom.type + ] = rightBoundaryParams[comparisonPeriodCustom.type] + ? rightBoundaryParams[comparisonPeriodCustom.type] - + comparisonPeriodCustom.value + : -comparisonPeriodCustom.value; + break; + } + + var stringifyParams = function(value, key) { + return key + "=" + value; + }; + var leftBoundaryStringifyParams = _.map( + leftBoundaryParams, + stringifyParams + ).join(", "); + var rightBoundaryStringifyParams = _.map( + rightBoundaryParams, + stringifyParams + ).join(", "); + + if (type === "date") { + return ( + "['&'," + + "('" + + fieldName + + "', '>=', (context_today() + relativedelta(" + + leftBoundaryStringifyParams + + ")).strftime('%Y-%m-%d'))," + + "('" + + fieldName + + "', '<', (context_today() + relativedelta(" + + rightBoundaryStringifyParams + + ")).strftime('%Y-%m-%d'))" + + "]" + ); + } + return ( + "['&'," + + "('" + + fieldName + + "', '>=', " + + "(datetime.datetime.combine(context_today() + relativedelta(" + + leftBoundaryStringifyParams + + "), datetime.time(0,0,0)).to_utc()).strftime('%Y-%m-%d %H:%M:%S'))," + + "('" + + fieldName + + "', '<', " + + "(datetime.datetime.combine(context_today() + relativedelta(" + + rightBoundaryStringifyParams + + "), datetime.time(0,0,0)).to_utc()).strftime('%Y-%m-%d %H:%M:%S'))" + + "]" + ); + } + + function defineCustom() { + if (periodCustom.type === "years") { + leftBoundaryParams = {month: 1, day: 1, years: -periodCustom.value}; + rightBoundaryParams = {month: 1, day: 1}; + offsetPeriodParams = {years: -periodCustom.value}; + } else if (periodCustom.type === "months") { + leftBoundaryParams = {day: 1, months: -periodCustom.value}; + rightBoundaryParams = {day: 1}; + offsetPeriodParams = {months: -periodCustom.value}; + } else if (periodCustom.type === "weeks") { + leftBoundaryParams = { + days: 1, + weekday: 0, + weeks: -periodCustom.value, + }; + rightBoundaryParams = {days: 1, weekday: 0}; + offsetPeriodParams = {weeks: -periodCustom.value}; + } else if (periodCustom.type === "days") { + leftBoundaryParams = {days: -periodCustom.value}; + rightBoundaryParams = {}; + offsetPeriodParams = {days: -periodCustom.value}; + } + } + + // Cloned from web.domain + // Necessary because can have period or/and comparisonPeriodCustom + switch (period) { + case "today": + leftBoundaryParams = {}; + rightBoundaryParams = {days: 1}; + offsetPeriodParams = {days: -1}; + return makeInterval(); + case "this_week": + leftBoundaryParams = {weeks: -1, days: 1, weekday: 0}; + rightBoundaryParams = {days: 1, weekday: 0}; + offsetPeriodParams = {weeks: -1}; + return makeInterval(); + case "this_month": + leftBoundaryParams = {day: 1}; + rightBoundaryParams = {day: 1, months: 1}; + offsetPeriodParams = {months: -1}; + return makeInterval(); + case "this_quarter": + leftBoundaryParams = { + months: "- (context_today().month - 1) % 3", + day: 1, + }; + rightBoundaryParams = { + months: "3 - (context_today().month - 1) % 3", + day: 1, + }; + offsetPeriodParams = {months: -3}; + return makeInterval(); + case "this_year": + leftBoundaryParams = {month: 1, day: 1}; + rightBoundaryParams = {month: 1, day: 1, years: 1}; + offsetPeriodParams = {years: -1}; + return makeInterval(); + case "yesterday": + leftBoundaryParams = {days: -1}; + rightBoundaryParams = {}; + offsetPeriodParams = {days: -1}; + return makeInterval(); + case "last_week": + leftBoundaryParams = {weeks: -2, days: 1, weekday: 0}; + rightBoundaryParams = {weeks: -1, days: 1, weekday: 0}; + offsetPeriodParams = {weeks: -1}; + return makeInterval(); + case "last_month": + leftBoundaryParams = {months: -1, day: 1}; + rightBoundaryParams = {day: 1}; + offsetPeriodParams = {months: -1}; + return makeInterval(); + case "last_quarter": + leftBoundaryParams = { + months: "- 3 - (context_today().month - 1) % 3", + day: 1, + }; + rightBoundaryParams = { + months: "- (context_today().month - 1) % 3", + day: 1, + }; + offsetPeriodParams = {months: -3}; + return makeInterval(); + case "last_year": + leftBoundaryParams = {month: 1, day: 1, years: -1}; + rightBoundaryParams = {month: 1, day: 1}; + offsetPeriodParams = {years: -1}; + return makeInterval(); + case "last_7_days": + leftBoundaryParams = {days: -7}; + rightBoundaryParams = {}; + offsetPeriodParams = {days: -7}; + return makeInterval(); + case "last_30_days": + leftBoundaryParams = {days: -30}; + rightBoundaryParams = {}; + offsetPeriodParams = {days: -30}; + return makeInterval(); + case "last_365_days": + leftBoundaryParams = {days: -365}; + rightBoundaryParams = {}; + offsetPeriodParams = {days: -365}; + return makeInterval(); + case "last_5_years": + leftBoundaryParams = {years: -5}; + rightBoundaryParams = {}; + offsetPeriodParams = {years: -5}; + return makeInterval(); + case "custom_period": + defineCustom(); + return makeInterval(); + } + }, + }); +}); diff --git a/web_time_range_menu_custom/static/src/js/search_facet.js b/web_time_range_menu_custom/static/src/js/search_facet.js new file mode 100644 index 000000000000..95d9174c6513 --- /dev/null +++ b/web_time_range_menu_custom/static/src/js/search_facet.js @@ -0,0 +1,57 @@ +/* Copyright 2021 Tecnativa - Alexandre D. Díaz + * License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl). */ +odoo.define("web_time_range_menu_custom.SearchFacet", function(require) { + "use strict"; + + const core = require("web.core"); + const SearchFacet = require("web.SearchFacet"); + + const _t = core._t; + + SearchFacet.include({ + /** + * @override + */ + _getFilterDescription: function(filter) { + if ( + filter.type === "timeRange" && + (filter.timeRangeId === "custom_period" || + filter.comparisonTimeRangeId === "custom_comparison_period") + ) { + let description = filter.description; + if (filter.timeRangeId === "custom_period") { + description += + ": " + + _t("Last ") + + `${filter.timeRangeCustom.value} ${filter.timeRangeCustom.type}`; + } else { + var timeRangeValue = _.findWhere(filter.timeRangeOptions, { + optionId: filter.timeRangeId, + }); + description += ": " + timeRangeValue.description; + } + + if (filter.comparisonTimeRangeId) { + if (filter.comparisonTimeRangeId === "custom_comparison_period") { + description += + " / " + + _t("Previous ") + + `${filter.comparisonTimeRangeCustom.value} ${filter.comparisonTimeRangeCustom.type}`; + } else { + var comparisonTimeRangeValue = _.findWhere( + filter.comparisonTimeRangeOptions, + { + optionId: filter.comparisonTimeRangeId, + } + ); + description += " / " + comparisonTimeRangeValue.description; + } + } + + return description; + } + + return this._super.apply(this, arguments); + }, + }); +}); diff --git a/web_time_range_menu_custom/static/src/js/time_range_menu.js b/web_time_range_menu_custom/static/src/js/time_range_menu.js new file mode 100644 index 000000000000..9cae35db798a --- /dev/null +++ b/web_time_range_menu_custom/static/src/js/time_range_menu.js @@ -0,0 +1,138 @@ +/* Copyright 2021 Tecnativa - Alexandre D. Díaz + * License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl). */ +odoo.define("web_time_range_menu_custom.TimeRangeMenu", function(require) { + "use strict"; + + const TimeRangeMenu = require("web.TimeRangeMenu"); + + TimeRangeMenu.include({ + events: _.extend({}, TimeRangeMenu.prototype.events, { + "change #time_range_selector": "_onChangeTimeRangeSelector", + "change .o_comparison_time_range_selector": + "_onChangeComparisonTimeRangeSelector", + }), + + renderElement: function() { + this._super.apply(this, arguments); + this.$time_range_selector = this.$el.find("#time_range_selector"); + this.$comparison_time_range_selector = this.$el.find( + ".o_comparison_time_range_selector" + ); + this.$selector_custom = this.$el.find("#time_range_selector_custom"); + this.$selector_custom_field_value = this.$selector_custom.find( + "#date_field_selector_custom_value" + ); + this.$selector_custom_field_type = this.$selector_custom.find( + "#date_field_selector_custom_type" + ); + this.$selector_comparison_custom = this.$el.find( + "#comparison_time_range_selector_custom" + ); + this.$selector_comparison_custom_field_value = this.$selector_comparison_custom.find( + "#date_field_selector_comparison_custom_value" + ); + this.$selector_comparison_custom_field_type = this.$selector_comparison_custom.find( + "#date_field_selector_comparison_custom_type" + ); + + this.$selector_custom.toggleClass( + "d-none", + this.$time_range_selector.val() !== "custom_period" + ); + this.$selector_comparison_custom.toggleClass( + "d-none", + this.$comparison_time_range_selector.val() !== + "custom_comparison_period" + ); + + if (!_.isEmpty(this.timeRangeCustom)) { + this.$selector_custom_field_value.val(this.timeRangeCustom.value); + this.$selector_custom_field_type.val(this.timeRangeCustom.type); + } + if (!_.isEmpty(this.comparisonTimeRangeCustom)) { + this.$selector_comparison_custom_field_value.val( + this.comparisonTimeRangeCustom.value + ); + this.$selector_comparison_custom_field_type.val( + this.comparisonTimeRangeCustom.type + ); + } + }, + + _onChangeTimeRangeSelector: function(ev) { + this.$selector_custom.toggleClass( + "d-none", + ev.target.value !== "custom_period" + ); + }, + + _onChangeComparisonTimeRangeSelector: function(ev) { + this.$selector_comparison_custom.toggleClass( + "d-none", + ev.target.value !== "custom_comparison_period" + ); + }, + + _onCheckBoxClick: function() { + this._super.apply(this, arguments); + const comparisonTimeRangeId = this.$( + ".o_comparison_time_range_selector" + ).val(); + this.$selector_comparison_custom.toggleClass( + "d-none", + !this.configuration.comparisonIsSelected || + comparisonTimeRangeId !== "custom_comparison_period" + ); + }, + + _onApplyButtonClick: function() { + const id = this.$(".o_date_field_selector").val(); + const timeRangeId = this.$(".o_time_range_selector").val(); + let comparisonTimeRangeId = false; + if (this.configuration.comparisonIsSelected) { + comparisonTimeRangeId = this.$( + ".o_comparison_time_range_selector" + ).val(); + } + if ( + timeRangeId !== "custom_period" && + comparisonTimeRangeId !== "custom_comparison_period" + ) { + return this._super.apply(this, arguments); + } + + const values = { + id: id, + timeRangeId: timeRangeId, + comparisonTimeRangeId: comparisonTimeRangeId, + }; + this.timeRangeCustom = null; + if (timeRangeId === "custom_period") { + const value = this.$selector_custom_field_value.val(); + const type = this.$selector_custom_field_type.val(); + if (!value || !type) { + return false; + } + this.timeRangeCustom = { + value: value, + type: type, + }; + values.timeRangeCustom = this.timeRangeCustom; + } + this.comparisonTimeRangeCustom = null; + if (comparisonTimeRangeId === "custom_comparison_period") { + const value = this.$selector_comparison_custom_field_value.val(); + const type = this.$selector_comparison_custom_field_type.val(); + if (!value || !type) { + return false; + } + this.comparisonTimeRangeCustom = { + value: value, + type: type, + }; + values.comparisonTimeRangeCustom = this.comparisonTimeRangeCustom; + } + this.trigger_up("activate_custom_time_range", values); + }, + }); +}); diff --git a/web_time_range_menu_custom/static/src/xml/time_range_menu.xml b/web_time_range_menu_custom/static/src/xml/time_range_menu.xml new file mode 100644 index 000000000000..2837e6ec96e3 --- /dev/null +++ b/web_time_range_menu_custom/static/src/xml/time_range_menu.xml @@ -0,0 +1,53 @@ + + diff --git a/web_time_range_menu_custom/templates/assets.xml b/web_time_range_menu_custom/templates/assets.xml new file mode 100644 index 000000000000..e64bdd02849c --- /dev/null +++ b/web_time_range_menu_custom/templates/assets.xml @@ -0,0 +1,35 @@ + + +