reformatted excel exporters of shopfloor reports

pull/74/MERGE
13621160019@163.com 2021-10-22 16:12:29 +08:00
parent 3d6bceb4db
commit c2725a9023
6 changed files with 66 additions and 88 deletions

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
@ -644,32 +643,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

@ -669,32 +669,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

@ -27,7 +27,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
@ -490,32 +489,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

@ -468,32 +468,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

@ -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
@ -636,32 +635,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

@ -27,7 +27,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
@ -576,32 +575,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