diff --git a/bpeng/reports/cbra_diag.py b/bpeng/reports/cbra_diag.py index 1e9ea5d3a67e04b0376311d8a3dea07a5c8df6a2..f2b181a7f892c0e5899a07e56ca1a76ed5856b32 100644 --- a/bpeng/reports/cbra_diag.py +++ b/bpeng/reports/cbra_diag.py @@ -82,7 +82,7 @@ class CbraDiagnostic: retrofit_elec_save = retrofit_data['retrofit_elec_save'] # Convert database strings to presentation strings # Also calculate new heat or elec save in cases where - # database retrofit's are combined to a single presentation retrofit + # database retrofits are combined to a single presentation retrofit new_retrofit_list = [] new_retrofit_heat_save = [] new_retrofit_elec_save = [] @@ -348,14 +348,20 @@ class CbraDiagnostic: for k, j in zip(retrofit_list, range(len(retrofit_list))): retrofit_table.table.cell(j+1, 0).text_frame.paragraphs[0].font.size = Pt(10) retrofit_table.table.cell(j+1, 0).text = k - retrofit_table.table.cell(j+1, 1).text_frame.paragraphs[0].font.size = Pt(10) - retrofit_table.table.cell(j+1, 1).text = str(int(retrofit_heat_save[j])) + '\N{PERCENT SIGN}' - retrofit_table.table.cell(j+1, 1).text_frame.paragraphs[0].alignment = PP_ALIGN.CENTER - retrofit_table.table.cell(j+1, 1).text_frame.vertical_anchor = MSO_ANCHOR.MIDDLE - retrofit_table.table.cell(j+1, 2).text_frame.paragraphs[0].font.size = Pt(10) - retrofit_table.table.cell(j+1, 2).text = str(int(retrofit_elec_save[j])) + '\N{PERCENT SIGN}' - retrofit_table.table.cell(j+1, 2).text_frame.paragraphs[0].alignment = PP_ALIGN.CENTER - retrofit_table.table.cell(j+1, 2).text_frame.vertical_anchor = MSO_ANCHOR.MIDDLE + if retrofit_heat_save[j] != 0: + retrofit_table.table.cell(j+1, 1).text_frame.paragraphs[0].font.size = Pt(10) + retrofit_table.table.cell(j+1, 1).text = str(int(retrofit_heat_save[j])) + '\N{PERCENT SIGN}' + retrofit_table.table.cell(j+1, 1).text_frame.paragraphs[0].alignment = PP_ALIGN.CENTER + retrofit_table.table.cell(j+1, 1).text_frame.vertical_anchor = MSO_ANCHOR.MIDDLE + else: + retrofit_table.table.cell(j+1, 1).text = '' + if retrofit_elec_save[j] != 0: + retrofit_table.table.cell(j+1, 2).text_frame.paragraphs[0].font.size = Pt(10) + retrofit_table.table.cell(j+1, 2).text = str(int(retrofit_elec_save[j])) + '\N{PERCENT SIGN}' + retrofit_table.table.cell(j+1, 2).text_frame.paragraphs[0].alignment = PP_ALIGN.CENTER + retrofit_table.table.cell(j+1, 2).text_frame.vertical_anchor = MSO_ANCHOR.MIDDLE + else: + retrofit_table.table.cell(j+1, 2).text = '' retrofit_table.table.cell(retrofit_count+1, 0).text_frame.paragraphs[0].font.size = Pt(12) retrofit_table.table.cell(retrofit_count+1, 0).text_frame.paragraphs[0].font.bold = True