Skip to content

[14.0][IMP] use cell_style_props for val_rendered in kpi matrix #561

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jonasbuchholz wants to merge 1 commit into
base: 14.0
Choose a base branch
from
Open

[14.0][IMP] use cell_style_props for val_rendered in kpi matrix #561

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 15 additions & 15 deletions mis_builder/models/kpimatrix.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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,
Expand Down