reformatted excel exporters of tenant reports

pull/74/head
13621160019@163.com 2021-10-21 21:23:48 +08:00
parent d9a0fe53b5
commit f968f17de3
7 changed files with 66 additions and 90 deletions

View File

@ -26,7 +26,6 @@ def export(report,
#################################################################################################################### ####################################################################################################################
if report is None: if report is None:
return None return None
print(report)
#################################################################################################################### ####################################################################################################################
# Step 2: Generate excel file from the report data # Step 2: Generate excel file from the report data

View File

@ -29,7 +29,6 @@ def export(report,
#################################################################################################################### ####################################################################################################################
if report is None: if report is None:
return None return None
print(report)
#################################################################################################################### ####################################################################################################################
# Step 2: Generate excel file from the report data # Step 2: Generate excel file from the report data
@ -586,32 +585,29 @@ def generate_excel(report,
parameters_ws.add_image(img, 'A1') parameters_ws.add_image(img, 'A1')
# Title # Title
parameters_ws.row_dimensions[3].height = 60
parameters_ws['B3'].font = name_font
parameters_ws['B3'].alignment = b_r_alignment parameters_ws['B3'].alignment = b_r_alignment
parameters_ws['B3'] = 'Name:' parameters_ws['B3'] = 'Name:'
parameters_ws['C3'].border = b_border parameters_ws['C3'].border = b_border
parameters_ws['C3'].alignment = b_c_alignment parameters_ws['C3'].alignment = b_c_alignment
parameters_ws['C3'].font = name_font
parameters_ws['C3'] = name parameters_ws['C3'] = name
parameters_ws['D3'].font = name_font
parameters_ws['D3'].alignment = b_r_alignment parameters_ws['D3'].alignment = b_r_alignment
parameters_ws['D3'] = 'Period:' parameters_ws['D3'] = 'Period:'
parameters_ws['E3'].border = b_border parameters_ws['E3'].border = b_border
parameters_ws['E3'].alignment = b_c_alignment parameters_ws['E3'].alignment = b_c_alignment
parameters_ws['E3'].font = name_font
parameters_ws['E3'] = period_type parameters_ws['E3'] = period_type
parameters_ws['F3'].font = name_font parameters_ws['B4'].alignment = b_r_alignment
parameters_ws['F3'].alignment = b_r_alignment parameters_ws['B4'] = 'Reporting Start Datetime:'
parameters_ws['F3'] = 'Date:' parameters_ws['C4'].border = b_border
parameters_ws['G3'].border = b_border parameters_ws['C4'].alignment = b_c_alignment
parameters_ws['G3'].alignment = b_c_alignment parameters_ws['C4'] = reporting_start_datetime_local
parameters_ws['G3'].font = name_font
parameters_ws['G3'] = reporting_start_datetime_local + "__" + reporting_end_datetime_local parameters_ws['D4'].alignment = b_r_alignment
parameters_ws.merge_cells("G3:H3") 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 parameters_ws_current_row_number = 6

View File

@ -28,7 +28,6 @@ def export(report,
#################################################################################################################### ####################################################################################################################
if report is None: if report is None:
return None return None
print(report)
#################################################################################################################### ####################################################################################################################
# Step 2: Generate excel file from the report data # Step 2: Generate excel file from the report data
@ -650,32 +649,29 @@ def generate_excel(report,
parameters_ws.add_image(img, 'A1') parameters_ws.add_image(img, 'A1')
# Title # Title
parameters_ws.row_dimensions[3].height = 60
parameters_ws['B3'].font = name_font
parameters_ws['B3'].alignment = b_r_alignment parameters_ws['B3'].alignment = b_r_alignment
parameters_ws['B3'] = 'Name:' parameters_ws['B3'] = 'Name:'
parameters_ws['C3'].border = b_border parameters_ws['C3'].border = b_border
parameters_ws['C3'].alignment = b_c_alignment parameters_ws['C3'].alignment = b_c_alignment
parameters_ws['C3'].font = name_font
parameters_ws['C3'] = name parameters_ws['C3'] = name
parameters_ws['D3'].font = name_font
parameters_ws['D3'].alignment = b_r_alignment parameters_ws['D3'].alignment = b_r_alignment
parameters_ws['D3'] = 'Period:' parameters_ws['D3'] = 'Period:'
parameters_ws['E3'].border = b_border parameters_ws['E3'].border = b_border
parameters_ws['E3'].alignment = b_c_alignment parameters_ws['E3'].alignment = b_c_alignment
parameters_ws['E3'].font = name_font
parameters_ws['E3'] = period_type parameters_ws['E3'] = period_type
parameters_ws['F3'].font = name_font parameters_ws['B4'].alignment = b_r_alignment
parameters_ws['F3'].alignment = b_r_alignment parameters_ws['B4'] = 'Reporting Start Datetime:'
parameters_ws['F3'] = 'Date:' parameters_ws['C4'].border = b_border
parameters_ws['G3'].border = b_border parameters_ws['C4'].alignment = b_c_alignment
parameters_ws['G3'].alignment = b_c_alignment parameters_ws['C4'] = reporting_start_datetime_local
parameters_ws['G3'].font = name_font
parameters_ws['G3'] = reporting_start_datetime_local + "__" + reporting_end_datetime_local parameters_ws['D4'].alignment = b_r_alignment
parameters_ws.merge_cells("G3:H3") 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 parameters_ws_current_row_number = 6

View File

@ -28,7 +28,6 @@ def export(report,
#################################################################################################################### ####################################################################################################################
if report is None: if report is None:
return None return None
print(report)
#################################################################################################################### ####################################################################################################################
# Step 2: Generate excel file from the report data # Step 2: Generate excel file from the report data
@ -484,32 +483,29 @@ def generate_excel(report,
parameters_ws.add_image(img, 'A1') parameters_ws.add_image(img, 'A1')
# Title # Title
parameters_ws.row_dimensions[3].height = 60
parameters_ws['B3'].font = name_font
parameters_ws['B3'].alignment = b_r_alignment parameters_ws['B3'].alignment = b_r_alignment
parameters_ws['B3'] = 'Name:' parameters_ws['B3'] = 'Name:'
parameters_ws['C3'].border = b_border parameters_ws['C3'].border = b_border
parameters_ws['C3'].alignment = b_c_alignment parameters_ws['C3'].alignment = b_c_alignment
parameters_ws['C3'].font = name_font
parameters_ws['C3'] = name parameters_ws['C3'] = name
parameters_ws['D3'].font = name_font
parameters_ws['D3'].alignment = b_r_alignment parameters_ws['D3'].alignment = b_r_alignment
parameters_ws['D3'] = 'Period:' parameters_ws['D3'] = 'Period:'
parameters_ws['E3'].border = b_border parameters_ws['E3'].border = b_border
parameters_ws['E3'].alignment = b_c_alignment parameters_ws['E3'].alignment = b_c_alignment
parameters_ws['E3'].font = name_font
parameters_ws['E3'] = period_type parameters_ws['E3'] = period_type
parameters_ws['F3'].font = name_font parameters_ws['B4'].alignment = b_r_alignment
parameters_ws['F3'].alignment = b_r_alignment parameters_ws['B4'] = 'Reporting Start Datetime:'
parameters_ws['F3'] = 'Date:' parameters_ws['C4'].border = b_border
parameters_ws['G3'].border = b_border parameters_ws['C4'].alignment = b_c_alignment
parameters_ws['G3'].alignment = b_c_alignment parameters_ws['C4'] = reporting_start_datetime_local
parameters_ws['G3'].font = name_font
parameters_ws['G3'] = reporting_start_datetime_local + "__" + reporting_end_datetime_local parameters_ws['D4'].alignment = b_r_alignment
parameters_ws.merge_cells("G3:H3") 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 parameters_ws_current_row_number = 6

View File

@ -28,7 +28,6 @@ def export(report,
#################################################################################################################### ####################################################################################################################
if report is None: if report is None:
return None return None
print(report)
#################################################################################################################### ####################################################################################################################
# Step 2: Generate excel file from the report data # 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') parameters_ws.add_image(img, 'A1')
# Title # Title
parameters_ws.row_dimensions[3].height = 60
parameters_ws['B3'].font = name_font
parameters_ws['B3'].alignment = b_r_alignment parameters_ws['B3'].alignment = b_r_alignment
parameters_ws['B3'] = 'Name:' parameters_ws['B3'] = 'Name:'
parameters_ws['C3'].border = b_border parameters_ws['C3'].border = b_border
parameters_ws['C3'].alignment = b_c_alignment parameters_ws['C3'].alignment = b_c_alignment
parameters_ws['C3'].font = name_font
parameters_ws['C3'] = name parameters_ws['C3'] = name
parameters_ws['D3'].font = name_font
parameters_ws['D3'].alignment = b_r_alignment parameters_ws['D3'].alignment = b_r_alignment
parameters_ws['D3'] = 'Period:' parameters_ws['D3'] = 'Period:'
parameters_ws['E3'].border = b_border parameters_ws['E3'].border = b_border
parameters_ws['E3'].alignment = b_c_alignment parameters_ws['E3'].alignment = b_c_alignment
parameters_ws['E3'].font = name_font
parameters_ws['E3'] = period_type parameters_ws['E3'] = period_type
parameters_ws['F3'].font = name_font parameters_ws['B4'].alignment = b_r_alignment
parameters_ws['F3'].alignment = b_r_alignment parameters_ws['B4'] = 'Reporting Start Datetime:'
parameters_ws['F3'] = 'Date:' parameters_ws['C4'].border = b_border
parameters_ws['G3'].border = b_border parameters_ws['C4'].alignment = b_c_alignment
parameters_ws['G3'].alignment = b_c_alignment parameters_ws['C4'] = reporting_start_datetime_local
parameters_ws['G3'].font = name_font
parameters_ws['G3'] = reporting_start_datetime_local + "__" + reporting_end_datetime_local parameters_ws['D4'].alignment = b_r_alignment
parameters_ws.merge_cells("G3:H3") 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 parameters_ws_current_row_number = 6

View File

@ -29,7 +29,6 @@ def export(report,
#################################################################################################################### ####################################################################################################################
if report is None: if report is None:
return None return None
print(report)
#################################################################################################################### ####################################################################################################################
# Step 2: Generate excel file from the report data # Step 2: Generate excel file from the report data
@ -630,32 +629,29 @@ def generate_excel(report,
parameters_ws.add_image(img, 'A1') parameters_ws.add_image(img, 'A1')
# Title # Title
parameters_ws.row_dimensions[3].height = 60
parameters_ws['B3'].font = name_font
parameters_ws['B3'].alignment = b_r_alignment parameters_ws['B3'].alignment = b_r_alignment
parameters_ws['B3'] = 'Name:' parameters_ws['B3'] = 'Name:'
parameters_ws['C3'].border = b_border parameters_ws['C3'].border = b_border
parameters_ws['C3'].alignment = b_c_alignment parameters_ws['C3'].alignment = b_c_alignment
parameters_ws['C3'].font = name_font
parameters_ws['C3'] = name parameters_ws['C3'] = name
parameters_ws['D3'].font = name_font
parameters_ws['D3'].alignment = b_r_alignment parameters_ws['D3'].alignment = b_r_alignment
parameters_ws['D3'] = 'Period:' parameters_ws['D3'] = 'Period:'
parameters_ws['E3'].border = b_border parameters_ws['E3'].border = b_border
parameters_ws['E3'].alignment = b_c_alignment parameters_ws['E3'].alignment = b_c_alignment
parameters_ws['E3'].font = name_font
parameters_ws['E3'] = period_type parameters_ws['E3'] = period_type
parameters_ws['F3'].font = name_font parameters_ws['B4'].alignment = b_r_alignment
parameters_ws['F3'].alignment = b_r_alignment parameters_ws['B4'] = 'Reporting Start Datetime:'
parameters_ws['F3'] = 'Date:' parameters_ws['C4'].border = b_border
parameters_ws['G3'].border = b_border parameters_ws['C4'].alignment = b_c_alignment
parameters_ws['G3'].alignment = b_c_alignment parameters_ws['C4'] = reporting_start_datetime_local
parameters_ws['G3'].font = name_font
parameters_ws['G3'] = reporting_start_datetime_local + "__" + reporting_end_datetime_local parameters_ws['D4'].alignment = b_r_alignment
parameters_ws.merge_cells("G3:H3") 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 parameters_ws_current_row_number = 6

View File

@ -28,7 +28,6 @@ def export(report,
#################################################################################################################### ####################################################################################################################
if report is None: if report is None:
return None return None
print(report)
#################################################################################################################### ####################################################################################################################
# Step 2: Generate excel file from the report data # Step 2: Generate excel file from the report data
@ -567,32 +566,30 @@ def generate_excel(report,
parameters_ws.add_image(img, 'A1') parameters_ws.add_image(img, 'A1')
# Title # Title
parameters_ws.row_dimensions[3].height = 60
parameters_ws['B3'].font = name_font
parameters_ws['B3'].alignment = b_r_alignment parameters_ws['B3'].alignment = b_r_alignment
parameters_ws['B3'] = 'Name:' parameters_ws['B3'] = 'Name:'
parameters_ws['C3'].border = b_border parameters_ws['C3'].border = b_border
parameters_ws['C3'].alignment = b_c_alignment parameters_ws['C3'].alignment = b_c_alignment
parameters_ws['C3'].font = name_font
parameters_ws['C3'] = name parameters_ws['C3'] = name
parameters_ws['D3'].font = name_font
parameters_ws['D3'].alignment = b_r_alignment parameters_ws['D3'].alignment = b_r_alignment
parameters_ws['D3'] = 'Period:' parameters_ws['D3'] = 'Period:'
parameters_ws['E3'].border = b_border parameters_ws['E3'].border = b_border
parameters_ws['E3'].alignment = b_c_alignment parameters_ws['E3'].alignment = b_c_alignment
parameters_ws['E3'].font = name_font
parameters_ws['E3'] = period_type parameters_ws['E3'] = period_type
parameters_ws['F3'].font = name_font parameters_ws['B4'].alignment = b_r_alignment
parameters_ws['F3'].alignment = b_r_alignment parameters_ws['B4'] = 'Reporting Start Datetime:'
parameters_ws['F3'] = 'Date:' parameters_ws['C4'].border = b_border
parameters_ws['G3'].border = b_border parameters_ws['C4'].alignment = b_c_alignment
parameters_ws['G3'].alignment = b_c_alignment parameters_ws['C4'] = reporting_start_datetime_local
parameters_ws['G3'].font = name_font
parameters_ws['G3'] = reporting_start_datetime_local + "__" + reporting_end_datetime_local parameters_ws['D4'].alignment = b_r_alignment
parameters_ws.merge_cells("G3:H3") 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 parameters_ws_current_row_number = 6