diff --git a/myems-api/excelexporters/combinedequipmentbatch.py b/myems-api/excelexporters/combinedequipmentbatch.py index 3bef8699..6e858316 100644 --- a/myems-api/excelexporters/combinedequipmentbatch.py +++ b/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 - img.height = img.height * 0.85 - ws.add_image(img, 'B1') + ws.add_image(img, 'A1') # Title ws.row_dimensions[3].height = 60 diff --git a/myems-api/excelexporters/combinedequipmentcost.py b/myems-api/excelexporters/combinedequipmentcost.py index 766ac880..9367cfa3 100644 --- a/myems-api/excelexporters/combinedequipmentcost.py +++ b/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 - img.height = img.height * 0.85 - ws.add_image(img, 'B1') + ws.add_image(img, 'A1') # 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 - img.height = img.height * 0.85 - # img = Image("myems.png") - parameters_ws.add_image(img, 'B1') + parameters_ws.add_image(img, 'A1') # Title parameters_ws.row_dimensions[3].height = 60 diff --git a/myems-api/excelexporters/combinedequipmentefficiency.py b/myems-api/excelexporters/combinedequipmentefficiency.py index 44605548..6273b06a 100644 --- a/myems-api/excelexporters/combinedequipmentefficiency.py +++ b/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 - img.height = img.height * 0.85 - ws.add_image(img, 'B1') + ws.add_image(img, 'A1') # 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 - img.height = img.height * 0.85 - parameters_ws.add_image(img, 'B1') + parameters_ws.add_image(img, 'A1') # Title parameters_ws.row_dimensions[3].height = 60 diff --git a/myems-api/excelexporters/combinedequipmentenergycategory.py b/myems-api/excelexporters/combinedequipmentenergycategory.py index 38782cd1..e5838c76 100644 --- a/myems-api/excelexporters/combinedequipmentenergycategory.py +++ b/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 - img.height = img.height * 1.06 - ws.add_image(img, 'B1') + ws.add_image(img, 'A1') # 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 - img.height = img.height * 0.85 - # img = Image("myems.png") - parameters_ws.add_image(img, 'B1') + parameters_ws.add_image(img, 'A1') # Title parameters_ws.row_dimensions[3].height = 60 diff --git a/myems-api/excelexporters/combinedequipmentenergyitem.py b/myems-api/excelexporters/combinedequipmentenergyitem.py index c6acacba..98962cd0 100644 --- a/myems-api/excelexporters/combinedequipmentenergyitem.py +++ b/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 - img.height = img.height * 0.85 - ws.add_image(img, 'B1') + ws.add_image(img, 'A1') # 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 - img.height = img.height * 0.85 - parameters_ws.add_image(img, 'B1') + parameters_ws.add_image(img, 'A1') # Title parameters_ws.row_dimensions[3].height = 60 diff --git a/myems-api/excelexporters/combinedequipmentincome.py b/myems-api/excelexporters/combinedequipmentincome.py index 9e956744..1e015a79 100644 --- a/myems-api/excelexporters/combinedequipmentincome.py +++ b/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 - img.height = img.height * 0.85 - ws.add_image(img, 'B1') + ws.add_image(img, 'A1') # 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 - img.height = img.height * 0.85 - parameters_ws.add_image(img, 'B1') + parameters_ws.add_image(img, 'A1') # Title parameters_ws.row_dimensions[3].height = 60 diff --git a/myems-api/excelexporters/combinedequipmentload.py b/myems-api/excelexporters/combinedequipmentload.py index d4298fb0..6b3f6755 100644 --- a/myems-api/excelexporters/combinedequipmentload.py +++ b/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 - img.height = img.height * 0.85 - ws.add_image(img, 'B1') + ws.add_image(img, 'A1') # 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 - img.height = img.height * 0.85 - parameters_ws.add_image(img, 'B1') + parameters_ws.add_image(img, 'A1') # Title parameters_ws.row_dimensions[3].height = 60 diff --git a/myems-api/excelexporters/combinedequipmentoutput.py b/myems-api/excelexporters/combinedequipmentoutput.py index 5939ee47..872abe09 100644 --- a/myems-api/excelexporters/combinedequipmentoutput.py +++ b/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 - img.height = img.height * 0.85 - ws.add_image(img, 'B1') + ws.add_image(img, 'A1') # 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 - img.height = img.height * 0.85 - parameters_ws.add_image(img, 'B1') + parameters_ws.add_image(img, 'A1') # Title parameters_ws.row_dimensions[3].height = 60 diff --git a/myems-api/excelexporters/combinedequipmentsaving.py b/myems-api/excelexporters/combinedequipmentsaving.py index dd0a14bd..39d89f95 100644 --- a/myems-api/excelexporters/combinedequipmentsaving.py +++ b/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 - img.height = img.height * 0.85 - ws.add_image(img, 'B1') + ws.add_image(img, 'A1') # 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 - img.height = img.height * 0.85 - # img = Image("myems.png") - parameters_ws.add_image(img, 'B1') + parameters_ws.add_image(img, 'A1') # Title parameters_ws.row_dimensions[3].height = 60 diff --git a/myems-api/excelexporters/combinedequipmentstatistics.py b/myems-api/excelexporters/combinedequipmentstatistics.py index c2cb0bd6..18ffb06a 100644 --- a/myems-api/excelexporters/combinedequipmentstatistics.py +++ b/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 - img.height = img.height * 0.85 - ws.add_image(img, 'B1') + ws.add_image(img, 'A1') # 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 - img.height = img.height * 0.85 - parameters_ws.add_image(img, 'B1') + parameters_ws.add_image(img, 'A1') # Title parameters_ws.row_dimensions[3].height = 60 diff --git a/myems-api/excelexporters/equipmentbatch.py b/myems-api/excelexporters/equipmentbatch.py index 8547b4c8..cc52baa1 100644 --- a/myems-api/excelexporters/equipmentbatch.py +++ b/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 - img.height = img.height * 0.85 - ws.add_image(img, 'B1') + ws.add_image(img, 'A1') # Title ws.row_dimensions[3].height = 60 diff --git a/myems-api/excelexporters/equipmentcost.py b/myems-api/excelexporters/equipmentcost.py index 0ad0ef4e..c37fb3d2 100644 --- a/myems-api/excelexporters/equipmentcost.py +++ b/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 - img.height = img.height * 1.06 - ws.add_image(img, 'B1') + ws.add_image(img, 'A1') # 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 - img.height = img.height * 0.85 - parameters_ws.add_image(img, 'B1') + parameters_ws.add_image(img, 'A1') # Title parameters_ws.row_dimensions[3].height = 60 diff --git a/myems-api/excelexporters/equipmentefficiency.py b/myems-api/excelexporters/equipmentefficiency.py index c324724e..ab5de3e7 100644 --- a/myems-api/excelexporters/equipmentefficiency.py +++ b/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 - img.height = img.height * 0.85 - ws.add_image(img, 'B1') + ws.add_image(img, 'A1') # 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 - img.height = img.height * 0.85 - parameters_ws.add_image(img, 'B1') + parameters_ws.add_image(img, 'A1') # Title parameters_ws.row_dimensions[3].height = 60 diff --git a/myems-api/excelexporters/equipmentenergycategory.py b/myems-api/excelexporters/equipmentenergycategory.py index c29782dc..217368d2 100644 --- a/myems-api/excelexporters/equipmentenergycategory.py +++ b/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 - img.height = img.height * 1.06 - ws.add_image(img, 'B1') + ws.add_image(img, 'A1') # 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 - img.height = img.height * 0.85 - parameters_ws.add_image(img, 'B1') + parameters_ws.add_image(img, 'A1') # Title parameters_ws.row_dimensions[3].height = 60 diff --git a/myems-api/excelexporters/equipmentenergyitem.py b/myems-api/excelexporters/equipmentenergyitem.py index 882e60de..7e9a18fd 100644 --- a/myems-api/excelexporters/equipmentenergyitem.py +++ b/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 - img.height = img.height * 0.85 - ws.add_image(img, 'B1') + ws.add_image(img, 'A1') # 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 - img.height = img.height * 0.85 - parameters_ws.add_image(img, 'B1') + parameters_ws.add_image(img, 'A1') # Title parameters_ws.row_dimensions[3].height = 60 diff --git a/myems-api/excelexporters/equipmentincome.py b/myems-api/excelexporters/equipmentincome.py index 9942f3a1..82ce6cb1 100644 --- a/myems-api/excelexporters/equipmentincome.py +++ b/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 - img.height = img.height * 0.85 - ws.add_image(img, 'B1') + ws.add_image(img, 'A1') # 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 - img.height = img.height * 0.85 - parameters_ws.add_image(img, 'B1') + parameters_ws.add_image(img, 'A1') # Title parameters_ws.row_dimensions[3].height = 60 diff --git a/myems-api/excelexporters/equipmentload.py b/myems-api/excelexporters/equipmentload.py index c9bcc57d..59205f4b 100644 --- a/myems-api/excelexporters/equipmentload.py +++ b/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 - img.height = img.height * 1.06 - ws.add_image(img, 'B1') + ws.add_image(img, 'A1') # 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 - img.height = img.height * 0.85 - parameters_ws.add_image(img, 'B1') + parameters_ws.add_image(img, 'A1') # Title parameters_ws.row_dimensions[3].height = 60 diff --git a/myems-api/excelexporters/equipmentoutput.py b/myems-api/excelexporters/equipmentoutput.py index 41af4491..7cdca3b7 100644 --- a/myems-api/excelexporters/equipmentoutput.py +++ b/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 - img.height = img.height * 0.85 - ws.add_image(img, 'B1') + ws.add_image(img, 'A1') # 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 - img.height = img.height * 0.85 - parameters_ws.add_image(img, 'B1') + parameters_ws.add_image(img, 'A1') # Title parameters_ws.row_dimensions[3].height = 60 diff --git a/myems-api/excelexporters/equipmentsaving.py b/myems-api/excelexporters/equipmentsaving.py index 18e4c999..a1ba7e6d 100644 --- a/myems-api/excelexporters/equipmentsaving.py +++ b/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 - img.height = img.height * 0.85 - ws.add_image(img, 'B1') + ws.add_image(img, 'A1') # 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 - img.height = img.height * 0.85 - parameters_ws.add_image(img, 'B1') + parameters_ws.add_image(img, 'A1') # Title parameters_ws.row_dimensions[3].height = 60 diff --git a/myems-api/excelexporters/equipmentstatistics.py b/myems-api/excelexporters/equipmentstatistics.py index 19b74fdf..3c4ea1d3 100644 --- a/myems-api/excelexporters/equipmentstatistics.py +++ b/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 - img.height = img.height * 0.85 - parameters_ws.add_image(img, 'B1') + parameters_ws.add_image(img, 'A1') # Title parameters_ws.row_dimensions[3].height = 60 diff --git a/myems-api/excelexporters/equipmenttracking.py b/myems-api/excelexporters/equipmenttracking.py index d4ed668c..03b7dcaa 100644 --- a/myems-api/excelexporters/equipmenttracking.py +++ b/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 diff --git a/myems-api/excelexporters/meterbatch.py b/myems-api/excelexporters/meterbatch.py index b74fc918..d1b39257 100644 --- a/myems-api/excelexporters/meterbatch.py +++ b/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 - img.height = img.height * 0.85 - ws.add_image(img, 'B1') + ws.add_image(img, 'A1') # Title ws.row_dimensions[3].height = 60 diff --git a/myems-api/excelexporters/metercost.py b/myems-api/excelexporters/metercost.py index 1f614640..d13cadd5 100644 --- a/myems-api/excelexporters/metercost.py +++ b/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 - img.height = img.height * 0.85 - ws.add_image(img, 'B1') + ws.add_image(img, 'A1') # 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 - img.height = img.height * 0.85 - parameters_ws.add_image(img, 'B1') + parameters_ws.add_image(img, 'A1') # Title parameters_ws.row_dimensions[3].height = 60 diff --git a/myems-api/excelexporters/meterenergy.py b/myems-api/excelexporters/meterenergy.py index 2125b3fb..0834eb57 100644 --- a/myems-api/excelexporters/meterenergy.py +++ b/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 - img.height = img.height * 0.85 - ws.add_image(img, 'B1') + ws.add_image(img, 'A1') # 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 - img.height = img.height * 0.85 - parameters_ws.add_image(img, 'B1') + parameters_ws.add_image(img, 'A1') # Title parameters_ws.row_dimensions[3].height = 60 diff --git a/myems-api/excelexporters/metersubmetersbalance.py b/myems-api/excelexporters/metersubmetersbalance.py index 08e47c3e..bc82ebd3 100644 --- a/myems-api/excelexporters/metersubmetersbalance.py +++ b/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 - img.height = img.height * 0.85 - ws.add_image(img, 'B1') + ws.add_image(img, 'A1') # 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 - img.height = img.height * 0.85 - parameters_ws.add_image(img, 'B1') + parameters_ws.add_image(img, 'A1') # Title parameters_ws.row_dimensions[3].height = 60 diff --git a/myems-api/excelexporters/metertracking.py b/myems-api/excelexporters/metertracking.py index 259b110e..b5c49833 100644 --- a/myems-api/excelexporters/metertracking.py +++ b/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 - img.height = img.height * 0.85 - ws.add_image(img, 'B1') + ws.add_image(img, 'A1') # Title ws.row_dimensions[3].height = 60 diff --git a/myems-api/excelexporters/metertrend.py b/myems-api/excelexporters/metertrend.py index cbeba372..dd724964 100644 --- a/myems-api/excelexporters/metertrend.py +++ b/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 - img.height = img.height * 0.85 - ws.add_image(img, 'B1') + ws.add_image(img, 'A1') # 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 - img.height = img.height * 0.85 - parameters_ws.add_image(img, 'B1') + parameters_ws.add_image(img, 'A1') # Title parameters_ws.row_dimensions[3].height = 60 diff --git a/myems-api/excelexporters/offlinemetercost.py b/myems-api/excelexporters/offlinemetercost.py index 5bc2d3b0..8477e5f4 100644 --- a/myems-api/excelexporters/offlinemetercost.py +++ b/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 - img.height = img.height * 0.85 - ws.add_image(img, 'B1') + ws.add_image(img, 'A1') # Title ws.row_dimensions[3].height = 60 diff --git a/myems-api/excelexporters/offlinemeterenergy.py b/myems-api/excelexporters/offlinemeterenergy.py index db40ee02..03a1e8d8 100644 --- a/myems-api/excelexporters/offlinemeterenergy.py +++ b/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 - img.height = img.height * 0.85 - ws.add_image(img, 'B1') + ws.add_image(img, 'A1') # Title ws.row_dimensions[3].height = 60 diff --git a/myems-api/excelexporters/shopfloorbatch.py b/myems-api/excelexporters/shopfloorbatch.py index 7270f820..82096371 100644 --- a/myems-api/excelexporters/shopfloorbatch.py +++ b/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 - img.height = img.height * 0.85 - ws.add_image(img, 'B1') + ws.add_image(img, 'A1') # Title ws.row_dimensions[3].height = 60 diff --git a/myems-api/excelexporters/shopfloorcost.py b/myems-api/excelexporters/shopfloorcost.py index 1e0b931f..6a27fe9a 100644 --- a/myems-api/excelexporters/shopfloorcost.py +++ b/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 - img.height = img.height * 0.85 - ws.add_image(img, 'B1') + ws.add_image(img, 'A1') # 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 - img.height = img.height * 0.85 - parameters_ws.add_image(img, 'B1') + parameters_ws.add_image(img, 'A1') # Title parameters_ws.row_dimensions[3].height = 60 diff --git a/myems-api/excelexporters/shopfloorenergycategory.py b/myems-api/excelexporters/shopfloorenergycategory.py index 2e896b96..75d3caf8 100644 --- a/myems-api/excelexporters/shopfloorenergycategory.py +++ b/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 - img.height = img.height * 1.06 - ws.add_image(img, 'B1') + ws.add_image(img, 'A1') # 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 - img.height = img.height * 0.85 - parameters_ws.add_image(img, 'B1') + parameters_ws.add_image(img, 'A1') # Title parameters_ws.row_dimensions[3].height = 60 diff --git a/myems-api/excelexporters/shopfloorenergyitem.py b/myems-api/excelexporters/shopfloorenergyitem.py index 04488681..48f6271b 100644 --- a/myems-api/excelexporters/shopfloorenergyitem.py +++ b/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 - img.height = img.height * 0.85 - ws.add_image(img, 'B1') + ws.add_image(img, 'A1') # 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 - img.height = img.height * 0.85 - parameters_ws.add_image(img, 'B1') + parameters_ws.add_image(img, 'A1') # Title parameters_ws.row_dimensions[3].height = 60 diff --git a/myems-api/excelexporters/shopfloorload.py b/myems-api/excelexporters/shopfloorload.py index b30da3df..4f8c710f 100644 --- a/myems-api/excelexporters/shopfloorload.py +++ b/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 - img.height = img.height * 0.85 - ws.add_image(img, 'B1') + ws.add_image(img, 'A1') # 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 - img.height = img.height * 0.85 - parameters_ws.add_image(img, 'B1') + parameters_ws.add_image(img, 'A1') # Title parameters_ws.row_dimensions[3].height = 60 diff --git a/myems-api/excelexporters/shopfloorsaving.py b/myems-api/excelexporters/shopfloorsaving.py index 8ea07ba4..1c481c1b 100644 --- a/myems-api/excelexporters/shopfloorsaving.py +++ b/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 - img.height = img.height * 0.85 - ws.add_image(img, 'B1') + ws.add_image(img, 'A1') # 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 - img.height = img.height * 0.85 - # img = Image("myems.png") - parameters_ws.add_image(img, 'B1') + parameters_ws.add_image(img, 'A1') # Title parameters_ws.row_dimensions[3].height = 60 diff --git a/myems-api/excelexporters/shopfloorstatistics.py b/myems-api/excelexporters/shopfloorstatistics.py index bf354e98..70b18aa1 100644 --- a/myems-api/excelexporters/shopfloorstatistics.py +++ b/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 - img.height = img.height * 0.85 - parameters_ws.add_image(img, 'B1') + parameters_ws.add_image(img, 'A1') # Title parameters_ws.row_dimensions[3].height = 60 diff --git a/myems-api/excelexporters/spacecost.py b/myems-api/excelexporters/spacecost.py index 0b9b5417..9f8ebb0e 100644 --- a/myems-api/excelexporters/spacecost.py +++ b/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 - img.height = img.height * 0.85 - ws.add_image(img, 'B1') + ws.add_image(img, 'A1') # 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 - img.height = img.height * 0.85 - parameters_ws.add_image(img, 'B1') + parameters_ws.add_image(img, 'A1') # Title parameters_ws.row_dimensions[3].height = 60 diff --git a/myems-api/excelexporters/spaceefficiency.py b/myems-api/excelexporters/spaceefficiency.py index bc52501f..8f2c7223 100644 --- a/myems-api/excelexporters/spaceefficiency.py +++ b/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 - img.height = img.height * 0.85 - ws.add_image(img, 'B1') + ws.add_image(img, 'A1') # 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 - img.height = img.height * 0.85 - parameters_ws.add_image(img, 'B1') + parameters_ws.add_image(img, 'A1') # Title parameters_ws.row_dimensions[3].height = 60 diff --git a/myems-api/excelexporters/spaceenergycategory.py b/myems-api/excelexporters/spaceenergycategory.py index 3f6a1a84..287454f6 100644 --- a/myems-api/excelexporters/spaceenergycategory.py +++ b/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 - img.height = img.height * 0.85 - # img = Image("myems.png") - parameters_ws.add_image(img, 'B1') + parameters_ws.add_image(img, 'A1') # Title parameters_ws.row_dimensions[3].height = 60 diff --git a/myems-api/excelexporters/spaceenergyitem.py b/myems-api/excelexporters/spaceenergyitem.py index f7b8d8d2..c9642e82 100644 --- a/myems-api/excelexporters/spaceenergyitem.py +++ b/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 - img.height = img.height * 0.85 - # img = Image("myems.png") - ws.add_image(img, 'B1') + ws.add_image(img, 'A1') # 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 - img.height = img.height * 0.85 - parameters_ws.add_image(img, 'B1') + parameters_ws.add_image(img, 'A1') # Title parameters_ws.row_dimensions[3].height = 60 diff --git a/myems-api/excelexporters/spaceincome.py b/myems-api/excelexporters/spaceincome.py index 75deb832..3a2dc411 100644 --- a/myems-api/excelexporters/spaceincome.py +++ b/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 - img.height = img.height * 0.85 - ws.add_image(img, 'B1') + ws.add_image(img, 'A1') # 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 - img.height = img.height * 0.85 - parameters_ws.add_image(img, 'B1') + parameters_ws.add_image(img, 'A1') # Title parameters_ws.row_dimensions[3].height = 60 diff --git a/myems-api/excelexporters/spaceload.py b/myems-api/excelexporters/spaceload.py index c696361f..4b65bcd7 100644 --- a/myems-api/excelexporters/spaceload.py +++ b/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 - img.height = img.height * 0.85 - ws.add_image(img, 'B1') + ws.add_image(img, 'A1') # 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 - img.height = img.height * 0.85 - parameters_ws.add_image(img, 'B1') + parameters_ws.add_image(img, 'A1') # Title parameters_ws.row_dimensions[3].height = 60 diff --git a/myems-api/excelexporters/spaceoutput.py b/myems-api/excelexporters/spaceoutput.py index b4302781..f272f422 100644 --- a/myems-api/excelexporters/spaceoutput.py +++ b/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 - img.height = img.height * 0.85 - ws.add_image(img, 'B1') + ws.add_image(img, 'A1') # 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 - img.height = img.height * 0.85 - parameters_ws.add_image(img, 'B1') + parameters_ws.add_image(img, 'A1') # Title parameters_ws.row_dimensions[3].height = 60 diff --git a/myems-api/excelexporters/spacesaving.py b/myems-api/excelexporters/spacesaving.py index 91595b6d..f05ac145 100644 --- a/myems-api/excelexporters/spacesaving.py +++ b/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 - img.height = img.height * 0.85 - ws.add_image(img, 'B1') + ws.add_image(img, 'A1') # 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 - img.height = img.height * 0.85 - parameters_ws.add_image(img, 'B1') + parameters_ws.add_image(img, 'A1') # Title parameters_ws.row_dimensions[3].height = 60 diff --git a/myems-api/excelexporters/spacestatistics.py b/myems-api/excelexporters/spacestatistics.py index 4c18f7b3..072544b5 100644 --- a/myems-api/excelexporters/spacestatistics.py +++ b/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 - img.height = img.height * 0.85 - parameters_ws.add_image(img, 'B1') + parameters_ws.add_image(img, 'A1') # Title parameters_ws.row_dimensions[3].height = 60 diff --git a/myems-api/excelexporters/storebatch.py b/myems-api/excelexporters/storebatch.py index d43f4f84..40bf0ed8 100644 --- a/myems-api/excelexporters/storebatch.py +++ b/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 - img.height = img.height * 0.85 - ws.add_image(img, 'B1') + ws.add_image(img, 'A1') # Title ws.row_dimensions[3].height = 60 diff --git a/myems-api/excelexporters/storecost.py b/myems-api/excelexporters/storecost.py index ec8ecc60..9f0c74b9 100644 --- a/myems-api/excelexporters/storecost.py +++ b/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 - img.height = img.height * 0.85 - parameters_ws.add_image(img, 'B1') + parameters_ws.add_image(img, 'A1') # Title parameters_ws.row_dimensions[3].height = 60 diff --git a/myems-api/excelexporters/storeenergycategory.py b/myems-api/excelexporters/storeenergycategory.py index f905774a..007ddbcf 100644 --- a/myems-api/excelexporters/storeenergycategory.py +++ b/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 - img.height = img.height * 1.06 - ws.add_image(img, 'B1') + ws.add_image(img, 'A1') # 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 - img.height = img.height * 0.85 - parameters_ws.add_image(img, 'B1') + parameters_ws.add_image(img, 'A1') # Title parameters_ws.row_dimensions[3].height = 60 diff --git a/myems-api/excelexporters/storeenergyitem.py b/myems-api/excelexporters/storeenergyitem.py index 3da5e167..ac8822c1 100644 --- a/myems-api/excelexporters/storeenergyitem.py +++ b/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 - img.height = img.height * 0.85 - ws.add_image(img, 'B1') + ws.add_image(img, 'A1') # 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 - img.height = img.height * 0.85 - parameters_ws.add_image(img, 'B1') + parameters_ws.add_image(img, 'A1') # Title parameters_ws.row_dimensions[3].height = 60 diff --git a/myems-api/excelexporters/storeload.py b/myems-api/excelexporters/storeload.py index 39a8313d..a8171d81 100644 --- a/myems-api/excelexporters/storeload.py +++ b/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 - img.height = img.height * 0.85 - ws.add_image(img, 'B1') + ws.add_image(img, 'A1') # Title ws['B3'].font = name_font diff --git a/myems-api/excelexporters/storesaving.py b/myems-api/excelexporters/storesaving.py index 2b9f43eb..362120ae 100644 --- a/myems-api/excelexporters/storesaving.py +++ b/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 - img.height = img.height * 0.85 - ws.add_image(img, 'B1') + ws.add_image(img, 'A1') # 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 - img.height = img.height * 0.85 - parameters_ws.add_image(img, 'B1') + parameters_ws.add_image(img, 'A1') # Title parameters_ws.row_dimensions[3].height = 60 diff --git a/myems-api/excelexporters/storestatistics.py b/myems-api/excelexporters/storestatistics.py index ab4db0fc..412fe50a 100644 --- a/myems-api/excelexporters/storestatistics.py +++ b/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 - img.height = img.height * 0.85 - parameters_ws.add_image(img, 'B1') + parameters_ws.add_image(img, 'A1') # Title parameters_ws.row_dimensions[3].height = 60 diff --git a/myems-api/excelexporters/tenantbatch.py b/myems-api/excelexporters/tenantbatch.py index ccf65b5e..f8eb09ee 100644 --- a/myems-api/excelexporters/tenantbatch.py +++ b/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 - img.height = img.height * 0.85 - ws.add_image(img, 'B1') + ws.add_image(img, 'A1') # Title ws.row_dimensions[3].height = 60 diff --git a/myems-api/excelexporters/tenantcost.py b/myems-api/excelexporters/tenantcost.py index 7512eb30..784c429a 100644 --- a/myems-api/excelexporters/tenantcost.py +++ b/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 - img.height = img.height * 0.85 - ws.add_image(img, 'B1') + ws.add_image(img, 'A1') # 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 - img.height = img.height * 0.85 - parameters_ws.add_image(img, 'B1') + parameters_ws.add_image(img, 'A1') # Title parameters_ws.row_dimensions[3].height = 60 diff --git a/myems-api/excelexporters/tenantenergycategory.py b/myems-api/excelexporters/tenantenergycategory.py index 84a38b6a..6149f297 100644 --- a/myems-api/excelexporters/tenantenergycategory.py +++ b/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 - img.height = img.height * 0.85 - ws.add_image(img, 'B1') + ws.add_image(img, 'A1') # 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 - img.height = img.height * 0.85 - parameters_ws.add_image(img, 'B1') + parameters_ws.add_image(img, 'A1') # Title parameters_ws.row_dimensions[3].height = 60 diff --git a/myems-api/excelexporters/tenantenergyitem.py b/myems-api/excelexporters/tenantenergyitem.py index a3da878c..285a1890 100644 --- a/myems-api/excelexporters/tenantenergyitem.py +++ b/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 - img.height = img.height * 0.85 - ws.add_image(img, 'B1') + ws.add_image(img, 'A1') # 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 - img.height = img.height * 0.85 - parameters_ws.add_image(img, 'B1') + parameters_ws.add_image(img, 'A1') # Title parameters_ws.row_dimensions[3].height = 60 diff --git a/myems-api/excelexporters/tenantload.py b/myems-api/excelexporters/tenantload.py index fda33bce..b186fcf8 100644 --- a/myems-api/excelexporters/tenantload.py +++ b/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 - img.height = img.height * 0.85 - ws.add_image(img, 'B1') + ws.add_image(img, 'A1') # 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 - img.height = img.height * 0.85 - parameters_ws.add_image(img, 'B1') + parameters_ws.add_image(img, 'A1') # Title parameters_ws.row_dimensions[3].height = 60 diff --git a/myems-api/excelexporters/tenantsaving.py b/myems-api/excelexporters/tenantsaving.py index 9626f005..9de657b7 100644 --- a/myems-api/excelexporters/tenantsaving.py +++ b/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 - img.height = img.height * 0.85 - ws.add_image(img, 'B1') + ws.add_image(img, 'A1') # 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 - img.height = img.height * 0.85 - parameters_ws.add_image(img, 'B1') + parameters_ws.add_image(img, 'A1') # Title parameters_ws.row_dimensions[3].height = 60 diff --git a/myems-api/excelexporters/tenantstatistics.py b/myems-api/excelexporters/tenantstatistics.py index bb7a6f23..92b89d5a 100644 --- a/myems-api/excelexporters/tenantstatistics.py +++ b/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 - img.height = img.height * 0.85 - parameters_ws.add_image(img, 'B1') + parameters_ws.add_image(img, 'A1') # Title parameters_ws.row_dimensions[3].height = 60 diff --git a/myems-api/excelexporters/virtualmetercost.py b/myems-api/excelexporters/virtualmetercost.py index 22601c91..92fb44f1 100644 --- a/myems-api/excelexporters/virtualmetercost.py +++ b/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 - img.height = img.height * 0.85 - ws.add_image(img, 'B1') + ws.add_image(img, 'A1') # Title ws.row_dimensions[3].height = 60 diff --git a/myems-api/excelexporters/virtualmeterenergy.py b/myems-api/excelexporters/virtualmeterenergy.py index c840d12e..559aaf94 100644 --- a/myems-api/excelexporters/virtualmeterenergy.py +++ b/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 - img.height = img.height * 0.85 - ws.add_image(img, 'B1') + ws.add_image(img, 'A1') # Title ws.row_dimensions[3].height = 60