diff --git a/myems-api/excelexporters/tenantbill.py b/myems-api/excelexporters/tenantbill.py index a71bcfb6..f094d780 100644 --- a/myems-api/excelexporters/tenantbill.py +++ b/myems-api/excelexporters/tenantbill.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 diff --git a/myems-api/excelexporters/tenantcost.py b/myems-api/excelexporters/tenantcost.py index 70ce4f2b..eddba9ba 100644 --- a/myems-api/excelexporters/tenantcost.py +++ b/myems-api/excelexporters/tenantcost.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 @@ -586,32 +585,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/tenantenergycategory.py b/myems-api/excelexporters/tenantenergycategory.py index b3d6a021..10298da1 100644 --- a/myems-api/excelexporters/tenantenergycategory.py +++ b/myems-api/excelexporters/tenantenergycategory.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 @@ -650,32 +649,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/tenantenergyitem.py b/myems-api/excelexporters/tenantenergyitem.py index 10008d2e..c990f6d0 100644 --- a/myems-api/excelexporters/tenantenergyitem.py +++ b/myems-api/excelexporters/tenantenergyitem.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 @@ -484,32 +483,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/tenantload.py b/myems-api/excelexporters/tenantload.py index 60fc77f1..f5fcd78c 100644 --- a/myems-api/excelexporters/tenantload.py +++ b/myems-api/excelexporters/tenantload.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 @@ -529,32 +528,29 @@ def generate_excel(report, name, reporting_start_datetime_local, reporting_end_d 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/tenantsaving.py b/myems-api/excelexporters/tenantsaving.py index 8c43ec13..0096f2d9 100644 --- a/myems-api/excelexporters/tenantsaving.py +++ b/myems-api/excelexporters/tenantsaving.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 @@ -630,32 +629,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/tenantstatistics.py b/myems-api/excelexporters/tenantstatistics.py index ec408767..5f95351a 100644 --- a/myems-api/excelexporters/tenantstatistics.py +++ b/myems-api/excelexporters/tenantstatistics.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 @@ -567,32 +566,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