From 9d12c136c5707dc8c2d3c86712914c236a12dff3 Mon Sep 17 00:00:00 2001 From: "laetitia.gangloff@acsone.eu" Date: Mon, 4 Aug 2014 13:37:32 +0200 Subject: [PATCH] excel export: set correct value for percentage, use format with 0 instead of # --- mis_builder/models/mis_builder.py | 1 + mis_builder/report/mis_builder_xls.py | 8 +++++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/mis_builder/models/mis_builder.py b/mis_builder/models/mis_builder.py index 43f62d5f..f593f40d 100644 --- a/mis_builder/models/mis_builder.py +++ b/mis_builder/models/mis_builder.py @@ -501,6 +501,7 @@ class mis_report_instance_period(orm.Model): 'style': kpi_style, 'suffix': kpi.suffix, 'dp': kpi.dp, + 'is_percentage': kpi.type == 'pct', } return res diff --git a/mis_builder/report/mis_builder_xls.py b/mis_builder/report/mis_builder_xls.py index b3f3b582..08615cb5 100644 --- a/mis_builder/report/mis_builder_xls.py +++ b/mis_builder/report/mis_builder_xls.py @@ -101,13 +101,15 @@ class mis_builder_xls(report_xls): num_format_str = '#' if value.get('dp'): num_format_str += '.' - for x in range(int(value['dp'])): - num_format_str = num_format_str + '#' + num_format_str += '0' * int(value['dp']) if value.get('suffix'): num_format_str = num_format_str + ' "%s"' % value['suffix'] kpi_cell_style = xlwt.easyxf(_xs['borders_all'] + _xs['right'], num_format_str=num_format_str) if value.get('val'): - ws.write(row_pos, col, value['val'], kpi_cell_style) + val = value['val'] + if value.get('is_percentage'): + val = val / 0.01 + ws.write(row_pos, col, val, kpi_cell_style) else: ws.write(row_pos, col, value['val_r'], kpi_cell_style) row_pos += 1