From e65cd550a2df4e379267e59b5b25455b950d387e Mon Sep 17 00:00:00 2001 From: "13621160019@163.com" <13621160019@163.com> Date: Wed, 20 Oct 2021 15:10:40 +0800 Subject: [PATCH] deleted unused comments from excelexporters --- .../excelexporters/combinedequipmentenergycategory.py | 4 ---- myems-api/excelexporters/equipmentenergycategory.py | 7 +------ myems-api/excelexporters/storeenergycategory.py | 2 -- 3 files changed, 1 insertion(+), 12 deletions(-) diff --git a/myems-api/excelexporters/combinedequipmentenergycategory.py b/myems-api/excelexporters/combinedequipmentenergycategory.py index b70d486c..db013ded 100644 --- a/myems-api/excelexporters/combinedequipmentenergycategory.py +++ b/myems-api/excelexporters/combinedequipmentenergycategory.py @@ -27,7 +27,6 @@ def export(report, #################################################################################################################### if report is None: return None - print(report) #################################################################################################################### # Step 2: Generate excel file from the report data @@ -503,8 +502,6 @@ def generate_excel(report, ca_len = len(report['reporting_period']['names']) real_timestamps_len = timestamps_data_not_equal_0(report['parameters']['timestamps']) table_row = current_row_number + 2 + ca_len * 6 + real_timestamps_len * 6 - # ca_len * 6 :The total length of linear tables of tailed data - # real_timestamps_len * 6 :The total length of linear tables of related parameters chart_start_row_number = current_row_number + 1 if "timestamps" not in reporting_period_data.keys() or \ reporting_period_data['timestamps'] is None or \ @@ -527,7 +524,6 @@ def generate_excel(report, if len(time) > 0: has_data = True max_row = table_row + len(time) - print("max_row", max_row) if has_data: for i in range(0, len(time)): diff --git a/myems-api/excelexporters/equipmentenergycategory.py b/myems-api/excelexporters/equipmentenergycategory.py index acb4d952..9e3b83af 100644 --- a/myems-api/excelexporters/equipmentenergycategory.py +++ b/myems-api/excelexporters/equipmentenergycategory.py @@ -2,7 +2,6 @@ import base64 import uuid import os import re - import openpyxl.utils from openpyxl.chart import PieChart, LineChart, Reference from openpyxl.styles import PatternFill, Border, Side, Alignment, Font @@ -30,7 +29,6 @@ def export(report, #################################################################################################################### if report is None: return None - print(report) #################################################################################################################### # Step 2: Generate excel file from the report data @@ -595,8 +593,7 @@ def generate_excel(report, ca_len = len(report['reporting_period']['names']) real_timestamps_len = timestamps_data_not_equal_0(report['parameters']['timestamps']) table_row = current_row_number + ca_len * 6 + real_timestamps_len * 6 + 2 - # ca_len * 6 :The total length of linear tables of tailed data - # real_timestamps_len * 6 :The total length of linear tables of related parameters + chart_start_row_number = current_row_number + 1 if "timestamps" not in reporting_period_data.keys() or \ reporting_period_data['timestamps'] is None or \ @@ -619,13 +616,11 @@ def generate_excel(report, if len(time) > 0: has_data = True max_row = table_row + len(time) - print("max_row", max_row) if has_data: for i in range(0, len(time)): col = 'B' row = str(table_row+1 + i) - # col = chr(ord('B') + i) ws[col + row].font = title_font ws[col + row].alignment = c_c_alignment ws[col + row] = time[i] diff --git a/myems-api/excelexporters/storeenergycategory.py b/myems-api/excelexporters/storeenergycategory.py index d953c07f..d84ba902 100644 --- a/myems-api/excelexporters/storeenergycategory.py +++ b/myems-api/excelexporters/storeenergycategory.py @@ -27,7 +27,6 @@ def export(report, #################################################################################################################### if report is None: return None - print(report) #################################################################################################################### # Step 2: Generate excel file from the report data @@ -547,7 +546,6 @@ def generate_excel(report, if len(time) > 0: has_data = True max_row = table_row + len(time) - print("max_row", max_row) if has_data: for i in range(0, len(time)):