From c2725a9023b301e93930594766483e09a139f4a6 Mon Sep 17 00:00:00 2001 From: "13621160019@163.com" <13621160019@163.com> Date: Fri, 22 Oct 2021 16:12:29 +0800 Subject: [PATCH] reformatted excel exporters of shopfloor reports --- myems-api/excelexporters/shopfloorcost.py | 26 ++++++++----------- .../excelexporters/shopfloorenergycategory.py | 25 ++++++++---------- .../excelexporters/shopfloorenergyitem.py | 26 ++++++++----------- myems-api/excelexporters/shopfloorload.py | 25 ++++++++---------- myems-api/excelexporters/shopfloorsaving.py | 26 ++++++++----------- .../excelexporters/shopfloorstatistics.py | 26 ++++++++----------- 6 files changed, 66 insertions(+), 88 deletions(-) diff --git a/myems-api/excelexporters/shopfloorcost.py b/myems-api/excelexporters/shopfloorcost.py index 8da166e9..077711cd 100644 --- a/myems-api/excelexporters/shopfloorcost.py +++ b/myems-api/excelexporters/shopfloorcost.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 @@ -644,32 +643,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/shopfloorenergycategory.py b/myems-api/excelexporters/shopfloorenergycategory.py index 50c190ac..e4ad20e8 100644 --- a/myems-api/excelexporters/shopfloorenergycategory.py +++ b/myems-api/excelexporters/shopfloorenergycategory.py @@ -669,32 +669,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/shopfloorenergyitem.py b/myems-api/excelexporters/shopfloorenergyitem.py index 85ca6fac..bc25ee7d 100644 --- a/myems-api/excelexporters/shopfloorenergyitem.py +++ b/myems-api/excelexporters/shopfloorenergyitem.py @@ -27,7 +27,6 @@ def export(report, #################################################################################################################### if report is None: return None - print(report) #################################################################################################################### # Step 2: Generate excel file from the report data @@ -490,32 +489,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/shopfloorload.py b/myems-api/excelexporters/shopfloorload.py index 949796fd..282e8f7d 100644 --- a/myems-api/excelexporters/shopfloorload.py +++ b/myems-api/excelexporters/shopfloorload.py @@ -468,32 +468,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/shopfloorsaving.py b/myems-api/excelexporters/shopfloorsaving.py index 9d982b05..b662f32f 100644 --- a/myems-api/excelexporters/shopfloorsaving.py +++ b/myems-api/excelexporters/shopfloorsaving.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 @@ -636,32 +635,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/shopfloorstatistics.py b/myems-api/excelexporters/shopfloorstatistics.py index 6e5f35d9..24377f8c 100644 --- a/myems-api/excelexporters/shopfloorstatistics.py +++ b/myems-api/excelexporters/shopfloorstatistics.py @@ -27,7 +27,6 @@ def export(report, #################################################################################################################### if report is None: return None - print(report) #################################################################################################################### # Step 2: Generate excel file from the report data @@ -576,32 +575,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