From c414ea4a875ef7c428389943758bcfd1d62c0908 Mon Sep 17 00:00:00 2001
From: Richard deMeester <richard@willowit.com.au>
Date: Thu, 28 Nov 2019 12:11:36 +1100
Subject: [PATCH 1/4] [12.0][ENH] sql view - allow group operator

Replaces #345

Adds the possibility, for float and integer columns, to
apply a group operator (average, min, max).
---
 bi_sql_editor_aggregate/__init__.py           |   3 ++
 bi_sql_editor_aggregate/__manifest__.py       |  20 +++++++++
 bi_sql_editor_aggregate/description/icon.png  | Bin 0 -> 11127 bytes
 bi_sql_editor_aggregate/models/__init__.py    |   5 +++
 bi_sql_editor_aggregate/models/bi_sql_view.py |  38 ++++++++++++++++++
 .../models/bi_sql_view_field.py               |  25 ++++++++++++
 bi_sql_editor_aggregate/models/ir_model.py    |  14 +++++++
 .../views/view_bi_sql_view.xml                |  19 +++++++++
 8 files changed, 124 insertions(+)
 create mode 100644 bi_sql_editor_aggregate/__init__.py
 create mode 100644 bi_sql_editor_aggregate/__manifest__.py
 create mode 100644 bi_sql_editor_aggregate/description/icon.png
 create mode 100644 bi_sql_editor_aggregate/models/__init__.py
 create mode 100644 bi_sql_editor_aggregate/models/bi_sql_view.py
 create mode 100644 bi_sql_editor_aggregate/models/bi_sql_view_field.py
 create mode 100644 bi_sql_editor_aggregate/models/ir_model.py
 create mode 100644 bi_sql_editor_aggregate/views/view_bi_sql_view.xml

diff --git a/bi_sql_editor_aggregate/__init__.py b/bi_sql_editor_aggregate/__init__.py
new file mode 100644
index 00000000..83e553ac
--- /dev/null
+++ b/bi_sql_editor_aggregate/__init__.py
@@ -0,0 +1,3 @@
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
+
+from . import models
diff --git a/bi_sql_editor_aggregate/__manifest__.py b/bi_sql_editor_aggregate/__manifest__.py
new file mode 100644
index 00000000..ac3766f0
--- /dev/null
+++ b/bi_sql_editor_aggregate/__manifest__.py
@@ -0,0 +1,20 @@
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
+
+{
+    'name': 'BI SQL Editor Aggregate',
+    'summary': 'BI SQL Editor Aggregation',
+    'version': '12.0.1.0.0',
+    'license': 'AGPL-3',
+    'category': 'Reporting',
+    'author': 'Richard deMeester,Odoo Community Association (OCA)',
+    'website': 'https://github.com/OCA/reporting-engine',
+    'depends': [
+        'bi_sql_editor',
+    ],
+    'data': [
+        'views/view_bi_sql_view.xml',
+    ],
+    'demo': [
+    ],
+    'installable': True,
+}
diff --git a/bi_sql_editor_aggregate/description/icon.png b/bi_sql_editor_aggregate/description/icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..c72ba5caa1302634ebeeb1689bb6df735f8bb5c8
GIT binary patch
literal 11127
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

literal 0
HcmV?d00001

diff --git a/bi_sql_editor_aggregate/models/__init__.py b/bi_sql_editor_aggregate/models/__init__.py
new file mode 100644
index 00000000..ef99aabc
--- /dev/null
+++ b/bi_sql_editor_aggregate/models/__init__.py
@@ -0,0 +1,5 @@
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
+
+from . import bi_sql_view
+from . import bi_sql_view_field
+from . import ir_model
diff --git a/bi_sql_editor_aggregate/models/bi_sql_view.py b/bi_sql_editor_aggregate/models/bi_sql_view.py
new file mode 100644
index 00000000..ceab2a34
--- /dev/null
+++ b/bi_sql_editor_aggregate/models/bi_sql_view.py
@@ -0,0 +1,38 @@
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
+
+from odoo import models, tools
+
+
+class BiSQLView(models.Model):
+    _inherit = 'bi.sql.view'
+
+    def check_manual_fields(self, model):
+        # check the fields we need are defined on self, to stop it going
+        # early on install / startup - particularly problematic during upgrade
+        if 'group_operator' in tools.table_columns(
+                    self.env.cr, 'bi_sql_view_field') and\
+                model._name.startswith(self._model_prefix):
+            # Use SQL instead of ORM, as ORM might not be fully initialised -
+            # we have no control over the order that fields are defined!
+            # We are not concerned about user security rules.
+            self.env.cr.execute(
+                """
+SELECT
+    f.name,
+    f.ttype,
+    f.group_operator
+FROM
+    bi_sql_view v
+    LEFT JOIN bi_sql_view_field f ON f.bi_sql_view_id = v.id
+WHERE
+    v.model_name = %s
+;
+                """, (model._name,)
+                )
+            sql_fields = self.env.cr.fetchall()
+
+            for sql_field in sql_fields:
+                if sql_field[0] in model._fields and\
+                        sql_field[1] in ('integer', 'float') and\
+                        sql_field[2]:
+                    model._fields[sql_field[0]].group_operator = sql_field[2]
diff --git a/bi_sql_editor_aggregate/models/bi_sql_view_field.py b/bi_sql_editor_aggregate/models/bi_sql_view_field.py
new file mode 100644
index 00000000..00efc454
--- /dev/null
+++ b/bi_sql_editor_aggregate/models/bi_sql_view_field.py
@@ -0,0 +1,25 @@
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
+
+from odoo import _, api, fields, models
+
+
+class BiSQLViewField(models.Model):
+    _inherit = 'bi.sql.view.field'
+
+    _GROUP_OPERATOR_SELECTION = [
+        ('sum', 'Sum'),
+        ('avg', 'Average'),
+        ('min', 'Minimum'),
+        ('max', 'Maximum'),
+    ]
+
+    _GRAPH_TYPE_SELECTION = [
+        ('col', 'Column'),
+        ('row', 'Row'),
+        ('measure', 'Measure'),
+    ]
+
+    group_operator = fields.Selection(
+        string='Group Operator', selection=_GROUP_OPERATOR_SELECTION,
+        help="By default, Odoo will sum the values when grouping. If you wish"
+        " to alter the behaviour, choose an alternate Group Operator")
diff --git a/bi_sql_editor_aggregate/models/ir_model.py b/bi_sql_editor_aggregate/models/ir_model.py
new file mode 100644
index 00000000..6ec21d50
--- /dev/null
+++ b/bi_sql_editor_aggregate/models/ir_model.py
@@ -0,0 +1,14 @@
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+from odoo import models
+
+
+class IrModelFields(models.Model):
+    _inherit = 'ir.model.fields'
+
+    def _add_manual_fields(self, model):
+        super()._add_manual_fields(model)
+        if 'bi.sql.view' in self.env:
+            Sql = self.env['bi.sql.view']
+            if hasattr(Sql, 'check_manual_fields'):
+                Sql.check_manual_fields(model)
diff --git a/bi_sql_editor_aggregate/views/view_bi_sql_view.xml b/bi_sql_editor_aggregate/views/view_bi_sql_view.xml
new file mode 100644
index 00000000..f81f62dc
--- /dev/null
+++ b/bi_sql_editor_aggregate/views/view_bi_sql_view.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
+-->
+
+<odoo>
+
+    <record id="view_bi_sql_view_form" model="ir.ui.view">
+        <field name="model">bi.sql.view</field>
+        <field name='inherit_id' ref='bi_sql_editor.view_bi_sql_view_form'/>
+        <field name="arch" type="xml">
+            <field name="ttype" position='before'>
+                <field name='group_operator' attrs="{
+                    'invisible': ['!', ('ttype', 'in', ('float', 'integer'))]}"/>
+            </field>
+        </field>
+    </record>
+
+</odoo>

From 46279078c4dbb0b94a9d47f2c8386a0655dbe706 Mon Sep 17 00:00:00 2001
From: Richard deMeester <richard@willowit.com.au>
Date: Thu, 28 Nov 2019 12:59:27 +1100
Subject: [PATCH 2/4] Added README

---
 bi_sql_editor_aggregate/README.rst | 63 ++++++++++++++++++++++++++++++
 1 file changed, 63 insertions(+)
 create mode 100644 bi_sql_editor_aggregate/README.rst

diff --git a/bi_sql_editor_aggregate/README.rst b/bi_sql_editor_aggregate/README.rst
new file mode 100644
index 00000000..4ebfc898
--- /dev/null
+++ b/bi_sql_editor_aggregate/README.rst
@@ -0,0 +1,63 @@
+.. 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
+
+==================
+BI Views aggregate
+==================
+
+This module extends the functionality of bi_sql_editor, to support creation
+custom aggregation for float and integer values.
+
+After the model is generated, before creating the UI, the option is given
+to define aggregation - either Sum (Default), Average, Minimum, or Maximum.
+
+Configuration
+=============
+
+No configuration is required after installation.
+
+Usage
+=====
+
+To use this module, you need to adjust the aggregation on the custom fields
+tab of the sql_view between validating the SQL
+
+#. Go to 'Reporting' / 'Custom Reports'
+
+Known issues / Roadmap
+======================
+
+* Can be integrated with bi_sql_editor, but breaks for existing sites.
+* Would be good to integrate and remove need for additional install.
+
+Bug Tracker
+===========
+
+Bugs are tracked on `GitHub Issues
+<https://github.com/OCA/reporting-engine/issues>`_. In case of trouble, please
+check there if your issue has already been reported. If you spotted it first,
+help us smash it by providing detailed and welcomed feedback.
+
+Credits
+=======
+
+Contributors
+------------
+
+* Richard deMeester, Willdoo IT (http://www.willdooit.com/)
+
+Maintainer
+----------
+
+.. image:: https://odoo-community.org/logo.png
+   :alt: Odoo Community Association
+   :target: https://odoo-community.org
+
+This module is maintained by the OCA.
+
+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.
+
+To contribute to this module, please visit https://odoo-community.org.

From 00d43abb9b8a95075f30fa1c07848daaa7523800 Mon Sep 17 00:00:00 2001
From: Richard deMeester <richard@willowit.com.au>
Date: Thu, 28 Nov 2019 17:09:40 +1100
Subject: [PATCH 3/4] flake8 lint

---
 bi_sql_editor_aggregate/models/bi_sql_view.py       | 2 +-
 bi_sql_editor_aggregate/models/bi_sql_view_field.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/bi_sql_editor_aggregate/models/bi_sql_view.py b/bi_sql_editor_aggregate/models/bi_sql_view.py
index ceab2a34..29d9aeec 100644
--- a/bi_sql_editor_aggregate/models/bi_sql_view.py
+++ b/bi_sql_editor_aggregate/models/bi_sql_view.py
@@ -10,7 +10,7 @@ class BiSQLView(models.Model):
         # check the fields we need are defined on self, to stop it going
         # early on install / startup - particularly problematic during upgrade
         if 'group_operator' in tools.table_columns(
-                    self.env.cr, 'bi_sql_view_field') and\
+                self.env.cr, 'bi_sql_view_field') and\
                 model._name.startswith(self._model_prefix):
             # Use SQL instead of ORM, as ORM might not be fully initialised -
             # we have no control over the order that fields are defined!
diff --git a/bi_sql_editor_aggregate/models/bi_sql_view_field.py b/bi_sql_editor_aggregate/models/bi_sql_view_field.py
index 00efc454..60bdfcff 100644
--- a/bi_sql_editor_aggregate/models/bi_sql_view_field.py
+++ b/bi_sql_editor_aggregate/models/bi_sql_view_field.py
@@ -1,6 +1,6 @@
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
 
-from odoo import _, api, fields, models
+from odoo import fields, models
 
 
 class BiSQLViewField(models.Model):

From c06c3914bf3fbd6d20656756a5bf66f5bf3a9629 Mon Sep 17 00:00:00 2001
From: Richard deMeester <richard@willowit.com.au>
Date: Fri, 29 Nov 2019 09:14:56 +1100
Subject: [PATCH 4/4] Remove unused constant

---
 bi_sql_editor_aggregate/models/bi_sql_view_field.py | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/bi_sql_editor_aggregate/models/bi_sql_view_field.py b/bi_sql_editor_aggregate/models/bi_sql_view_field.py
index 60bdfcff..db79ab21 100644
--- a/bi_sql_editor_aggregate/models/bi_sql_view_field.py
+++ b/bi_sql_editor_aggregate/models/bi_sql_view_field.py
@@ -13,12 +13,6 @@ class BiSQLViewField(models.Model):
         ('max', 'Maximum'),
     ]
 
-    _GRAPH_TYPE_SELECTION = [
-        ('col', 'Column'),
-        ('row', 'Row'),
-        ('measure', 'Measure'),
-    ]
-
     group_operator = fields.Selection(
         string='Group Operator', selection=_GROUP_OPERATOR_SELECTION,
         help="By default, Odoo will sum the values when grouping. If you wish"