reformatted excel exporters

myems-api/excelexporters/combinedequipmentbatch.py

@@ -107,9 +107,7 @@ def generate_excel(report, space_name, reporting_start_datetime_local, reporting
 
     # Img
     img = Image("excelexporters/myems.png")
-    img.width = img.width * 0.85
+    ws.add_image(img, 'A1')
-    img.height = img.height * 0.85
-    ws.add_image(img, 'B1')
 
     # Title
     ws.row_dimensions[3].height = 60

myems-api/excelexporters/combinedequipmentcost.py

@@ -117,9 +117,7 @@ def generate_excel(report,
 
     # Img
     img = Image("excelexporters/myems.png")
-    img.width = img.width * 0.85
+    ws.add_image(img, 'A1')
-    img.height = img.height * 0.85
-    ws.add_image(img, 'B1')
 
     # Title
     ws.row_dimensions[3].height = 60
@@ -686,10 +684,7 @@ def generate_excel(report,
 
         # Img
         img = Image("excelexporters/myems.png")
-        img.width = img.width * 0.85
+        parameters_ws.add_image(img, 'A1')
-        img.height = img.height * 0.85
-        # img = Image("myems.png")
-        parameters_ws.add_image(img, 'B1')
 
         # Title
         parameters_ws.row_dimensions[3].height = 60

myems-api/excelexporters/combinedequipmentefficiency.py

@@ -115,9 +115,7 @@ def generate_excel(report,
                               indent=0)
     # Img
     img = Image("excelexporters/myems.png")
-    img.width = img.width * 0.85
+    ws.add_image(img, 'A1')
-    img.height = img.height * 0.85
-    ws.add_image(img, 'B1')
 
     # Title
     ws.row_dimensions[3].height = 60
@@ -428,9 +426,7 @@ def generate_excel(report,
 
         # Img
         img = Image("excelexporters/myems.png")
-        img.width = img.width * 0.85
+        parameters_ws.add_image(img, 'A1')
-        img.height = img.height * 0.85
-        parameters_ws.add_image(img, 'B1')
 
         # Title
         parameters_ws.row_dimensions[3].height = 60

myems-api/excelexporters/combinedequipmentenergycategory.py

@@ -117,9 +117,7 @@ def generate_excel(report,
 
     # Img
     img = Image("excelexporters/myems.png")
-    img.width = img.width * 1.06
+    ws.add_image(img, 'A1')
-    img.height = img.height * 1.06
-    ws.add_image(img, 'B1')
 
     # Title
     ws.row_dimensions[3].height = 60
@@ -562,10 +560,7 @@ def generate_excel(report,
 
         # Img
         img = Image("excelexporters/myems.png")
-        img.width = img.width * 0.85
+        parameters_ws.add_image(img, 'A1')
-        img.height = img.height * 0.85
-        # img = Image("myems.png")
-        parameters_ws.add_image(img, 'B1')
 
         # Title
         parameters_ws.row_dimensions[3].height = 60

myems-api/excelexporters/combinedequipmentenergyitem.py

@@ -115,9 +115,7 @@ def generate_excel(report,
                               indent=0)
     # Img
     img = Image("excelexporters/myems.png")
-    img.width = img.width * 0.85
+    ws.add_image(img, 'A1')
-    img.height = img.height * 0.85
-    ws.add_image(img, 'B1')
 
     # Title
     ws.row_dimensions[3].height = 60
@@ -528,9 +526,7 @@ def generate_excel(report,
 
         # Img
         img = Image("excelexporters/myems.png")
-        img.width = img.width * 0.85
+        parameters_ws.add_image(img, 'A1')
-        img.height = img.height * 0.85
-        parameters_ws.add_image(img, 'B1')
 
         # Title
         parameters_ws.row_dimensions[3].height = 60

myems-api/excelexporters/combinedequipmentincome.py

@@ -117,9 +117,7 @@ def generate_excel(report,
 
     # Img
     img = Image("excelexporters/myems.png")
-    img.width = img.width * 0.85
+    ws.add_image(img, 'A1')
-    img.height = img.height * 0.85
-    ws.add_image(img, 'B1')
 
     # Title
     ws.row_dimensions[3].height = 60
@@ -567,9 +565,7 @@ def generate_excel(report,
 
         # Img
         img = Image("excelexporters/myems.png")
-        img.width = img.width * 0.85
+        parameters_ws.add_image(img, 'A1')
-        img.height = img.height * 0.85
-        parameters_ws.add_image(img, 'B1')
 
         # Title
         parameters_ws.row_dimensions[3].height = 60

myems-api/excelexporters/combinedequipmentload.py

@@ -115,9 +115,7 @@ def generate_excel(report,
 
     # Img
     img = Image("excelexporters/myems.png")
-    img.width = img.width * 0.85
+    ws.add_image(img, 'A1')
-    img.height = img.height * 0.85
-    ws.add_image(img, 'B1')
 
     # Title
     ws['B3'].font = name_font
@@ -479,9 +477,7 @@ def generate_excel(report,
 
         # Img
         img = Image("excelexporters/myems.png")
-        img.width = img.width * 0.85
+        parameters_ws.add_image(img, 'A1')
-        img.height = img.height * 0.85
-        parameters_ws.add_image(img, 'B1')
 
         # Title
         parameters_ws.row_dimensions[3].height = 60

myems-api/excelexporters/combinedequipmentoutput.py

@@ -115,9 +115,7 @@ def generate_excel(report,
                               indent=0)
     # Img
     img = Image("excelexporters/myems.png")
-    img.width = img.width * 0.85
+    ws.add_image(img, 'A1')
-    img.height = img.height * 0.85
-    ws.add_image(img, 'B1')
 
     # Title
     ws.row_dimensions[3].height = 60
@@ -467,9 +465,7 @@ def generate_excel(report,
 
         # Img
         img = Image("excelexporters/myems.png")
-        img.width = img.width * 0.85
+        parameters_ws.add_image(img, 'A1')
-        img.height = img.height * 0.85
-        parameters_ws.add_image(img, 'B1')
 
         # Title
         parameters_ws.row_dimensions[3].height = 60

myems-api/excelexporters/combinedequipmentsaving.py

@@ -117,9 +117,7 @@ def generate_excel(report,
 
     # Img
     img = Image("excelexporters/myems.png")
-    img.width = img.width * 0.85
+    ws.add_image(img, 'A1')
-    img.height = img.height * 0.85
-    ws.add_image(img, 'B1')
 
     # Title
     ws.row_dimensions[3].height = 60
@@ -656,10 +654,7 @@ def generate_excel(report,
 
         # Img
         img = Image("excelexporters/myems.png")
-        img.width = img.width * 0.85
+        parameters_ws.add_image(img, 'A1')
-        img.height = img.height * 0.85
-        # img = Image("myems.png")
-        parameters_ws.add_image(img, 'B1')
 
         # Title
         parameters_ws.row_dimensions[3].height = 60

myems-api/excelexporters/combinedequipmentstatistics.py

@@ -116,9 +116,7 @@ def generate_excel(report,
 
     # Img
     img = Image("excelexporters/myems.png")
-    img.width = img.width * 0.85
+    ws.add_image(img, 'A1')
-    img.height = img.height * 0.85
-    ws.add_image(img, 'B1')
 
     # Title
     ws['B3'].font = name_font
@@ -510,9 +508,7 @@ def generate_excel(report,
 
         # Img
         img = Image("excelexporters/myems.png")
-        img.width = img.width * 0.85
+        parameters_ws.add_image(img, 'A1')
-        img.height = img.height * 0.85
-        parameters_ws.add_image(img, 'B1')
 
         # Title
         parameters_ws.row_dimensions[3].height = 60

myems-api/excelexporters/equipmentbatch.py

@@ -107,9 +107,7 @@ def generate_excel(report, space_name, reporting_start_datetime_local, reporting
 
     # Img
     img = Image("excelexporters/myems.png")
-    img.width = img.width * 0.85
+    ws.add_image(img, 'A1')
-    img.height = img.height * 0.85
-    ws.add_image(img, 'B1')
 
     # Title
     ws.row_dimensions[3].height = 60

myems-api/excelexporters/equipmentcost.py

@@ -116,9 +116,7 @@ def generate_excel(report,
 
     # Img
     img = Image("excelexporters/myems.png")
-    img.width = img.width * 1.06
+    ws.add_image(img, 'A1')
-    img.height = img.height * 1.06
-    ws.add_image(img, 'B1')
 
     # Title
     ws.row_dimensions[3].height = 60
@@ -552,9 +550,7 @@ def generate_excel(report,
 
         # Img
         img = Image("excelexporters/myems.png")
-        img.width = img.width * 0.85
+        parameters_ws.add_image(img, 'A1')
-        img.height = img.height * 0.85
-        parameters_ws.add_image(img, 'B1')
 
         # Title
         parameters_ws.row_dimensions[3].height = 60

myems-api/excelexporters/equipmentefficiency.py

@@ -113,9 +113,7 @@ def generate_excel(report,
                               indent=0)
     # Img
     img = Image("excelexporters/myems.png")
-    img.width = img.width * 0.85
+    ws.add_image(img, 'A1')
-    img.height = img.height * 0.85
-    ws.add_image(img, 'B1')
 
     # Title
     ws.row_dimensions[3].height = 60
@@ -426,9 +424,7 @@ def generate_excel(report,
 
         # Img
         img = Image("excelexporters/myems.png")
-        img.width = img.width * 0.85
+        parameters_ws.add_image(img, 'A1')
-        img.height = img.height * 0.85
-        parameters_ws.add_image(img, 'B1')
 
         # Title
         parameters_ws.row_dimensions[3].height = 60

myems-api/excelexporters/equipmentenergycategory.py

@@ -116,9 +116,7 @@ def generate_excel(report,
 
     # Img
     img = Image("excelexporters/myems.png")
-    img.width = img.width * 1.06
+    ws.add_image(img, 'A1')
-    img.height = img.height * 1.06
-    ws.add_image(img, 'B1')
 
     # Title
     ws.row_dimensions[3].height = 60
@@ -594,9 +592,7 @@ def generate_excel(report,
 
         # Img
         img = Image("excelexporters/myems.png")
-        img.width = img.width * 0.85
+        parameters_ws.add_image(img, 'A1')
-        img.height = img.height * 0.85
-        parameters_ws.add_image(img, 'B1')
 
         # Title
         parameters_ws.row_dimensions[3].height = 60

myems-api/excelexporters/equipmentenergyitem.py

@@ -113,9 +113,7 @@ def generate_excel(report,
                               indent=0)
     # Img
     img = Image("excelexporters/myems.png")
-    img.width = img.width * 0.85
+    ws.add_image(img, 'A1')
-    img.height = img.height * 0.85
-    ws.add_image(img, 'B1')
 
     # Title
     ws.row_dimensions[3].height = 60
@@ -467,9 +465,7 @@ def generate_excel(report,
 
         # Img
         img = Image("excelexporters/myems.png")
-        img.width = img.width * 0.85
+        parameters_ws.add_image(img, 'A1')
-        img.height = img.height * 0.85
-        parameters_ws.add_image(img, 'B1')
 
         # Title
         parameters_ws.row_dimensions[3].height = 60

myems-api/excelexporters/equipmentincome.py

@@ -114,9 +114,7 @@ def generate_excel(report,
 
     # Img
     img = Image("excelexporters/myems.png")
-    img.width = img.width * 0.85
+    ws.add_image(img, 'A1')
-    img.height = img.height * 0.85
-    ws.add_image(img, 'B1')
 
     # Title
     ws.row_dimensions[3].height = 60
@@ -490,9 +488,7 @@ def generate_excel(report,
 
         # Img
         img = Image("excelexporters/myems.png")
-        img.width = img.width * 0.85
+        parameters_ws.add_image(img, 'A1')
-        img.height = img.height * 0.85
-        parameters_ws.add_image(img, 'B1')
 
         # Title
         parameters_ws.row_dimensions[3].height = 60

myems-api/excelexporters/equipmentload.py

@@ -113,9 +113,7 @@ def generate_excel(report,
 
     # Img
     img = Image("excelexporters/myems.png")
-    img.width = img.width * 1.06
+    ws.add_image(img, 'A1')
-    img.height = img.height * 1.06
-    ws.add_image(img, 'B1')
 
     # Title
     ws['B3'].font = name_font
@@ -397,9 +395,7 @@ def generate_excel(report,
 
         # Img
         img = Image("excelexporters/myems.png")
-        img.width = img.width * 0.85
+        parameters_ws.add_image(img, 'A1')
-        img.height = img.height * 0.85
-        parameters_ws.add_image(img, 'B1')
 
         # Title
         parameters_ws.row_dimensions[3].height = 60

myems-api/excelexporters/equipmentoutput.py

@@ -113,9 +113,7 @@ def generate_excel(report,
                               indent=0)
     # Img
     img = Image("excelexporters/myems.png")
-    img.width = img.width * 0.85
+    ws.add_image(img, 'A1')
-    img.height = img.height * 0.85
-    ws.add_image(img, 'B1')
 
     # Title
     ws.row_dimensions[3].height = 60
@@ -408,9 +406,7 @@ def generate_excel(report,
 
         # Img
         img = Image("excelexporters/myems.png")
-        img.width = img.width * 0.85
+        parameters_ws.add_image(img, 'A1')
-        img.height = img.height * 0.85
-        parameters_ws.add_image(img, 'B1')
 
         # Title
         parameters_ws.row_dimensions[3].height = 60

myems-api/excelexporters/equipmentsaving.py

@@ -115,9 +115,7 @@ def generate_excel(report,
 
     # Img
     img = Image("excelexporters/myems.png")
-    img.width = img.width * 0.85
+    ws.add_image(img, 'A1')
-    img.height = img.height * 0.85
-    ws.add_image(img, 'B1')
 
     # Title
     ws.row_dimensions[3].height = 60
@@ -596,9 +594,7 @@ def generate_excel(report,
 
         # Img
         img = Image("excelexporters/myems.png")
-        img.width = img.width * 0.85
+        parameters_ws.add_image(img, 'A1')
-        img.height = img.height * 0.85
-        parameters_ws.add_image(img, 'B1')
 
         # Title
         parameters_ws.row_dimensions[3].height = 60

myems-api/excelexporters/equipmentstatistics.py

@@ -116,7 +116,7 @@ def generate_excel(report,
 
     # Img
     img = Image("excelexporters/myems.png")
-    ws.add_image(img, 'B1')
+    ws.add_image(img, 'A1')
 
     # Title
     ws['B3'].font = name_font
@@ -449,9 +449,7 @@ def generate_excel(report,
 
         # Img
         img = Image("excelexporters/myems.png")
-        img.width = img.width * 0.85
+        parameters_ws.add_image(img, 'A1')
-        img.height = img.height * 0.85
-        parameters_ws.add_image(img, 'B1')
 
         # Title
         parameters_ws.row_dimensions[3].height = 60

myems-api/excelexporters/equipmenttracking.py

@@ -86,10 +86,8 @@ def generate_excel(report, space_name):
         ws.column_dimensions[chr(i)].width = 30.0
 
     # Img
-    ws.merge_cells("B1:D1")
-    ws.merge_cells("B2:E2")
     img = Image("excelexporters/myems.png")
-    ws.add_image(img, 'B1')
+    ws.add_image(img, 'A1')
 
     # Title
     ws['B3'].border = f_border

myems-api/excelexporters/meterbatch.py

@@ -107,9 +107,7 @@ def generate_excel(report, space_name, reporting_start_datetime_local, reporting
 
     # Img
     img = Image("excelexporters/myems.png")
-    img.width = img.width * 0.85
+    ws.add_image(img, 'A1')
-    img.height = img.height * 0.85
-    ws.add_image(img, 'B1')
 
     # Title
     ws.row_dimensions[3].height = 60

myems-api/excelexporters/metercost.py

@@ -110,9 +110,7 @@ def generate_excel(report, name, reporting_start_datetime_local, reporting_end_d
 
     # Img
     img = Image("excelexporters/myems.png")
-    img.width = img.width * 0.85
+    ws.add_image(img, 'A1')
-    img.height = img.height * 0.85
-    ws.add_image(img, 'B1')
 
     # Title
     ws.row_dimensions[3].height = 60
@@ -400,9 +398,7 @@ def generate_excel(report, name, reporting_start_datetime_local, reporting_end_d
 
         # Img
         img = Image("excelexporters/myems.png")
-        img.width = img.width * 0.85
+        parameters_ws.add_image(img, 'A1')
-        img.height = img.height * 0.85
-        parameters_ws.add_image(img, 'B1')
 
         # Title
         parameters_ws.row_dimensions[3].height = 60

myems-api/excelexporters/meterenergy.py

@@ -107,9 +107,7 @@ def generate_excel(report, name, reporting_start_datetime_local, reporting_end_d
 
     # Img
     img = Image("excelexporters/myems.png")
-    img.width = img.width * 0.85
+    ws.add_image(img, 'A1')
-    img.height = img.height * 0.85
-    ws.add_image(img, 'B1')
 
     # Title
     ws.row_dimensions[3].height = 60
@@ -415,9 +413,7 @@ def generate_excel(report, name, reporting_start_datetime_local, reporting_end_d
 
         # Img
         img = Image("excelexporters/myems.png")
-        img.width = img.width * 0.85
+        parameters_ws.add_image(img, 'A1')
-        img.height = img.height * 0.85
-        parameters_ws.add_image(img, 'B1')
 
         # Title
         parameters_ws.row_dimensions[3].height = 60

myems-api/excelexporters/metersubmetersbalance.py

@@ -106,9 +106,7 @@ def generate_excel(report, name, reporting_start_datetime_local, reporting_end_d
 
     # Img
     img = Image("excelexporters/myems.png")
-    img.width = img.width * 0.85
+    ws.add_image(img, 'A1')
-    img.height = img.height * 0.85
-    ws.add_image(img, 'B1')
 
     # Title
     ws.row_dimensions[3].height = 60
@@ -365,9 +363,7 @@ def generate_excel(report, name, reporting_start_datetime_local, reporting_end_d
 
         # Img
         img = Image("excelexporters/myems.png")
-        img.width = img.width * 0.85
+        parameters_ws.add_image(img, 'A1')
-        img.height = img.height * 0.85
-        parameters_ws.add_image(img, 'B1')
 
         # Title
         parameters_ws.row_dimensions[3].height = 60

myems-api/excelexporters/metertracking.py

@@ -106,9 +106,7 @@ def generate_excel(report, space_name, reporting_start_datetime_local, reporting
 
     # Img
     img = Image("excelexporters/myems.png")
-    img.width = img.width * 0.85
+    ws.add_image(img, 'A1')
-    img.height = img.height * 0.85
-    ws.add_image(img, 'B1')
 
     # Title
     ws.row_dimensions[3].height = 60

myems-api/excelexporters/metertrend.py

@@ -117,9 +117,7 @@ def generate_excel(report,
 
     # Img
     img = Image("excelexporters/myems.png")
-    img.width = img.width * 0.85
+    ws.add_image(img, 'A1')
-    img.height = img.height * 0.85
-    ws.add_image(img, 'B1')
 
     # Title
     ws.row_dimensions[3].height = 60
@@ -310,9 +308,7 @@ def generate_excel(report,
 
         # Img
         img = Image("excelexporters/myems.png")
-        img.width = img.width * 0.85
+        parameters_ws.add_image(img, 'A1')
-        img.height = img.height * 0.85
-        parameters_ws.add_image(img, 'B1')
 
         # Title
         parameters_ws.row_dimensions[3].height = 60

myems-api/excelexporters/offlinemetercost.py

@@ -109,9 +109,7 @@ def generate_excel(report, name, reporting_start_datetime_local, reporting_end_d
 
     # Img
     img = Image("excelexporters/myems.png")
-    img.width = img.width * 0.85
+    ws.add_image(img, 'A1')
-    img.height = img.height * 0.85
-    ws.add_image(img, 'B1')
 
     # Title
     ws.row_dimensions[3].height = 60

myems-api/excelexporters/offlinemeterenergy.py

@@ -106,9 +106,7 @@ def generate_excel(report, name, reporting_start_datetime_local, reporting_end_d
 
     # Img
     img = Image("excelexporters/myems.png")
-    img.width = img.width * 0.85
+    ws.add_image(img, 'A1')
-    img.height = img.height * 0.85
-    ws.add_image(img, 'B1')
 
     # Title
     ws.row_dimensions[3].height = 60

myems-api/excelexporters/shopfloorbatch.py

@@ -107,9 +107,7 @@ def generate_excel(report, space_name, reporting_start_datetime_local, reporting
 
     # Img
     img = Image("excelexporters/myems.png")
-    img.width = img.width * 0.85
+    ws.add_image(img, 'A1')
-    img.height = img.height * 0.85
-    ws.add_image(img, 'B1')
 
     # Title
     ws.row_dimensions[3].height = 60

myems-api/excelexporters/shopfloorcost.py

@@ -117,9 +117,7 @@ def generate_excel(report,
 
     # Img
     img = Image("excelexporters/myems.png")
-    img.width = img.width * 0.85
+    ws.add_image(img, 'A1')
-    img.height = img.height * 0.85
-    ws.add_image(img, 'B1')
 
     # Title
     ws.row_dimensions[3].height = 60
@@ -644,9 +642,7 @@ def generate_excel(report,
 
         # Img
         img = Image("excelexporters/myems.png")
-        img.width = img.width * 0.85
+        parameters_ws.add_image(img, 'A1')
-        img.height = img.height * 0.85
-        parameters_ws.add_image(img, 'B1')
 
         # Title
         parameters_ws.row_dimensions[3].height = 60

myems-api/excelexporters/shopfloorenergycategory.py

@@ -117,9 +117,7 @@ def generate_excel(report,
 
     # Img
     img = Image("excelexporters/myems.png")
-    img.width = img.width * 1.06
+    ws.add_image(img, 'A1')
-    img.height = img.height * 1.06
-    ws.add_image(img, 'B1')
 
     # Title
     ws.row_dimensions[3].height = 60
@@ -530,9 +528,7 @@ def generate_excel(report,
 
         # Img
         img = Image("excelexporters/myems.png")
-        img.width = img.width * 0.85
+        parameters_ws.add_image(img, 'A1')
-        img.height = img.height * 0.85
-        parameters_ws.add_image(img, 'B1')
 
         # Title
         parameters_ws.row_dimensions[3].height = 60

myems-api/excelexporters/shopfloorenergyitem.py

@@ -114,9 +114,7 @@ def generate_excel(report,
                               indent=0)
     # Img
     img = Image("excelexporters/myems.png")
-    img.width = img.width * 0.85
+    ws.add_image(img, 'A1')
-    img.height = img.height * 0.85
-    ws.add_image(img, 'B1')
 
     # Title
     ws.row_dimensions[3].height = 60
@@ -491,9 +489,7 @@ def generate_excel(report,
 
         # Img
         img = Image("excelexporters/myems.png")
-        img.width = img.width * 0.85
+        parameters_ws.add_image(img, 'A1')
-        img.height = img.height * 0.85
-        parameters_ws.add_image(img, 'B1')
 
         # Title
         parameters_ws.row_dimensions[3].height = 60

myems-api/excelexporters/shopfloorload.py

@@ -115,9 +115,7 @@ def generate_excel(report,
 
     # Img
     img = Image("excelexporters/myems.png")
-    img.width = img.width * 0.85
+    ws.add_image(img, 'A1')
-    img.height = img.height * 0.85
-    ws.add_image(img, 'B1')
 
     # Title
     ws['B3'].font = name_font
@@ -467,9 +465,7 @@ def generate_excel(report,
 
         # Img
         img = Image("excelexporters/myems.png")
-        img.width = img.width * 0.85
+        parameters_ws.add_image(img, 'A1')
-        img.height = img.height * 0.85
-        parameters_ws.add_image(img, 'B1')
 
         # Title
         parameters_ws.row_dimensions[3].height = 60

myems-api/excelexporters/shopfloorsaving.py

@@ -117,9 +117,7 @@ def generate_excel(report,
 
     # Img
     img = Image("excelexporters/myems.png")
-    img.width = img.width * 0.85
+    ws.add_image(img, 'A1')
-    img.height = img.height * 0.85
-    ws.add_image(img, 'B1')
 
     # Title
     ws.row_dimensions[3].height = 60
@@ -637,10 +635,7 @@ def generate_excel(report,
 
         # Img
         img = Image("excelexporters/myems.png")
-        img.width = img.width * 0.85
+        parameters_ws.add_image(img, 'A1')
-        img.height = img.height * 0.85
-        # img = Image("myems.png")
-        parameters_ws.add_image(img, 'B1')
 
         # Title
         parameters_ws.row_dimensions[3].height = 60

myems-api/excelexporters/shopfloorstatistics.py

@@ -115,7 +115,7 @@ def generate_excel(report,
 
     # Img
     img = Image("excelexporters/myems.png")
-    ws.add_image(img, 'B1')
+    ws.add_image(img, 'A1')
 
     # Title
     ws['B3'].font = name_font
@@ -573,9 +573,7 @@ def generate_excel(report,
 
         # Img
         img = Image("excelexporters/myems.png")
-        img.width = img.width * 0.85
+        parameters_ws.add_image(img, 'A1')
-        img.height = img.height * 0.85
-        parameters_ws.add_image(img, 'B1')
 
         # Title
         parameters_ws.row_dimensions[3].height = 60

myems-api/excelexporters/spacecost.py

@@ -117,9 +117,7 @@ def generate_excel(report,
 
     # Img
     img = Image("excelexporters/myems.png")
-    img.width = img.width * 0.85
+    ws.add_image(img, 'A1')
-    img.height = img.height * 0.85
-    ws.add_image(img, 'B1')
 
     # Title
     ws.row_dimensions[3].height = 60
@@ -687,9 +685,7 @@ def generate_excel(report,
 
         # Img
         img = Image("excelexporters/myems.png")
-        img.width = img.width * 0.85
+        parameters_ws.add_image(img, 'A1')
-        img.height = img.height * 0.85
-        parameters_ws.add_image(img, 'B1')
 
         # Title
         parameters_ws.row_dimensions[3].height = 60

myems-api/excelexporters/spaceefficiency.py

@@ -115,9 +115,7 @@ def generate_excel(report,
                               indent=0)
     # Img
     img = Image("excelexporters/myems.png")
-    img.width = img.width * 0.85
+    ws.add_image(img, 'A1')
-    img.height = img.height * 0.85
-    ws.add_image(img, 'B1')
 
     # Title
     ws.row_dimensions[3].height = 60
@@ -430,9 +428,7 @@ def generate_excel(report,
 
         # Img
         img = Image("excelexporters/myems.png")
-        img.width = img.width * 0.85
+        parameters_ws.add_image(img, 'A1')
-        img.height = img.height * 0.85
-        parameters_ws.add_image(img, 'B1')
 
         # Title
         parameters_ws.row_dimensions[3].height = 60

myems-api/excelexporters/spaceenergycategory.py

@@ -117,9 +117,6 @@ def generate_excel(report,
 
     # Img
     img = Image("excelexporters/myems.png")
-    img.width = img.width
-    img.height = img.height
-    # img = Image("myems.png")
     ws.add_image(img, 'A1')
 
     # Title
@@ -726,10 +723,7 @@ def generate_excel(report,
 
         # Img
         img = Image("excelexporters/myems.png")
-        img.width = img.width * 0.85
+        parameters_ws.add_image(img, 'A1')
-        img.height = img.height * 0.85
-        # img = Image("myems.png")
-        parameters_ws.add_image(img, 'B1')
 
         # Title
         parameters_ws.row_dimensions[3].height = 60

myems-api/excelexporters/spaceenergyitem.py

@@ -115,10 +115,7 @@ def generate_excel(report,
                               indent=0)
     # Img
     img = Image("excelexporters/myems.png")
-    img.width = img.width * 0.85
+    ws.add_image(img, 'A1')
-    img.height = img.height * 0.85
-    # img = Image("myems.png")
-    ws.add_image(img, 'B1')
 
     # Title
     ws.row_dimensions[3].height = 60
@@ -577,9 +574,7 @@ def generate_excel(report,
 
         # Img
         img = Image("excelexporters/myems.png")
-        img.width = img.width * 0.85
+        parameters_ws.add_image(img, 'A1')
-        img.height = img.height * 0.85
-        parameters_ws.add_image(img, 'B1')
 
         # Title
         parameters_ws.row_dimensions[3].height = 60

myems-api/excelexporters/spaceincome.py

@@ -117,9 +117,7 @@ def generate_excel(report,
 
     # Img
     img = Image("excelexporters/myems.png")
-    img.width = img.width * 0.85
+    ws.add_image(img, 'A1')
-    img.height = img.height * 0.85
-    ws.add_image(img, 'B1')
 
     # Title
     ws.row_dimensions[3].height = 60
@@ -620,9 +618,7 @@ def generate_excel(report,
 
         # Img
         img = Image("excelexporters/myems.png")
-        img.width = img.width * 0.85
+        parameters_ws.add_image(img, 'A1')
-        img.height = img.height * 0.85
-        parameters_ws.add_image(img, 'B1')
 
         # Title
         parameters_ws.row_dimensions[3].height = 60

myems-api/excelexporters/spaceload.py

@@ -113,9 +113,7 @@ def generate_excel(report, name, reporting_start_datetime_local, reporting_end_d
 
     # Img
     img = Image("excelexporters/myems.png")
-    img.width = img.width * 0.85
+    ws.add_image(img, 'A1')
-    img.height = img.height * 0.85
-    ws.add_image(img, 'B1')
 
     # Title
     ws.row_dimensions[3].height = 60
@@ -527,9 +525,7 @@ def generate_excel(report, name, reporting_start_datetime_local, reporting_end_d
 
         # Img
         img = Image("excelexporters/myems.png")
-        img.width = img.width * 0.85
+        parameters_ws.add_image(img, 'A1')
-        img.height = img.height * 0.85
-        parameters_ws.add_image(img, 'B1')
 
         # Title
         parameters_ws.row_dimensions[3].height = 60

myems-api/excelexporters/spaceoutput.py

@@ -115,9 +115,7 @@ def generate_excel(report,
                               indent=0)
     # Img
     img = Image("excelexporters/myems.png")
-    img.width = img.width * 0.85
+    ws.add_image(img, 'A1')
-    img.height = img.height * 0.85
-    ws.add_image(img, 'B1')
 
     # Title
     ws.row_dimensions[3].height = 60
@@ -515,9 +513,7 @@ def generate_excel(report,
 
         # Img
         img = Image("excelexporters/myems.png")
-        img.width = img.width * 0.85
+        parameters_ws.add_image(img, 'A1')
-        img.height = img.height * 0.85
-        parameters_ws.add_image(img, 'B1')
 
         # Title
         parameters_ws.row_dimensions[3].height = 60

myems-api/excelexporters/spacesaving.py

@@ -117,9 +117,7 @@ def generate_excel(report,
 
     # Img
     img = Image("excelexporters/myems.png")
-    img.width = img.width * 0.85
+    ws.add_image(img, 'A1')
-    img.height = img.height * 0.85
-    ws.add_image(img, 'B1')
 
     # Title
     ws.row_dimensions[3].height = 60
@@ -727,9 +725,7 @@ def generate_excel(report,
 
         # Img
         img = Image("excelexporters/myems.png")
-        img.width = img.width * 0.85
+        parameters_ws.add_image(img, 'A1')
-        img.height = img.height * 0.85
-        parameters_ws.add_image(img, 'B1')
 
         # Title
         parameters_ws.row_dimensions[3].height = 60

myems-api/excelexporters/spacestatistics.py

@@ -116,7 +116,7 @@ def generate_excel(report,
 
     # Img
     img = Image("excelexporters/myems.png")
-    ws.add_image(img, 'B1')
+    ws.add_image(img, 'A1')
 
     # Title
     ws['B3'].font = name_font
@@ -565,9 +565,7 @@ def generate_excel(report,
 
         # Img
         img = Image("excelexporters/myems.png")
-        img.width = img.width * 0.85
+        parameters_ws.add_image(img, 'A1')
-        img.height = img.height * 0.85
-        parameters_ws.add_image(img, 'B1')
 
         # Title
         parameters_ws.row_dimensions[3].height = 60

myems-api/excelexporters/storebatch.py

@@ -107,9 +107,7 @@ def generate_excel(report, space_name, reporting_start_datetime_local, reporting
 
     # Img
     img = Image("excelexporters/myems.png")
-    img.width = img.width * 0.85
+    ws.add_image(img, 'A1')
-    img.height = img.height * 0.85
-    ws.add_image(img, 'B1')
 
     # Title
     ws.row_dimensions[3].height = 60

myems-api/excelexporters/storecost.py

@@ -116,7 +116,7 @@ def generate_excel(report,
                               indent=0)
     # Img
     img = Image("excelexporters/myems.png")
-    ws.add_image(img, 'B1')
+    ws.add_image(img, 'A1')
 
     # Title
     ws['B3'].font = name_font
@@ -610,9 +610,7 @@ def generate_excel(report,
 
         # Img
         img = Image("excelexporters/myems.png")
-        img.width = img.width * 0.85
+        parameters_ws.add_image(img, 'A1')
-        img.height = img.height * 0.85
-        parameters_ws.add_image(img, 'B1')
 
         # Title
         parameters_ws.row_dimensions[3].height = 60

myems-api/excelexporters/storeenergycategory.py

@@ -117,9 +117,7 @@ def generate_excel(report,
 
     # Img
     img = Image("excelexporters/myems.png")
-    img.width = img.width * 1.06
+    ws.add_image(img, 'A1')
-    img.height = img.height * 1.06
-    ws.add_image(img, 'B1')
 
     # Title
     ws.row_dimensions[3].height = 60
@@ -529,9 +527,7 @@ def generate_excel(report,
 
         # Img
         img = Image("excelexporters/myems.png")
-        img.width = img.width * 0.85
+        parameters_ws.add_image(img, 'A1')
-        img.height = img.height * 0.85
-        parameters_ws.add_image(img, 'B1')
 
         # Title
         parameters_ws.row_dimensions[3].height = 60

myems-api/excelexporters/storeenergyitem.py

@@ -114,9 +114,7 @@ def generate_excel(report,
                               indent=0)
     # Img
     img = Image("excelexporters/myems.png")
-    img.width = img.width * 0.85
+    ws.add_image(img, 'A1')
-    img.height = img.height * 0.85
-    ws.add_image(img, 'B1')
 
     # Title
     ws.row_dimensions[3].height = 60
@@ -493,9 +491,7 @@ def generate_excel(report,
 
         # Img
         img = Image("excelexporters/myems.png")
-        img.width = img.width * 0.85
+        parameters_ws.add_image(img, 'A1')
-        img.height = img.height * 0.85
-        parameters_ws.add_image(img, 'B1')
 
         # Title
         parameters_ws.row_dimensions[3].height = 60

myems-api/excelexporters/storeload.py

@@ -115,9 +115,7 @@ def generate_excel(report,
 
     # Img
     img = Image("excelexporters/myems.png")
-    img.width = img.width * 0.85
+    ws.add_image(img, 'A1')
-    img.height = img.height * 0.85
-    ws.add_image(img, 'B1')
 
     # Title
     ws['B3'].font = name_font

myems-api/excelexporters/storesaving.py

@@ -117,9 +117,7 @@ def generate_excel(report,
 
     # Img
     img = Image("excelexporters/myems.png")
-    img.width = img.width * 0.85
+    ws.add_image(img, 'A1')
-    img.height = img.height * 0.85
-    ws.add_image(img, 'B1')
 
     # Title
     ws.row_dimensions[3].height = 60
@@ -637,9 +635,7 @@ def generate_excel(report,
 
         # Img
         img = Image("excelexporters/myems.png")
-        img.width = img.width * 0.85
+        parameters_ws.add_image(img, 'A1')
-        img.height = img.height * 0.85
-        parameters_ws.add_image(img, 'B1')
 
         # Title
         parameters_ws.row_dimensions[3].height = 60

myems-api/excelexporters/storestatistics.py

@@ -115,7 +115,7 @@ def generate_excel(report,
 
     # Img
     img = Image("excelexporters/myems.png")
-    ws.add_image(img, 'B1')
+    ws.add_image(img, 'A1')
 
     # Title
     ws['B3'].font = name_font
@@ -572,9 +572,7 @@ def generate_excel(report,
 
         # Img
         img = Image("excelexporters/myems.png")
-        img.width = img.width * 0.85
+        parameters_ws.add_image(img, 'A1')
-        img.height = img.height * 0.85
-        parameters_ws.add_image(img, 'B1')
 
         # Title
         parameters_ws.row_dimensions[3].height = 60

myems-api/excelexporters/tenantbatch.py

@@ -107,9 +107,7 @@ def generate_excel(report, space_name, reporting_start_datetime_local, reporting
 
     # Img
     img = Image("excelexporters/myems.png")
-    img.width = img.width * 0.85
+    ws.add_image(img, 'A1')
-    img.height = img.height * 0.85
-    ws.add_image(img, 'B1')
 
     # Title
     ws.row_dimensions[3].height = 60

myems-api/excelexporters/tenantcost.py

@@ -118,9 +118,7 @@ def generate_excel(report,
 
     # Img
     img = Image("excelexporters/myems.png")
-    img.width = img.width * 0.85
+    ws.add_image(img, 'A1')
-    img.height = img.height * 0.85
-    ws.add_image(img, 'B1')
 
     # Title
     ws.row_dimensions[3].height = 60
@@ -586,9 +584,7 @@ def generate_excel(report,
 
         # Img
         img = Image("excelexporters/myems.png")
-        img.width = img.width * 0.85
+        parameters_ws.add_image(img, 'A1')
-        img.height = img.height * 0.85
-        parameters_ws.add_image(img, 'B1')
 
         # Title
         parameters_ws.row_dimensions[3].height = 60

myems-api/excelexporters/tenantenergycategory.py

@@ -117,9 +117,7 @@ def generate_excel(report,
 
     # Img
     img = Image("excelexporters/myems.png")
-    img.width = img.width * 0.85
+    ws.add_image(img, 'A1')
-    img.height = img.height * 0.85
-    ws.add_image(img, 'B1')
 
     # Title
     ws.row_dimensions[3].height = 60
@@ -651,9 +649,7 @@ def generate_excel(report,
 
         # Img
         img = Image("excelexporters/myems.png")
-        img.width = img.width * 0.85
+        parameters_ws.add_image(img, 'A1')
-        img.height = img.height * 0.85
-        parameters_ws.add_image(img, 'B1')
 
         # Title
         parameters_ws.row_dimensions[3].height = 60

myems-api/excelexporters/tenantenergyitem.py

@@ -115,9 +115,7 @@ def generate_excel(report,
                               indent=0)
     # Img
     img = Image("excelexporters/myems.png")
-    img.width = img.width * 0.85
+    ws.add_image(img, 'A1')
-    img.height = img.height * 0.85
-    ws.add_image(img, 'B1')
 
     # Title
     ws.row_dimensions[3].height = 60
@@ -484,9 +482,7 @@ def generate_excel(report,
 
         # Img
         img = Image("excelexporters/myems.png")
-        img.width = img.width * 0.85
+        parameters_ws.add_image(img, 'A1')
-        img.height = img.height * 0.85
-        parameters_ws.add_image(img, 'B1')
 
         # Title
         parameters_ws.row_dimensions[3].height = 60

myems-api/excelexporters/tenantload.py

@@ -113,9 +113,7 @@ def generate_excel(report, name, reporting_start_datetime_local, reporting_end_d
 
     # Img
     img = Image("excelexporters/myems.png")
-    img.width = img.width * 0.85
+    ws.add_image(img, 'A1')
-    img.height = img.height * 0.85
-    ws.add_image(img, 'B1')
 
     # Title
     ws.row_dimensions[3].height = 60
@@ -529,9 +527,7 @@ def generate_excel(report, name, reporting_start_datetime_local, reporting_end_d
 
         # Img
         img = Image("excelexporters/myems.png")
-        img.width = img.width * 0.85
+        parameters_ws.add_image(img, 'A1')
-        img.height = img.height * 0.85
-        parameters_ws.add_image(img, 'B1')
 
         # Title
         parameters_ws.row_dimensions[3].height = 60

myems-api/excelexporters/tenantsaving.py

@@ -117,9 +117,7 @@ def generate_excel(report,
 
     # Img
     img = Image("excelexporters/myems.png")
-    img.width = img.width * 0.85
+    ws.add_image(img, 'A1')
-    img.height = img.height * 0.85
-    ws.add_image(img, 'B1')
 
     # Title
     ws.row_dimensions[3].height = 60
@@ -631,9 +629,7 @@ def generate_excel(report,
 
         # Img
         img = Image("excelexporters/myems.png")
-        img.width = img.width * 0.85
+        parameters_ws.add_image(img, 'A1')
-        img.height = img.height * 0.85
-        parameters_ws.add_image(img, 'B1')
 
         # Title
         parameters_ws.row_dimensions[3].height = 60

myems-api/excelexporters/tenantstatistics.py

@@ -116,7 +116,7 @@ def generate_excel(report,
 
     # Img
     img = Image("excelexporters/myems.png")
-    ws.add_image(img, 'B1')
+    ws.add_image(img, 'A1')
 
     # Title
     ws['B3'].font = name_font
@@ -564,9 +564,7 @@ def generate_excel(report,
 
         # Img
         img = Image("excelexporters/myems.png")
-        img.width = img.width * 0.85
+        parameters_ws.add_image(img, 'A1')
-        img.height = img.height * 0.85
-        parameters_ws.add_image(img, 'B1')
 
         # Title
         parameters_ws.row_dimensions[3].height = 60

myems-api/excelexporters/virtualmetercost.py

@@ -109,9 +109,7 @@ def generate_excel(report, name, reporting_start_datetime_local, reporting_end_d
 
     # Img
     img = Image("excelexporters/myems.png")
-    img.width = img.width * 0.85
+    ws.add_image(img, 'A1')
-    img.height = img.height * 0.85
-    ws.add_image(img, 'B1')
 
     # Title
     ws.row_dimensions[3].height = 60

myems-api/excelexporters/virtualmeterenergy.py

@@ -105,9 +105,7 @@ def generate_excel(report, name, reporting_start_datetime_local, reporting_end_d
 
     # Img
     img = Image("excelexporters/myems.png")
-    img.width = img.width * 0.85
+    ws.add_image(img, 'A1')
-    img.height = img.height * 0.85
-    ws.add_image(img, 'B1')
 
     # Title
     ws.row_dimensions[3].height = 60