From 20b05f769da13129d60a108042e417a600f451d1 Mon Sep 17 00:00:00 2001 From: Caozhenhui <823914102@qq.com> Date: Wed, 20 Oct 2021 17:50:46 +0800 Subject: [PATCH] Remove Child Space Data Section from EquipmentEnergyCategory Excel Exporter --- .../excelexporters/equipmentenergycategory.py | 93 +------------------ 1 file changed, 1 insertion(+), 92 deletions(-) diff --git a/myems-api/excelexporters/equipmentenergycategory.py b/myems-api/excelexporters/equipmentenergycategory.py index 9e3b83af..5b6c7193 100644 --- a/myems-api/excelexporters/equipmentenergycategory.py +++ b/myems-api/excelexporters/equipmentenergycategory.py @@ -490,98 +490,7 @@ def generate_excel(report, current_row_number += 1 #################################################################################################################### - # Fifth: Child Spaces Data - # current_row_number: title - # current_row_number + 1: table title - # current_row_number + 2 ~ current_row_number + 2 + space_len table_data - #################################################################################################################### - has_child_flag = True - # Judge if the space has child space, if not, delete it. - if "child_space" not in report.keys() or "energy_category_names" not in report['child_space'].keys() or \ - len(report['child_space']["energy_category_names"]) == 0 \ - or 'child_space_names_array' not in report['child_space'].keys() \ - or report['child_space']['energy_category_names'] is None \ - or len(report['child_space']['child_space_names_array']) == 0 \ - or len(report['child_space']['child_space_nchild_space_names_arrayames_array'][0]) == 0: - - has_child_flag = False - - if has_child_flag: - child = report['child_space'] - child_spaces = child['child_space_names_array'][0] - child_subtotals = child['subtotals_array'][0] - - ws['B' + str(current_row_number)].font = title_font - ws['B' + str(current_row_number)] = name + ' ' + 'Child Spaces Data' - - current_row_number += 1 - table_start_row_number = current_row_number - - ws.row_dimensions[20].height = 60 - ws['B' + str(current_row_number)].fill = table_fill - ws['B' + str(current_row_number)].border = f_border - ca_len = len(child['energy_category_names']) - - for i in range(0, ca_len): - row = openpyxl.utils.get_column_letter(ord('C') + i) - ws[row + str(current_row_number)].fill = table_fill - ws[row + str(current_row_number)].font = title_font - ws[row + str(current_row_number)].alignment = c_c_alignment - ws[row + str(current_row_number)].border = f_border - ws[row + str(current_row_number)] = child['energy_category_names'][i] + ' ' + '(' + child['units'][i] + ')' - - space_len = len(child['child_space_names_array'][0]) - - current_row_number += 1 - for i in range(0, space_len): - row = str(i + current_row_number) - - ws['B' + row].font = name_font - ws['B' + row].alignment = c_c_alignment - ws['B' + row] = child['child_space_names_array'][0][i] - ws['B' + row].border = f_border - - for j in range(0, ca_len): - col = openpyxl.utils.get_column_letter(ord('C') + j) - ws[col + row].font = name_font - ws[col + row].alignment = c_c_alignment - ws[col + row] = round(child['subtotals_array'][j][i], 2) - ws[col + row].border = f_border - - table_end_row_number = table_start_row_number + space_len - chart_start_row_number = table_start_row_number + space_len + 1 - - for i in range(0, ca_len): - # pie - pie = PieChart() - pie.title = ws.cell(column=3 + i, row=table_start_row_number).value - labels = Reference(ws, min_col=2, min_row=table_start_row_number + 1, max_row=table_end_row_number) - pie_data = Reference(ws, min_col=3 + i, min_row=table_start_row_number, max_row=table_end_row_number) - pie.add_data(pie_data, titles_from_data=True) - pie.set_categories(labels) - pie.height = 6.6 - pie.width = 8 - s1 = pie.series[0] - s1.dLbls = DataLabelList() - s1.dLbls.showCatName = False # 标签显示 - s1.dLbls.showVal = True # 数量显示 - s1.dLbls.showPercent = True # 百分比显示 - if i % 2 == 0: - chart_cell = 'B' + str(chart_start_row_number) - else: - chart_cell = 'E' + str(chart_start_row_number) - chart_start_row_number += 5 - ws.add_chart(pie, chart_cell) - - current_row_number = chart_start_row_number - - if ca_len % 2 == 1: - current_row_number += 5 - - current_row_number += 1 - - #################################################################################################################### - # Sixth: Detailed Data + # Fifth: Detailed Data # current_row_number: title # current_row_number+1 ~ current_row_number+1+ca_len*6-1: line # current_row_number+1+ca_len*6: table title