updated format of excel exporters

myems-api/excelexporters/equipmentcost.py

@@ -119,32 +119,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['B4'].alignment = b_r_alignment
-    ws['F3'].alignment = b_r_alignment
+    ws['B4'] = 'Reporting Start Datetime:'
-    ws['F3'] = 'Date:'
+    ws['C4'].border = b_border
-    ws['G3'].border = b_border
+    ws['C4'].alignment = b_c_alignment
-    ws['G3'].alignment = b_c_alignment
+    ws['C4'] = reporting_start_datetime_local
-    ws['G3'].font = name_font
+
-    ws['G3'] = reporting_start_datetime_local[:10] + "__" + reporting_end_datetime_local[:10]
+    ws['D4'].alignment = b_r_alignment
-    ws.merge_cells("G3:H3")
+    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:

myems-api/excelexporters/equipmentefficiency.py

@@ -116,32 +116,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['B4'].alignment = b_r_alignment
-    ws['F3'].alignment = b_r_alignment
+    ws['B4'] = 'Reporting Start Datetime:'
-    ws['F3'] = 'Date:'
+    ws['C4'].border = b_border
-    ws['G3'].border = b_border
+    ws['C4'].alignment = b_c_alignment
-    ws['G3'].alignment = b_c_alignment
+    ws['C4'] = reporting_start_datetime_local
-    ws['G3'].font = name_font
+
-    ws['G3'] = reporting_start_datetime_local + "__" + reporting_end_datetime_local
+    ws['D4'].alignment = b_r_alignment
-    ws.merge_cells("G3:H3")
+    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(

myems-api/excelexporters/equipmentenergycategory.py

@@ -119,32 +119,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['B4'].alignment = b_r_alignment
-    ws['F3'].alignment = b_r_alignment
+    ws['B4'] = 'Reporting Start Datetime:'
-    ws['F3'] = 'Date:'
+    ws['C4'].border = b_border
-    ws['G3'].border = b_border
+    ws['C4'].alignment = b_c_alignment
-    ws['G3'].alignment = b_c_alignment
+    ws['C4'] = reporting_start_datetime_local
-    ws['G3'].font = name_font
+
-    ws['G3'] = reporting_start_datetime_local[:10] + "__" + reporting_end_datetime_local[:10]
+    ws['D4'].alignment = b_r_alignment
-    ws.merge_cells("G3:H3")
+    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:

myems-api/excelexporters/equipmentenergyitem.py

@@ -116,32 +116,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['B4'].alignment = b_r_alignment
-    ws['F3'].alignment = b_r_alignment
+    ws['B4'] = 'Reporting Start Datetime:'
-    ws['F3'] = 'Date:'
+    ws['C4'].border = b_border
-    ws['G3'].border = b_border
+    ws['C4'].alignment = b_c_alignment
-    ws['G3'].alignment = b_c_alignment
+    ws['C4'] = reporting_start_datetime_local
-    ws['G3'].font = name_font
+
-    ws['G3'] = reporting_start_datetime_local + "__" + reporting_end_datetime_local
+    ws['D4'].alignment = b_r_alignment
-    ws.merge_cells("G3:H3")
+    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:

myems-api/excelexporters/equipmentincome.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['B4'].alignment = b_r_alignment
-    ws['F3'].alignment = b_r_alignment
+    ws['B4'] = 'Reporting Start Datetime:'
-    ws['F3'] = 'Date:'
+    ws['C4'].border = b_border
-    ws['G3'].border = b_border
+    ws['C4'].alignment = b_c_alignment
-    ws['G3'].alignment = b_c_alignment
+    ws['C4'] = reporting_start_datetime_local
-    ws['G3'].font = name_font
+
-    ws['G3'] = reporting_start_datetime_local + "__" + reporting_end_datetime_local
+    ws['D4'].alignment = b_r_alignment
-    ws.merge_cells("G3:H3")
+    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:

myems-api/excelexporters/equipmentload.py

@@ -95,7 +95,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',
@@ -107,7 +107,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)
 
@@ -116,30 +116,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['B4'].alignment = b_r_alignment
-    ws['F3'].alignment = b_r_alignment
+    ws['B4'] = 'Reporting Start Datetime:'
-    ws['F3'] = 'Date:'
+    ws['C4'].border = b_border
-    ws['G3'].border = b_border
+    ws['C4'].alignment = b_c_alignment
-    ws['G3'].alignment = b_c_alignment
+    ws['C4'] = reporting_start_datetime_local
-    ws['G3'].font = name_font
+
-    ws['G3'] = reporting_start_datetime_local[:10] + "__" + reporting_end_datetime_local[:10]
+    ws['D4'].alignment = b_r_alignment
-    ws.merge_cells("G3:H3")
+    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:

myems-api/excelexporters/equipmentoutput.py

@@ -116,32 +116,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['B4'].alignment = b_r_alignment
-    ws['F3'].alignment = b_r_alignment
+    ws['B4'] = 'Reporting Start Datetime:'
-    ws['F3'] = 'Date:'
+    ws['C4'].border = b_border
-    ws['G3'].border = b_border
+    ws['C4'].alignment = b_c_alignment
-    ws['G3'].alignment = b_c_alignment
+    ws['C4'] = reporting_start_datetime_local
-    ws['G3'].font = name_font
+
-    ws['G3'] = reporting_start_datetime_local + "__" + reporting_end_datetime_local
+    ws['D4'].alignment = b_r_alignment
-    ws.merge_cells("G3:H3")
+    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:

myems-api/excelexporters/equipmentsaving.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['B4'].alignment = b_r_alignment
-    ws['F3'].alignment = b_r_alignment
+    ws['B4'] = 'Reporting Start Datetime:'
-    ws['F3'] = 'Date:'
+    ws['C4'].border = b_border
-    ws['G3'].alignment = b_c_alignment
+    ws['C4'].alignment = b_c_alignment
-    ws['G3'].font = name_font
+    ws['C4'] = reporting_start_datetime_local
-    ws['G3'] = reporting_start_datetime_local + "__" + reporting_end_datetime_local
+
-    ws['G3'].border = b_border
+    ws['D4'].alignment = b_r_alignment
-    ws.merge_cells("G3:H3")
+    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:

myems-api/excelexporters/equipmentstatistics.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['B4'].alignment = b_r_alignment
-    ws['F3'].alignment = b_r_alignment
+    ws['B4'] = 'Reporting Start Datetime:'
-    ws['F3'] = 'Date:'
+    ws['C4'].border = b_border
-    ws['G3'].border = b_border
+    ws['C4'].alignment = b_c_alignment
-    ws['G3'].alignment = b_c_alignment
+    ws['C4'] = reporting_start_datetime_local
-    ws['G3'].font = name_font
+
-    ws['G3'] = reporting_start_datetime_local + "__" + reporting_end_datetime_local
+    ws['D4'].alignment = b_r_alignment
-    ws.merge_cells("G3:H3")
+    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:

myems-api/excelexporters/equipmenttracking.py

@@ -73,13 +73,13 @@ def generate_excel(report, space_name):
     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)
     for i in range(ord('B'), ord('F')):

myems-api/excelexporters/meterbatch.py

@@ -128,7 +128,7 @@ def generate_excel(report, space_name, reporting_start_datetime_local, reporting
     ws['C5'].alignment = b_c_alignment
     ws['C5'] = reporting_end_datetime_local
 
-    # Title
+    # Column Title
     ws['B6'].border = f_border
     ws['B6'].font = name_font
     ws['B6'].alignment = c_c_alignment

myems-api/excelexporters/metercost.py

@@ -113,32 +113,29 @@ def generate_excel(report, name, reporting_start_datetime_local, reporting_end_d
     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['B4'].alignment = b_r_alignment
-    ws['F3'].alignment = b_r_alignment
+    ws['B4'] = 'Reporting Start Datetime:'
-    ws['F3'] = 'Date:'
+    ws['C4'].border = b_border
-    ws['G3'].border = b_border
+    ws['C4'].alignment = b_c_alignment
-    ws['G3'].alignment = b_c_alignment
+    ws['C4'] = reporting_start_datetime_local
-    ws['G3'].font = name_font
+
-    ws['G3'] = reporting_start_datetime_local + "__" + reporting_end_datetime_local
+    ws['D4'].alignment = b_r_alignment
-    ws.merge_cells("G3:H3")
+    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 \
             "values" not in report['reporting_period'].keys() or len(report['reporting_period']['values']) == 0:

myems-api/excelexporters/meterenergy.py

@@ -110,32 +110,29 @@ def generate_excel(report, name, reporting_start_datetime_local, reporting_end_d
     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['B4'].alignment = b_r_alignment
-    ws['F3'].alignment = b_r_alignment
+    ws['B4'] = 'Reporting Start Datetime:'
-    ws['F3'] = 'Date:'
+    ws['C4'].border = b_border
-    ws['G3'].border = b_border
+    ws['C4'].alignment = b_c_alignment
-    ws['G3'].alignment = b_c_alignment
+    ws['C4'] = reporting_start_datetime_local
-    ws['G3'].font = name_font
+
-    ws['G3'] = reporting_start_datetime_local + "__" + reporting_end_datetime_local
+    ws['D4'].alignment = b_r_alignment
-    ws.merge_cells("G3:H3")
+    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 \
             "values" not in report['reporting_period'].keys() or len(report['reporting_period']['values']) == 0:

myems-api/excelexporters/metersubmetersbalance.py

@@ -109,31 +109,29 @@ def generate_excel(report, name, reporting_start_datetime_local, reporting_end_d
     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['B4'].alignment = b_r_alignment
-    ws['F3'].alignment = b_r_alignment
+    ws['B4'] = 'Reporting Start Datetime:'
-    ws['F3'] = 'Date:'
+    ws['C4'].border = b_border
-    ws['G3'].alignment = b_c_alignment
+    ws['C4'].alignment = b_c_alignment
-    ws['G3'].font = name_font
+    ws['C4'] = reporting_start_datetime_local
-    ws['G3'] = reporting_start_datetime_local + "__" + reporting_end_datetime_local
+
-    ws.merge_cells("G3:H3")
+    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 \
             "difference_values" not in report['reporting_period'].keys() or \

myems-api/excelexporters/metertracking.py

@@ -109,24 +109,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'] = 'Name:'
+    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['B4'].alignment = b_r_alignment
-    ws['F3'].alignment = b_r_alignment
+    ws['B4'] = 'Reporting Start Datetime:'
-    ws['F3'] = 'Date:'
+    ws['C4'].border = b_border
-    ws['G3'].border = b_border
+    ws['C4'].alignment = b_c_alignment
-    ws['G3'].alignment = b_c_alignment
+    ws['C4'] = reporting_start_datetime_local
-    ws['G3'].font = name_font
+
-    ws['G3'] = reporting_start_datetime_local + "__" + reporting_end_datetime_local
+    ws['B5'].alignment = b_r_alignment
-    ws.merge_cells("G3:H3")
+    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

myems-api/excelexporters/metertrend.py

@@ -120,24 +120,23 @@ 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['F3'].font = name_font
+    ws['B4'].alignment = b_r_alignment
-    ws['F3'].alignment = b_r_alignment
+    ws['B4'] = 'Reporting Start Datetime:'
-    ws['F3'] = 'Date:'
+    ws['C4'].border = b_border
-    ws['G3'].border = b_border
+    ws['C4'].alignment = b_c_alignment
-    ws['G3'].alignment = b_c_alignment
+    ws['C4'] = reporting_start_datetime_local
-    ws['G3'].font = name_font
+
-    ws['G3'] = reporting_start_datetime_local + "__" + reporting_end_datetime_local
+    ws['B5'].alignment = b_r_alignment
-    ws.merge_cells("G3:H3")
+    ws['B5'] = 'Reporting End Datetime:'
+    ws['C5'].border = b_border
+    ws['C5'].alignment = b_c_alignment
+    ws['C5'] = 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:
         filename = str(uuid.uuid4()) + '.xlsx'

myems-api/excelexporters/offlinemetercost.py

@@ -112,32 +112,29 @@ def generate_excel(report, name, reporting_start_datetime_local, reporting_end_d
     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['B4'].alignment = b_r_alignment
-    ws['F3'].alignment = b_r_alignment
+    ws['B4'] = 'Reporting Start Datetime:'
-    ws['F3'] = 'Date:'
+    ws['C4'].border = b_border
-    ws['G3'].border = b_border
+    ws['C4'].alignment = b_c_alignment
-    ws['G3'].alignment = b_c_alignment
+    ws['C4'] = reporting_start_datetime_local
-    ws['G3'].font = name_font
+
-    ws['G3'] = reporting_start_datetime_local + "__" + reporting_end_datetime_local
+    ws['D4'].alignment = b_r_alignment
-    ws.merge_cells("G3:H3")
+    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 \
             "values" not in report['reporting_period'].keys() or len(report['reporting_period']['values']) == 0:

myems-api/excelexporters/offlinemeterenergy.py

@@ -109,32 +109,29 @@ def generate_excel(report, name, reporting_start_datetime_local, reporting_end_d
     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['B4'].alignment = b_r_alignment
-    ws['F3'].alignment = b_r_alignment
+    ws['B4'] = 'Reporting Start Datetime:'
-    ws['F3'] = 'Date:'
+    ws['C4'].border = b_border
-    ws['G3'].border = b_border
+    ws['C4'].alignment = b_c_alignment
-    ws['G3'].alignment = b_c_alignment
+    ws['C4'] = reporting_start_datetime_local
-    ws['G3'].font = name_font
+
-    ws['G3'] = reporting_start_datetime_local + "__" + reporting_end_datetime_local
+    ws['D4'].alignment = b_r_alignment
-    ws.merge_cells("G3:H3")
+    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 \
             "values" not in report['reporting_period'].keys() or len(report['reporting_period']['values']) == 0:

myems-api/excelexporters/spaceincome.py

@@ -120,8 +120,6 @@ def generate_excel(report,
     ws.add_image(img, 'A1')
 
     # Title
-    ws.row_dimensions[3].height = 60
-
     ws['B3'].alignment = b_r_alignment
     ws['B3'] = 'Name:'
     ws['C3'].border = b_border

myems-api/excelexporters/spacestatistics.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)
 

myems-api/excelexporters/storecost.py

@@ -99,7 +99,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',
@@ -111,7 +111,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)
     # Img
@@ -119,32 +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['B4'].alignment = b_r_alignment
-    ws['F3'].alignment = b_r_alignment
+    ws['B4'] = 'Reporting Start Datetime:'
-    ws['F3'] = 'Date:'
+    ws['C4'].border = b_border
-    ws.merge_cells("G3:I3")
+    ws['C4'].alignment = b_c_alignment
-    for i in range(ord('G'), ord('I') + 1):
+    ws['C4'] = reporting_start_datetime_local
-        ws[chr(i) + '3'].border = b_border
 
-    ws['G3'].alignment = b_c_alignment
+    ws['D4'].alignment = b_r_alignment
-    ws['G3'].font = name_font
+    ws['D4'] = 'Reporting End Datetime:'
-    ws['G3'] = reporting_start_datetime_local + "__" + reporting_end_datetime_local
+    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:

myems-api/excelexporters/storeenergycategory.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['B4'].alignment = b_r_alignment
-    ws['F3'].alignment = b_r_alignment
+    ws['B4'] = 'Reporting Start Datetime:'
-    ws['F3'] = 'Date:'
+    ws['C4'].border = b_border
-    ws['G3'].border = b_border
+    ws['C4'].alignment = b_c_alignment
-    ws['G3'].alignment = b_c_alignment
+    ws['C4'] = reporting_start_datetime_local
-    ws['G3'].font = name_font
+
-    ws['G3'] = reporting_start_datetime_local[:10] + "__" + reporting_end_datetime_local[:10]
+    ws['D4'].alignment = b_r_alignment
-    ws.merge_cells("G3:H3")
+    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:

myems-api/excelexporters/storeenergyitem.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['B4'].alignment = b_r_alignment
-    ws['F3'].alignment = b_r_alignment
+    ws['B4'] = 'Reporting Start Datetime:'
-    ws['F3'] = 'Date:'
+    ws['C4'].border = b_border
-    ws['G3'].border = b_border
+    ws['C4'].alignment = b_c_alignment
-    ws['G3'].alignment = b_c_alignment
+    ws['C4'] = reporting_start_datetime_local
-    ws['G3'].font = name_font
+
-    ws['G3'] = reporting_start_datetime_local + "__" + reporting_end_datetime_local
+    ws['D4'].alignment = b_r_alignment
-    ws.merge_cells("G3:H3")
+    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:

myems-api/excelexporters/storeload.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['B4'].alignment = b_r_alignment
-    ws['F3'].alignment = b_r_alignment
+    ws['B4'] = 'Reporting Start Datetime:'
-    ws['F3'] = 'Date:'
+    ws['C4'].border = b_border
-    ws['G3'].border = b_border
+    ws['C4'].alignment = b_c_alignment
-    ws['G3'].alignment = b_c_alignment
+    ws['C4'] = reporting_start_datetime_local
-    ws['G3'].font = name_font
+
-    ws['G3'] = reporting_start_datetime_local + "__" + reporting_end_datetime_local
+    ws['D4'].alignment = b_r_alignment
-    ws.merge_cells("G3:H3")
+    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:

myems-api/excelexporters/storesaving.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['B4'].alignment = b_r_alignment
-    ws['F3'].alignment = b_r_alignment
+    ws['B4'] = 'Reporting Start Datetime:'
-    ws['F3'] = 'Date:'
+    ws['C4'].border = b_border
-    ws['G3'].alignment = b_c_alignment
+    ws['C4'].alignment = b_c_alignment
-    ws['G3'].font = name_font
+    ws['C4'] = reporting_start_datetime_local
-    ws['G3'] = reporting_start_datetime_local + "__" + reporting_end_datetime_local
+
-    ws['G3'].border = b_border
+    ws['D4'].alignment = b_r_alignment
-    ws.merge_cells("G3:H3")
+    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:

myems-api/excelexporters/storestatistics.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['B4'].alignment = b_r_alignment
-    ws['F3'].alignment = b_r_alignment
+    ws['B4'] = 'Reporting Start Datetime:'
-    ws['F3'] = 'Date:'
+    ws['C4'].border = b_border
-    ws['G3'].border = b_border
+    ws['C4'].alignment = b_c_alignment
-    ws['G3'].alignment = b_c_alignment
+    ws['C4'] = reporting_start_datetime_local
-    ws['G3'].font = name_font
+
-    ws['G3'] = reporting_start_datetime_local + "__" + reporting_end_datetime_local
+    ws['D4'].alignment = b_r_alignment
-    ws.merge_cells("G3:H3")
+    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:

myems-api/excelexporters/tenantbatch.py

@@ -110,14 +110,10 @@ 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['B4'].alignment = b_r_alignment

myems-api/excelexporters/tenantbill.py

@@ -113,19 +113,19 @@ def generate_excel(report,
     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)
     b_l_alignment = Alignment(vertical='bottom',
                               horizontal='left',
                               text_rotation=0,
-                              wrap_text=False,
+                              wrap_text=True,
                               shrink_to_fit=False,
                               indent=0)
 
@@ -150,7 +150,7 @@ def generate_excel(report,
     if has_lease_number_data_flag:
         ws['B24'].font = name_font
         ws['B24'].alignment = b_r_alignment
-        ws['B24'] = '租赁合同号码:'
+        ws['B24'] = 'Lease Number:'
         ws['C24'].alignment = b_l_alignment
         ws['C24'].font = name_font
         ws['C24'] = report['tenant']['lease_number']

myems-api/excelexporters/tenantcost.py

@@ -121,31 +121,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['B4'].alignment = b_r_alignment
-    ws['F3'].alignment = b_r_alignment
+    ws['B4'] = 'Reporting Start Datetime:'
-    ws['F3'] = 'Date:'
+    ws['C4'].border = b_border
-    ws['G3'].alignment = b_c_alignment
+    ws['C4'].alignment = b_c_alignment
-    ws['G3'].font = name_font
+    ws['C4'] = reporting_start_datetime_local
-    ws['G3'] = reporting_start_datetime_local + "__" + reporting_end_datetime_local
+
-    ws.merge_cells("G3:H3")
+    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:

myems-api/excelexporters/tenantenergycategory.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['B4'].alignment = b_r_alignment
-    ws['F3'].alignment = b_r_alignment
+    ws['B4'] = 'Reporting Start Datetime:'
-    ws['F3'] = 'Date:'
+    ws['C4'].border = b_border
-    ws['G3'].border = b_border
+    ws['C4'].alignment = b_c_alignment
-    ws['G3'].alignment = b_c_alignment
+    ws['C4'] = reporting_start_datetime_local
-    ws['G3'].font = name_font
+
-    ws['G3'] = reporting_start_datetime_local + "__" + reporting_end_datetime_local
+    ws['D4'].alignment = b_r_alignment
-    ws.merge_cells("G3:H3")
+    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:

myems-api/excelexporters/tenantenergyitem.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['B4'].alignment = b_r_alignment
-    ws['F3'].alignment = b_r_alignment
+    ws['B4'] = 'Reporting Start Datetime:'
-    ws['F3'] = 'Date:'
+    ws['C4'].border = b_border
-    ws['G3'].border = b_border
+    ws['C4'].alignment = b_c_alignment
-    ws['G3'].alignment = b_c_alignment
+    ws['C4'] = reporting_start_datetime_local
-    ws['G3'].font = name_font
+
-    ws['G3'] = reporting_start_datetime_local + "__" + reporting_end_datetime_local
+    ws['D4'].alignment = b_r_alignment
-    ws.merge_cells("G3:H3")
+    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:

myems-api/excelexporters/tenantload.py

@@ -116,31 +116,29 @@ def generate_excel(report, name, reporting_start_datetime_local, reporting_end_d
     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['B4'].alignment = b_r_alignment
-    ws['F3'].alignment = b_r_alignment
+    ws['B4'] = 'Reporting Start Datetime:'
-    ws['F3'] = 'Date:'
+    ws['C4'].border = b_border
-    ws['G3'].alignment = b_c_alignment
+    ws['C4'].alignment = b_c_alignment
-    ws['G3'].font = name_font
+    ws['C4'] = reporting_start_datetime_local
-    ws['G3'] = reporting_start_datetime_local + "__" + reporting_end_datetime_local
+
-    ws.merge_cells("G3:H3")
+    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 \
             "timestamps" not in report['reporting_period'].keys() or len(report['reporting_period']['timestamps']) == 0:

myems-api/excelexporters/tenantsaving.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['B4'].alignment = b_r_alignment
-    ws['F3'].alignment = b_r_alignment
+    ws['B4'] = 'Reporting Start Datetime:'
-    ws['F3'] = 'Date:'
+    ws['C4'].border = b_border
-    ws['G3'].border = b_border
+    ws['C4'].alignment = b_c_alignment
-    ws['G3'].alignment = b_c_alignment
+    ws['C4'] = reporting_start_datetime_local
-    ws['G3'].font = name_font
+
-    ws['G3'] = reporting_start_datetime_local + "__" + reporting_end_datetime_local
+    ws['D4'].alignment = b_r_alignment
-    ws.merge_cells("G3:H3")
+    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:

myems-api/excelexporters/tenantstatistics.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['B4'].alignment = b_r_alignment
-    ws['F3'].alignment = b_r_alignment
+    ws['B4'] = 'Reporting Start Datetime:'
-    ws['F3'] = 'Date:'
+    ws['C4'].border = b_border
-    ws['G3'].border = b_border
+    ws['C4'].alignment = b_c_alignment
-    ws['G3'].alignment = b_c_alignment
+    ws['C4'] = reporting_start_datetime_local
-    ws['G3'].font = name_font
+
-    ws['G3'] = reporting_start_datetime_local + "__" + reporting_end_datetime_local
+    ws['D4'].alignment = b_r_alignment
-    ws.merge_cells("G3:H3")
+    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:

myems-api/excelexporters/virtualmetercost.py

@@ -112,32 +112,29 @@ def generate_excel(report, name, reporting_start_datetime_local, reporting_end_d
     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['B4'].alignment = b_r_alignment
-    ws['F3'].alignment = b_r_alignment
+    ws['B4'] = 'Reporting Start Datetime:'
-    ws['F3'] = 'Date:'
+    ws['C4'].border = b_border
-    ws['G3'].border = b_border
+    ws['C4'].alignment = b_c_alignment
-    ws['G3'].alignment = b_c_alignment
+    ws['C4'] = reporting_start_datetime_local
-    ws['G3'].font = name_font
+
-    ws['G3'] = reporting_start_datetime_local + "__" + reporting_end_datetime_local
+    ws['D4'].alignment = b_r_alignment
-    ws.merge_cells("G3:H3")
+    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 \
             "values" not in report['reporting_period'].keys() or len(report['reporting_period']['values']) == 0:

myems-api/excelexporters/virtualmeterenergy.py

@@ -108,32 +108,29 @@ def generate_excel(report, name, reporting_start_datetime_local, reporting_end_d
     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['B4'].alignment = b_r_alignment
-    ws['F3'].alignment = b_r_alignment
+    ws['B4'] = 'Reporting Start Datetime:'
-    ws['F3'] = 'Date:'
+    ws['C4'].border = b_border
-    ws.merge_cells("G3:H3")
+    ws['C4'].alignment = b_c_alignment
-    ws['G3'].border = b_border
+    ws['C4'] = reporting_start_datetime_local
-    ws['G3'].alignment = b_c_alignment
+
-    ws['G3'].font = name_font
+    ws['D4'].alignment = b_r_alignment
-    ws['G3'] = reporting_start_datetime_local + "__" + reporting_end_datetime_local
+    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 \
             "values" not in report['reporting_period'].keys() or len(report['reporting_period']['values']) == 0: