diff --git a/myems-api/excelexporters/shopfloorbatch.py b/myems-api/excelexporters/shopfloorbatch.py index 82096371..f0b408b3 100644 --- a/myems-api/excelexporters/shopfloorbatch.py +++ b/myems-api/excelexporters/shopfloorbatch.py @@ -110,24 +110,23 @@ def generate_excel(report, space_name, reporting_start_datetime_local, reporting ws.add_image(img, 'A1') # Title - ws.row_dimensions[3].height = 60 - - ws['B3'].font = name_font ws['B3'].alignment = b_r_alignment ws['B3'] = 'Space:' ws['C3'].border = b_border ws['C3'].alignment = b_c_alignment - ws['C3'].font = name_font ws['C3'] = space_name - ws['F3'].font = name_font - ws['F3'].alignment = b_r_alignment - ws['F3'] = 'Datetime:' - ws['G3'].border = b_border - ws['G3'].alignment = b_c_alignment - ws['G3'].font = name_font - ws['G3'] = reporting_start_datetime_local + "~" + reporting_end_datetime_local - ws.merge_cells("G3:H3") + ws['B4'].alignment = b_r_alignment + ws['B4'] = 'Reporting Start Datetime:' + ws['C4'].border = b_border + ws['C4'].alignment = b_c_alignment + ws['C4'] = reporting_start_datetime_local + + ws['B5'].alignment = b_r_alignment + ws['B5'] = 'Reporting End Datetime:' + ws['C5'].border = b_border + ws['C5'].alignment = b_c_alignment + ws['C5'] = reporting_end_datetime_local # Title ws['B6'].border = f_border diff --git a/myems-api/excelexporters/shopfloorcost.py b/myems-api/excelexporters/shopfloorcost.py index 6a27fe9a..5ab44930 100644 --- a/myems-api/excelexporters/shopfloorcost.py +++ b/myems-api/excelexporters/shopfloorcost.py @@ -120,31 +120,29 @@ def generate_excel(report, ws.add_image(img, 'A1') # Title - ws.row_dimensions[3].height = 60 - - ws['B3'].font = name_font ws['B3'].alignment = b_r_alignment ws['B3'] = 'Name:' ws['C3'].border = b_border ws['C3'].alignment = b_c_alignment - ws['C3'].font = name_font ws['C3'] = name - ws['D3'].font = name_font ws['D3'].alignment = b_r_alignment ws['D3'] = 'Period:' ws['E3'].border = b_border ws['E3'].alignment = b_c_alignment - ws['E3'].font = name_font ws['E3'] = period_type - ws['F3'].font = name_font - ws['F3'].alignment = b_r_alignment - ws['F3'] = 'Date:' - ws['G3'].alignment = b_c_alignment - ws['G3'].font = name_font - ws['G3'] = reporting_start_datetime_local + "__" + reporting_end_datetime_local - ws.merge_cells("G3:H3") + ws['B4'].alignment = b_r_alignment + ws['B4'] = 'Reporting Start Datetime:' + ws['C4'].border = b_border + ws['C4'].alignment = b_c_alignment + ws['C4'] = reporting_start_datetime_local + + ws['D4'].alignment = b_r_alignment + ws['D4'] = 'Reporting End Datetime:' + ws['E4'].border = b_border + ws['E4'].alignment = b_c_alignment + ws['E4'] = reporting_end_datetime_local if "reporting_period" not in report.keys() or \ "names" not in report['reporting_period'].keys() or len(report['reporting_period']['names']) == 0: diff --git a/myems-api/excelexporters/shopfloorenergycategory.py b/myems-api/excelexporters/shopfloorenergycategory.py index 75d3caf8..d2a0eb81 100644 --- a/myems-api/excelexporters/shopfloorenergycategory.py +++ b/myems-api/excelexporters/shopfloorenergycategory.py @@ -120,32 +120,29 @@ def generate_excel(report, ws.add_image(img, 'A1') # Title - ws.row_dimensions[3].height = 60 - - ws['B3'].font = name_font ws['B3'].alignment = b_r_alignment ws['B3'] = 'Name:' ws['C3'].border = b_border ws['C3'].alignment = b_c_alignment - ws['C3'].font = name_font ws['C3'] = name - ws['D3'].font = name_font ws['D3'].alignment = b_r_alignment ws['D3'] = 'Period:' ws['E3'].border = b_border ws['E3'].alignment = b_c_alignment - ws['E3'].font = name_font ws['E3'] = period_type - ws['F3'].font = name_font - ws['F3'].alignment = b_r_alignment - ws['F3'] = 'Date:' - ws['G3'].border = b_border - ws['G3'].alignment = b_c_alignment - ws['G3'].font = name_font - ws['G3'] = reporting_start_datetime_local[:10] + "__" + reporting_end_datetime_local[:10] - ws.merge_cells("G3:H3") + ws['B4'].alignment = b_r_alignment + ws['B4'] = 'Reporting Start Datetime:' + ws['C4'].border = b_border + ws['C4'].alignment = b_c_alignment + ws['C4'] = reporting_start_datetime_local + + ws['D4'].alignment = b_r_alignment + ws['D4'] = 'Reporting End Datetime:' + ws['E4'].border = b_border + ws['E4'].alignment = b_c_alignment + ws['E4'] = reporting_end_datetime_local if "reporting_period" not in report.keys() or \ "names" not in report['reporting_period'].keys() or len(report['reporting_period']['names']) == 0: diff --git a/myems-api/excelexporters/shopfloorenergyitem.py b/myems-api/excelexporters/shopfloorenergyitem.py index 48f6271b..a9f98b29 100644 --- a/myems-api/excelexporters/shopfloorenergyitem.py +++ b/myems-api/excelexporters/shopfloorenergyitem.py @@ -117,32 +117,29 @@ def generate_excel(report, ws.add_image(img, 'A1') # Title - ws.row_dimensions[3].height = 60 - - ws['B3'].font = name_font ws['B3'].alignment = b_r_alignment ws['B3'] = 'Name:' ws['C3'].border = b_border ws['C3'].alignment = b_c_alignment - ws['C3'].font = name_font ws['C3'] = name - ws['D3'].font = name_font ws['D3'].alignment = b_r_alignment ws['D3'] = 'Period:' ws['E3'].border = b_border ws['E3'].alignment = b_c_alignment - ws['E3'].font = name_font ws['E3'] = period_type - ws['F3'].font = name_font - ws['F3'].alignment = b_r_alignment - ws['F3'] = 'Date:' - ws['G3'].border = b_border - ws['G3'].alignment = b_c_alignment - ws['G3'].font = name_font - ws['G3'] = reporting_start_datetime_local + "__" + reporting_end_datetime_local - ws.merge_cells("G3:H3") + ws['B4'].alignment = b_r_alignment + ws['B4'] = 'Reporting Start Datetime:' + ws['C4'].border = b_border + ws['C4'].alignment = b_c_alignment + ws['C4'] = reporting_start_datetime_local + + ws['D4'].alignment = b_r_alignment + ws['D4'] = 'Reporting End Datetime:' + ws['E4'].border = b_border + ws['E4'].alignment = b_c_alignment + ws['E4'] = reporting_end_datetime_local if "reporting_period" not in report.keys() or \ "names" not in report['reporting_period'].keys() or len(report['reporting_period']['names']) == 0: diff --git a/myems-api/excelexporters/shopfloorload.py b/myems-api/excelexporters/shopfloorload.py index 4f8c710f..7e36567b 100644 --- a/myems-api/excelexporters/shopfloorload.py +++ b/myems-api/excelexporters/shopfloorload.py @@ -118,30 +118,29 @@ def generate_excel(report, ws.add_image(img, 'A1') # Title - ws['B3'].font = name_font ws['B3'].alignment = b_r_alignment ws['B3'] = 'Name:' ws['C3'].border = b_border ws['C3'].alignment = b_c_alignment - ws['C3'].font = name_font ws['C3'] = name - ws['D3'].font = name_font ws['D3'].alignment = b_r_alignment ws['D3'] = 'Period:' ws['E3'].border = b_border ws['E3'].alignment = b_c_alignment - ws['E3'].font = name_font ws['E3'] = period_type - ws['F3'].font = name_font - ws['F3'].alignment = b_r_alignment - ws['F3'] = 'Date:' - ws['G3'].border = b_border - ws['G3'].alignment = b_c_alignment - ws['G3'].font = name_font - ws['G3'] = reporting_start_datetime_local + "__" + reporting_end_datetime_local - ws.merge_cells("G3:H3") + ws['B4'].alignment = b_r_alignment + ws['B4'] = 'Reporting Start Datetime:' + ws['C4'].border = b_border + ws['C4'].alignment = b_c_alignment + ws['C4'] = reporting_start_datetime_local + + ws['D4'].alignment = b_r_alignment + ws['D4'] = 'Reporting End Datetime:' + ws['E4'].border = b_border + ws['E4'].alignment = b_c_alignment + ws['E4'] = reporting_end_datetime_local if "reporting_period" not in report.keys() or \ "names" not in report['reporting_period'].keys() or len(report['reporting_period']['names']) == 0: diff --git a/myems-api/excelexporters/shopfloorsaving.py b/myems-api/excelexporters/shopfloorsaving.py index 1c481c1b..552bccbb 100644 --- a/myems-api/excelexporters/shopfloorsaving.py +++ b/myems-api/excelexporters/shopfloorsaving.py @@ -120,32 +120,29 @@ def generate_excel(report, ws.add_image(img, 'A1') # Title - ws.row_dimensions[3].height = 60 - - ws['B3'].font = name_font ws['B3'].alignment = b_r_alignment ws['B3'] = 'Name:' ws['C3'].border = b_border ws['C3'].alignment = b_c_alignment - ws['C3'].font = name_font ws['C3'] = name - ws['D3'].font = name_font ws['D3'].alignment = b_r_alignment ws['D3'] = 'Period:' ws['E3'].border = b_border ws['E3'].alignment = b_c_alignment - ws['E3'].font = name_font ws['E3'] = period_type - ws['F3'].font = name_font - ws['F3'].alignment = b_r_alignment - ws['F3'] = 'Date:' - ws['G3'].alignment = b_c_alignment - ws['G3'].font = name_font - ws['G3'] = reporting_start_datetime_local + "__" + reporting_end_datetime_local - ws['G3'].border = b_border - ws.merge_cells("G3:H3") + ws['B4'].alignment = b_r_alignment + ws['B4'] = 'Reporting Start Datetime:' + ws['C4'].border = b_border + ws['C4'].alignment = b_c_alignment + ws['C4'] = reporting_start_datetime_local + + ws['D4'].alignment = b_r_alignment + ws['D4'] = 'Reporting End Datetime:' + ws['E4'].border = b_border + ws['E4'].alignment = b_c_alignment + ws['E4'] = reporting_end_datetime_local if "reporting_period" not in report.keys() or \ "names" not in report['reporting_period'].keys() or len(report['reporting_period']['names']) == 0: diff --git a/myems-api/excelexporters/shopfloorstatistics.py b/myems-api/excelexporters/shopfloorstatistics.py index 70b18aa1..4694256d 100644 --- a/myems-api/excelexporters/shopfloorstatistics.py +++ b/myems-api/excelexporters/shopfloorstatistics.py @@ -118,30 +118,29 @@ def generate_excel(report, ws.add_image(img, 'A1') # Title - ws['B3'].font = name_font ws['B3'].alignment = b_r_alignment ws['B3'] = 'Name:' ws['C3'].border = b_border ws['C3'].alignment = b_c_alignment - ws['C3'].font = name_font ws['C3'] = name - ws['D3'].font = name_font ws['D3'].alignment = b_r_alignment ws['D3'] = 'Period:' ws['E3'].border = b_border ws['E3'].alignment = b_c_alignment - ws['E3'].font = name_font ws['E3'] = period_type - ws['F3'].font = name_font - ws['F3'].alignment = b_r_alignment - ws['F3'] = 'Date:' - ws['G3'].border = b_border - ws['G3'].alignment = b_c_alignment - ws['G3'].font = name_font - ws['G3'] = reporting_start_datetime_local + "__" + reporting_end_datetime_local - ws.merge_cells("G3:H3") + ws['B4'].alignment = b_r_alignment + ws['B4'] = 'Reporting Start Datetime:' + ws['C4'].border = b_border + ws['C4'].alignment = b_c_alignment + ws['C4'] = reporting_start_datetime_local + + ws['D4'].alignment = b_r_alignment + ws['D4'] = 'Reporting End Datetime:' + ws['E4'].border = b_border + ws['E4'].alignment = b_c_alignment + ws['E4'] = reporting_end_datetime_local if "reporting_period" not in report.keys() or \ "names" not in report['reporting_period'].keys() or len(report['reporting_period']['names']) == 0: