From d9a0fe53b5c529b8c11dab11043feeb16b34712d Mon Sep 17 00:00:00 2001 From: "13621160019@163.com" <13621160019@163.com> Date: Thu, 21 Oct 2021 20:56:28 +0800 Subject: [PATCH] reformatted excel exporters of equipment reports --- myems-api/excelexporters/equipmentcost.py | 25 ++++++++---------- .../excelexporters/equipmentefficiency.py | 25 ++++++++---------- .../excelexporters/equipmentenergycategory.py | 25 ++++++++---------- .../excelexporters/equipmentenergyitem.py | 26 ++++++++----------- myems-api/excelexporters/equipmentincome.py | 25 ++++++++---------- myems-api/excelexporters/equipmentload.py | 24 ++++++++--------- myems-api/excelexporters/equipmentoutput.py | 25 ++++++++---------- myems-api/excelexporters/equipmentsaving.py | 25 ++++++++---------- .../excelexporters/equipmentstatistics.py | 25 ++++++++---------- 9 files changed, 99 insertions(+), 126 deletions(-) diff --git a/myems-api/excelexporters/equipmentcost.py b/myems-api/excelexporters/equipmentcost.py index ccaa7941..d31e821f 100644 --- a/myems-api/excelexporters/equipmentcost.py +++ b/myems-api/excelexporters/equipmentcost.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 @@ -551,32 +550,30 @@ 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/equipmentefficiency.py b/myems-api/excelexporters/equipmentefficiency.py index 591735a4..b43b50f9 100644 --- a/myems-api/excelexporters/equipmentefficiency.py +++ b/myems-api/excelexporters/equipmentefficiency.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 @@ -425,32 +424,30 @@ 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/equipmentenergycategory.py b/myems-api/excelexporters/equipmentenergycategory.py index 5b6c7193..a8a7138a 100644 --- a/myems-api/excelexporters/equipmentenergycategory.py +++ b/myems-api/excelexporters/equipmentenergycategory.py @@ -646,32 +646,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/equipmentenergyitem.py b/myems-api/excelexporters/equipmentenergyitem.py index d9ca5775..30dead77 100644 --- a/myems-api/excelexporters/equipmentenergyitem.py +++ b/myems-api/excelexporters/equipmentenergyitem.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 @@ -466,32 +465,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/equipmentincome.py b/myems-api/excelexporters/equipmentincome.py index f727f7c9..76f16fdb 100644 --- a/myems-api/excelexporters/equipmentincome.py +++ b/myems-api/excelexporters/equipmentincome.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 @@ -489,32 +488,30 @@ 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/equipmentload.py b/myems-api/excelexporters/equipmentload.py index ec472b1a..0ea652dc 100644 --- a/myems-api/excelexporters/equipmentload.py +++ b/myems-api/excelexporters/equipmentload.py @@ -398,32 +398,30 @@ 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/equipmentoutput.py b/myems-api/excelexporters/equipmentoutput.py index e3456ecc..def8ce58 100644 --- a/myems-api/excelexporters/equipmentoutput.py +++ b/myems-api/excelexporters/equipmentoutput.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 @@ -407,32 +406,30 @@ 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/equipmentsaving.py b/myems-api/excelexporters/equipmentsaving.py index 1908282c..a16277e1 100644 --- a/myems-api/excelexporters/equipmentsaving.py +++ b/myems-api/excelexporters/equipmentsaving.py @@ -29,7 +29,6 @@ def export(report, #################################################################################################################### if report is None: return None - print(report) #################################################################################################################### # Step 2: Generate excel file from the report data @@ -595,32 +594,30 @@ 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/equipmentstatistics.py b/myems-api/excelexporters/equipmentstatistics.py index 6d3596e6..46fefb6b 100644 --- a/myems-api/excelexporters/equipmentstatistics.py +++ b/myems-api/excelexporters/equipmentstatistics.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 @@ -452,32 +451,30 @@ 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