From e9a272a68f4e0dc43c4fcc7c38bc58d40532450f Mon Sep 17 00:00:00 2001
From: Caozhenhui <823914102@qq.com>
Date: Thu, 11 Mar 2021 15:47:18 +0800
Subject: [PATCH] change line chart insertion position and delete annotation
 code

---
 myems-api/excelexporters/storeload.py        | 6 ------
 myems-api/excelexporters/storestatistics.py  | 8 +-------
 myems-api/excelexporters/tenantstatistics.py | 6 ------
 3 files changed, 1 insertion(+), 19 deletions(-)

diff --git a/myems-api/excelexporters/storeload.py b/myems-api/excelexporters/storeload.py
index d9850427..acdf2b34 100644
--- a/myems-api/excelexporters/storeload.py
+++ b/myems-api/excelexporters/storeload.py
@@ -113,12 +113,6 @@ def generate_excel(report,
                               wrap_text=False,
                               shrink_to_fit=False,
                               indent=0)
-    # c_r_alignment = Alignment(vertical='bottom',
-    #                           horizontal='center',
-    #                           text_rotation=0,
-    #                           wrap_text=False,
-    #                           shrink_to_fit=False,
-    #                           indent=0)
 
     # Img
     img = Image("excelexporters/myems.png")
diff --git a/myems-api/excelexporters/storestatistics.py b/myems-api/excelexporters/storestatistics.py
index 52ab0083..7d63e5af 100644
--- a/myems-api/excelexporters/storestatistics.py
+++ b/myems-api/excelexporters/storestatistics.py
@@ -115,12 +115,6 @@ def generate_excel(report,
                               wrap_text=False,
                               shrink_to_fit=False,
                               indent=0)
-    # c_r_alignment = Alignment(vertical='bottom',
-    #                           horizontal='center',
-    #                           text_rotation=0,
-    #                           wrap_text=False,
-    #                           shrink_to_fit=False,
-    #                           indent=0)
 
     # Img
     img = Image("excelexporters/myems.png")
@@ -526,7 +520,7 @@ def generate_excel(report,
             ser = line.series[0]
             ser.marker.symbol = "diamond"
             ser.marker.size = 5
-            ws.add_chart(line, 'B' + str(analysis_end_row_number + 10 * i))
+            ws.add_chart(line, 'B' + str(analysis_end_row_number + 6 * i))
 
     filename = str(uuid.uuid4()) + '.xlsx'
     wb.save(filename)
diff --git a/myems-api/excelexporters/tenantstatistics.py b/myems-api/excelexporters/tenantstatistics.py
index 9c530121..d0535cf5 100644
--- a/myems-api/excelexporters/tenantstatistics.py
+++ b/myems-api/excelexporters/tenantstatistics.py
@@ -114,12 +114,6 @@ def generate_excel(report,
                               wrap_text=False,
                               shrink_to_fit=False,
                               indent=0)
-    # c_r_alignment = Alignment(vertical='bottom',
-    #                           horizontal='center',
-    #                           text_rotation=0,
-    #                           wrap_text=False,
-    #                           shrink_to_fit=False,
-    #                           indent=0)
 
     # Img
     img = Image("excelexporters/myems.png")