diff --git a/test-requirements.txt b/test-requirements.txt new file mode 100644 index 000000000..4ad8e0ece --- /dev/null +++ b/test-requirements.txt @@ -0,0 +1 @@ +odoo-test-helper diff --git a/web_pivot_computed_measure/README.rst b/web_pivot_computed_measure/README.rst index c5dc6f1ac..1b03b9796 100644 --- a/web_pivot_computed_measure/README.rst +++ b/web_pivot_computed_measure/README.rst @@ -7,7 +7,7 @@ Web Pivot Computed Measure !! This file is generated by oca-gen-addon-readme !! !! changes will be overwritten. !! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! - !! source digest: sha256:34691d378ce32fade67311831059070fab3df66f5cb2ec7fa88287018b85de7b + !! source digest: sha256:4cef60dd775467b756ccbacb8c215bba0bc74fd32e1917c8b15c3be9de6302a1 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! .. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png @@ -17,13 +17,13 @@ Web Pivot Computed Measure :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_pivot_computed_measure + :target: https://github.com/OCA/web/tree/16.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-15-0/web-15-0-web_pivot_computed_measure + :target: https://translation.odoo-community.org/projects/web-16-0/web-16-0-web_pivot_computed_measure :alt: Translate me on Weblate .. |badge5| image:: https://img.shields.io/badge/runboat-Try%20me-875A7B.png - :target: https://runboat.odoo-community.org/builds?repo=OCA/web&target_branch=15.0 + :target: https://runboat.odoo-community.org/builds?repo=OCA/web&target_branch=16.0 :alt: Try me on Runboat |badge1| |badge2| |badge3| |badge4| |badge5| @@ -68,7 +68,7 @@ Known issues / Roadmap ====================== #. Add support to define a style for a computed measure (ex. colored) -#. Use t-model to data-binding instad of jquery selectors +#. Use t-model to data-binding instead of jquery selectors Bug Tracker =========== @@ -76,7 +76,7 @@ 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 to smash it by providing a detailed and welcomed -`feedback `_. +`feedback `_. Do not contact contributors directly about support or help with technical issues. @@ -111,6 +111,14 @@ 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. +.. |maintainer-CarlosRoca13| image:: https://github.com/CarlosRoca13.png?size=40px + :target: https://github.com/CarlosRoca13 + :alt: CarlosRoca13 + +Current `maintainer `__: + +|maintainer-CarlosRoca13| + +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/__manifest__.py b/web_pivot_computed_measure/__manifest__.py index e77ae591a..02260c9c7 100644 --- a/web_pivot_computed_measure/__manifest__.py +++ b/web_pivot_computed_measure/__manifest__.py @@ -3,21 +3,20 @@ { "name": "Web Pivot Computed Measure", "category": "web", - "version": "15.0.1.0.3", + "version": "16.0.1.0.0", "author": "Tecnativa, Odoo Community Association (OCA)", "license": "AGPL-3", "website": "https://github.com/OCA/web", "depends": ["web"], "auto_install": False, "installable": True, + "maintainers": ["CarlosRoca13"], "assets": { - "web.assets_qweb": [ - "/web_pivot_computed_measure/static/src/**/*.xml", - ], "web.assets_backend": [ "/web_pivot_computed_measure/static/src/**/*.esm.js", "/web_pivot_computed_measure/static/src/**/*.scss", ("remove", "/web_pivot_computed_measure/static/src/test/*.esm.js"), + "/web_pivot_computed_measure/static/src/**/*.xml", ], "web.assets_tests": [ "/web_pivot_computed_measure/static/src/test/test.esm.js", diff --git a/web_pivot_computed_measure/readme/ROADMAP.rst b/web_pivot_computed_measure/readme/ROADMAP.rst index 453971d1b..8e4604028 100644 --- a/web_pivot_computed_measure/readme/ROADMAP.rst +++ b/web_pivot_computed_measure/readme/ROADMAP.rst @@ -1,2 +1,2 @@ #. Add support to define a style for a computed measure (ex. colored) -#. Use t-model to data-binding instad of jquery selectors +#. Use t-model to data-binding instead of jquery selectors diff --git a/web_pivot_computed_measure/static/description/index.html b/web_pivot_computed_measure/static/description/index.html index f3e6801f0..7353f3434 100644 --- a/web_pivot_computed_measure/static/description/index.html +++ b/web_pivot_computed_measure/static/description/index.html @@ -367,9 +367,9 @@ ul.auto-toc { !! This file is generated by oca-gen-addon-readme !! !! changes will be overwritten. !! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -!! source digest: sha256:34691d378ce32fade67311831059070fab3df66f5cb2ec7fa88287018b85de7b +!! source digest: sha256:4cef60dd775467b756ccbacb8c215bba0bc74fd32e1917c8b15c3be9de6302a1 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! --> -

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

+

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

Adds support for computed measures on the pivot view.

Table of contents

@@ -434,7 +434,7 @@ 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. -
  2. Use t-model to data-binding instad of jquery selectors
    3. +
  3. Use t-model to data-binding instead of jquery selectors
@@ -442,7 +442,7 @@ can’t be deactivated until you have deactivate the ‘computed measure’.

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 to smash it by providing a detailed and welcomed -feedback.

+feedback.

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

@@ -472,7 +472,9 @@ If you spotted it first, help us to smash it by providing a detailed and welcome

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.

+

Current maintainer:

+

CarlosRoca13

+

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/dropdown_item_custom_measure/dropdown_item_custom_measure.esm.js b/web_pivot_computed_measure/static/src/dropdown_item_custom_measure/dropdown_item_custom_measure.esm.js index 3469e386f..e6a9259cd 100644 --- a/web_pivot_computed_measure/static/src/dropdown_item_custom_measure/dropdown_item_custom_measure.esm.js +++ b/web_pivot_computed_measure/static/src/dropdown_item_custom_measure/dropdown_item_custom_measure.esm.js @@ -2,8 +2,7 @@ /* Copyright 2022 Tecnativa - Carlos Roca * License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html) */ -const {Component, QWeb} = owl; -const {useState} = owl.hooks; +import {Component, useState} from "@odoo/owl"; /** * @extends Component @@ -48,4 +47,3 @@ DropdownItemCustomMeasure.props = { // uses Measures like the graph view. model: Object, }; -QWeb.registerComponent("DropdownItemCustomMeasure", DropdownItemCustomMeasure); diff --git a/web_pivot_computed_measure/static/src/pivot/pivot_controller.esm.js b/web_pivot_computed_measure/static/src/pivot/pivot_controller.esm.js new file mode 100644 index 000000000..8fd29a265 --- /dev/null +++ b/web_pivot_computed_measure/static/src/pivot/pivot_controller.esm.js @@ -0,0 +1,26 @@ +/** @odoo-module **/ +/* Copyright 2024 Tecnativa - Carlos Roca + * License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html) */ + +import {PivotController} from "@web/views/pivot/pivot_controller"; +import {patch} from "@web/core/utils/patch"; +import {DropdownItemCustomMeasure} from "../dropdown_item_custom_measure/dropdown_item_custom_measure.esm"; + +patch(PivotController.prototype, "web_pivot_computed_measure.PivotController", { + /** + * Add computed_measures to context key to avoid loosing info when saving the + * filter to favorites. + * + * @override + */ + getContext() { + var res = this._super(...arguments); + res.pivot_computed_measures = this.model._computed_measures; + return res; + }, +}); + +PivotController.components = { + ...PivotController.components, + DropdownItemCustomMeasure, +}; diff --git a/web_pivot_computed_measure/static/src/pivot/pivot_model.esm.js b/web_pivot_computed_measure/static/src/pivot/pivot_model.esm.js index 76f02bb69..96d09f668 100644 --- a/web_pivot_computed_measure/static/src/pivot/pivot_model.esm.js +++ b/web_pivot_computed_measure/static/src/pivot/pivot_model.esm.js @@ -4,8 +4,8 @@ * License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html) */ import {PivotModel} from "@web/views/pivot/pivot_model"; -import {patch} from "web.utils"; -import {computeReportMeasures} from "@web/views/helpers/utils"; +import {patch} from "@web/core/utils/patch"; +import {computeReportMeasures} from "@web/views/utils"; import {evalOperation} from "../helpers/utils.esm"; patch(PivotModel.prototype, "web_pivot_computed_measure.PivotModel", { diff --git a/web_pivot_computed_measure/static/src/pivot/pivot_renderer.esm.js b/web_pivot_computed_measure/static/src/pivot/pivot_renderer.esm.js index d3a0e9c7b..3987dc852 100644 --- a/web_pivot_computed_measure/static/src/pivot/pivot_renderer.esm.js +++ b/web_pivot_computed_measure/static/src/pivot/pivot_renderer.esm.js @@ -3,7 +3,7 @@ * License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html) */ import {PivotRenderer} from "@web/views/pivot/pivot_renderer"; -import {patch} from "web.utils"; +import {patch} from "@web/core/utils/patch"; patch(PivotRenderer.prototype, "web_pivot_computed_measure.PivotRenderer", { getFormattedValue(cell) { diff --git a/web_pivot_computed_measure/static/src/pivot/pivot_view.esm.js b/web_pivot_computed_measure/static/src/pivot/pivot_view.esm.js deleted file mode 100644 index 5242dbe11..000000000 --- a/web_pivot_computed_measure/static/src/pivot/pivot_view.esm.js +++ /dev/null @@ -1,20 +0,0 @@ -/** @odoo-module **/ -/* Copyright 2022 Tecnativa - Carlos Roca - * License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html) */ - -import {PivotView} from "@web/views/pivot/pivot_view"; -import {patch} from "web.utils"; - -patch(PivotView.prototype, "web_pivot_computed_measure.PivotView", { - /** - * Add computed_measures to context key to avoid loosing info when saving the - * filter to favorites. - * - * @override - */ - getContext() { - var res = this._super(...arguments); - res.pivot_computed_measures = this.model._computed_measures; - return res; - }, -}); diff --git a/web_pivot_computed_measure/static/src/test/test.esm.js b/web_pivot_computed_measure/static/src/test/test.esm.js index faa2824fc..25b0ed0a4 100644 --- a/web_pivot_computed_measure/static/src/test/test.esm.js +++ b/web_pivot_computed_measure/static/src/test/test.esm.js @@ -11,9 +11,11 @@ tour.register( test: true, }, [ - tour.stepUtils.showAppsMenuItem(), { - trigger: 'a[data-menu-xmlid="base.menu_administration"]', + trigger: ".o_navbar_apps_menu button", + }, + { + trigger: '.o_app[data-menu-xmlid="base.menu_administration"]', }, { trigger: 'button[data-menu-xmlid="base.menu_users"]', diff --git a/web_pivot_computed_measure/static/src/view.xml b/web_pivot_computed_measure/static/src/view.xml index f779b8943..20da6cd4b 100644 --- a/web_pivot_computed_measure/static/src/view.xml +++ b/web_pivot_computed_measure/static/src/view.xml @@ -8,14 +8,12 @@