From 93a87cb1b055a09b4d6510280b1ec729a9042437 Mon Sep 17 00:00:00 2001 From: YangZhang-GitHub <2533471770@qq.com> Date: Fri, 5 Mar 2021 17:13:21 +0800 Subject: [PATCH 1/5] Implemented the EquipmentSaving Excel Exporter --- myems-api/excelexporters/equipmentsaving.py | 534 ++++++++++++++++++++ 1 file changed, 534 insertions(+) create mode 100644 myems-api/excelexporters/equipmentsaving.py diff --git a/myems-api/excelexporters/equipmentsaving.py b/myems-api/excelexporters/equipmentsaving.py new file mode 100644 index 00000000..fbc853aa --- /dev/null +++ b/myems-api/excelexporters/equipmentsaving.py @@ -0,0 +1,534 @@ +import base64 +import uuid +import os +from openpyxl.chart import ( + PieChart, + LineChart, + BarChart, + Reference, +) +from openpyxl.styles import PatternFill, Border, Side, Alignment, Font +from openpyxl.drawing.image import Image +from openpyxl import Workbook +from openpyxl.chart.label import DataLabelList + + +#################################################################################################################### +# PROCEDURES +# Step 1: Validate the report data +# Step 2: Generate excel file +# Step 3: Encode the excel file bytes to Base64 +#################################################################################################################### + + +def export(report, + name, + reporting_start_datetime_local, + reporting_end_datetime_local, + period_type): + #################################################################################################################### + # Step 1: Validate the report data + #################################################################################################################### + if report is None: + return None + print(report) + + #################################################################################################################### + # Step 2: Generate excel file from the report data + #################################################################################################################### + filename = generate_excel(report, + name, + reporting_start_datetime_local, + reporting_end_datetime_local, + period_type) + #################################################################################################################### + # Step 3: Encode the excel file to Base64 + #################################################################################################################### + try: + with open(filename, 'rb') as binary_file: + binary_file_data = binary_file.read() + except IOError as ex: + pass + + # Base64 encode the bytes + base64_encoded_data = base64.b64encode(binary_file_data) + # get the Base64 encoded data using human-readable characters. + base64_message = base64_encoded_data.decode('utf-8') + # delete the file from server + try: + os.remove(filename) + except NotImplementedError as ex: + pass + return base64_message + + +def generate_excel(report, + name, + reporting_start_datetime_local, + reporting_end_datetime_local, + period_type): + wb = Workbook() + ws = wb.active + + # Row height + ws.row_dimensions[1].height = 102 + for i in range(2, 2000 + 1): + ws.row_dimensions[i].height = 42 + + # Col width + ws.column_dimensions['A'].width = 1.5 + + ws.column_dimensions['B'].width = 25.0 + + for i in range(ord('C'), ord('L')): + ws.column_dimensions[chr(i)].width = 15.0 + + # Font + name_font = Font(name='Constantia', size=15, bold=True) + title_font = Font(name='宋体', size=15, bold=True) + data_font = Font(name='Franklin Gothic Book', size=11) + + table_fill = PatternFill(fill_type='solid', fgColor='1F497D') + f_border = Border(left=Side(border_style='medium', color='00000000'), + right=Side(border_style='medium', color='00000000'), + bottom=Side(border_style='medium', color='00000000'), + top=Side(border_style='medium', color='00000000') + ) + b_border = Border( + bottom=Side(border_style='medium', color='00000000'), + ) + + b_c_alignment = Alignment(vertical='bottom', + horizontal='center', + text_rotation=0, + wrap_text=True, + shrink_to_fit=False, + indent=0) + c_c_alignment = Alignment(vertical='center', + horizontal='center', + text_rotation=0, + wrap_text=True, + shrink_to_fit=False, + indent=0) + b_r_alignment = Alignment(vertical='bottom', + horizontal='right', + text_rotation=0, + wrap_text=True, + shrink_to_fit=False, + indent=0) + c_r_alignment = Alignment(vertical='bottom', + horizontal='center', + text_rotation=0, + wrap_text=True, + shrink_to_fit=False, + indent=0) + + # Img + img = Image("excelexporters/myems.png") + img.width = img.width * 0.85 + img.height = img.height * 0.85 + # img = Image("myems.png") + ws.add_image(img, 'B1') + + # Title + ws.row_dimensions[3].height = 60 + + ws['B3'].font = name_font + ws['B3'].alignment = b_r_alignment + ws['B3'] = 'Name:' + ws['C3'].border = b_border + ws['C3'].alignment = b_c_alignment + ws['C3'].font = name_font + ws['C3'] = name + + ws['D3'].font = name_font + ws['D3'].alignment = b_r_alignment + ws['D3'] = 'Period:' + ws['E3'].border = b_border + ws['E3'].alignment = b_c_alignment + ws['E3'].font = name_font + ws['E3'] = period_type + + ws['F3'].font = name_font + ws['F3'].alignment = b_r_alignment + ws['F3'] = 'Date:' + ws['G3'].alignment = b_c_alignment + ws['G3'].font = name_font + ws['G3'] = reporting_start_datetime_local + "__" + reporting_end_datetime_local + ws['G3'].border = b_border + ws.merge_cells("G3:H3") + + if "reporting_period" not in report.keys() or \ + "names" not in report['reporting_period'].keys() or len(report['reporting_period']['names']) == 0: + filename = str(uuid.uuid4()) + '.xlsx' + wb.save(filename) + + return filename + + ################################## + + current_row_number = 6 + + reporting_period_data = report['reporting_period'] + + has_names_data_flag = True + + if "names" not in reporting_period_data.keys() or \ + reporting_period_data['names'] is None or \ + len(reporting_period_data['names']) == 0: + has_names_data_flag = False + + if has_names_data_flag: + ws['B' + str(current_row_number)].font = title_font + ws['B' + str(current_row_number)] = name + ' 报告期节约' + + current_row_number += 1 + + category = reporting_period_data['names'] + ca_len = len(category) + + ws.row_dimensions[current_row_number].height = 75 + ws['B' + str(current_row_number)].fill = table_fill + ws['B' + str(current_row_number)].border = f_border + + col = 'C' + + for i in range(0, ca_len): + ws[col + str(current_row_number)].fill = table_fill + ws[col + str(current_row_number)].font = name_font + ws[col + str(current_row_number)].alignment = c_c_alignment + ws[col + str(current_row_number)].border = f_border + ws[col + str(current_row_number)] = \ + reporting_period_data['names'][i] + " (基线-实际) (" + reporting_period_data['units'][i] + ")" + + col = chr(ord(col) + 1) + + ws[col + str(current_row_number)].fill = table_fill + ws[col + str(current_row_number)].font = name_font + ws[col + str(current_row_number)].alignment = c_c_alignment + ws[col + str(current_row_number)].border = f_border + ws[col + str(current_row_number)] = '吨标准煤 (基线-实际) (TCE)' + + col = chr(ord(col) + 1) + + ws[col + str(current_row_number)].fill = table_fill + ws[col + str(current_row_number)].font = name_font + ws[col + str(current_row_number)].alignment = c_c_alignment + ws[col + str(current_row_number)].border = f_border + ws[col + str(current_row_number)] = '吨二氧化碳排放 (基线-实际) (TCO2E)' + + col = chr(ord(col) + 1) + + current_row_number += 1 + + ws['B' + str(current_row_number)].font = title_font + ws['B' + str(current_row_number)].alignment = c_c_alignment + ws['B' + str(current_row_number)].border = f_border + ws['B' + str(current_row_number)] = '节约' + + col = 'C' + + for i in range(0, ca_len): + ws[col + str(current_row_number)].font = name_font + ws[col + str(current_row_number)].alignment = c_c_alignment + ws[col + str(current_row_number)].border = f_border + ws[col + str(current_row_number)] = round(reporting_period_data['subtotals_saving'][i], 2) + + col = chr(ord(col) + 1) + + ws[col + str(current_row_number)].font = name_font + ws[col + str(current_row_number)].alignment = c_c_alignment + ws[col + str(current_row_number)].border = f_border + ws[col + str(current_row_number)] = round(reporting_period_data['total_in_kgce_saving'] / 1000, 2) + + col = chr(ord(col) + 1) + + ws[col + str(current_row_number)].font = name_font + ws[col + str(current_row_number)].alignment = c_c_alignment + ws[col + str(current_row_number)].border = f_border + ws[col + str(current_row_number)] = round(reporting_period_data['total_in_kgco2e_saving'] / 1000, 2) + + col = chr(ord(col) + 1) + + current_row_number += 1 + + ws['B' + str(current_row_number)].font = title_font + ws['B' + str(current_row_number)].alignment = c_c_alignment + ws['B' + str(current_row_number)].border = f_border + ws['B' + str(current_row_number)] = '环比' + + col = 'C' + + for i in range(0, ca_len): + ws[col + str(current_row_number)].font = name_font + ws[col + str(current_row_number)].alignment = c_c_alignment + ws[col + str(current_row_number)].border = f_border + ws[col + str(current_row_number)] = str( + round(reporting_period_data['increment_rates_saving'][i] * 100, 2)) + '%' \ + if reporting_period_data['increment_rates_saving'][i] is not None else '-' + + col = chr(ord(col) + 1) + + ws[col + str(current_row_number)].font = name_font + ws[col + str(current_row_number)].alignment = c_c_alignment + ws[col + str(current_row_number)].border = f_border + ws[col + str(current_row_number)] = str( + round(reporting_period_data['increment_rate_in_kgce_saving'] * 100, 2)) + '%' \ + if reporting_period_data['increment_rate_in_kgce_saving'] is not None else '-' + + col = chr(ord(col) + 1) + + ws[col + str(current_row_number)].font = name_font + ws[col + str(current_row_number)].alignment = c_c_alignment + ws[col + str(current_row_number)].border = f_border + ws[col + str(current_row_number)] = str( + round(reporting_period_data['increment_rate_in_kgco2e_saving'] * 100, 2)) + '%' \ + if reporting_period_data['increment_rate_in_kgco2e_saving'] is not None else '-' + + col = chr(ord(col) + 1) + + current_row_number += 2 + + ws['B' + str(current_row_number)].font = title_font + ws['B' + str(current_row_number)] = name + ' 吨标准煤(TCE)占比' + + current_row_number += 1 + table_start_row_number = current_row_number + chart_start_row_number = current_row_number + + ws.row_dimensions[current_row_number].height = 60 + ws['B' + str(current_row_number)].fill = table_fill + ws['B' + str(current_row_number)].border = f_border + + ws['C' + str(current_row_number)].fill = table_fill + ws['C' + str(current_row_number)].font = name_font + ws['C' + str(current_row_number)].alignment = c_c_alignment + ws['C' + str(current_row_number)].border = f_border + ws['C' + str(current_row_number)] = '吨标准煤(TCE)占比' + + current_row_number += 1 + + for i in range(0, ca_len): + ws['B' + str(current_row_number)].font = title_font + ws['B' + str(current_row_number)].alignment = c_c_alignment + ws['B' + str(current_row_number)].border = f_border + ws['B' + str(current_row_number)] = reporting_period_data['names'][i] + + ws['C' + str(current_row_number)].font = name_font + ws['C' + str(current_row_number)].alignment = c_c_alignment + ws['C' + str(current_row_number)].border = f_border + ws['C' + str(current_row_number)] = round(reporting_period_data['subtotals_in_kgce_saving'][i] / 1000, 3) + + current_row_number += 1 + + table_end_row_number = current_row_number - 1 + + if ca_len < 4: + current_row_number = current_row_number - ca_len + 4 + + current_row_number += 1 + + pie = PieChart() + pie.title = name + ' 吨标准煤(TCE)占比' + 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, 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 = 7.25 + pie.width = 9 + s1 = pie.series[0] + s1.dLbls = DataLabelList() + s1.dLbls.showCatName = False + s1.dLbls.showVal = True + s1.dLbls.showPercent = True + ws.add_chart(pie, 'D' + str(chart_start_row_number)) + + ws['B' + str(current_row_number)].font = title_font + ws['B' + str(current_row_number)] = name + ' 吨二氧化碳排放(TCO2E)占比' + + current_row_number += 1 + table_start_row_number = current_row_number + chart_start_row_number = current_row_number + + ws.row_dimensions[current_row_number].height = 60 + ws['B' + str(current_row_number)].fill = table_fill + ws['B' + str(current_row_number)].border = f_border + + ws['C' + str(current_row_number)].fill = table_fill + ws['C' + str(current_row_number)].font = name_font + ws['C' + str(current_row_number)].alignment = c_c_alignment + ws['C' + str(current_row_number)].border = f_border + ws['C' + str(current_row_number)] = '吨二氧化碳排放(TCO2E)占比' + + current_row_number += 1 + + for i in range(0, ca_len): + ws['B' + str(current_row_number)].font = title_font + ws['B' + str(current_row_number)].alignment = c_c_alignment + ws['B' + str(current_row_number)].border = f_border + ws['B' + str(current_row_number)] = reporting_period_data['names'][i] + + ws['C' + str(current_row_number)].font = name_font + ws['C' + str(current_row_number)].alignment = c_c_alignment + ws['C' + str(current_row_number)].border = f_border + ws['C' + str(current_row_number)] = round(reporting_period_data['subtotals_in_kgco2e_saving'][i] / 1000, 3) + + current_row_number += 1 + + table_end_row_number = current_row_number - 1 + + if ca_len < 4: + current_row_number = current_row_number - ca_len + 4 + + current_row_number += 1 + + pie = PieChart() + pie.title = name + ' 吨二氧化碳排放(TCO2E)占比' + 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, 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 = 7.25 + pie.width = 9 + s1 = pie.series[0] + s1.dLbls = DataLabelList() + s1.dLbls.showCatName = False + s1.dLbls.showVal = True + s1.dLbls.showPercent = True + ws.add_chart(pie, 'D' + str(chart_start_row_number)) + + ############################################# + + has_values_saving_data = True + has_timestamps_data = True + + if 'values_saving' not in reporting_period_data.keys() or \ + reporting_period_data['values_saving'] is None or \ + len(reporting_period_data['values_saving']) == 0: + has_values_saving_data = False + + if 'timestamps' not in reporting_period_data.keys() or \ + reporting_period_data['timestamps'] is None or \ + len(reporting_period_data['timestamps']) == 0 or \ + len(reporting_period_data['timestamps'][0]) == 0: + has_timestamps_data = False + + if has_values_saving_data and has_timestamps_data: + ca_len = len(reporting_period_data['names']) + time = reporting_period_data['timestamps'][0] + + ws['B' + str(current_row_number)].font = title_font + ws['B' + str(current_row_number)] = name + ' 详细数据' + + current_row_number += 1 + + chart_start_row_number = current_row_number + + current_row_number += ca_len * 6 + table_start_row_number = current_row_number + + ws.row_dimensions[current_row_number].height = 60 + ws['B' + str(current_row_number)].fill = table_fill + ws['B' + str(current_row_number)].font = title_font + ws['B' + str(current_row_number)].alignment = c_c_alignment + ws['B' + str(current_row_number)].border = f_border + ws['B' + str(current_row_number)] = '日期时间' + + col = 'C' + + for i in range(0, ca_len): + ws[col + str(current_row_number)].fill = table_fill + ws[col + str(current_row_number)].font = title_font + ws[col + str(current_row_number)].alignment = c_c_alignment + ws[col + str(current_row_number)].border = f_border + ws[col + str(current_row_number)] = \ + reporting_period_data['names'][i] + " (" + reporting_period_data['units'][i] + ")" + col = chr(ord(col) + 1) + + current_row_number += 1 + + for i in range(0, len(time)): + ws['B' + str(current_row_number)].font = title_font + ws['B' + str(current_row_number)].alignment = c_c_alignment + ws['B' + str(current_row_number)].border = f_border + ws['B' + str(current_row_number)] = time[i] + + col = 'C' + for j in range(0, ca_len): + ws[col + str(current_row_number)].font = title_font + ws[col + str(current_row_number)].alignment = c_c_alignment + ws[col + str(current_row_number)].border = f_border + ws[col + str(current_row_number)] = round(reporting_period_data['values_saving'][j][i], 2) \ + if reporting_period_data['values_saving'][j][i] is not None else 0.00 + col = chr(ord(col) + 1) + + current_row_number += 1 + + table_end_row_number = current_row_number - 1 + + ws['B' + str(current_row_number)].font = title_font + ws['B' + str(current_row_number)].alignment = c_c_alignment + ws['B' + str(current_row_number)].border = f_border + ws['B' + str(current_row_number)] = '小计' + + col = 'C' + + for i in range(0, ca_len): + ws[col + str(current_row_number)].font = title_font + ws[col + str(current_row_number)].alignment = c_c_alignment + ws[col + str(current_row_number)].border = f_border + ws[col + str(current_row_number)] = round(reporting_period_data['subtotals_saving'][i], 2) + col = chr(ord(col) + 1) + + current_row_number += 2 + + format_time_width_number = 1.0 + min_len_number = 1.0 + min_width_number = 11.0 # format_time_width_number * min_len_number + 4 and min_width_number > 11.0 + + if period_type == 'hourly': + format_time_width_number = 4.0 + min_len_number = 2 + min_width_number = 12.0 + elif period_type == 'daily': + format_time_width_number = 2.5 + min_len_number = 4 + min_width_number = 14.0 + elif period_type == 'monthly': + format_time_width_number = 2.1 + min_len_number = 4 + min_width_number = 12.4 + elif period_type == 'yearly': + format_time_width_number = 1.5 + min_len_number = 5 + min_width_number = 11.5 + + for i in range(0, ca_len): + line = LineChart() + line.title = '报告期节约 - ' + \ + reporting_period_data['names'][i] + " (" + reporting_period_data['units'][i] + ")" + labels = Reference(ws, min_col=2, min_row=table_start_row_number + 1, max_row=table_end_row_number) + line_data = Reference(ws, min_col=3 + i, min_row=table_start_row_number, max_row=table_end_row_number) + line.add_data(line_data, titles_from_data=True) + line.set_categories(labels) + line_data = line.series[0] + line_data.marker.symbol = "circle" + line_data.smooth = True + line.height = 8.25 + line.width = format_time_width_number * len(time) if len(time) > min_len_number else min_width_number + if line.width > 24: + line.width = 24 + line.x_axis.crosses = 'min' + line.dLbls = DataLabelList() + line.dLbls.dLblPos = 't' + line.dLbls.showVal = True + line.dLbls.showPercent = False + chart_col = 'B' + chart_cell = chart_col + str(chart_start_row_number) + chart_start_row_number += 6 + ws.add_chart(line, chart_cell) + + filename = str(uuid.uuid4()) + '.xlsx' + wb.save(filename) + + return filename From 0f9b2fffb7c2b26ad07877afec330b0ed1847754 Mon Sep 17 00:00:00 2001 From: YangZhang-GitHub <2533471770@qq.com> Date: Fri, 5 Mar 2021 17:14:52 +0800 Subject: [PATCH 2/5] Added 'excelexporters.equipmentsaving.export()' method --- myems-api/reports/equipmentsaving.py | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/myems-api/reports/equipmentsaving.py b/myems-api/reports/equipmentsaving.py index 2f779295..af3a3247 100644 --- a/myems-api/reports/equipmentsaving.py +++ b/myems-api/reports/equipmentsaving.py @@ -5,6 +5,7 @@ import config from datetime import datetime, timedelta, timezone from core import utilities from decimal import Decimal +import excelexporters.equipmentsaving class Reporting: @@ -655,4 +656,11 @@ class Reporting: "values": parameters_data['values'] } + # export result to Excel file and then encode the file to base64 string + result['excel_bytes_base64'] = excelexporters.equipmentsaving.export(result, + equipment['name'], + reporting_start_datetime_local, + reporting_end_datetime_local, + period_type) + resp.body = json.dumps(result) From a62735c9b656e7bd19ae711a5b3fec4a9204a6de Mon Sep 17 00:00:00 2001 From: YangZhang-GitHub <2533471770@qq.com> Date: Fri, 5 Mar 2021 21:24:00 +0800 Subject: [PATCH 3/5] Percentage added --- myems-api/excelexporters/equipmentsaving.py | 50 ++++++++++++++++++--- 1 file changed, 44 insertions(+), 6 deletions(-) diff --git a/myems-api/excelexporters/equipmentsaving.py b/myems-api/excelexporters/equipmentsaving.py index fbc853aa..7d5a7a1a 100644 --- a/myems-api/excelexporters/equipmentsaving.py +++ b/myems-api/excelexporters/equipmentsaving.py @@ -12,7 +12,6 @@ from openpyxl.drawing.image import Image from openpyxl import Workbook from openpyxl.chart.label import DataLabelList - #################################################################################################################### # PROCEDURES # Step 1: Validate the report data @@ -304,10 +303,18 @@ def generate_excel(report, ws['C' + str(current_row_number)].font = name_font ws['C' + str(current_row_number)].alignment = c_c_alignment ws['C' + str(current_row_number)].border = f_border - ws['C' + str(current_row_number)] = '吨标准煤(TCE)占比' + ws['C' + str(current_row_number)] = '节约' + + ws['D' + str(current_row_number)].fill = table_fill + ws['D' + str(current_row_number)].font = name_font + ws['D' + str(current_row_number)].alignment = c_c_alignment + ws['D' + str(current_row_number)].border = f_border + ws['D' + str(current_row_number)] = '吨标准煤(TCE) 节约占比' current_row_number += 1 + subtotals_in_kgce_saving_sum = sum_list(reporting_period_data['subtotals_in_kgce_saving']) + for i in range(0, ca_len): ws['B' + str(current_row_number)].font = title_font ws['B' + str(current_row_number)].alignment = c_c_alignment @@ -319,6 +326,13 @@ def generate_excel(report, ws['C' + str(current_row_number)].border = f_border ws['C' + str(current_row_number)] = round(reporting_period_data['subtotals_in_kgce_saving'][i] / 1000, 3) + ws['D' + str(current_row_number)].font = name_font + ws['D' + str(current_row_number)].alignment = c_c_alignment + ws['D' + str(current_row_number)].border = f_border + ws['D' + str(current_row_number)] = \ + str(round(abs(reporting_period_data['subtotals_in_kgce_saving'][i]) / + subtotals_in_kgce_saving_sum * 100, 2)) + '%' + current_row_number += 1 table_end_row_number = current_row_number - 1 @@ -341,7 +355,7 @@ def generate_excel(report, s1.dLbls.showCatName = False s1.dLbls.showVal = True s1.dLbls.showPercent = True - ws.add_chart(pie, 'D' + str(chart_start_row_number)) + ws.add_chart(pie, 'E' + str(chart_start_row_number)) ws['B' + str(current_row_number)].font = title_font ws['B' + str(current_row_number)] = name + ' 吨二氧化碳排放(TCO2E)占比' @@ -358,10 +372,18 @@ def generate_excel(report, ws['C' + str(current_row_number)].font = name_font ws['C' + str(current_row_number)].alignment = c_c_alignment ws['C' + str(current_row_number)].border = f_border - ws['C' + str(current_row_number)] = '吨二氧化碳排放(TCO2E)占比' + ws['C' + str(current_row_number)] = '节约' + + ws['D' + str(current_row_number)].fill = table_fill + ws['D' + str(current_row_number)].font = name_font + ws['D' + str(current_row_number)].alignment = c_c_alignment + ws['D' + str(current_row_number)].border = f_border + ws['D' + str(current_row_number)] = '吨二氧化碳排放(TCO2E) 节约占比' current_row_number += 1 + subtotals_in_kgco2e_saving_sum = sum_list(reporting_period_data['subtotals_in_kgco2e_saving']) + for i in range(0, ca_len): ws['B' + str(current_row_number)].font = title_font ws['B' + str(current_row_number)].alignment = c_c_alignment @@ -373,6 +395,13 @@ def generate_excel(report, ws['C' + str(current_row_number)].border = f_border ws['C' + str(current_row_number)] = round(reporting_period_data['subtotals_in_kgco2e_saving'][i] / 1000, 3) + ws['D' + str(current_row_number)].font = name_font + ws['D' + str(current_row_number)].alignment = c_c_alignment + ws['D' + str(current_row_number)].border = f_border + ws['D' + str(current_row_number)] = \ + str(round(abs(reporting_period_data['subtotals_in_kgco2e_saving'][i]) / + subtotals_in_kgco2e_saving_sum * 100, 2)) + '%' + current_row_number += 1 table_end_row_number = current_row_number - 1 @@ -395,7 +424,7 @@ def generate_excel(report, s1.dLbls.showCatName = False s1.dLbls.showVal = True s1.dLbls.showPercent = True - ws.add_chart(pie, 'D' + str(chart_start_row_number)) + ws.add_chart(pie, 'E' + str(chart_start_row_number)) ############################################# @@ -506,7 +535,7 @@ def generate_excel(report, for i in range(0, ca_len): line = LineChart() line.title = '报告期节约 - ' + \ - reporting_period_data['names'][i] + " (" + reporting_period_data['units'][i] + ")" + reporting_period_data['names'][i] + " (" + reporting_period_data['units'][i] + ")" labels = Reference(ws, min_col=2, min_row=table_start_row_number + 1, max_row=table_end_row_number) line_data = Reference(ws, min_col=3 + i, min_row=table_start_row_number, max_row=table_end_row_number) line.add_data(line_data, titles_from_data=True) @@ -532,3 +561,12 @@ def generate_excel(report, wb.save(filename) return filename + + +def sum_list(lists): + total = 0 + + for i in range(0, len(lists)): + total += abs(lists[i]) + + return total From 57a4bf377bb6be2347d344a6b68d52abf559e6c3 Mon Sep 17 00:00:00 2001 From: "13621160019@163.com" <13621160019@163.com> Date: Sun, 7 Mar 2021 10:58:30 +0800 Subject: [PATCH 4/5] removed abs functions for calculating percentage in equipmentsaving --- myems-api/excelexporters/equipmentsaving.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/myems-api/excelexporters/equipmentsaving.py b/myems-api/excelexporters/equipmentsaving.py index 7d5a7a1a..c272af9c 100644 --- a/myems-api/excelexporters/equipmentsaving.py +++ b/myems-api/excelexporters/equipmentsaving.py @@ -330,7 +330,7 @@ def generate_excel(report, ws['D' + str(current_row_number)].alignment = c_c_alignment ws['D' + str(current_row_number)].border = f_border ws['D' + str(current_row_number)] = \ - str(round(abs(reporting_period_data['subtotals_in_kgce_saving'][i]) / + str(round(reporting_period_data['subtotals_in_kgce_saving'][i] / subtotals_in_kgce_saving_sum * 100, 2)) + '%' current_row_number += 1 @@ -399,7 +399,7 @@ def generate_excel(report, ws['D' + str(current_row_number)].alignment = c_c_alignment ws['D' + str(current_row_number)].border = f_border ws['D' + str(current_row_number)] = \ - str(round(abs(reporting_period_data['subtotals_in_kgco2e_saving'][i]) / + str(round(reporting_period_data['subtotals_in_kgco2e_saving'][i] / subtotals_in_kgco2e_saving_sum * 100, 2)) + '%' current_row_number += 1 @@ -567,6 +567,6 @@ def sum_list(lists): total = 0 for i in range(0, len(lists)): - total += abs(lists[i]) + total += lists[i] return total From cd6237d57c0ac3917c044ac14a17ba3b15e06b9d Mon Sep 17 00:00:00 2001 From: "13621160019@163.com" <13621160019@163.com> Date: Sun, 7 Mar 2021 11:08:36 +0800 Subject: [PATCH 5/5] fixed divide by zero issues in equipmentsaving --- myems-api/excelexporters/equipmentsaving.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/myems-api/excelexporters/equipmentsaving.py b/myems-api/excelexporters/equipmentsaving.py index c272af9c..e01ce855 100644 --- a/myems-api/excelexporters/equipmentsaving.py +++ b/myems-api/excelexporters/equipmentsaving.py @@ -329,9 +329,9 @@ def generate_excel(report, ws['D' + str(current_row_number)].font = name_font ws['D' + str(current_row_number)].alignment = c_c_alignment ws['D' + str(current_row_number)].border = f_border - ws['D' + str(current_row_number)] = \ - str(round(reporting_period_data['subtotals_in_kgce_saving'][i] / - subtotals_in_kgce_saving_sum * 100, 2)) + '%' + ws['D' + str(current_row_number)] = str(round(reporting_period_data['subtotals_in_kgce_saving'][i] / + subtotals_in_kgce_saving_sum * 100, 2)) + '%' \ + if subtotals_in_kgce_saving_sum > 0 else '-' current_row_number += 1 @@ -398,9 +398,9 @@ def generate_excel(report, ws['D' + str(current_row_number)].font = name_font ws['D' + str(current_row_number)].alignment = c_c_alignment ws['D' + str(current_row_number)].border = f_border - ws['D' + str(current_row_number)] = \ - str(round(reporting_period_data['subtotals_in_kgco2e_saving'][i] / - subtotals_in_kgco2e_saving_sum * 100, 2)) + '%' + ws['D' + str(current_row_number)] = str(round(reporting_period_data['subtotals_in_kgco2e_saving'][i] / + subtotals_in_kgco2e_saving_sum * 100, 2)) + '%' \ + if subtotals_in_kgco2e_saving_sum > 0 else '-' current_row_number += 1