From a09735ad41bb8b2decc7263d12cde9be205935c6 Mon Sep 17 00:00:00 2001 From: jb Date: Fri, 14 Apr 2023 12:14:29 +0200 Subject: [PATCH] [IMP] use cell_style_props for val_rendered in kpi matrix --- mis_builder/models/kpimatrix.py | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/mis_builder/models/kpimatrix.py b/mis_builder/models/kpimatrix.py index 7aaf43d44..2c1eb4948 100644 --- a/mis_builder/models/kpimatrix.py +++ b/mis_builder/models/kpimatrix.py @@ -236,21 +236,6 @@ def set_values_detail_account( assert len(vals) == col.colspan assert len(drilldown_args) == col.colspan for val, drilldown_arg, subcol in zip(vals, drilldown_args, col.iter_subcols()): - if isinstance(val, DataError): - val_rendered = val.name - val_comment = val.msg - else: - val_rendered = self._style_model.render( - self.lang, row.style_props, kpi.type, val - ) - if row.kpi.multi and subcol.subkpi: - val_comment = "{}.{} = {}".format( - row.kpi.name, - subcol.subkpi.name, - row.kpi._get_expression_str_for_subkpi(subcol.subkpi), - ) - else: - val_comment = "{} = {}".format(row.kpi.name, row.kpi.expression) cell_style_props = row.style_props if row.kpi.style_expression: # evaluate style expression @@ -272,6 +257,21 @@ def set_values_detail_account( ) else: _logger.error("Style '%s' not found.", style_name) + if isinstance(val, DataError): + val_rendered = val.name + val_comment = val.msg + else: + val_rendered = self._style_model.render( + self.lang, cell_style_props, kpi.type, val + ) + if row.kpi.multi and subcol.subkpi: + val_comment = "{}.{} = {}".format( + row.kpi.name, + subcol.subkpi.name, + row.kpi._get_expression_str_for_subkpi(subcol.subkpi), + ) + else: + val_comment = "{} = {}".format(row.kpi.name, row.kpi.expression) cell = KpiMatrixCell( row, subcol,