From 807071fbebd4828cd66a5e61a46dc5e517761a62 Mon Sep 17 00:00:00 2001 From: zhou <123@> Date: Mon, 11 Aug 2025 11:42:48 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- web_tree_dynamic_colored_field/README.rst | 192 +++++++ web_tree_dynamic_colored_field/__init__.py | 1 + .../__manifest__.py | 20 + .../demo/res_users.xml | 21 + web_tree_dynamic_colored_field/i18n/es.po | 22 + web_tree_dynamic_colored_field/i18n/fi.po | 22 + web_tree_dynamic_colored_field/i18n/fr.po | 0 web_tree_dynamic_colored_field/i18n/it.po | 14 + web_tree_dynamic_colored_field/i18n/nl_NL.po | 23 + web_tree_dynamic_colored_field/i18n/sl.po | 23 + .../i18n/web_tree_dynamic_colored_field.pot | 13 + web_tree_dynamic_colored_field/i18n/zh_CN.po | 0 web_tree_dynamic_colored_field/pyproject.toml | 3 + .../readme/CONTRIBUTORS.md | 7 + .../readme/CREDITS.md | 4 + .../readme/DESCRIPTION.md | 9 + .../readme/ROADMAP.md | 7 + .../readme/USAGE.md | 70 +++ .../static/description/icon.png | Bin 0 -> 9455 bytes .../static/description/index.html | 532 ++++++++++++++++++ .../static/src/js/list_renderer.esm.js | 78 +++ .../static/src/xml/list.xml | 19 + yuthon_holiday/models/inherit_hr_leave.py | 8 +- .../models/yuthon_vacation_reports.py | 12 +- .../views/yuthon_vacation_reports_views.xml | 8 +- 25 files changed, 1096 insertions(+), 12 deletions(-) create mode 100644 web_tree_dynamic_colored_field/README.rst create mode 100644 web_tree_dynamic_colored_field/__init__.py create mode 100644 web_tree_dynamic_colored_field/__manifest__.py create mode 100644 web_tree_dynamic_colored_field/demo/res_users.xml create mode 100644 web_tree_dynamic_colored_field/i18n/es.po create mode 100644 web_tree_dynamic_colored_field/i18n/fi.po create mode 100644 web_tree_dynamic_colored_field/i18n/fr.po create mode 100644 web_tree_dynamic_colored_field/i18n/it.po create mode 100644 web_tree_dynamic_colored_field/i18n/nl_NL.po create mode 100644 web_tree_dynamic_colored_field/i18n/sl.po create mode 100644 web_tree_dynamic_colored_field/i18n/web_tree_dynamic_colored_field.pot create mode 100644 web_tree_dynamic_colored_field/i18n/zh_CN.po create mode 100644 web_tree_dynamic_colored_field/pyproject.toml create mode 100644 web_tree_dynamic_colored_field/readme/CONTRIBUTORS.md create mode 100644 web_tree_dynamic_colored_field/readme/CREDITS.md create mode 100644 web_tree_dynamic_colored_field/readme/DESCRIPTION.md create mode 100644 web_tree_dynamic_colored_field/readme/ROADMAP.md create mode 100644 web_tree_dynamic_colored_field/readme/USAGE.md create mode 100644 web_tree_dynamic_colored_field/static/description/icon.png create mode 100644 web_tree_dynamic_colored_field/static/description/index.html create mode 100644 web_tree_dynamic_colored_field/static/src/js/list_renderer.esm.js create mode 100644 web_tree_dynamic_colored_field/static/src/xml/list.xml diff --git a/web_tree_dynamic_colored_field/README.rst b/web_tree_dynamic_colored_field/README.rst new file mode 100644 index 000000000..e8af03130 --- /dev/null +++ b/web_tree_dynamic_colored_field/README.rst @@ -0,0 +1,192 @@ +============================ +Colorize field in tree views +============================ + +.. + !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + !! This file is generated by oca-gen-addon-readme !! + !! changes will be overwritten. !! + !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + !! source digest: sha256:6521bdb39984b1f0b648e2ab5e2798ab30f3b70c504669ef51a772bcb92663da + !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + +.. |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/17.0/web_tree_dynamic_colored_field + :alt: OCA/web +.. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png + :target: https://translation.odoo-community.org/projects/web-17-0/web-17-0-web_tree_dynamic_colored_field + :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=17.0 + :alt: Try me on Runboat + +|badge1| |badge2| |badge3| |badge4| |badge5| + +This module aims to add support for dynamically coloring fields in tree +view according to data in the record. + +Features +-------- + +- Add attribute ``bg_color`` on field's ``options`` to color background + of a cell in tree view +- Add attribute ``fg_color`` on field's ``options`` to change text + color of a cell in tree view + +**Table of contents** + +.. contents:: + :local: + +Usage +===== + +- In the tree view declaration, put + ``options='{"bg_color": "red: customer==True"}`` attribute in the + ``field`` tag: + + :: + + ... + + + ... + + ... + + + ... + + With this example, column which renders 'name' field will have its **background** colored in red on customer records. + +- In the tree view declaration, put + ``options='{"fg_color": "white:customer == True"}'`` attribute in the + ``field`` tag: + + :: + + ... + + + ... + + ... + + + ... + + With this example, column which renders 'name' field will have its **text** colored in white on customer records. + +- If you want to use more than one color, you can split the attributes + using ';': + +:: + + options='{"fg_color": "red:red_color == True; green:green_color == True"}' + +Example: + +.. code:: xml + + ... + + + ... + + ... + + + ... + +- Can use strings too... In the tree view declaration, put + ``options="{'fg_color': 'green:customer_state == \'success\''}"`` + attribute in the ``field`` tag: + + :: + + ... + + + ... + + ... + + + ... + +**Note that you can use single or normal quotes. If the declaration of +the options doesn't follow the JSON format, the options string will be +evaluated using py.eval()** + +Known issues / Roadmap +====================== + +- Before version 13.0, this module had a feature allowing to change the + color of a line depending on a field, using a ``colors`` attribute + with the name of the field on the ```` element. Since 13.0, the + ``colors`` attribute is no longer in the RelaxNG schema of the tree + view, so we can't use it anymore. This feature has then been dropped, + but could be reimplement in another way. +- Since version 17.0 coloring is written into ``style`` attribute of + (td) element + +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 `_. + +Do not contact contributors directly about support or help with technical issues. + +Credits +======= + +Authors +------- + +* Camptocamp +* Therp BV + +Contributors +------------ + +- Damien Crier +- Holger Brunn +- Artem Kostyuk +- Guewen Baconnier +- Phuc Tran Thanh +- Sylvain LE GAL +- Jurgis Pralgauskis + +Other credits +------------- + +The development of this module has been financially supported by: + +- Camptocamp +- Versada + +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_tree_dynamic_colored_field/__init__.py b/web_tree_dynamic_colored_field/__init__.py new file mode 100644 index 000000000..6d4f4bde9 --- /dev/null +++ b/web_tree_dynamic_colored_field/__init__.py @@ -0,0 +1 @@ +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). diff --git a/web_tree_dynamic_colored_field/__manifest__.py b/web_tree_dynamic_colored_field/__manifest__.py new file mode 100644 index 000000000..b1e99b51a --- /dev/null +++ b/web_tree_dynamic_colored_field/__manifest__.py @@ -0,0 +1,20 @@ +# Copyright 2015-2018 Camptocamp SA, Damien Crier +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). +{ + "name": "Colorize field in tree views", + "summary": "Allows you to dynamically color fields on tree views", + "category": "Hidden/Dependency", + "version": "17.0.1.0.0", + "depends": ["web"], + "author": "Camptocamp, Therp BV, Odoo Community Association (OCA)", + "license": "AGPL-3", + "website": "https://github.com/OCA/web", + "demo": ["demo/res_users.xml"], + "installable": True, + "assets": { + "web.assets_backend": [ + "web_tree_dynamic_colored_field/static/src/xml/list.xml", + "web_tree_dynamic_colored_field/static/src/js/list_renderer.esm.js", + ], + }, +} diff --git a/web_tree_dynamic_colored_field/demo/res_users.xml b/web_tree_dynamic_colored_field/demo/res_users.xml new file mode 100644 index 000000000..c2f004e70 --- /dev/null +++ b/web_tree_dynamic_colored_field/demo/res_users.xml @@ -0,0 +1,21 @@ + + + + res.users + + + + { + "bg_color": "#9e1635: login_date == False", + "fg_color": "white: login_date == False" + } + + + { + "bg_color": "blue; #653b5b: login == 'admin'", + "fg_color": "white" + } + + + + diff --git a/web_tree_dynamic_colored_field/i18n/es.po b/web_tree_dynamic_colored_field/i18n/es.po new file mode 100644 index 000000000..5077b7e57 --- /dev/null +++ b/web_tree_dynamic_colored_field/i18n/es.po @@ -0,0 +1,22 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * web_tree_dynamic_colored_field +# +# Translators: +# Pedro M. Baeza , 2017 +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 9.0c\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-01-05 01:38+0000\n" +"PO-Revision-Date: 2017-01-05 01:38+0000\n" +"Last-Translator: Pedro M. Baeza , 2017\n" +"Language-Team: Spanish (https://www.transifex.com/oca/teams/23907/es/)\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" + +#~ msgid "columns.fct_colorize(record, column)" +#~ msgstr "columns.fct_colorize(record, column)" diff --git a/web_tree_dynamic_colored_field/i18n/fi.po b/web_tree_dynamic_colored_field/i18n/fi.po new file mode 100644 index 000000000..4b8c0c557 --- /dev/null +++ b/web_tree_dynamic_colored_field/i18n/fi.po @@ -0,0 +1,22 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * web_tree_dynamic_colored_field +# +# Translators: +# Jarmo Kortetjärvi , 2016 +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 8.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2016-07-08 16:36+0000\n" +"PO-Revision-Date: 2016-07-08 16:36+0000\n" +"Last-Translator: Jarmo Kortetjärvi , 2016\n" +"Language-Team: Finnish (https://www.transifex.com/oca/teams/23907/fi/)\n" +"Language: fi\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" + +#~ msgid "columns.fct_colorize(record, column)" +#~ msgstr "columns.fct_colorize(record, column)" diff --git a/web_tree_dynamic_colored_field/i18n/fr.po b/web_tree_dynamic_colored_field/i18n/fr.po new file mode 100644 index 000000000..e69de29bb diff --git a/web_tree_dynamic_colored_field/i18n/it.po b/web_tree_dynamic_colored_field/i18n/it.po new file mode 100644 index 000000000..8af45f7b8 --- /dev/null +++ b/web_tree_dynamic_colored_field/i18n/it.po @@ -0,0 +1,14 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 17.0\n" +"Report-Msgid-Bugs-To: \n" +"Last-Translator: Automatically generated\n" +"Language-Team: none\n" +"Language: it\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" diff --git a/web_tree_dynamic_colored_field/i18n/nl_NL.po b/web_tree_dynamic_colored_field/i18n/nl_NL.po new file mode 100644 index 000000000..b3846a913 --- /dev/null +++ b/web_tree_dynamic_colored_field/i18n/nl_NL.po @@ -0,0 +1,23 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * web_tree_dynamic_colored_field +# +# Translators: +# Peter Hageman , 2017 +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 10.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-06-22 08:27+0000\n" +"PO-Revision-Date: 2017-06-22 08:27+0000\n" +"Last-Translator: Peter Hageman , 2017\n" +"Language-Team: Dutch (Netherlands) (https://www.transifex.com/oca/" +"teams/23907/nl_NL/)\n" +"Language: nl_NL\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" + +#~ msgid "columns.fct_colorize(record, column)" +#~ msgstr "columns.fct_colorize(record, column)" diff --git a/web_tree_dynamic_colored_field/i18n/sl.po b/web_tree_dynamic_colored_field/i18n/sl.po new file mode 100644 index 000000000..62d42da76 --- /dev/null +++ b/web_tree_dynamic_colored_field/i18n/sl.po @@ -0,0 +1,23 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * web_tree_dynamic_colored_field +# +# Translators: +# Matjaž Mozetič , 2016 +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 8.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2016-06-24 00:46+0000\n" +"PO-Revision-Date: 2016-06-24 00:46+0000\n" +"Last-Translator: Matjaž Mozetič , 2016\n" +"Language-Team: Slovenian (https://www.transifex.com/oca/teams/23907/sl/)\n" +"Language: sl\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n" +"%100==4 ? 2 : 3);\n" + +#~ msgid "columns.fct_colorize(record, column)" +#~ msgstr "columns.fct_colorize(record, column)" diff --git a/web_tree_dynamic_colored_field/i18n/web_tree_dynamic_colored_field.pot b/web_tree_dynamic_colored_field/i18n/web_tree_dynamic_colored_field.pot new file mode 100644 index 000000000..716a0702d --- /dev/null +++ b/web_tree_dynamic_colored_field/i18n/web_tree_dynamic_colored_field.pot @@ -0,0 +1,13 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 17.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" diff --git a/web_tree_dynamic_colored_field/i18n/zh_CN.po b/web_tree_dynamic_colored_field/i18n/zh_CN.po new file mode 100644 index 000000000..e69de29bb diff --git a/web_tree_dynamic_colored_field/pyproject.toml b/web_tree_dynamic_colored_field/pyproject.toml new file mode 100644 index 000000000..4231d0ccc --- /dev/null +++ b/web_tree_dynamic_colored_field/pyproject.toml @@ -0,0 +1,3 @@ +[build-system] +requires = ["whool"] +build-backend = "whool.buildapi" diff --git a/web_tree_dynamic_colored_field/readme/CONTRIBUTORS.md b/web_tree_dynamic_colored_field/readme/CONTRIBUTORS.md new file mode 100644 index 000000000..36093db6e --- /dev/null +++ b/web_tree_dynamic_colored_field/readme/CONTRIBUTORS.md @@ -0,0 +1,7 @@ +- Damien Crier \<\> +- Holger Brunn \<\> +- Artem Kostyuk \<\> +- Guewen Baconnier \<\> +- Phuc Tran Thanh \<\> +- Sylvain LE GAL \<\> +- Jurgis Pralgauskis \<\> diff --git a/web_tree_dynamic_colored_field/readme/CREDITS.md b/web_tree_dynamic_colored_field/readme/CREDITS.md new file mode 100644 index 000000000..c24508984 --- /dev/null +++ b/web_tree_dynamic_colored_field/readme/CREDITS.md @@ -0,0 +1,4 @@ +The development of this module has been financially supported by: + +- Camptocamp +- Versada diff --git a/web_tree_dynamic_colored_field/readme/DESCRIPTION.md b/web_tree_dynamic_colored_field/readme/DESCRIPTION.md new file mode 100644 index 000000000..f1c8a74a1 --- /dev/null +++ b/web_tree_dynamic_colored_field/readme/DESCRIPTION.md @@ -0,0 +1,9 @@ +This module aims to add support for dynamically coloring fields in tree +view according to data in the record. + +## Features + +- Add attribute `bg_color` on field's `options` to color background of a + cell in tree view +- Add attribute `fg_color` on field's `options` to change text color of + a cell in tree view diff --git a/web_tree_dynamic_colored_field/readme/ROADMAP.md b/web_tree_dynamic_colored_field/readme/ROADMAP.md new file mode 100644 index 000000000..16376e95f --- /dev/null +++ b/web_tree_dynamic_colored_field/readme/ROADMAP.md @@ -0,0 +1,7 @@ +- Before version 13.0, this module had a feature allowing to change the + color of a line depending on a field, using a `colors` attribute with + the name of the field on the `` element. Since 13.0, the + `colors` attribute is no longer in the RelaxNG schema of the tree + view, so we can't use it anymore. This feature has then been dropped, + but could be reimplement in another way. +- Since version 17.0 coloring is written into ``style`` attribute of (td) element diff --git a/web_tree_dynamic_colored_field/readme/USAGE.md b/web_tree_dynamic_colored_field/readme/USAGE.md new file mode 100644 index 000000000..b5950598f --- /dev/null +++ b/web_tree_dynamic_colored_field/readme/USAGE.md @@ -0,0 +1,70 @@ +- In the tree view declaration, put + `options='{"bg_color": "red: customer==True"}` attribute in the + `field` tag: + + ... + + + ... + + ... + + + ... + + With this example, column which renders 'name' field will have its **background** colored in red on customer records. + +- In the tree view declaration, put + `options='{"fg_color": "white:customer == True"}'` attribute in the + `field` tag: + + ... + + + ... + + ... + + + ... + + With this example, column which renders 'name' field will have its **text** colored in white on customer records. + +- If you want to use more than one color, you can split the attributes + using ';': + +``` +options='{"fg_color": "red:red_color == True; green:green_color == True"}' +``` + +Example: + +``` xml +... + + + ... + + ... + + + ... +``` + +- Can use strings too... In the tree view declaration, put + `options="{'fg_color': 'green:customer_state == \'success\''}"` + attribute in the `field` tag: + + ... + + + ... + + ... + + + ... + +**Note that you can use single or normal quotes. If the declaration of +the options doesn't follow the JSON format, the options string will be +evaluated using py.eval()** diff --git a/web_tree_dynamic_colored_field/static/description/icon.png b/web_tree_dynamic_colored_field/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_tree_dynamic_colored_field/static/description/index.html b/web_tree_dynamic_colored_field/static/description/index.html new file mode 100644 index 000000000..47a41010f --- /dev/null +++ b/web_tree_dynamic_colored_field/static/description/index.html @@ -0,0 +1,532 @@ + + + + + +Colorize field in tree views + + + +
+

Colorize field in tree views

+ + +

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

+

This module aims to add support for dynamically coloring fields in tree +view according to data in the record.

+
+

Features

+
    +
  • Add attribute bg_color on field’s options to color background +of a cell in tree view
    • +
  • Add attribute fg_color on field’s options to change text +color of a cell in tree view
    • +
+

Table of contents

+ +
+

Usage

+
    +

  • In the tree view declaration, put +options='{"bg_color": "red: customer==True"} attribute in the +field tag:

    +
    +...
+<field name="arch" type="xml">
+    <tree string="View name">
+        ...
+        <field name="name" options='{"bg_color": "red: customer == True"}'/>
+        ...
+    </tree>
+</field>
+...
+
+With this example, column which renders 'name' field will have its **background** colored in red on customer records.
+
    +
    • +

  • In the tree view declaration, put +options='{"fg_color": "white:customer == True"}' attribute in the +field tag:

    +
    +...
+<field name="arch" type="xml">
+    <tree string="View name">
+        ...
+        <field name="name" options='{"fg_color": "white:customer == True"}'/>
+        ...
+    </tree>
+</field>
+...
+
+With this example, column which renders 'name' field will have its **text** colored in white on customer records.
+
    +
    • +

  • If you want to use more than one color, you can split the attributes +using ‘;’:

    +
    • +
+
+options='{"fg_color": "red:red_color == True; green:green_color == True"}'
+
+

Example:

+
+...
+ <field name="arch" type="xml">
+     <tree string="View name">
+         ...
+         <field name="name" options='{"fg_color": "red:red_color == True; green:green_color == True"}'/>
+         ...
+     </tree>
+ </field>
+ ...
+
+
    +

  • Can use strings too… In the tree view declaration, put +options="{'fg_color': 'green:customer_state == \'success\''}" +attribute in the field tag:

    +
    +...
+<field name="arch" type="xml">
+    <tree string="View name">
+        ...
+        <field name="name" options="{'fg_color': 'green:customer_state == \'success\''}"/>
+        ...
+    </tree>
+</field>
+...
+
    +
    • +
+

Note that you can use single or normal quotes. If the declaration of +the options doesn’t follow the JSON format, the options string will be +evaluated using py.eval()

+
+
+

Known issues / Roadmap

+
    +
  • Before version 13.0, this module had a feature allowing to change the +color of a line depending on a field, using a colors attribute +with the name of the field on the <tree> element. Since 13.0, the +colors attribute is no longer in the RelaxNG schema of the tree +view, so we can’t use it anymore. This feature has then been dropped, +but could be reimplement in another way.
    • +
  • Since version 17.0 coloring is written into style attribute of +(td) element
    • +
+
+
+

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.

+

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

+
+ +
+
+

Authors

+
    +
  • Camptocamp
    • +
  • Therp BV
    • +
+
+
+

Contributors

+ +
+
+

Other credits

+

The development of this module has been financially supported by:

+
    +
  • Camptocamp
    • +
  • Versada
    • +
+
+
+

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_tree_dynamic_colored_field/static/src/js/list_renderer.esm.js b/web_tree_dynamic_colored_field/static/src/js/list_renderer.esm.js new file mode 100644 index 000000000..866195516 --- /dev/null +++ b/web_tree_dynamic_colored_field/static/src/js/list_renderer.esm.js @@ -0,0 +1,78 @@ +/** @odoo-module **/ + +import {patch} from "@web/core/utils/patch"; +import {ListRenderer} from "@web/views/list/list_renderer"; +import {evaluateBooleanExpr} from "@web/core/py_js/py"; + +patch(ListRenderer.prototype, { + /** + * @param {Object} column represents field + * @param {Record} record + * @returns {String} style code for the html element + */ + getDynamicColoredStyle(column, record) { + let style = ""; + + let color = this.getDynamicColor(column, record, "bg_color"); + if (color !== undefined) { + style += `background-color: ${color};`; + } + + color = this.getDynamicColor(column, record, "fg_color"); + if (color !== undefined) { + // $td.css('color', color); + style += `color: ${color};`; + } + + return style; + }, + + /** + * Return the `color` that has truthfull expresssion + * + * @param column {Object} represents field + * @param record {Record} + * @param color_target {String} 'bg_color' or 'fg_color' + * @returns {String | undefined} color + */ + getDynamicColor(column, record, color_target) { + if (color_target in column.options) { + const definition = column.options[color_target]; + let result = ""; + for (const color_def of definition.split(";")) { + const color_to_expression = this.pairColorParse(color_def); + if (color_to_expression !== undefined) { + const [color, expression] = color_to_expression; + if ( + evaluateBooleanExpr( + expression, + record.evalContextWithVirtualIds + ) + ) { + // We don't return first match, + // as it can be default color (with "True" expression), + // and later more precise condition may be found. + result = color; + } + } + } + return result || undefined; + } + }, + + /** + * @param {String} pairColor `color: expression` pair + * @returns {Array} undefined or array of color, expression + */ + pairColorParse: function (pairColor) { + if (pairColor !== "") { + var pairList = pairColor.split(":"), + color = pairList[0], + // If one passes a bare color instead of an expression, + // then we consider that color is to be shown in any case + expression = pairList[1] ? pairList[1] : "True"; + return [color, expression]; + } + return undefined; + }, +}); diff --git a/web_tree_dynamic_colored_field/static/src/xml/list.xml b/web_tree_dynamic_colored_field/static/src/xml/list.xml new file mode 100644 index 000000000..42515c439 --- /dev/null +++ b/web_tree_dynamic_colored_field/static/src/xml/list.xml @@ -0,0 +1,19 @@ + + + + + + {{getDynamicColoredStyle(column, record)}} + + + + diff --git a/yuthon_holiday/models/inherit_hr_leave.py b/yuthon_holiday/models/inherit_hr_leave.py index a5ebafc17..789648dc7 100644 --- a/yuthon_holiday/models/inherit_hr_leave.py +++ b/yuthon_holiday/models/inherit_hr_leave.py @@ -802,12 +802,8 @@ class HolidaysRequestBatch(models.Model): for record in self: reports_id = self.env['yuthon.vacation.reports'].search([('employee_id', '=', record.users_id.employee_id.id)], limit=1) if reports_id and not record.log_ids: - leave_hours_str = reports_id.leave.split('小时')[0].strip() - leave_hours = float(leave_hours_str) - leave_days = leave_hours / 8 - overtime_hours_str = reports_id.working_overtime.split('小时')[0].strip() - overtime_hours = float(overtime_hours_str) - overtime_days = overtime_hours / 8 + leave_days = reports_id.leave + overtime_days = reports_id.working_overtime record.holiday_allowance = f"年假{leave_days:.1f}天, 补休{overtime_days:.1f}天" class HrLeaveLine(models.Model): diff --git a/yuthon_hr_attendance/models/yuthon_vacation_reports.py b/yuthon_hr_attendance/models/yuthon_vacation_reports.py index f2b281ec1..07f94a177 100644 --- a/yuthon_hr_attendance/models/yuthon_vacation_reports.py +++ b/yuthon_hr_attendance/models/yuthon_vacation_reports.py @@ -22,8 +22,10 @@ class YuthonVacationReports(models.Model): other_fee_ids = fields.One2many('vacation.other.line', 'vacation_id', string='其他明细') vacation_date = fields.Date(string='日期', default=lambda self: fields.Date.today()) - leave = fields.Float(string='年假', compute='_compute_leave', store=True, digits=(16, 3)) - working_overtime = fields.Float(string='加班时', compute='_compute_working_overtime', store=True, digits=(16, 3)) + done_leave = fields.Float(string='年假', compute='_compute_leave', store=True, digits=(16, 3)) + done_working_overtime = fields.Float(string='加班时', compute='_compute_working_overtime', digits=(16, 3), store=True) + leave = fields.Float(string='剩余年假', compute='_compute_leave', store=True, digits=(16, 3)) + working_overtime = fields.Float(string='剩余加班时', compute='_compute_working_overtime', store=True, digits=(16, 3)) meal_fee = fields.Integer(string="误餐次数", compute='_compute_meal_fee', store=True) medical_fee = fields.Float(string="体检费", compute='_compute_medical_fee', store=True) compensatory_leave = fields.Integer(string="调休", compute='_compute_other_leave', store=True) @@ -399,6 +401,7 @@ class YuthonVacationReports(models.Model): @api.depends('leave_ids.update_lines', 'leave_ids.update_type', 'leave_ids.is_void') def _compute_leave(self): for record in self: + done_leave_hours = 0.0 leave_hours = 0.0 for line in record.leave_ids: if not line.is_void: @@ -407,7 +410,9 @@ class YuthonVacationReports(models.Model): leave_hours += line_value elif line.update_type == 'reduce': leave_hours -= line_value + done_leave_hours += line_value record.leave = leave_hours / 8 + record.done_leave = done_leave_hours / 8 @api.depends( 'overtime_ids.workday', @@ -420,6 +425,7 @@ class YuthonVacationReports(models.Model): for record in self: total_add = 0.0 total_reduce = 0.0 + done_working_overtime = 0.0 for line in record.overtime_ids: if not line.is_void: line_total = (line.workday or 0) + (line.legal_day or 0) + (line.public_holidays or 0) @@ -427,7 +433,9 @@ class YuthonVacationReports(models.Model): total_add += line_total elif line.update_type == 'reduce': total_reduce += line_total + done_working_overtime += line_total record.working_overtime = total_add / 8 + record.done_working_overtime = done_working_overtime / 8 record.cop_leave = total_reduce / 8 @api.depends('meal_fee_ids.update_lines', 'meal_fee_ids.update_type', 'meal_fee_ids.is_void') diff --git a/yuthon_hr_attendance/views/yuthon_vacation_reports_views.xml b/yuthon_hr_attendance/views/yuthon_vacation_reports_views.xml index a296de08e..2681e7b20 100644 --- a/yuthon_hr_attendance/views/yuthon_vacation_reports_views.xml +++ b/yuthon_hr_attendance/views/yuthon_vacation_reports_views.xml @@ -18,8 +18,8 @@ - - + + @@ -63,8 +63,8 @@ - - + +