From 58aa10b900752ae382414ec1d214f2a7e4eb10c5 Mon Sep 17 00:00:00 2001 From: Sylvain LE GAL Date: Fri, 12 Jan 2024 01:12:26 +0100 Subject: [PATCH] [IMP] bi_sql_editor : Allow to use sum / avg operator on tree view --- bi_sql_editor/migrations/17.0.2.0.0/end-migration.py | 3 +++ bi_sql_editor/models/bi_sql_view_field.py | 8 +++++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/bi_sql_editor/migrations/17.0.2.0.0/end-migration.py b/bi_sql_editor/migrations/17.0.2.0.0/end-migration.py index f30ae4070..2503c9c59 100644 --- a/bi_sql_editor/migrations/17.0.2.0.0/end-migration.py +++ b/bi_sql_editor/migrations/17.0.2.0.0/end-migration.py @@ -8,4 +8,7 @@ from openupgradelib import openupgrade @openupgrade.migrate() def migrate(env, version): for view in env["bi.sql.view"].search([("state", "=", "ui_valid")]): + # create new Form view view.form_view_id = env["ir.ui.view"].create(view._prepare_form_view()).id + # Update tree view, to add sum / avg option + view.tree_view_id.write(view._prepare_tree_view()) diff --git a/bi_sql_editor/models/bi_sql_view_field.py b/bi_sql_editor/models/bi_sql_view_field.py index 7928a1599..59fab39b3 100644 --- a/bi_sql_editor/models/bi_sql_view_field.py +++ b/bi_sql_editor/models/bi_sql_view_field.py @@ -255,8 +255,14 @@ class BiSQLViewField(models.Model): elif self.tree_visibility == "optional_show": visibility_text = 'optional="show"' + operator_text = "" + if self.group_operator == "sum": + operator_text = f'sum="{_("Total")}"' + elif self.group_operator == "avg": + operator_text = f'avg="{_("Average")}"' + return ( - f"""\n""" )