diff --git a/myems-api/excelexporters/combinedequipmentcost.py b/myems-api/excelexporters/combinedequipmentcost.py index 9367cfa3..f2a3e2cf 100644 --- a/myems-api/excelexporters/combinedequipmentcost.py +++ b/myems-api/excelexporters/combinedequipmentcost.py @@ -119,32 +119,30 @@ def generate_excel(report, img = Image("excelexporters/myems.png") ws.add_image(img, 'A1') - # Title - ws.row_dimensions[3].height = 60 - - ws['B3'].font = name_font + # Title= 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/combinedequipmentefficiency.py b/myems-api/excelexporters/combinedequipmentefficiency.py index 6273b06a..af058a49 100644 --- a/myems-api/excelexporters/combinedequipmentefficiency.py +++ b/myems-api/excelexporters/combinedequipmentefficiency.py @@ -118,32 +118,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_efficiency" not in report.keys() or \ "names" not in report['reporting_period_efficiency'].keys() or len( diff --git a/myems-api/excelexporters/combinedequipmentenergycategory.py b/myems-api/excelexporters/combinedequipmentenergycategory.py index e5838c76..8ccd0008 100644 --- a/myems-api/excelexporters/combinedequipmentenergycategory.py +++ b/myems-api/excelexporters/combinedequipmentenergycategory.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/combinedequipmentenergyitem.py b/myems-api/excelexporters/combinedequipmentenergyitem.py index 98962cd0..32ab2068 100644 --- a/myems-api/excelexporters/combinedequipmentenergyitem.py +++ b/myems-api/excelexporters/combinedequipmentenergyitem.py @@ -118,32 +118,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/combinedequipmentincome.py b/myems-api/excelexporters/combinedequipmentincome.py index 1e015a79..b29056fb 100644 --- a/myems-api/excelexporters/combinedequipmentincome.py +++ b/myems-api/excelexporters/combinedequipmentincome.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 + "__" + 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/combinedequipmentload.py b/myems-api/excelexporters/combinedequipmentload.py index 6b3f6755..6da5eea5 100644 --- a/myems-api/excelexporters/combinedequipmentload.py +++ b/myems-api/excelexporters/combinedequipmentload.py @@ -97,7 +97,7 @@ def generate_excel(report, b_c_alignment = Alignment(vertical='bottom', horizontal='center', text_rotation=0, - wrap_text=False, + wrap_text=True, shrink_to_fit=False, indent=0) c_c_alignment = Alignment(vertical='center', @@ -109,7 +109,7 @@ def generate_excel(report, b_r_alignment = Alignment(vertical='bottom', horizontal='right', text_rotation=0, - wrap_text=False, + wrap_text=True, shrink_to_fit=False, indent=0) @@ -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/combinedequipmentoutput.py b/myems-api/excelexporters/combinedequipmentoutput.py index 872abe09..eaa3af17 100644 --- a/myems-api/excelexporters/combinedequipmentoutput.py +++ b/myems-api/excelexporters/combinedequipmentoutput.py @@ -118,32 +118,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/combinedequipmentsaving.py b/myems-api/excelexporters/combinedequipmentsaving.py index 39d89f95..4f66bd53 100644 --- a/myems-api/excelexporters/combinedequipmentsaving.py +++ b/myems-api/excelexporters/combinedequipmentsaving.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/combinedequipmentstatistics.py b/myems-api/excelexporters/combinedequipmentstatistics.py index 18ffb06a..e1d33e0a 100644 --- a/myems-api/excelexporters/combinedequipmentstatistics.py +++ b/myems-api/excelexporters/combinedequipmentstatistics.py @@ -98,19 +98,19 @@ def generate_excel(report, b_c_alignment = Alignment(vertical='bottom', horizontal='center', text_rotation=0, - wrap_text=False, + wrap_text=True, shrink_to_fit=False, indent=0) c_c_alignment = Alignment(vertical='center', horizontal='center', text_rotation=0, - wrap_text=False, + wrap_text=True, shrink_to_fit=False, indent=0) b_r_alignment = Alignment(vertical='bottom', horizontal='right', text_rotation=0, - wrap_text=False, + wrap_text=True, shrink_to_fit=False, indent=0) @@ -119,30 +119,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: