diff --git a/setup/web_widget_progressbar_color/odoo/addons/web_widget_progressbar_color b/setup/web_widget_progressbar_color/odoo/addons/web_widget_progressbar_color deleted file mode 120000 index b9ab7eee6..000000000 --- a/setup/web_widget_progressbar_color/odoo/addons/web_widget_progressbar_color +++ /dev/null @@ -1 +0,0 @@ -../../../../web_widget_progressbar_color \ No newline at end of file diff --git a/setup/web_widget_progressbar_gradient/odoo/addons/web_widget_progressbar_gradient b/setup/web_widget_progressbar_gradient/odoo/addons/web_widget_progressbar_gradient new file mode 120000 index 000000000..6aa212cb6 --- /dev/null +++ b/setup/web_widget_progressbar_gradient/odoo/addons/web_widget_progressbar_gradient @@ -0,0 +1 @@ +../../../../web_widget_progressbar_gradient \ No newline at end of file diff --git a/setup/web_widget_progressbar_color/setup.py b/setup/web_widget_progressbar_gradient/setup.py similarity index 100% rename from setup/web_widget_progressbar_color/setup.py rename to setup/web_widget_progressbar_gradient/setup.py diff --git a/web_widget_progressbar_color/readme/DESCRIPTION.md b/web_widget_progressbar_color/readme/DESCRIPTION.md deleted file mode 100644 index de323aa4b..000000000 --- a/web_widget_progressbar_color/readme/DESCRIPTION.md +++ /dev/null @@ -1,5 +0,0 @@ -This module allows to display progress bars with colorized bar. -The color will be green for values between 0% and 40%, yellow for values -between 40% and 70% and red between 70% and 100%. - -![Progressbar Color](../static/description/progressbar_color.png) diff --git a/web_widget_progressbar_color/static/description/progressbar_color.png b/web_widget_progressbar_color/static/description/progressbar_color.png deleted file mode 100644 index 6a0318263..000000000 Binary files a/web_widget_progressbar_color/static/description/progressbar_color.png and /dev/null differ diff --git a/web_widget_progressbar_color/static/src/js/progressbar.esm.js b/web_widget_progressbar_color/static/src/js/progressbar.esm.js deleted file mode 100644 index 9a7fbdb28..000000000 --- a/web_widget_progressbar_color/static/src/js/progressbar.esm.js +++ /dev/null @@ -1,11 +0,0 @@ -/** @odoo-module **/ -import {ProgressBarField} from "@web/views/fields/progress_bar/progress_bar_field"; -import {registry} from "@web/core/registry"; - -export class ProgressBarFieldColor extends ProgressBarField { - setup() { - super.setup(); - } -} -ProgressBarFieldColor.template = "web_widget_progressbar_color.ProgressBarFieldColor"; -registry.category("fields").add("progressbar_color", ProgressBarFieldColor); diff --git a/web_widget_progressbar_color/static/src/scss/progressbar.scss b/web_widget_progressbar_color/static/src/scss/progressbar.scss deleted file mode 100644 index 12f6a6657..000000000 --- a/web_widget_progressbar_color/static/src/scss/progressbar.scss +++ /dev/null @@ -1,12 +0,0 @@ -.o_progressbar .o_progress .o_progress_danger { - background-color: #dc3545; - height: 100%; -} -.o_progressbar .o_progress .o_progress_warning { - background-color: #ffc107; - height: 100%; -} -.o_progressbar .o_progress .o_progress_success { - background-color: #198754; - height: 100%; -} diff --git a/web_widget_progressbar_color/README.rst b/web_widget_progressbar_gradient/README.rst similarity index 79% rename from web_widget_progressbar_color/README.rst rename to web_widget_progressbar_gradient/README.rst index f6fbbda46..a16c1ed17 100644 --- a/web_widget_progressbar_color/README.rst +++ b/web_widget_progressbar_gradient/README.rst @@ -1,6 +1,6 @@ -============================ -Web Widget Progressbar Color -============================ +=============================== +Web Widget Progressbar Gradient +=============================== .. !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! @@ -17,10 +17,10 @@ Web Widget Progressbar Color :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/16.0/web_widget_progressbar_color + :target: https://github.com/OCA/web/tree/16.0/web_widget_progressbar_gradient :alt: OCA/web .. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png - :target: https://translation.odoo-community.org/projects/web-16-0/web-16-0-web_widget_progressbar_color + :target: https://translation.odoo-community.org/projects/web-16-0/web-16-0-web_widget_progressbar_gradient :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=16.0 @@ -28,13 +28,13 @@ Web Widget Progressbar Color |badge1| |badge2| |badge3| |badge4| |badge5| -This module allows to display progress bars with colorized bar. The -color will be green for values between 0% and 40%, yellow for values -between 40% and 70% and red between 70% and 100%. +This module allows to display progress bars with colorized gradient bar. +The color will increase following value from green passing per yellow +and finishing to red. -|Progressbar Color| +|Progressbar Gradient| -.. |Progressbar Color| image:: https://raw.githubusercontent.com/OCA/web/16.0/web_widget_progressbar_color/static/description/progressbar_color.png +.. |Progressbar Gradient| image:: https://raw.githubusercontent.com/OCA/web/16.0/web_widget_progressbar_gradient/static/description/progressbar_gradient.png **Table of contents** @@ -59,7 +59,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. @@ -75,6 +75,7 @@ Contributors ------------ - Denis Roussel denis.roussel@acsone.eu +- Jacques-Etienne Baudoux je@bcim.be Maintainers ----------- @@ -97,6 +98,6 @@ Current `maintainer `__: |maintainer-rousseldenis| -This module is part of the `OCA/web `_ project on GitHub. +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_widget_progressbar_color/__init__.py b/web_widget_progressbar_gradient/__init__.py similarity index 100% rename from web_widget_progressbar_color/__init__.py rename to web_widget_progressbar_gradient/__init__.py diff --git a/web_widget_progressbar_color/__manifest__.py b/web_widget_progressbar_gradient/__manifest__.py similarity index 51% rename from web_widget_progressbar_color/__manifest__.py rename to web_widget_progressbar_gradient/__manifest__.py index 37ca3e687..03c878037 100644 --- a/web_widget_progressbar_color/__manifest__.py +++ b/web_widget_progressbar_gradient/__manifest__.py @@ -2,8 +2,8 @@ # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). { - "name": "Web Widget Progressbar Color", - "summary": """This module allows to customize progressbar color""", + "name": "Web Widget Progressbar Gradient", + "summary": """This module allows to display progressbar with gradient""", "version": "16.0.1.0.0", "license": "AGPL-3", "author": "ACSONE SA/NV,Odoo Community Association (OCA)", @@ -12,9 +12,9 @@ "depends": ["web"], "assets": { "web.assets_backend": [ - "web_widget_progressbar_color/static/src/scss/progressbar.scss", - "web_widget_progressbar_color/static/src/xml/progressbar.xml", - "web_widget_progressbar_color/static/src/js/progressbar.esm.js", + "web_widget_progressbar_gradient/static/src/scss/progressbar.scss", + "web_widget_progressbar_gradient/static/src/xml/progressbar.xml", + "web_widget_progressbar_gradient/static/src/js/progressbar.esm.js", ], }, } diff --git a/web_widget_progressbar_color/readme/CONTRIBUTORS.md b/web_widget_progressbar_gradient/readme/CONTRIBUTORS.md similarity index 51% rename from web_widget_progressbar_color/readme/CONTRIBUTORS.md rename to web_widget_progressbar_gradient/readme/CONTRIBUTORS.md index 4e7e68472..48218ea22 100644 --- a/web_widget_progressbar_color/readme/CONTRIBUTORS.md +++ b/web_widget_progressbar_gradient/readme/CONTRIBUTORS.md @@ -1 +1,2 @@ - Denis Roussel +- Jacques-Etienne Baudoux diff --git a/web_widget_progressbar_gradient/readme/DESCRIPTION.md b/web_widget_progressbar_gradient/readme/DESCRIPTION.md new file mode 100644 index 000000000..874a82bf2 --- /dev/null +++ b/web_widget_progressbar_gradient/readme/DESCRIPTION.md @@ -0,0 +1,5 @@ +This module allows to display progress bars with colorized gradient bar. +The color will increase following value from green passing per yellow +and finishing to red. + +![Progressbar Gradient](../static/description/progressbar_gradient.png) diff --git a/web_widget_progressbar_color/readme/ROADMAP.md b/web_widget_progressbar_gradient/readme/ROADMAP.md similarity index 100% rename from web_widget_progressbar_color/readme/ROADMAP.md rename to web_widget_progressbar_gradient/readme/ROADMAP.md diff --git a/web_widget_progressbar_color/readme/USAGE.md b/web_widget_progressbar_gradient/readme/USAGE.md similarity index 100% rename from web_widget_progressbar_color/readme/USAGE.md rename to web_widget_progressbar_gradient/readme/USAGE.md diff --git a/web_widget_progressbar_color/static/description/icon.png b/web_widget_progressbar_gradient/static/description/icon.png similarity index 100% rename from web_widget_progressbar_color/static/description/icon.png rename to web_widget_progressbar_gradient/static/description/icon.png diff --git a/web_widget_progressbar_color/static/description/index.html b/web_widget_progressbar_gradient/static/description/index.html similarity index 88% rename from web_widget_progressbar_color/static/description/index.html rename to web_widget_progressbar_gradient/static/description/index.html index ecda1afdf..0291c1076 100644 --- a/web_widget_progressbar_color/static/description/index.html +++ b/web_widget_progressbar_gradient/static/description/index.html @@ -3,7 +3,7 @@ -Web Widget Progressbar Color +Web Widget Progressbar Gradient -
-

Web Widget Progressbar Color

+
+

Web Widget Progressbar Gradient

-

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

-

This module allows to display progress bars with colorized bar. The -color will be green for values between 0% and 40%, yellow for values -between 40% and 70% and red between 70% and 100%.

-

Progressbar Color

+

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

+

This module allows to display progress bars with colorized gradient bar. +The color will increase following value from green passing per yellow +and finishing to red.

+

Progressbar Gradient

Table of contents

    @@ -407,7 +407,7 @@ inversed mode.

    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.

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

Contributors

@@ -435,7 +436,7 @@ mission is to support the collaborative development of Odoo features and promote its widespread use.

Current maintainer:

rousseldenis

-

This module is part of the OCA/web project on GitHub.

+

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_widget_progressbar_gradient/static/description/progressbar_gradient.png b/web_widget_progressbar_gradient/static/description/progressbar_gradient.png new file mode 100644 index 000000000..8df8e74d6 Binary files /dev/null and b/web_widget_progressbar_gradient/static/description/progressbar_gradient.png differ diff --git a/web_widget_progressbar_gradient/static/src/js/progressbar.esm.js b/web_widget_progressbar_gradient/static/src/js/progressbar.esm.js new file mode 100644 index 000000000..19eedd085 --- /dev/null +++ b/web_widget_progressbar_gradient/static/src/js/progressbar.esm.js @@ -0,0 +1,15 @@ +/** @odoo-module + * Copyright 2024 ACSONE SA/NV + * License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). + * **/ +import {ProgressBarField} from "@web/views/fields/progress_bar/progress_bar_field"; +import {registry} from "@web/core/registry"; + +export class ProgressBarFieldGradient extends ProgressBarField { + setup() { + super.setup(); + } +} +ProgressBarFieldGradient.template = + "web_widget_progressbar_color.ProgressBarFieldGradient"; +registry.category("fields").add("progressbar_gradient", ProgressBarFieldGradient); diff --git a/web_widget_progressbar_gradient/static/src/scss/progressbar.scss b/web_widget_progressbar_gradient/static/src/scss/progressbar.scss new file mode 100644 index 000000000..fc865523a --- /dev/null +++ b/web_widget_progressbar_gradient/static/src/scss/progressbar.scss @@ -0,0 +1,19 @@ +div:has(div.o_progressbar_gradient) .o_progressbar .o_progress { + position: relative; +} + +.o_progressbar .o_progress .o_progressbar_gradient { + height: 100%; + /* this will do the magic for masking the gradient */ + -webkit-mask: linear-gradient(#fff 0 0); + mask: linear-gradient(#fff 0 0); +} +.o_progressbar .o_progress .o_progressbar_gradient::before { + content: ""; + position: absolute; + top: 0; + left: 0; + right: 0; + bottom: 0; + background-image: linear-gradient(to right, #198754, #ffc107, #dc3545); +} diff --git a/web_widget_progressbar_color/static/src/xml/progressbar.xml b/web_widget_progressbar_gradient/static/src/xml/progressbar.xml similarity index 68% rename from web_widget_progressbar_color/static/src/xml/progressbar.xml rename to web_widget_progressbar_gradient/static/src/xml/progressbar.xml index 2a823276a..d762571cc 100644 --- a/web_widget_progressbar_color/static/src/xml/progressbar.xml +++ b/web_widget_progressbar_gradient/static/src/xml/progressbar.xml @@ -4,7 +4,7 @@