From 1cee9f4685f31d658ad3f2a8012ca9733305ec54 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexandre=20D=C3=ADaz?= Date: Tue, 10 Mar 2020 03:35:30 +0100 Subject: [PATCH 01/23] [ADD] web_pivot_computed_measure --- web_pivot_computed_measure/README.rst | 110 ++++ web_pivot_computed_measure/__init__.py | 0 web_pivot_computed_measure/__manifest__.py | 21 + .../i18n/web_pivot_computed_measure.pot | 148 ++++++ .../readme/CONTRIBUTORS.rst | 4 + .../readme/DESCRIPTION.rst | 1 + web_pivot_computed_measure/readme/ROADMAP.rst | 1 + web_pivot_computed_measure/readme/USAGE.rst | 25 + .../static/description/icon.png | Bin 0 -> 9455 bytes .../static/description/index.html | 476 ++++++++++++++++++ .../static/src/js/pivot_controller.js | 145 ++++++ .../static/src/js/pivot_model.js | 256 ++++++++++ .../src/xml/web_pivot_computed_measure.xml | 102 ++++ web_pivot_computed_measure/view/assets.xml | 11 + 14 files changed, 1300 insertions(+) create mode 100644 web_pivot_computed_measure/README.rst create mode 100644 web_pivot_computed_measure/__init__.py create mode 100644 web_pivot_computed_measure/__manifest__.py create mode 100644 web_pivot_computed_measure/i18n/web_pivot_computed_measure.pot create mode 100644 web_pivot_computed_measure/readme/CONTRIBUTORS.rst create mode 100644 web_pivot_computed_measure/readme/DESCRIPTION.rst create mode 100644 web_pivot_computed_measure/readme/ROADMAP.rst create mode 100644 web_pivot_computed_measure/readme/USAGE.rst create mode 100644 web_pivot_computed_measure/static/description/icon.png create mode 100644 web_pivot_computed_measure/static/description/index.html create mode 100644 web_pivot_computed_measure/static/src/js/pivot_controller.js create mode 100644 web_pivot_computed_measure/static/src/js/pivot_model.js create mode 100644 web_pivot_computed_measure/static/src/xml/web_pivot_computed_measure.xml create mode 100644 web_pivot_computed_measure/view/assets.xml diff --git a/web_pivot_computed_measure/README.rst b/web_pivot_computed_measure/README.rst new file mode 100644 index 000000000000..e9b36a989e3b --- /dev/null +++ b/web_pivot_computed_measure/README.rst @@ -0,0 +1,110 @@ +========================== +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/12.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-12-0/web-12-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/12.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 + +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 000000000000..e69de29bb2d1 diff --git a/web_pivot_computed_measure/__manifest__.py b/web_pivot_computed_measure/__manifest__.py new file mode 100644 index 000000000000..9f7547b95c7b --- /dev/null +++ b/web_pivot_computed_measure/__manifest__.py @@ -0,0 +1,21 @@ +# 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': "12.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/web_pivot_computed_measure.pot b/web_pivot_computed_measure/i18n/web_pivot_computed_measure.pot new file mode 100644 index 000000000000..69141cae3209 --- /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:224 +#, 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 000000000000..3ce122c7f79e --- /dev/null +++ b/web_pivot_computed_measure/readme/CONTRIBUTORS.rst @@ -0,0 +1,4 @@ +* `Tecnativa `_: + + * Alexandre D. Díaz + * Pedro M. Baeza diff --git a/web_pivot_computed_measure/readme/DESCRIPTION.rst b/web_pivot_computed_measure/readme/DESCRIPTION.rst new file mode 100644 index 000000000000..d8bdacf3d0d2 --- /dev/null +++ b/web_pivot_computed_measure/readme/DESCRIPTION.rst @@ -0,0 +1 @@ +Adds support for computed measures on the pivot view \ No newline at end of file diff --git a/web_pivot_computed_measure/readme/ROADMAP.rst b/web_pivot_computed_measure/readme/ROADMAP.rst new file mode 100644 index 000000000000..af507d470a58 --- /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 000000000000..02f354433516 --- /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 0000000000000000000000000000000000000000..3a0328b516c4980e8e44cdb63fd945757ddd132d GIT binary patch literal 9455 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 z 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 Xviia!U7SGha1wx#SCgwmn*{w2TRX*I literal 0 HcmV?d00001 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 000000000000..f6c627832e33 --- /dev/null +++ b/web_pivot_computed_measure/static/description/index.html @@ -0,0 +1,476 @@ + + + + + + +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
      • +
    +
    • +
+
+
+

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 000000000000..0b2581af0342 --- /dev/null +++ b/web_pivot_computed_measure/static/src/js/pivot_controller.js @@ -0,0 +1,145 @@ +/* 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"; + + var core = require('web.core'); + var config = require('web.config'); + var PivotController = require('web.PivotController'); + + var QWeb = core.qweb; + + + PivotController.include({ + 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 + */ + getContext: function () { + var res = this._super.apply(this, arguments); + var state = this.model.get(); + res.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) { + var $target = $(event.target); + if ($target.parents("div[data-id='__computed__']").length) { + var 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; + var field1 = this.$buttons_measures_ex.find('#computed_measure_field_1').val(); + var field2 = this.$buttons_measures_ex.find('#computed_measure_field_2').val(); + var oper = this.$buttons_measures_ex.find('#computed_measure_operation').val(); + if (oper === "custom") { + oper = this.$buttons_measures_ex.find('#computed_measure_operation_custom').val(); + } + var name = this.$buttons_measures_ex.find('#computed_measure_name').val(); + var format = this.$buttons_measures_ex.find('#computed_measure_format').val(); + var 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 + */ + _renderComputedMeasures: function() { + if (this.$buttons_measures_ex && this.$buttons_measures_ex.length) { + this.$buttons_measures_ex.remove(); + } + var self = this; + var measures = _.sortBy(_.pairs(_.omit(this.measures, '__count')), function (x) { return x[1].string.toLowerCase(); }); + this.$buttons_measures_ex = $(QWeb.render('web_pivot_computed_measure.ExtendedMenu', { + isOpen: this.computed_measures_open, + debug: config.debug, + measures: measures, + computed_measures: _.map(_.reject(measures, function(item) { return !item[1].__computed_id; }), function(item) { + item[1].active = _.contains(self.model.data.measures, item[0]); + return item; + }), + })); + this.$buttons_measures_ex.find('#computed_measure_operation').on('change', this._onChangeComputedMeasureOperation.bind(this)); + this.$buttons.find('.o_pivot_measures_list').append(this.$buttons_measures_ex); + }, + + /** + * Custom event to add a new measure + * + * @param {CustomEvent} ev + */ + _onAddMeasure: function(ev) { + this.measures[ev.data.id] = ev.data.def; + this._renderComputedMeasures(); + }, + + /** + * Custom event to remove a measure + * + * @param {CustomEvent} ev + */ + _onRemoveMeasure: function(ev) { + delete this.measures[ev.data.id]; + this._renderComputedMeasures(); + }, + + /** + * Set default values related with the selected operation + * + * @param {ChangeEvent} ev + */ + _onChangeComputedMeasureOperation: function(ev) { + var $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 { + var 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 000000000000..3c4f4ab6df50 --- /dev/null +++ b/web_pivot_computed_measure/static/src/js/pivot_model.js @@ -0,0 +1,256 @@ +/* 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"; + + var core = require('web.core'); + var PivotModel = require('web.PivotModel'); + + var _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 + */ + createComputedMeasure: function(id, field1, field2, operation, name, format) { + var measure = _.find(this._computed_measures, function(item) { + return item.field1 === field1 && item.field2 === field2 && item.operation === operation; + }); + if (measure) { + return $.Deferred(function(d) { + d.resolve(); + }); + } + var fieldM1 = this.fields[field1]; + var fieldM2 = this.fields[field2]; + var cmId = '__computed_' + id; + var oper = operation.replace(/m1/g, field1).replace(/m2/g, field2); + var oper_human = operation.replace( + /m1/g, + fieldM1.__computed_id?"("+fieldM1.string+")":fieldM1.string).replace( + /m2/g, + fieldM2.__computed_id?"("+fieldM2.string+")":fieldM2.string); + var 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 + * + * @param {Object} cmDef + * @param {List} fields *Optional* + */ + _createVirtualMeasure: function(cmDef, fields) { + var arrFields = fields || this.fields; + // This is a minimal 'fake' field info + arrFields[cmDef.id] = { + type: cmDef.format, // Used to format the value + string: cmDef.name, // Used to print the header name + __computed_id: cmDef.id, // Used to know if is a computed measure field + } + this.trigger_up("add_measure", { + id: cmDef.id, + def: arrFields[cmDef.id], + }); + return this._activeMeasures([cmDef.field1, cmDef.field2, cmDef.id]); + }, + + /** + * @param {List of Strings} fields + */ + _activeMeasures: function(fields) { + var needLoad = false; + var l = fields.length; + for (var x = 0; x < l; ++x) { + var field = fields[x]; + if (!this._isMeasureEnabled(field)) { + this.data.measures.push(field); + needLoad = true; + } + } + if (needLoad) { + return this._loadData(); + } + return $.Deferred(function(d) { + d.resolve(); + }) + }, + + /** + * @param {String} field + */ + _isMeasureEnabled: function(field) { + return _.contains(this.data.measures, field); + }, + + /** + * Fill the dataPoints with the computed measures values + * + * @override + */ + _mergeData: function (data, comparisonData, groupBys) { + var res = this._super.apply(this, arguments); + var l = groupBys.length; // Cached loop (This is not python! hehe) + for (var index = 0; index < l; ++index) { + if (data.length) { + var l2 = data[index].length; + for (var k = 0; k < l2; ++k) { + var dataPoint = data[index][k]; + if (_.isEmpty(dataPoint)) { + break; + } + var l3 = this._computed_measures.length; + for (var x = 0; x < l3; ++x) { + var cm = this._computed_measures[x]; + if (!this._isMeasureEnabled(cm.id)) { + continue; + } + dataPoint[cm.id] = py.eval(cm.operation, dataPoint); + } + } + } + } + return res; + }, + + /** + * Load the computed measures in context. This is used by filters. + * + * @override + */ + load: function (params) { + var self = this; + this._computed_measures = params.context.pivot_computed_measures || params.computed_measures || []; + var toActive = []; + var l = this._computed_measures.length; + for (var x = 0; x < l; ++x) { + var cmDef = this._computed_measures[x]; + 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(function() { + _.defer(function() { + for (var x = 0; x < l; ++x) { + var cmDef = self._computed_measures[x]; + self.trigger_up("add_measure", { + id: cmDef.id, + def: self.fields[cmDef.id], + }); + } + }); + self._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 || []; + } + var l = this._computed_measures.length; + for (var x = 0; x < l; ++x) { + this._createVirtualMeasure(this._computed_measures[x]); + } + // Clean unused 'fake' fields + var fieldNames = Object.keys(this.fields); + for (var x = 0; x < fieldNames.length; ++x) { + var field = this.fields[fieldNames[x]]; + if (field.__computed_id) { + var cm = _.find(this._computed_measures, {id:field.__computed_id}); + if (!cm) { + delete this.fields[fieldNames[x]]; + this.data.measures = _.without(this.data.measures, fieldNames[x]); + this.trigger_up("remove_measure", { + id: fieldNames[x], + }); + } + } + } + return this._super.apply(this, arguments); + }, + + /** + * Add the computed measures to the state. This is used by filters. + * + * @override + */ + get: function () { + var 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 + var umeasures = _.filter(this._computed_measures, function(item) { + return item.field1 === field || item.field2 === field; + }) + if (umeasures.length && this._isMeasureEnabled(umeasures[0].id)) { + return $.Deferred(function(d) { + d.reject(_t("This measure is currently used by a 'computed measure'. Please, disable the computed measure first.")); + }); + } + } else { + // Mesaure is enabled + var toEnable = []; + var toAnalize = [field]; + while (toAnalize.length) { + var afield = toAnalize.shift(); + var fieldDef = this.fields[afield]; + if (fieldDef.__computed_id) { + var cm = _.find(this._computed_measures, {id:fieldDef.__computed_id}); + toAnalize.push(cm.field1, cm.field2); + var 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 000000000000..7cdce42f201c --- /dev/null +++ b/web_pivot_computed_measure/static/src/xml/web_pivot_computed_measure.xml @@ -0,0 +1,102 @@ + + + + + + + + + + + + + + + + + + + + +