From 3d6bceb4db0db4dd873205f8146e18a976293f11 Mon Sep 17 00:00:00 2001 From: "13621160019@163.com" <13621160019@163.com> Date: Fri, 22 Oct 2021 13:13:44 +0800 Subject: [PATCH] reformatted excel exporters of store reports --- myems-api/excelexporters/storecost.py | 26 ++++++++----------- .../excelexporters/storeenergycategory.py | 25 ++++++++---------- myems-api/excelexporters/storeenergyitem.py | 26 ++++++++----------- myems-api/excelexporters/storeload.py | 25 ++++++++---------- myems-api/excelexporters/storesaving.py | 26 ++++++++----------- myems-api/excelexporters/storestatistics.py | 26 ++++++++----------- 6 files changed, 66 insertions(+), 88 deletions(-) diff --git a/myems-api/excelexporters/storecost.py b/myems-api/excelexporters/storecost.py index fdf6700b..4bc62bc7 100644 --- a/myems-api/excelexporters/storecost.py +++ b/myems-api/excelexporters/storecost.py @@ -28,7 +28,6 @@ def export(report, #################################################################################################################### if report is None: return None - print(report) #################################################################################################################### # Step 2: Generate excel file from the report data @@ -611,32 +610,29 @@ def generate_excel(report, parameters_ws.add_image(img, 'A1') # Title - parameters_ws.row_dimensions[3].height = 60 - - parameters_ws['B3'].font = name_font parameters_ws['B3'].alignment = b_r_alignment parameters_ws['B3'] = 'Name:' parameters_ws['C3'].border = b_border parameters_ws['C3'].alignment = b_c_alignment - parameters_ws['C3'].font = name_font parameters_ws['C3'] = name - parameters_ws['D3'].font = name_font parameters_ws['D3'].alignment = b_r_alignment parameters_ws['D3'] = 'Period:' parameters_ws['E3'].border = b_border parameters_ws['E3'].alignment = b_c_alignment - parameters_ws['E3'].font = name_font parameters_ws['E3'] = period_type - parameters_ws['F3'].font = name_font - parameters_ws['F3'].alignment = b_r_alignment - parameters_ws['F3'] = 'Date:' - parameters_ws['G3'].border = b_border - parameters_ws['G3'].alignment = b_c_alignment - parameters_ws['G3'].font = name_font - parameters_ws['G3'] = reporting_start_datetime_local + "__" + reporting_end_datetime_local - parameters_ws.merge_cells("G3:H3") + parameters_ws['B4'].alignment = b_r_alignment + parameters_ws['B4'] = 'Reporting Start Datetime:' + parameters_ws['C4'].border = b_border + parameters_ws['C4'].alignment = b_c_alignment + parameters_ws['C4'] = reporting_start_datetime_local + + parameters_ws['D4'].alignment = b_r_alignment + parameters_ws['D4'] = 'Reporting End Datetime:' + parameters_ws['E4'].border = b_border + parameters_ws['E4'].alignment = b_c_alignment + parameters_ws['E4'] = reporting_end_datetime_local parameters_ws_current_row_number = 6 diff --git a/myems-api/excelexporters/storeenergycategory.py b/myems-api/excelexporters/storeenergycategory.py index d84ba902..8b1b3fa4 100644 --- a/myems-api/excelexporters/storeenergycategory.py +++ b/myems-api/excelexporters/storeenergycategory.py @@ -670,32 +670,29 @@ def generate_excel(report, parameters_ws.add_image(img, 'A1') # Title - parameters_ws.row_dimensions[3].height = 60 - - parameters_ws['B3'].font = name_font parameters_ws['B3'].alignment = b_r_alignment parameters_ws['B3'] = 'Name:' parameters_ws['C3'].border = b_border parameters_ws['C3'].alignment = b_c_alignment - parameters_ws['C3'].font = name_font parameters_ws['C3'] = name - parameters_ws['D3'].font = name_font parameters_ws['D3'].alignment = b_r_alignment parameters_ws['D3'] = 'Period:' parameters_ws['E3'].border = b_border parameters_ws['E3'].alignment = b_c_alignment - parameters_ws['E3'].font = name_font parameters_ws['E3'] = period_type - parameters_ws['F3'].font = name_font - parameters_ws['F3'].alignment = b_r_alignment - parameters_ws['F3'] = 'Date:' - parameters_ws['G3'].border = b_border - parameters_ws['G3'].alignment = b_c_alignment - parameters_ws['G3'].font = name_font - parameters_ws['G3'] = reporting_start_datetime_local + "__" + reporting_end_datetime_local - parameters_ws.merge_cells("G3:H3") + parameters_ws['B4'].alignment = b_r_alignment + parameters_ws['B4'] = 'Reporting Start Datetime:' + parameters_ws['C4'].border = b_border + parameters_ws['C4'].alignment = b_c_alignment + parameters_ws['C4'] = reporting_start_datetime_local + + parameters_ws['D4'].alignment = b_r_alignment + parameters_ws['D4'] = 'Reporting End Datetime:' + parameters_ws['E4'].border = b_border + parameters_ws['E4'].alignment = b_c_alignment + parameters_ws['E4'] = reporting_end_datetime_local parameters_ws_current_row_number = 6 diff --git a/myems-api/excelexporters/storeenergyitem.py b/myems-api/excelexporters/storeenergyitem.py index 0753598a..ab3787e5 100644 --- a/myems-api/excelexporters/storeenergyitem.py +++ b/myems-api/excelexporters/storeenergyitem.py @@ -27,7 +27,6 @@ def export(report, #################################################################################################################### if report is None: return None - print(report['reporting_period']) #################################################################################################################### # Step 2: Generate excel file from the report data @@ -492,32 +491,29 @@ def generate_excel(report, parameters_ws.add_image(img, 'A1') # Title - parameters_ws.row_dimensions[3].height = 60 - - parameters_ws['B3'].font = name_font parameters_ws['B3'].alignment = b_r_alignment parameters_ws['B3'] = 'Name:' parameters_ws['C3'].border = b_border parameters_ws['C3'].alignment = b_c_alignment - parameters_ws['C3'].font = name_font parameters_ws['C3'] = name - parameters_ws['D3'].font = name_font parameters_ws['D3'].alignment = b_r_alignment parameters_ws['D3'] = 'Period:' parameters_ws['E3'].border = b_border parameters_ws['E3'].alignment = b_c_alignment - parameters_ws['E3'].font = name_font parameters_ws['E3'] = period_type - parameters_ws['F3'].font = name_font - parameters_ws['F3'].alignment = b_r_alignment - parameters_ws['F3'] = 'Date:' - parameters_ws['G3'].border = b_border - parameters_ws['G3'].alignment = b_c_alignment - parameters_ws['G3'].font = name_font - parameters_ws['G3'] = reporting_start_datetime_local + "__" + reporting_end_datetime_local - parameters_ws.merge_cells("G3:H3") + parameters_ws['B4'].alignment = b_r_alignment + parameters_ws['B4'] = 'Reporting Start Datetime:' + parameters_ws['C4'].border = b_border + parameters_ws['C4'].alignment = b_c_alignment + parameters_ws['C4'] = reporting_start_datetime_local + + parameters_ws['D4'].alignment = b_r_alignment + parameters_ws['D4'] = 'Reporting End Datetime:' + parameters_ws['E4'].border = b_border + parameters_ws['E4'].alignment = b_c_alignment + parameters_ws['E4'] = reporting_end_datetime_local parameters_ws_current_row_number = 6 diff --git a/myems-api/excelexporters/storeload.py b/myems-api/excelexporters/storeload.py index 4e6e5b83..0a348ca3 100644 --- a/myems-api/excelexporters/storeload.py +++ b/myems-api/excelexporters/storeload.py @@ -467,32 +467,29 @@ def generate_excel(report, parameters_ws.add_image(img, 'B1') # Title - parameters_ws.row_dimensions[3].height = 60 - - parameters_ws['B3'].font = name_font parameters_ws['B3'].alignment = b_r_alignment parameters_ws['B3'] = 'Name:' parameters_ws['C3'].border = b_border parameters_ws['C3'].alignment = b_c_alignment - parameters_ws['C3'].font = name_font parameters_ws['C3'] = name - parameters_ws['D3'].font = name_font parameters_ws['D3'].alignment = b_r_alignment parameters_ws['D3'] = 'Period:' parameters_ws['E3'].border = b_border parameters_ws['E3'].alignment = b_c_alignment - parameters_ws['E3'].font = name_font parameters_ws['E3'] = period_type - parameters_ws['F3'].font = name_font - parameters_ws['F3'].alignment = b_r_alignment - parameters_ws['F3'] = 'Date:' - parameters_ws['G3'].border = b_border - parameters_ws['G3'].alignment = b_c_alignment - parameters_ws['G3'].font = name_font - parameters_ws['G3'] = reporting_start_datetime_local + "__" + reporting_end_datetime_local - parameters_ws.merge_cells("G3:H3") + parameters_ws['B4'].alignment = b_r_alignment + parameters_ws['B4'] = 'Reporting Start Datetime:' + parameters_ws['C4'].border = b_border + parameters_ws['C4'].alignment = b_c_alignment + parameters_ws['C4'] = reporting_start_datetime_local + + parameters_ws['D4'].alignment = b_r_alignment + parameters_ws['D4'] = 'Reporting End Datetime:' + parameters_ws['E4'].border = b_border + parameters_ws['E4'].alignment = b_c_alignment + parameters_ws['E4'] = reporting_end_datetime_local parameters_ws_current_row_number = 6 diff --git a/myems-api/excelexporters/storesaving.py b/myems-api/excelexporters/storesaving.py index d3a9036e..0f9fcd35 100644 --- a/myems-api/excelexporters/storesaving.py +++ b/myems-api/excelexporters/storesaving.py @@ -28,7 +28,6 @@ def export(report, #################################################################################################################### if report is None: return None - print(report) #################################################################################################################### # Step 2: Generate excel file from the report data @@ -635,32 +634,29 @@ def generate_excel(report, parameters_ws.add_image(img, 'A1') # Title - parameters_ws.row_dimensions[3].height = 60 - - parameters_ws['B3'].font = name_font parameters_ws['B3'].alignment = b_r_alignment parameters_ws['B3'] = 'Name:' parameters_ws['C3'].border = b_border parameters_ws['C3'].alignment = b_c_alignment - parameters_ws['C3'].font = name_font parameters_ws['C3'] = name - parameters_ws['D3'].font = name_font parameters_ws['D3'].alignment = b_r_alignment parameters_ws['D3'] = 'Period:' parameters_ws['E3'].border = b_border parameters_ws['E3'].alignment = b_c_alignment - parameters_ws['E3'].font = name_font parameters_ws['E3'] = period_type - parameters_ws['F3'].font = name_font - parameters_ws['F3'].alignment = b_r_alignment - parameters_ws['F3'] = 'Date:' - parameters_ws['G3'].border = b_border - parameters_ws['G3'].alignment = b_c_alignment - parameters_ws['G3'].font = name_font - parameters_ws['G3'] = reporting_start_datetime_local + "__" + reporting_end_datetime_local - parameters_ws.merge_cells("G3:H3") + parameters_ws['B4'].alignment = b_r_alignment + parameters_ws['B4'] = 'Reporting Start Datetime:' + parameters_ws['C4'].border = b_border + parameters_ws['C4'].alignment = b_c_alignment + parameters_ws['C4'] = reporting_start_datetime_local + + parameters_ws['D4'].alignment = b_r_alignment + parameters_ws['D4'] = 'Reporting End Datetime:' + parameters_ws['E4'].border = b_border + parameters_ws['E4'].alignment = b_c_alignment + parameters_ws['E4'] = reporting_end_datetime_local parameters_ws_current_row_number = 6 diff --git a/myems-api/excelexporters/storestatistics.py b/myems-api/excelexporters/storestatistics.py index 00eb9b0d..a70a98cf 100644 --- a/myems-api/excelexporters/storestatistics.py +++ b/myems-api/excelexporters/storestatistics.py @@ -26,7 +26,6 @@ def export(report, #################################################################################################################### if report is None: return None - print(report) #################################################################################################################### # Step 2: Generate excel file from the report data @@ -574,32 +573,29 @@ def generate_excel(report, parameters_ws.add_image(img, 'A1') # Title - parameters_ws.row_dimensions[3].height = 60 - - parameters_ws['B3'].font = name_font parameters_ws['B3'].alignment = b_r_alignment parameters_ws['B3'] = 'Name:' parameters_ws['C3'].border = b_border parameters_ws['C3'].alignment = b_c_alignment - parameters_ws['C3'].font = name_font parameters_ws['C3'] = name - parameters_ws['D3'].font = name_font parameters_ws['D3'].alignment = b_r_alignment parameters_ws['D3'] = 'Period:' parameters_ws['E3'].border = b_border parameters_ws['E3'].alignment = b_c_alignment - parameters_ws['E3'].font = name_font parameters_ws['E3'] = period_type - parameters_ws['F3'].font = name_font - parameters_ws['F3'].alignment = b_r_alignment - parameters_ws['F3'] = 'Date:' - parameters_ws['G3'].border = b_border - parameters_ws['G3'].alignment = b_c_alignment - parameters_ws['G3'].font = name_font - parameters_ws['G3'] = reporting_start_datetime_local + "__" + reporting_end_datetime_local - parameters_ws.merge_cells("G3:H3") + parameters_ws['B4'].alignment = b_r_alignment + parameters_ws['B4'] = 'Reporting Start Datetime:' + parameters_ws['C4'].border = b_border + parameters_ws['C4'].alignment = b_c_alignment + parameters_ws['C4'] = reporting_start_datetime_local + + parameters_ws['D4'].alignment = b_r_alignment + parameters_ws['D4'] = 'Reporting End Datetime:' + parameters_ws['E4'].border = b_border + parameters_ws['E4'].alignment = b_c_alignment + parameters_ws['E4'] = reporting_end_datetime_local parameters_ws_current_row_number = 6