mirror of
https://github.com/OCA/reporting-engine.git
synced 2025-02-16 16:30:38 +02:00
[IMP] Add back the variable feature in sql_export
Refactore to use the new properties field
This commit is contained in:
committed by
David Beal
parent
8df404eff2
commit
3cb3fae1f6
@@ -2,12 +2,9 @@
|
||||
# @author: Florian da Costa
|
||||
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
|
||||
|
||||
import json
|
||||
from datetime import datetime
|
||||
|
||||
from lxml import etree
|
||||
|
||||
from odoo import _, api, fields, models
|
||||
from odoo import fields, models
|
||||
from odoo.tools import DEFAULT_SERVER_DATETIME_FORMAT
|
||||
|
||||
|
||||
@@ -18,54 +15,11 @@ class SqlFileWizard(models.TransientModel):
|
||||
binary_file = fields.Binary("File", readonly=True)
|
||||
file_name = fields.Char(readonly=True)
|
||||
sql_export_id = fields.Many2one(comodel_name="sql.export", required=True)
|
||||
|
||||
@api.model
|
||||
def get_view(self, view_id=None, view_type="form", **options):
|
||||
export_obj = self.env["sql.export"]
|
||||
sql_export = export_obj.browse(self.env.context.get("active_id"))
|
||||
|
||||
result = super().get_view(view_id=view_id, view_type=view_type, **options)
|
||||
|
||||
if sql_export.field_ids:
|
||||
etree.fromstring(result["arch"])
|
||||
raise NotImplementedError(
|
||||
_("The export with parameters is not implemented in V16")
|
||||
)
|
||||
return result
|
||||
|
||||
@api.model
|
||||
def fields_view_get(
|
||||
self, view_id=None, view_type="form", toolbar=False, submenu=False
|
||||
):
|
||||
"""
|
||||
Display dynamically parameter fields depending on the sql_export.
|
||||
"""
|
||||
res = super(SqlFileWizard, self).fields_view_get(
|
||||
view_id=view_id, view_type=view_type, toolbar=toolbar, submenu=submenu
|
||||
)
|
||||
export_obj = self.env["sql.export"]
|
||||
if view_type == "form":
|
||||
sql_export = export_obj.browse(self.env.context.get("active_id"))
|
||||
if sql_export.field_ids:
|
||||
eview = etree.fromstring(res["arch"])
|
||||
group = etree.Element("group", name="variables_group", colspan="4")
|
||||
toupdate_fields = []
|
||||
for field in sql_export.field_ids:
|
||||
toupdate_fields.append(field.name)
|
||||
attrib = {"name": field.name, "required": "0", "readonly": "0"}
|
||||
view_field = etree.SubElement(group, "field", attrib=attrib)
|
||||
modifiers = json.loads(view_field.get("modifiers", "{}"))
|
||||
if field.required:
|
||||
modifiers["required"] = True
|
||||
view_field.set("modifiers", json.dumps(modifiers))
|
||||
|
||||
res["fields"].update(self.fields_get(toupdate_fields))
|
||||
placeholder = eview.xpath(
|
||||
"//separator[@string='variables_placeholder']"
|
||||
)[0]
|
||||
placeholder.getparent().replace(placeholder, group)
|
||||
res["arch"] = etree.tostring(eview, pretty_print=True)
|
||||
return res
|
||||
query_properties = fields.Properties(
|
||||
string="Properties",
|
||||
definition="sql_export_id.query_properties_definition",
|
||||
copy=False,
|
||||
)
|
||||
|
||||
def export_sql(self):
|
||||
self.ensure_one()
|
||||
@@ -75,14 +29,11 @@ class SqlFileWizard(models.TransientModel):
|
||||
variable_dict = {}
|
||||
now_tz = fields.Datetime.context_timestamp(sql_export, datetime.now())
|
||||
date = now_tz.strftime(DEFAULT_SERVER_DATETIME_FORMAT)
|
||||
if sql_export.field_ids:
|
||||
for field in sql_export.field_ids:
|
||||
if field.ttype == "many2one":
|
||||
variable_dict[field.name] = self[field.name].id
|
||||
elif field.ttype == "many2many":
|
||||
variable_dict[field.name] = tuple(self[field.name].ids)
|
||||
else:
|
||||
variable_dict[field.name] = self[field.name]
|
||||
for prop in self.query_properties:
|
||||
if prop["type"] == "many2many" and prop["value"]:
|
||||
variable_dict[prop["string"]] = tuple(prop["value"])
|
||||
else:
|
||||
variable_dict[prop["string"]] = prop["value"]
|
||||
if "%(company_id)s" in sql_export.query:
|
||||
company_id = self.env.company.id
|
||||
variable_dict["company_id"] = company_id
|
||||
|
||||
Reference in New Issue
Block a user