diff --git a/setup/web_pivot_computed_measure/odoo/addons/web_pivot_computed_measure b/setup/web_pivot_computed_measure/odoo/addons/web_pivot_computed_measure new file mode 120000 index 000000000..282ada6fd --- /dev/null +++ b/setup/web_pivot_computed_measure/odoo/addons/web_pivot_computed_measure @@ -0,0 +1 @@ +../../../../web_pivot_computed_measure \ No newline at end of file diff --git a/setup/web_pivot_computed_measure/setup.py b/setup/web_pivot_computed_measure/setup.py new file mode 100644 index 000000000..28c57bb64 --- /dev/null +++ b/setup/web_pivot_computed_measure/setup.py @@ -0,0 +1,6 @@ +import setuptools + +setuptools.setup( + setup_requires=['setuptools-odoo'], + odoo_addon=True, +) diff --git a/web_pivot_computed_measure/README.rst b/web_pivot_computed_measure/README.rst new file mode 100644 index 000000000..f124524fe --- /dev/null +++ b/web_pivot_computed_measure/README.rst @@ -0,0 +1,111 @@ +========================== +Web Pivot Computed Measure +========================== + +.. !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + !! 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_pivot_computed_measure + :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_pivot_computed_measure + :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 support for computed measures on the pivot view. + +**Table of contents** + +.. contents:: + :local: + +Usage +===== + +Go to pivot view and click on the "Measures" menu, you will see +a new option called 'Computed Measure'. + +You have the follow options to create a 'computed measure': + - Measure 1: Used in 'operation formula' as 'm1' + - Measure 2: Used in 'operation formula' as 'm2' + - Operation: The formula + - Sum: m1 + m2 + - Sub: m1 - m2 + - Mult: m1 * m2 + - Div: m1 / m2 (Format: Float) + - Perc m1 / m2 (Format: Percentage) + - Custom: Special option only visible in debug mode to write a custom formula. + - Name: The name of the new measure (emtpy = auto-generated) + - Format: How will the value be printed + - Integer + - Float + - Percentage (value * 100) + - Formula*: Custom operation formula + These formula is evaluated using 'PY.eval' + +These computed measures can be mixed (You can reuse it to make new computed measures) and saved as favorites. + +Notice that "measures/computed measures" involved in an active 'computed measure' +can't be deactivated until you have deactivate the 'computed measure'. + +Known issues / Roadmap +====================== + +#. Add support to define a style for a computed measure (ex. colored) + +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 +~~~~~~~ + +* Tecnativa + +Contributors +~~~~~~~~~~~~ + +* `Tecnativa `_: + + * Alexandre D. Díaz + * Pedro M. Baeza + * Ernesto Tejeda + +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_pivot_computed_measure/__init__.py b/web_pivot_computed_measure/__init__.py new file mode 100644 index 000000000..e69de29bb diff --git a/web_pivot_computed_measure/__manifest__.py b/web_pivot_computed_measure/__manifest__.py new file mode 100644 index 000000000..b347deb0c --- /dev/null +++ b/web_pivot_computed_measure/__manifest__.py @@ -0,0 +1,16 @@ +# Copyright 2020 Tecnativa - Alexandre Díaz +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html) + +{ + "name": "Web Pivot Computed Measure", + "category": "web", + "version": "13.0.1.0.0", + "author": "Tecnativa, Odoo Community Association (OCA)", + "license": "AGPL-3", + "website": "https://github.com/OCA/web", + "depends": ["web"], + "data": ["view/assets.xml"], + "qweb": ["static/src/xml/web_pivot_computed_measure.xml"], + "auto_install": False, + "installable": True, +} diff --git a/web_pivot_computed_measure/i18n/es.po b/web_pivot_computed_measure/i18n/es.po new file mode 100644 index 000000000..1eff05478 --- /dev/null +++ b/web_pivot_computed_measure/i18n/es.po @@ -0,0 +1,152 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * web_pivot_computed_measure +# +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 12.0\n" +"Report-Msgid-Bugs-To: \n" +"PO-Revision-Date: 2020-09-16 14:00+0000\n" +"Last-Translator: claudiagn \n" +"Language-Team: none\n" +"Language: es\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Weblate 3.10\n" + +#. module: web_pivot_computed_measure +#. openerp-web +#: code:addons/web_pivot_computed_measure/static/src/xml/web_pivot_computed_measure.xml:96 +#, python-format +msgid "Add" +msgstr "Añadir" + +#. module: web_pivot_computed_measure +#. openerp-web +#: code:addons/web_pivot_computed_measure/static/src/xml/web_pivot_computed_measure.xml:87 +#, python-format +msgid "Can be empty" +msgstr "Puede estar vacío" + +#. module: web_pivot_computed_measure +#. openerp-web +#: code:addons/web_pivot_computed_measure/static/src/xml/web_pivot_computed_measure.xml:47 +#, python-format +msgid "Computed Measure" +msgstr "Medida computada" + +#. module: web_pivot_computed_measure +#. openerp-web +#: code:addons/web_pivot_computed_measure/static/src/xml/web_pivot_computed_measure.xml:24 +#, python-format +msgid "Custom" +msgstr "Customizado" + +#. module: web_pivot_computed_measure +#. openerp-web +#: code:addons/web_pivot_computed_measure/static/src/xml/web_pivot_computed_measure.xml:18 +#, python-format +msgid "Div (m1 / m2)" +msgstr "Div (m1 / m2)" + +#. module: web_pivot_computed_measure +#. openerp-web +#: code:addons/web_pivot_computed_measure/static/src/xml/web_pivot_computed_measure.xml:33 +#, python-format +msgid "Float" +msgstr "Flotador" + +#. module: web_pivot_computed_measure +#. openerp-web +#: code:addons/web_pivot_computed_measure/static/src/xml/web_pivot_computed_measure.xml:90 +#, python-format +msgid "Format" +msgstr "Formato" + +#. module: web_pivot_computed_measure +#. openerp-web +#: code:addons/web_pivot_computed_measure/static/src/xml/web_pivot_computed_measure.xml:82 +#, python-format +msgid "Formula" +msgstr "Fórmula" + +#. module: web_pivot_computed_measure +#. openerp-web +#: code:addons/web_pivot_computed_measure/static/src/xml/web_pivot_computed_measure.xml:30 +#, python-format +msgid "Integer" +msgstr "Entero" + +#. module: web_pivot_computed_measure +#. openerp-web +#: code:addons/web_pivot_computed_measure/static/src/xml/web_pivot_computed_measure.xml:56 +#, python-format +msgid "Measure 1" +msgstr "Medida 1" + +#. module: web_pivot_computed_measure +#. openerp-web +#: code:addons/web_pivot_computed_measure/static/src/xml/web_pivot_computed_measure.xml:66 +#, python-format +msgid "Measure 2" +msgstr "Medida 2" + +#. module: web_pivot_computed_measure +#. openerp-web +#: code:addons/web_pivot_computed_measure/static/src/xml/web_pivot_computed_measure.xml:15 +#, python-format +msgid "Mult (m1 * m2)" +msgstr "Mult (m1 * m2)" + +#. module: web_pivot_computed_measure +#. openerp-web +#: code:addons/web_pivot_computed_measure/static/src/xml/web_pivot_computed_measure.xml:86 +#, python-format +msgid "Name" +msgstr "Nombre" + +#. module: web_pivot_computed_measure +#. openerp-web +#: code:addons/web_pivot_computed_measure/static/src/xml/web_pivot_computed_measure.xml:76 +#, python-format +msgid "Operation" +msgstr "Operación" + +#. module: web_pivot_computed_measure +#. openerp-web +#: code:addons/web_pivot_computed_measure/static/src/xml/web_pivot_computed_measure.xml:21 +#, python-format +msgid "Perc (m1 * 100 / m2)" +msgstr "Perc (m1 * 100 / m2)" + +#. module: web_pivot_computed_measure +#. openerp-web +#: code:addons/web_pivot_computed_measure/static/src/xml/web_pivot_computed_measure.xml:36 +#, python-format +msgid "Percentage" +msgstr "Porcentaje" + +#. module: web_pivot_computed_measure +#. openerp-web +#: code:addons/web_pivot_computed_measure/static/src/xml/web_pivot_computed_measure.xml:12 +#, python-format +msgid "Sub (m1 - m2)" +msgstr "Sub (m1 - m2)" + +#. module: web_pivot_computed_measure +#. openerp-web +#: code:addons/web_pivot_computed_measure/static/src/xml/web_pivot_computed_measure.xml:9 +#, python-format +msgid "Sum (m1 + m2)" +msgstr "Sum (m1 + m2)" + +#. module: web_pivot_computed_measure +#. openerp-web +#: code:addons/web_pivot_computed_measure/static/src/js/pivot_model.js:275 +#, python-format +msgid "This measure is currently used by a 'computed measure'. Please, disable the computed measure first." +msgstr "" +"Esta medida está utilizada por una 'medida computada'. Por favor, desabilita " +"la medida computada primero." diff --git a/web_pivot_computed_measure/i18n/web_pivot_computed_measure.pot b/web_pivot_computed_measure/i18n/web_pivot_computed_measure.pot new file mode 100644 index 000000000..9feda8589 --- /dev/null +++ b/web_pivot_computed_measure/i18n/web_pivot_computed_measure.pot @@ -0,0 +1,148 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * web_pivot_computed_measure +# +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 12.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_pivot_computed_measure +#. openerp-web +#: code:addons/web_pivot_computed_measure/static/src/xml/web_pivot_computed_measure.xml:96 +#, python-format +msgid "Add" +msgstr "" + +#. module: web_pivot_computed_measure +#. openerp-web +#: code:addons/web_pivot_computed_measure/static/src/xml/web_pivot_computed_measure.xml:87 +#, python-format +msgid "Can be empty" +msgstr "" + +#. module: web_pivot_computed_measure +#. openerp-web +#: code:addons/web_pivot_computed_measure/static/src/xml/web_pivot_computed_measure.xml:47 +#, python-format +msgid "Computed Measure" +msgstr "" + +#. module: web_pivot_computed_measure +#. openerp-web +#: code:addons/web_pivot_computed_measure/static/src/xml/web_pivot_computed_measure.xml:24 +#, python-format +msgid "Custom" +msgstr "" + +#. module: web_pivot_computed_measure +#. openerp-web +#: code:addons/web_pivot_computed_measure/static/src/xml/web_pivot_computed_measure.xml:18 +#, python-format +msgid "Div (m1 / m2)" +msgstr "" + +#. module: web_pivot_computed_measure +#. openerp-web +#: code:addons/web_pivot_computed_measure/static/src/xml/web_pivot_computed_measure.xml:33 +#, python-format +msgid "Float" +msgstr "" + +#. module: web_pivot_computed_measure +#. openerp-web +#: code:addons/web_pivot_computed_measure/static/src/xml/web_pivot_computed_measure.xml:90 +#, python-format +msgid "Format" +msgstr "" + +#. module: web_pivot_computed_measure +#. openerp-web +#: code:addons/web_pivot_computed_measure/static/src/xml/web_pivot_computed_measure.xml:82 +#, python-format +msgid "Formula" +msgstr "" + +#. module: web_pivot_computed_measure +#. openerp-web +#: code:addons/web_pivot_computed_measure/static/src/xml/web_pivot_computed_measure.xml:30 +#, python-format +msgid "Integer" +msgstr "" + +#. module: web_pivot_computed_measure +#. openerp-web +#: code:addons/web_pivot_computed_measure/static/src/xml/web_pivot_computed_measure.xml:56 +#, python-format +msgid "Measure 1" +msgstr "" + +#. module: web_pivot_computed_measure +#. openerp-web +#: code:addons/web_pivot_computed_measure/static/src/xml/web_pivot_computed_measure.xml:66 +#, python-format +msgid "Measure 2" +msgstr "" + +#. module: web_pivot_computed_measure +#. openerp-web +#: code:addons/web_pivot_computed_measure/static/src/xml/web_pivot_computed_measure.xml:15 +#, python-format +msgid "Mult (m1 * m2)" +msgstr "" + +#. module: web_pivot_computed_measure +#. openerp-web +#: code:addons/web_pivot_computed_measure/static/src/xml/web_pivot_computed_measure.xml:86 +#, python-format +msgid "Name" +msgstr "" + +#. module: web_pivot_computed_measure +#. openerp-web +#: code:addons/web_pivot_computed_measure/static/src/xml/web_pivot_computed_measure.xml:76 +#, python-format +msgid "Operation" +msgstr "" + +#. module: web_pivot_computed_measure +#. openerp-web +#: code:addons/web_pivot_computed_measure/static/src/xml/web_pivot_computed_measure.xml:21 +#, python-format +msgid "Perc (m1 * 100 / m2)" +msgstr "" + +#. module: web_pivot_computed_measure +#. openerp-web +#: code:addons/web_pivot_computed_measure/static/src/xml/web_pivot_computed_measure.xml:36 +#, python-format +msgid "Percentage" +msgstr "" + +#. module: web_pivot_computed_measure +#. openerp-web +#: code:addons/web_pivot_computed_measure/static/src/xml/web_pivot_computed_measure.xml:12 +#, python-format +msgid "Sub (m1 - m2)" +msgstr "" + +#. module: web_pivot_computed_measure +#. openerp-web +#: code:addons/web_pivot_computed_measure/static/src/xml/web_pivot_computed_measure.xml:9 +#, python-format +msgid "Sum (m1 + m2)" +msgstr "" + +#. module: web_pivot_computed_measure +#. openerp-web +#: code:addons/web_pivot_computed_measure/static/src/js/pivot_model.js:275 +#, python-format +msgid "This measure is currently used by a 'computed measure'. Please, disable the computed measure first." +msgstr "" + diff --git a/web_pivot_computed_measure/readme/CONTRIBUTORS.rst b/web_pivot_computed_measure/readme/CONTRIBUTORS.rst new file mode 100644 index 000000000..ea8b8e058 --- /dev/null +++ b/web_pivot_computed_measure/readme/CONTRIBUTORS.rst @@ -0,0 +1,5 @@ +* `Tecnativa `_: + + * Alexandre D. Díaz + * Pedro M. Baeza + * Ernesto Tejeda diff --git a/web_pivot_computed_measure/readme/DESCRIPTION.rst b/web_pivot_computed_measure/readme/DESCRIPTION.rst new file mode 100644 index 000000000..c48768ca0 --- /dev/null +++ b/web_pivot_computed_measure/readme/DESCRIPTION.rst @@ -0,0 +1 @@ +Adds support for computed measures on the pivot view. diff --git a/web_pivot_computed_measure/readme/ROADMAP.rst b/web_pivot_computed_measure/readme/ROADMAP.rst new file mode 100644 index 000000000..af507d470 --- /dev/null +++ b/web_pivot_computed_measure/readme/ROADMAP.rst @@ -0,0 +1 @@ +#. Add support to define a style for a computed measure (ex. colored) diff --git a/web_pivot_computed_measure/readme/USAGE.rst b/web_pivot_computed_measure/readme/USAGE.rst new file mode 100644 index 000000000..02f354433 --- /dev/null +++ b/web_pivot_computed_measure/readme/USAGE.rst @@ -0,0 +1,25 @@ +Go to pivot view and click on the "Measures" menu, you will see +a new option called 'Computed Measure'. + +You have the follow options to create a 'computed measure': + - Measure 1: Used in 'operation formula' as 'm1' + - Measure 2: Used in 'operation formula' as 'm2' + - Operation: The formula + - Sum: m1 + m2 + - Sub: m1 - m2 + - Mult: m1 * m2 + - Div: m1 / m2 (Format: Float) + - Perc m1 / m2 (Format: Percentage) + - Custom: Special option only visible in debug mode to write a custom formula. + - Name: The name of the new measure (emtpy = auto-generated) + - Format: How will the value be printed + - Integer + - Float + - Percentage (value * 100) + - Formula*: Custom operation formula + These formula is evaluated using 'PY.eval' + +These computed measures can be mixed (You can reuse it to make new computed measures) and saved as favorites. + +Notice that "measures/computed measures" involved in an active 'computed measure' +can't be deactivated until you have deactivate the 'computed measure'. diff --git a/web_pivot_computed_measure/static/description/icon.png b/web_pivot_computed_measure/static/description/icon.png new file mode 100644 index 000000000..3a0328b51 Binary files /dev/null and b/web_pivot_computed_measure/static/description/icon.png differ diff --git a/web_pivot_computed_measure/static/description/index.html b/web_pivot_computed_measure/static/description/index.html new file mode 100644 index 000000000..bf68e1601 --- /dev/null +++ b/web_pivot_computed_measure/static/description/index.html @@ -0,0 +1,477 @@ + + + + + + +Web Pivot Computed Measure + + + +
+

Web Pivot Computed Measure

+ + +

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

+

Adds support for computed measures on the pivot view.

+

Table of contents

+ +
+

Usage

+

Go to pivot view and click on the “Measures” menu, you will see +a new option called ‘Computed Measure’.

+
+
You have the follow options to create a ‘computed measure’:
+
    +
  • Measure 1: Used in ‘operation formula’ as ‘m1’
    • +
  • Measure 2: Used in ‘operation formula’ as ‘m2’
    • +
  • +
    Operation: The formula
    +
      +
    • Sum: m1 + m2
      • +
    • Sub: m1 - m2
      • +
    • Mult: m1 * m2
      • +
    • Div: m1 / m2 (Format: Float)
      • +
    • Perc m1 / m2 (Format: Percentage)
      • +
    • Custom: Special option only visible in debug mode to write a custom formula.
      • +
    +
    +
    +
    • +
  • Name: The name of the new measure (emtpy = auto-generated)
    • +
  • +
    Format: How will the value be printed
    +
      +
    • Integer
      • +
    • Float
      • +
    • Percentage (value * 100)
      • +
    +
    +
    +
    • +
  • +
    Formula*: Custom operation formula
    +
    These formula is evaluated using ‘PY.eval’
    +
    +
    • +
+
+
+

These computed measures can be mixed (You can reuse it to make new computed measures) and saved as favorites.

+

Notice that “measures/computed measures” involved in an active ‘computed measure’ +can’t be deactivated until you have deactivate the ‘computed measure’.

+
+
+

Known issues / Roadmap

+
    +
  1. Add support to define a style for a computed measure (ex. colored)
    2. +
+
+
+

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

+
    +
  • Tecnativa
    • +
+
+
+

Contributors

+
    +
  • Tecnativa:
      +
    • Alexandre D. Díaz
      • +
    • Pedro M. Baeza
      • +
    • Ernesto Tejeda
      • +
    +
    • +
+
+
+

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_pivot_computed_measure/static/src/js/pivot_controller.js b/web_pivot_computed_measure/static/src/js/pivot_controller.js new file mode 100644 index 000000000..4adcbe4f1 --- /dev/null +++ b/web_pivot_computed_measure/static/src/js/pivot_controller.js @@ -0,0 +1,193 @@ +/* Copyright 2020 Tecnativa - Alexandre Díaz + * License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html) */ + +odoo.define("web_pivot_computed_measure.PivotController", function(require) { + "use strict"; + + const core = require("web.core"); + const config = require("web.config"); + const PivotController = require("web.PivotController"); + + const QWeb = core.qweb; + + PivotController.include({ + custom_events: _.extend({}, PivotController.prototype.custom_events, { + add_measure: "_onAddMeasure", + remove_measure: "_onRemoveMeasure", + }), + + computed_measures_open: false, + + /** + * Add the computed measures to the context. This + * will be used when save a filter. + * + * @override + */ + getOwnedQueryParams: function() { + const res = this._super.apply(this, arguments); + const state = this.model.get({raw: true}); + res.context.pivot_computed_measures = state.computed_measures; + return res; + }, + + /** + * @override + */ + renderButtons: function($node) { + this._super.apply(this, arguments); + if ($node) { + this._renderComputedMeasures(); + } + }, + + /** + * Handle click event on measures menu to support computed measures sub-menu + * + * @override + */ + _onButtonClick: function(event) { + const $target = $(event.target); + if ($target.parents("div[data-id='__computed__']").length) { + let hideMenu = false; + event.preventDefault(); + + if ( + $target.hasClass("dropdown-item") || + $target.hasClass("o_submenu_switcher") + ) { + this.computed_measures_open = !this.computed_measures_open; + this._renderComputedMeasures(); + } else if ($target.hasClass("o_add_computed_measure")) { + hideMenu = true; + const field1 = this.$buttons_measures_ex + .find("#computed_measure_field_1") + .val(); + const field2 = this.$buttons_measures_ex + .find("#computed_measure_field_2") + .val(); + let oper = this.$buttons_measures_ex + .find("#computed_measure_operation") + .val(); + if (oper === "custom") { + oper = this.$buttons_measures_ex + .find("#computed_measure_operation_custom") + .val(); + } + const name = this.$buttons_measures_ex + .find("#computed_measure_name") + .val(); + const format = this.$buttons_measures_ex + .find("#computed_measure_format") + .val(); + const uniqueId = new Date().getTime(); + this.model + .createComputedMeasure( + uniqueId, + field1, + field2, + oper, + name, + format + ) + .then(this.update.bind(this, {}, {reload: false})); + } + + if (!hideMenu) { + event.stopPropagation(); + } + + return; + } + + this._super.apply(this, arguments); + }, + + /** + * Render computed measures menu + * + * @private + */ + _renderComputedMeasures: function() { + if (this.$buttons_measures_ex && this.$buttons_measures_ex.length) { + this.$buttons_measures_ex.remove(); + } + const measures = _.sortBy(_.pairs(_.omit(this.measures, "__count")), x => { + return x[1].string.toLowerCase(); + }); + this.$buttons_measures_ex = $( + QWeb.render("web_pivot_computed_measure.ExtendedMenu", { + isOpen: this.computed_measures_open, + debug: config.isDebug(), + measures: measures, + computed_measures: _.map( + _.reject(measures, item => { + return !item[1].__computed_id; + }), + item => { + item[1].active = _.contains( + this.model.data.measures, + item[0] + ); + return item; + } + ), + }) + ); + this.$buttons_measures_ex + .find("#computed_measure_operation") + .on("change", this._onChangeComputedMeasureOperation.bind(this)); + if (this.$buttons) + this.$buttons + .find(".o_pivot_measures_list") + .append(this.$buttons_measures_ex); + }, + + /** + * Custom event to add a new measure + * + * @private + * @param {CustomEvent} ev + */ + _onAddMeasure: function(ev) { + this.measures[ev.data.id] = ev.data.def; + this._renderComputedMeasures(); + }, + + /** + * Custom event to remove a measure + * + * @private + * @param {CustomEvent} ev + */ + _onRemoveMeasure: function(ev) { + delete this.measures[ev.data.id]; + this._renderComputedMeasures(); + }, + + /** + * Set default values related with the selected operation + * + * @private + * @param {ChangeEvent} ev + */ + _onChangeComputedMeasureOperation: function(ev) { + const $option = $(ev.target.options[ev.target.selectedIndex]); + if ($(ev.target).val() === "custom") { + this.$buttons_measures_ex + .find("#container_computed_measure_operation_custom") + .removeClass("d-none"); + } else { + const format = $option.data("format"); + if (format) { + this.$buttons_measures_ex + .find("#computed_measure_format") + .val(format); + } + this.$buttons_measures_ex + .find("#container_computed_measure_operation_custom") + .addClass("d-none"); + } + }, + }); +}); diff --git a/web_pivot_computed_measure/static/src/js/pivot_model.js b/web_pivot_computed_measure/static/src/js/pivot_model.js new file mode 100644 index 000000000..315cf3e0e --- /dev/null +++ b/web_pivot_computed_measure/static/src/js/pivot_model.js @@ -0,0 +1,294 @@ +/* Copyright 2020 Tecnativa - Alexandre Díaz + * License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html) */ + +odoo.define("web_pivot_computed_measure.PivotModel", function(require) { + "use strict"; + + const core = require("web.core"); + const PivotModel = require("web.PivotModel"); + + const _t = core._t; + + PivotModel.include({ + _computed_measures: [], + + /** + * Create a new computed measure + * + * @param {String} id + * @param {String} field1 + * @param {String} field2 + * @param {String} operation + * @param {String} name + * @param {String} format + * @returns a promise + */ + createComputedMeasure: function(id, field1, field2, operation, name, format) { + const measure = _.find(this._computed_measures, item => { + return ( + item.field1 === field1 && + item.field2 === field2 && + item.operation === operation + ); + }); + if (measure) { + return Promise.resolve(); + } + const fieldM1 = this.fields[field1]; + const fieldM2 = this.fields[field2]; + const cmId = "__computed_" + id; + const oper = operation.replace(/m1/g, field1).replace(/m2/g, field2); + const oper_human = operation + .replace( + /m1/g, + fieldM1.__computed_id ? "(" + fieldM1.string + ")" : fieldM1.string + ) + .replace( + /m2/g, + fieldM2.__computed_id ? "(" + fieldM2.string + ")" : fieldM2.string + ); + const cmTotal = this._computed_measures.push({ + field1: field1, + field2: field2, + operation: oper, + name: name || oper_human, + id: cmId, + format: format, + }); + + return this._createVirtualMeasure(this._computed_measures[cmTotal - 1]); + }, + + /** + * Create and enable a measure based on a 'fake' field + * + * @private + * @param {Object} cmDef + * @param {List} fields *Optional* + * @returns a promise + */ + _createVirtualMeasure: function(cmDef, fields) { + const arrFields = fields || this.fields; + // This is a minimal 'fake' field info + arrFields[cmDef.id] = { + // Used to format the value + type: cmDef.format, + // Used to print the header name + string: cmDef.name, + // Used to know if is a computed measure field + __computed_id: cmDef.id, + }; + this.trigger_up("add_measure", { + id: cmDef.id, + def: arrFields[cmDef.id], + }); + return this._activeMeasures([cmDef.field1, cmDef.field2, cmDef.id]); + }, + + /* + * @private + * @param {List of Strings} fields + */ + _activeMeasures: function(fields) { + let needLoad = false; + for (const field of fields) { + if (!this._isMeasureEnabled(field)) { + this.data.measures.push(field); + needLoad = true; + } + } + if (needLoad) { + return this._loadData(); + } + return Promise.resolve(); + }, + + /* + * @private + * @param {String} field + */ + _isMeasureEnabled: function(field) { + return _.contains(this.data.measures, field); + }, + + /** + * Helper function to add computed measure fields data into a 'subGroupData' + * + * @private + * @param {Object} subGroupData + */ + _fillComputedMeasuresData: function(subGroupData) { + for (const cm of this._computed_measures) { + if (!this._isMeasureEnabled(cm.id)) return; + if (subGroupData.__count === 0) { + subGroupData[cm.id] = false; + } else { + // eslint-disable-next-line no-undef + subGroupData[cm.id] = py.eval(cm.operation, subGroupData); + } + } + }, + + /** + * Fill the groupSubdivisions with the computed measures and their values + * + * @override + */ + _prepareData: function(group, groupSubdivisions) { + for (const groupSubdivision of groupSubdivisions) { + for (const subGroup of groupSubdivision.subGroups) { + this._fillComputedMeasuresData(subGroup); + } + } + this._super.apply(this, arguments); + }, + + /** + * _getGroupSubdivision method invokes the read_group method of the + * model via rpc and the passed 'fields' argument is the list of + * measure names that is in this.data.measures, so we remove the + * computed measures form this.data.measures before calling _super + * to prevent an exception + * + * @override + */ + _getGroupSubdivision: function() { + const computed_measures = []; + for (let i = 0; i < this.data.measures.length; i++) + if (this.data.measures[i].startsWith("__computed_")) { + computed_measures.push(this.data.measures[i]); + this.data.measures.splice(i, 1); + i--; + } + const res = this._super.apply(this, arguments); + $.merge(this.data.measures, computed_measures); + return res; + }, + + /** + * Load the computed measures in context. This is used by filters. + * + * @override + */ + load: function(params) { + this._computed_measures = + params.context.pivot_computed_measures || + params.computed_measures || + []; + const toActive = []; + for (const cmDef of this._computed_measures) { + params.fields[cmDef.id] = { + type: cmDef.format, + string: cmDef.name, + __computed_id: cmDef.id, + }; + toActive.push(cmDef.field1, cmDef.field2, cmDef.id); + } + return this._super(params).then(() => { + _.defer(() => { + for (const cmDef of this._computed_measures) { + this.trigger_up("add_measure", { + id: cmDef.id, + def: this.fields[cmDef.id], + }); + } + }); + this._activeMeasures(toActive); + }); + }, + + /** + * Load the computed measures in context. This is used by filters. + * + * @override + */ + reload: function(handle, params) { + if ("context" in params) { + this._computed_measures = + params.context.pivot_computed_measures || + params.computed_measures || + []; + } + for (const cmDef of this._computed_measures) { + this._createVirtualMeasure(cmDef); + } + const fieldNames = Object.keys(this.fields); + for (const fieldName of fieldNames) { + const field = this.fields[fieldName]; + if (field.__computed_id) { + const cm = _.find(this._computed_measures, { + id: field.__computed_id, + }); + if (!cm) { + delete this.fields[fieldName]; + this.data.measures = _.without(this.data.measures, fieldName); + this.trigger_up("remove_measure", { + id: fieldName, + }); + } + } + } + return this._super.apply(this, arguments); + }, + + /** + * Add the computed measures to the state. This is used by filters. + * + * @override + */ + get: function() { + const res = this._super.apply(this, arguments); + res.computed_measures = this._computed_measures; + return res; + }, + + /** + * Adds a rule to deny that measures can be disabled if are being used by a computed measure. + * In the other hand, when enables a measure analyzes it to active all involved measures. + * + * @override + */ + toggleMeasure: function(field) { + if (this._isMeasureEnabled(field)) { + // Measure is disabled + const umeasures = _.filter(this._computed_measures, item => { + return item.field1 === field || item.field2 === field; + }); + if (umeasures.length && this._isMeasureEnabled(umeasures[0].id)) { + return Promise.reject( + _t( + "This measure is currently used by a 'computed measure'. Please, disable the computed measure first." + ) + ); + } + } else { + // Mesaure is enabled + const toEnable = []; + const toAnalize = [field]; + while (toAnalize.length) { + const afield = toAnalize.shift(); + const fieldDef = this.fields[afield]; + if (fieldDef.__computed_id) { + const cm = _.find(this._computed_measures, { + id: fieldDef.__computed_id, + }); + toAnalize.push(cm.field1, cm.field2); + const toEnableFields = []; + if (!this.fields[cm.field1].__computed_id) { + toEnableFields.push(cm.field1); + } + if (!this.fields[cm.field2].__computed_id) { + toEnableFields.push(cm.field2); + } + toEnableFields.push(afield); + toEnable.push(toEnableFields); + } + } + if (toEnable.length) { + return this._activeMeasures(_.flatten(toEnable.reverse())); + } + } + return this._super.apply(this, arguments); + }, + }); +}); diff --git a/web_pivot_computed_measure/static/src/xml/web_pivot_computed_measure.xml b/web_pivot_computed_measure/static/src/xml/web_pivot_computed_measure.xml new file mode 100644 index 000000000..3d609509b --- /dev/null +++ b/web_pivot_computed_measure/static/src/xml/web_pivot_computed_measure.xml @@ -0,0 +1,133 @@ + + + + + + + + + + + + + + + + + +