Browse Source

[WIP] mis_builder refactoring: restore tooltips and make them work with subkpis

pull/189/head
Stéphane Bidoul 9 years ago
parent
commit
53f27b2edd
  1. 23
      mis_builder/models/mis_report.py

23
mis_builder/models/mis_report.py

@ -109,11 +109,12 @@ class KpiMatrixSubCol(object):
@property @property
def subkpi(self): def subkpi(self):
return self.col.subkpis[self.index]
if self.col.subkpis:
return self.col.subkpis[self.index]
def iter_cells(self): def iter_cells(self):
for cells in self.col.iter_cell_tuples():
yield cells[self.index]
for cell_tuple in self.col.iter_cell_tuples():
yield cell_tuple[self.index]
def get_cell_for_row(self, row): def get_cell_for_row(self, row):
cell_tuple = self.col.get_cell_tuple_for_row(row) cell_tuple = self.col.get_cell_tuple_for_row(row)
@ -132,6 +133,7 @@ class KpiMatrixCell(object):
self.val = val self.val = val
self.val_rendered = val_rendered self.val_rendered = val_rendered
self.val_comment = val_comment self.val_comment = val_comment
self.style = style
self.drilldown_key = None self.drilldown_key = None
@ -212,7 +214,15 @@ class KpiMatrix(object):
val_comment = val.msg val_comment = val.msg
else: else:
val_rendered = kpi.render(self.lang, val) val_rendered = kpi.render(self.lang, val)
val_comment = '' # TODO FIXME get subkpi expression
if subcol.subkpi:
val_comment = "{}.{} = {}".format(
row.kpi.name,
subcol.subkpi.name,
row.kpi.get_expression_for_subkpi(subcol.subkpi))
else:
val_comment = "{} = {}".format(
row.kpi.name,
row.kpi.expression)
# TODO style # TODO style
# TODO drilldown_key # TODO drilldown_key
cell = KpiMatrixCell(row, subcol, val, val_rendered, val_comment) cell = KpiMatrixCell(row, subcol, val, val_rendered, val_comment)
@ -525,6 +535,11 @@ class MisReportKpi(models.Model):
self.divider = '' self.divider = ''
self.dp = 0 self.dp = 0
def get_expression_for_subkpi(self, subkpi):
for expression in self.expression_ids:
if expression.subkpi_id == subkpi:
return expression.name
def render(self, lang, value): def render(self, lang, value):
""" render a KPI value as a unicode string, ready for display """ """ render a KPI value as a unicode string, ready for display """
assert len(self) == 1 assert len(self) == 1

Loading…
Cancel
Save