From bfd6d8956abffd494bed6c45496fd8912c21ae3b Mon Sep 17 00:00:00 2001
From: "13621160019@163.com" <13621160019@163.com>
Date: Thu, 30 Sep 2021 22:39:29 +0800
Subject: [PATCH] updated format of excel exporters

---
 .../excelexporters/combinedequipmentbatch.py  | 23 +++++++++----------
 myems-api/excelexporters/equipmentbatch.py    | 23 +++++++++----------
 myems-api/excelexporters/meterbatch.py        | 23 +++++++++----------
 myems-api/excelexporters/storebatch.py        | 23 +++++++++----------
 myems-api/excelexporters/tenantbatch.py       | 19 ++++++++-------
 5 files changed, 55 insertions(+), 56 deletions(-)

diff --git a/myems-api/excelexporters/combinedequipmentbatch.py b/myems-api/excelexporters/combinedequipmentbatch.py
index 6e858316..d031bf47 100644
--- a/myems-api/excelexporters/combinedequipmentbatch.py
+++ b/myems-api/excelexporters/combinedequipmentbatch.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'] = '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['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/equipmentbatch.py b/myems-api/excelexporters/equipmentbatch.py
index cc52baa1..b3df74e7 100644
--- a/myems-api/excelexporters/equipmentbatch.py
+++ b/myems-api/excelexporters/equipmentbatch.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/meterbatch.py b/myems-api/excelexporters/meterbatch.py
index d1b39257..404b5ac4 100644
--- a/myems-api/excelexporters/meterbatch.py
+++ b/myems-api/excelexporters/meterbatch.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/storebatch.py b/myems-api/excelexporters/storebatch.py
index 40bf0ed8..985ebd3e 100644
--- a/myems-api/excelexporters/storebatch.py
+++ b/myems-api/excelexporters/storebatch.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/tenantbatch.py b/myems-api/excelexporters/tenantbatch.py
index f8eb09ee..00ee0027 100644
--- a/myems-api/excelexporters/tenantbatch.py
+++ b/myems-api/excelexporters/tenantbatch.py
@@ -120,14 +120,17 @@ def generate_excel(report, space_name, reporting_start_datetime_local, reporting
     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