renamed parameter worksheet names in excel exporters

Merge branch 'develop'

myems-api/excelexporters/combinedequipmentcost.py

@@ -1,6 +1,7 @@
 import base64
 import uuid
 import os
+import re
 from decimal import Decimal
 from openpyxl.chart import PieChart, LineChart, Reference
 from openpyxl.styles import PatternFill, Border, Side, Alignment, Font
@@ -658,7 +659,7 @@ def generate_excel(report,
         parameters_data = report['parameters']
         parameters_names_len = len(parameters_data['names'])
 
-        file_name = __file__.split('/')[-1].replace(".py", "")
+        file_name = (re.sub(r'[^A-Z]', '', ws.title))+'_'
         parameters_ws = wb.create_sheet(file_name + 'Parameters')
 
         parameters_timestamps_data_max_len = \

myems-api/excelexporters/combinedequipmentenergycategory.py

@@ -1,6 +1,7 @@
 import base64
 import uuid
 import os
+import re
 from openpyxl.chart import PieChart, LineChart, Reference
 from openpyxl.styles import PatternFill, Border, Side, Alignment, Font
 from openpyxl.drawing.image import Image
@@ -533,7 +534,7 @@ def generate_excel(report,
         parameters_data = report['parameters']
         parameters_names_len = len(parameters_data['names'])
 
-        file_name = __file__.split('/')[-1].replace(".py", "")
+        file_name = (re.sub(r'[^A-Z]', '', ws.title))+'_'
         parameters_ws = wb.create_sheet(file_name + 'Parameters')
 
         parameters_timestamps_data_max_len = \

myems-api/excelexporters/combinedequipmentenergyitem.py

@@ -1,6 +1,7 @@
 import base64
 import uuid
 import os
+import re
 from openpyxl.chart import PieChart, LineChart, Reference
 from openpyxl.styles import PatternFill, Border, Side, Alignment, Font
 from openpyxl.drawing.image import Image
@@ -499,7 +500,7 @@ def generate_excel(report,
         parameters_data = report['parameters']
         parameters_names_len = len(parameters_data['names'])
 
-        file_name = __file__.split('/')[-1].replace(".py", "")
+        file_name = (re.sub(r'[^A-Z]', '', ws.title))+'_'
         parameters_ws = wb.create_sheet(file_name + 'Parameters')
 
         parameters_timestamps_data_max_len = \

myems-api/excelexporters/combinedequipmentincome.py

@@ -1,6 +1,7 @@
 import base64
 import uuid
 import os
+import re
 from decimal import Decimal
 from openpyxl.chart import PieChart, LineChart, Reference
 from openpyxl.styles import PatternFill, Border, Side, Alignment, Font
@@ -538,7 +539,7 @@ def generate_excel(report,
         parameters_data = report['parameters']
         parameters_names_len = len(parameters_data['names'])
 
-        file_name = __file__.split('/')[-1].replace(".py", "")
+        file_name = (re.sub(r'[^A-Z]', '', ws.title))+'_'
         parameters_ws = wb.create_sheet(file_name + 'Parameters')
 
         parameters_timestamps_data_max_len = \

myems-api/excelexporters/combinedequipmentload.py

@@ -1,6 +1,7 @@
 import base64
 import uuid
 import os
+import re
 from openpyxl.chart import LineChart, Reference
 from openpyxl.chart.label import DataLabelList
 from openpyxl.styles import PatternFill, Border, Side, Alignment, Font
@@ -452,7 +453,7 @@ def generate_excel(report,
         parameters_data = report['parameters']
         parameters_names_len = len(parameters_data['names'])
 
-        file_name = __file__.split('/')[-1].replace(".py", "")
+        file_name = (re.sub(r'[^A-Z]', '', ws.title))+'_'
         parameters_ws = wb.create_sheet(file_name + 'Parameters')
 
         parameters_timestamps_data_max_len = \

myems-api/excelexporters/combinedequipmentoutput.py

@@ -1,6 +1,7 @@
 import base64
 import uuid
 import os
+import re
 from openpyxl.chart import LineChart, Reference
 from openpyxl.styles import PatternFill, Border, Side, Alignment, Font
 from openpyxl.drawing.image import Image
@@ -438,7 +439,7 @@ def generate_excel(report,
         parameters_data = report['parameters']
         parameters_names_len = len(parameters_data['names'])
 
-        file_name = __file__.split('/')[-1].replace(".py", "")
+        file_name = (re.sub(r'[^A-Z]', '', ws.title))+'_'
         parameters_ws = wb.create_sheet(file_name + 'Parameters')
 
         parameters_timestamps_data_max_len = \

myems-api/excelexporters/combinedequipmentsaving.py

@@ -1,6 +1,7 @@
 import base64
 import uuid
 import os
+import re
 from decimal import Decimal
 from openpyxl.chart import PieChart, LineChart, Reference
 from openpyxl.styles import PatternFill, Border, Side, Alignment, Font
@@ -627,7 +628,7 @@ def generate_excel(report,
         parameters_data = report['parameters']
         parameters_names_len = len(parameters_data['names'])
 
-        file_name = __file__.split('/')[-1].replace(".py", "")
+        file_name = (re.sub(r'[^A-Z]', '', ws.title)) + 'aving_'
         parameters_ws = wb.create_sheet(file_name + 'Parameters')
 
         parameters_timestamps_data_max_len = \

myems-api/excelexporters/combinedequipmentstatistics.py

@@ -1,6 +1,7 @@
 import base64
 import uuid
 import os
+import re
 from openpyxl.chart import LineChart, Reference
 from openpyxl.chart.label import DataLabelList
 from openpyxl.styles import PatternFill, Border, Side, Alignment, Font
@@ -483,7 +484,7 @@ def generate_excel(report,
         parameters_data = report['parameters']
         parameters_names_len = len(parameters_data['names'])
 
-        file_name = __file__.split('/')[-1].replace(".py", "")
+        file_name = (re.sub(r'[^A-Z]', '', ws.title))+'tatistics_'
         parameters_ws = wb.create_sheet(file_name + 'Parameters')
 
         parameters_timestamps_data_max_len = \

myems-api/excelexporters/equipmentcost.py

@@ -1,6 +1,7 @@
 import base64
 import uuid
 import os
+import re
 from openpyxl.chart import PieChart, LineChart, Reference
 from openpyxl.styles import PatternFill, Border, Side, Alignment, Font
 from openpyxl.drawing.image import Image
@@ -523,7 +524,7 @@ def generate_excel(report,
         parameters_data = report['parameters']
         parameters_names_len = len(parameters_data['names'])
 
-        file_name = __file__.split('/')[-1].replace(".py", "")
+        file_name = (re.sub(r'[^A-Z]', '', ws.title))+'_'
         parameters_ws = wb.create_sheet(file_name + 'Parameters')
 
         parameters_timestamps_data_max_len = \

myems-api/excelexporters/equipmentefficiency.py

@@ -1,6 +1,7 @@
 import base64
 import uuid
 import os
+import re
 from openpyxl.chart import LineChart, Reference
 from openpyxl.styles import PatternFill, Border, Side, Alignment, Font
 from openpyxl.drawing.image import Image
@@ -397,7 +398,7 @@ def generate_excel(report,
         parameters_data = report['parameters']
         parameters_names_len = len(parameters_data['names'])
 
-        file_name = __file__.split('/')[-1].replace(".py", "")
+        file_name = (re.sub(r'[^A-Z]', '', ws.title))+'_'
         parameters_ws = wb.create_sheet(file_name + 'Parameters')
 
         parameters_timestamps_data_max_len = \

myems-api/excelexporters/equipmentenergycategory.py

@@ -1,6 +1,7 @@
 import base64
 import uuid
 import os
+import re
 from openpyxl.chart import PieChart, LineChart, Reference
 from openpyxl.styles import PatternFill, Border, Side, Alignment, Font
 from openpyxl.drawing.image import Image
@@ -565,7 +566,7 @@ def generate_excel(report,
         parameters_data = report['parameters']
         parameters_names_len = len(parameters_data['names'])
 
-        file_name = __file__.split('/')[-1].replace(".py", "")
+        file_name = (re.sub(r'[^A-Z]', '', ws.title))+'_'
         parameters_ws = wb.create_sheet(file_name + 'Parameters')
 
         parameters_timestamps_data_max_len = \

myems-api/excelexporters/equipmentenergyitem.py

@@ -1,6 +1,7 @@
 import base64
 import uuid
 import os
+import re
 from openpyxl.chart import PieChart, LineChart, Reference
 from openpyxl.styles import PatternFill, Border, Side, Alignment, Font
 from openpyxl.drawing.image import Image
@@ -438,7 +439,7 @@ def generate_excel(report,
         parameters_data = report['parameters']
         parameters_names_len = len(parameters_data['names'])
 
-        file_name = __file__.split('/')[-1].replace(".py", "")
+        file_name = (re.sub(r'[^A-Z]', '', ws.title))+'_'
         parameters_ws = wb.create_sheet(file_name + 'Parameters')
 
         parameters_timestamps_data_max_len = \

myems-api/excelexporters/equipmentincome.py

@@ -1,6 +1,7 @@
 import base64
 import uuid
 import os
+import re
 from openpyxl.chart import PieChart, LineChart, Reference
 from decimal import Decimal
 from openpyxl.styles import PatternFill, Border, Side, Alignment, Font
@@ -461,7 +462,7 @@ def generate_excel(report,
         parameters_data = report['parameters']
         parameters_names_len = len(parameters_data['names'])
 
-        file_name = __file__.split('/')[-1].replace(".py", "")
+        file_name = (re.sub(r'[^A-Z]', '', ws.title))+'_'
         parameters_ws = wb.create_sheet(file_name + 'Parameters')
 
         parameters_timestamps_data_max_len = \

myems-api/excelexporters/equipmentload.py

@@ -1,6 +1,7 @@
 import base64
 import uuid
 import os
+import re
 from openpyxl.chart import LineChart, Reference
 from openpyxl.chart.label import DataLabelList
 from openpyxl.styles import PatternFill, Border, Side, Alignment, Font
@@ -370,7 +371,7 @@ def generate_excel(report,
         parameters_data = report['parameters']
         parameters_names_len = len(parameters_data['names'])
 
-        file_name = __file__.split('/')[-1].replace(".py", "")
+        file_name = (re.sub(r'[^A-Z]', '', ws.title))+'_'
         parameters_ws = wb.create_sheet(file_name + 'Parameters')
 
         parameters_timestamps_data_max_len = \

myems-api/excelexporters/equipmentoutput.py

@@ -1,6 +1,7 @@
 import base64
 import uuid
 import os
+import re
 from openpyxl.chart import LineChart, Reference
 from openpyxl.styles import PatternFill, Border, Side, Alignment, Font
 from openpyxl.drawing.image import Image
@@ -379,7 +380,7 @@ def generate_excel(report,
         parameters_data = report['parameters']
         parameters_names_len = len(parameters_data['names'])
 
-        file_name = __file__.split('/')[-1].replace(".py", "")
+        file_name = (re.sub(r'[^A-Z]', '', ws.title))+'_'
         parameters_ws = wb.create_sheet(file_name + 'Parameters')
 
         parameters_timestamps_data_max_len = \

myems-api/excelexporters/equipmentsaving.py

@@ -1,6 +1,7 @@
 import base64
 import uuid
 import os
+import re
 from decimal import Decimal
 from openpyxl.chart import PieChart, LineChart, Reference
 from openpyxl.styles import PatternFill, Border, Side, Alignment, Font
@@ -567,7 +568,7 @@ def generate_excel(report,
         parameters_data = report['parameters']
         parameters_names_len = len(parameters_data['names'])
 
-        file_name = __file__.split('/')[-1].replace(".py", "")
+        file_name = (re.sub(r'[^A-Z]', '', ws.title))+'aving_'
         parameters_ws = wb.create_sheet(file_name + 'Parameters')
 
         parameters_timestamps_data_max_len = \

myems-api/excelexporters/equipmentstatistics.py

@@ -1,6 +1,7 @@
 import base64
 import uuid
 import os
+import re
 from openpyxl.chart import LineChart, Reference
 from openpyxl.chart.label import DataLabelList
 from openpyxl.styles import PatternFill, Border, Side, Alignment, Font
@@ -424,7 +425,7 @@ def generate_excel(report,
         parameters_data = report['parameters']
         parameters_names_len = len(parameters_data['names'])
 
-        file_name = __file__.split('/')[-1].replace(".py", "")
+        file_name = (re.sub(r'[^A-Z]', '', ws.title))+'tatistics_'
         parameters_ws = wb.create_sheet(file_name + 'Parameters')
 
         parameters_timestamps_data_max_len = \

myems-api/excelexporters/metercost.py

@@ -1,6 +1,7 @@
 import base64
 import uuid
 import os
+import re
 from openpyxl.chart import LineChart, Reference, Series
 from openpyxl.styles import PatternFill, Border, Side, Alignment, Font
 from openpyxl.drawing.image import Image
@@ -371,7 +372,7 @@ def generate_excel(report, name, reporting_start_datetime_local, reporting_end_d
 
         parameters_names_len = len(parameters_data['names'])
 
-        file_name = __file__.split('/')[-1].replace(".py", "")
+        file_name = (re.sub(r'[^A-Z]', '', ws.title))+'_'
         parameters_ws = wb.create_sheet(file_name + 'Parameters')
 
         parameters_timestamps_data_max_len = \

myems-api/excelexporters/meterenergy.py

@@ -1,6 +1,7 @@
 import base64
 import uuid
 import os
+import re
 from openpyxl.chart import LineChart, Reference
 from openpyxl.styles import PatternFill, Border, Side, Alignment, Font
 from openpyxl.drawing.image import Image
@@ -386,7 +387,7 @@ def generate_excel(report, name, reporting_start_datetime_local, reporting_end_d
 
         parameters_names_len = len(parameters_data['names'])
 
-        file_name = __file__.split('/')[-1].replace(".py", "")
+        file_name = (re.sub(r'[^A-Z]', '', ws.title))+'_'
         parameters_ws = wb.create_sheet(file_name + 'Parameters')
 
         parameters_timestamps_data_max_len = \

myems-api/excelexporters/metersubmetersbalance.py

@@ -1,6 +1,7 @@
 import base64
 import uuid
 import os
+import re
 from openpyxl.chart import LineChart, Reference
 from openpyxl.styles import PatternFill, Border, Side, Alignment, Font
 from openpyxl.drawing.image import Image
@@ -337,7 +338,7 @@ def generate_excel(report, name, reporting_start_datetime_local, reporting_end_d
 
         parameters_names_len = len(parameters_data['names'])
 
-        file_name = __file__.split('/')[-1].replace(".py", "")
+        file_name = (re.sub(r'[^A-Z]', '', ws.title))+'_'
         parameters_ws = wb.create_sheet(file_name + 'Parameters')
 
         parameters_timestamps_data_max_len = \

myems-api/excelexporters/metertrend.py

@@ -1,6 +1,7 @@
 import base64
 import uuid
 import os
+import re
 from openpyxl.chart import LineChart, Reference
 from openpyxl.styles import PatternFill, Border, Side, Alignment, Font
 from openpyxl.drawing.image import Image
@@ -283,7 +284,7 @@ def generate_excel(report,
 
         parameters_names_len = len(parameters_data['names'])
 
-        file_name = __file__.split('/')[-1].replace(".py", "")
+        file_name = (re.sub(r'[^A-Z]', '', ws.title))+'_'
         parameters_ws = wb.create_sheet(file_name + 'Parameters')
 
         parameters_timestamps_data_max_len = \

myems-api/excelexporters/shopfloorcost.py

@@ -1,6 +1,7 @@
 import base64
 import uuid
 import os
+import re
 from decimal import Decimal
 from openpyxl.chart import PieChart, LineChart, Reference
 from openpyxl.styles import PatternFill, Border, Side, Alignment, Font
@@ -616,7 +617,7 @@ def generate_excel(report,
 
         parameters_names_len = len(parameters_data['names'])
 
-        file_name = __file__.split('/')[-1].replace(".py", "")
+        file_name = (re.sub(r'[^A-Z]', '', ws.title))+'_'
         parameters_ws = wb.create_sheet(file_name + 'Parameters')
 
         parameters_timestamps_data_max_len = \

myems-api/excelexporters/shopfloorenergycategory.py

@@ -1,6 +1,7 @@
 import base64
 import uuid
 import os
+import re
 from openpyxl.chart import PieChart, LineChart, Reference
 from openpyxl.styles import PatternFill, Border, Side, Alignment, Font
 from openpyxl.drawing.image import Image
@@ -501,7 +502,7 @@ def generate_excel(report,
 
         parameters_names_len = len(parameters_data['names'])
 
-        file_name = __file__.split('/')[-1].replace(".py", "")
+        file_name = (re.sub(r'[^A-Z]', '', ws.title))+'_'
         parameters_ws = wb.create_sheet(file_name + 'Parameters')
 
         parameters_timestamps_data_max_len = \

myems-api/excelexporters/shopfloorenergyitem.py

@@ -1,6 +1,7 @@
 import base64
 import uuid
 import os
+import re
 from openpyxl.chart import PieChart, LineChart, Reference
 from openpyxl.styles import PatternFill, Border, Side, Alignment, Font
 from openpyxl.drawing.image import Image
@@ -462,7 +463,7 @@ def generate_excel(report,
 
         parameters_names_len = len(parameters_data['names'])
 
-        file_name = __file__.split('/')[-1].replace(".py", "")
+        file_name = (re.sub(r'[^A-Z]', '', ws.title)) + '_'
         parameters_ws = wb.create_sheet(file_name + 'Parameters')
 
         parameters_timestamps_data_max_len = \

myems-api/excelexporters/shopfloorload.py

@@ -1,6 +1,7 @@
 import base64
 import uuid
 import os
+import re
 from openpyxl.chart import LineChart, Reference
 from openpyxl.chart.label import DataLabelList
 from openpyxl.styles import PatternFill, Border, Side, Alignment, Font
@@ -440,7 +441,7 @@ def generate_excel(report,
 
         parameters_names_len = len(parameters_data['names'])
 
-        file_name = __file__.split('/')[-1].replace(".py", "")
+        file_name = (re.sub(r'[^A-Z]', '', ws.title))+'_'
         parameters_ws = wb.create_sheet(file_name + 'Parameters')
 
         parameters_timestamps_data_max_len = \

myems-api/excelexporters/shopfloorsaving.py

@@ -1,6 +1,7 @@
 import base64
 import uuid
 import os
+import re
 from decimal import Decimal
 from openpyxl.chart import PieChart, LineChart, Reference
 from openpyxl.styles import PatternFill, Border, Side, Alignment, Font
@@ -608,7 +609,7 @@ def generate_excel(report,
 
         parameters_names_len = len(parameters_data['names'])
 
-        file_name = __file__.split('/')[-1].replace(".py", "")
+        file_name = (re.sub(r'[^A-Z]', '', ws.title))+'aving_'
         parameters_ws = wb.create_sheet(file_name + 'Parameters')
 
         parameters_timestamps_data_max_len = \

myems-api/excelexporters/shopfloorstatistics.py

@@ -1,6 +1,7 @@
 import base64
 import uuid
 import os
+import re
 from openpyxl.chart import LineChart, Reference
 from openpyxl.chart.label import DataLabelList
 from openpyxl.styles import PatternFill, Border, Side, Alignment, Font
@@ -548,7 +549,7 @@ def generate_excel(report,
 
         parameters_names_len = len(parameters_data['names'])
 
-        file_name = __file__.split('/')[-1].replace(".py", "")
+        file_name = (re.sub(r'[^A-Z]', '', ws.title))+'tatistics_'
         parameters_ws = wb.create_sheet(file_name + 'Parameters')
 
         parameters_timestamps_data_max_len = \

myems-api/excelexporters/spacecost.py

@@ -1,6 +1,7 @@
 import base64
 import uuid
 import os
+import re
 from decimal import Decimal
 from openpyxl.chart import PieChart, LineChart, Reference
 from openpyxl.styles import PatternFill, Border, Side, Alignment, Font
@@ -658,7 +659,7 @@ def generate_excel(report,
         parameters_data = report['parameters']
         parameters_names_len = len(parameters_data['names'])
 
-        file_name = __file__.split('/')[-1].replace(".py", "")
+        file_name = "Space"+re.sub(r'[^A-Z]', '', ws.title.strip('S')) + "_"
         parameters_ws = wb.create_sheet(file_name + 'Parameters')
 
         parameters_timestamps_data_max_len = \

myems-api/excelexporters/spaceefficiency.py

@@ -1,6 +1,7 @@
 import base64
 import uuid
 import os
+import re
 from openpyxl.chart import LineChart, Reference
 from openpyxl.styles import PatternFill, Border, Side, Alignment, Font
 from openpyxl.drawing.image import Image
@@ -401,7 +402,7 @@ def generate_excel(report,
         parameters_data = report['parameters']
         parameters_names_len = len(parameters_data['names'])
 
-        file_name = __file__.split('/')[-1].replace(".py", "")
+        file_name = "Space"+re.sub(r'[^A-Z]', '', ws.title.strip('S')) + "_"
         parameters_ws = wb.create_sheet(file_name + 'Parameters')
 
         parameters_timestamps_data_max_len = \

myems-api/excelexporters/spaceenergycategory.py

@@ -1,6 +1,7 @@
 import base64
 import uuid
 import os
+import re
 from openpyxl.chart import PieChart, LineChart, Reference
 from openpyxl.styles import PatternFill, Border, Side, Alignment, Font
 from openpyxl.drawing.image import Image
@@ -697,7 +698,7 @@ def generate_excel(report,
         parameters_data = report['parameters']
         parameters_names_len = len(parameters_data['names'])
 
-        file_name = __file__.split('/')[-1].replace(".py", "")
+        file_name = "Space"+re.sub(r'[^A-Z]', '', ws.title.strip('S')) + "_"
         parameters_ws = wb.create_sheet(file_name + 'Parameters')
 
         parameters_timestamps_data_max_len = \

myems-api/excelexporters/spaceenergyitem.py

@@ -1,6 +1,7 @@
 import base64
 import uuid
 import os
+import re
 from openpyxl.chart import PieChart, LineChart, Reference
 from openpyxl.styles import PatternFill, Border, Side, Alignment, Font
 from openpyxl.drawing.image import Image
@@ -549,7 +550,7 @@ def generate_excel(report,
         parameters_data = report['parameters']
         parameters_names_len = len(parameters_data['names'])
 
-        file_name = __file__.split('/')[-1].replace(".py", "")
+        file_name = "Space"+re.sub(r'[^A-Z]', '', ws.title.strip('S')) + "_"
         parameters_ws = wb.create_sheet(file_name + 'Parameters')
 
         parameters_timestamps_data_max_len = \

myems-api/excelexporters/spaceincome.py

@@ -1,6 +1,7 @@
 import base64
 import uuid
 import os
+import re
 from decimal import Decimal
 from openpyxl.chart import PieChart, LineChart, Reference
 from openpyxl.styles import PatternFill, Border, Side, Alignment, Font
@@ -591,7 +592,7 @@ def generate_excel(report,
         parameters_data = report['parameters']
         parameters_names_len = len(parameters_data['names'])
 
-        file_name = __file__.split('/')[-1].replace(".py", "")
+        file_name = "Space"+re.sub(r'[^A-Z]', '', ws.title.strip('S')) + "_"
         parameters_ws = wb.create_sheet(file_name + 'Parameters')
 
         parameters_timestamps_data_max_len = \

myems-api/excelexporters/spaceload.py

@@ -1,6 +1,7 @@
 import base64
 import uuid
 import os
+import re
 from openpyxl.chart import LineChart, Reference
 from openpyxl.styles import PatternFill, Border, Side, Alignment, Font
 from openpyxl.drawing.image import Image
@@ -499,7 +500,7 @@ def generate_excel(report, name, reporting_start_datetime_local, reporting_end_d
         parameters_data = report['parameters']
         parameters_names_len = len(parameters_data['names'])
 
-        file_name = __file__.split('/')[-1].replace(".py", "")
+        file_name = "Space"+re.sub(r'[^A-Z]', '', ws.title.strip('S')) + "_"
         parameters_ws = wb.create_sheet(file_name + 'Parameters')
 
         parameters_timestamps_data_max_len = \

myems-api/excelexporters/spaceoutput.py

@@ -1,6 +1,7 @@
 import base64
 import uuid
 import os
+import re
 from openpyxl.chart import PieChart, LineChart, Reference
 from openpyxl.styles import PatternFill, Border, Side, Alignment, Font
 from openpyxl.drawing.image import Image
@@ -488,7 +489,7 @@ def generate_excel(report,
         parameters_data = report['parameters']
         parameters_names_len = len(parameters_data['names'])
 
-        file_name = __file__.split('/')[-1].replace(".py", "")
+        file_name = "Space"+re.sub(r'[^A-Z]', '', ws.title.strip('S')) + "_"
         parameters_ws = wb.create_sheet(file_name + 'Parameters')
 
         parameters_timestamps_data_max_len = \

myems-api/excelexporters/spacesaving.py

@@ -698,7 +698,7 @@ def generate_excel(report,
         parameters_data = report['parameters']
         parameters_names_len = len(parameters_data['names'])
 
-        file_name = __file__.split('/')[-1].replace(".py", "")
+        file_name = ws.title
         parameters_ws = wb.create_sheet(file_name + 'Parameters')
 
         parameters_timestamps_data_max_len = \

myems-api/excelexporters/spacestatistics.py

@@ -540,7 +540,7 @@ def generate_excel(report,
         parameters_data = report['parameters']
         parameters_names_len = len(parameters_data['names'])
 
-        file_name = __file__.split('/')[-1].replace(".py", "")
+        file_name = ws.title
         parameters_ws = wb.create_sheet(file_name + 'Parameters')
 
         parameters_timestamps_data_max_len = \

myems-api/excelexporters/storecost.py

@@ -1,6 +1,7 @@
 import base64
 import uuid
 import os
+import re
 from decimal import Decimal
 from openpyxl.chart import PieChart, Reference, LineChart
 from openpyxl.styles import PatternFill, Border, Side, Alignment, Font
@@ -583,7 +584,7 @@ def generate_excel(report,
 
         parameters_names_len = len(parameters_data['names'])
 
-        file_name = __file__.split('/')[-1].replace(".py", "")
+        file_name = "Store" + re.sub(r'[^A-Z]', '', ws.title.strip('S')) + "_"
         parameters_ws = wb.create_sheet(file_name + 'Parameters')
 
         parameters_timestamps_data_max_len = \

myems-api/excelexporters/storeenergycategory.py

@@ -1,6 +1,7 @@
 import base64
 import uuid
 import os
+import re
 from openpyxl.chart import PieChart, LineChart, Reference
 from openpyxl.styles import PatternFill, Border, Side, Alignment, Font
 from openpyxl.drawing.image import Image
@@ -500,7 +501,7 @@ def generate_excel(report,
 
         parameters_names_len = len(parameters_data['names'])
 
-        file_name = __file__.split('/')[-1].replace(".py", "")
+        file_name = "Store"+re.sub(r'[^A-Z]', '', ws.title.strip('S')) + "_"
         parameters_ws = wb.create_sheet(file_name + 'Parameters')
 
         parameters_timestamps_data_max_len = \

myems-api/excelexporters/storeenergyitem.py

@@ -1,6 +1,7 @@
 import base64
 import uuid
 import os
+import re
 from openpyxl.chart import PieChart, LineChart, Reference
 from openpyxl.styles import PatternFill, Border, Side, Alignment, Font
 from openpyxl.drawing.image import Image
@@ -464,7 +465,7 @@ def generate_excel(report,
 
         parameters_names_len = len(parameters_data['names'])
 
-        file_name = __file__.split('/')[-1].replace(".py", "")
+        file_name = "Store"+re.sub(r'[^A-Z]', '', ws.title.strip('S')) + "_"
         parameters_ws = wb.create_sheet(file_name + 'Parameters')
 
         parameters_timestamps_data_max_len = \

myems-api/excelexporters/storeload.py

@@ -1,6 +1,7 @@
 import base64
 import uuid
 import os
+import re
 from openpyxl.chart import LineChart, Reference
 from openpyxl.chart.label import DataLabelList
 from openpyxl.styles import PatternFill, Border, Side, Alignment, Font
@@ -437,7 +438,7 @@ def generate_excel(report,
 
         parameters_names_len = len(parameters_data['names'])
 
-        file_name = __file__.split('/')[-1].replace(".py", "")
+        file_name = "Store"+re.sub(r'[^A-Z]', '', ws.title.strip('S')) + "_"
         parameters_ws = wb.create_sheet(file_name + 'Parameters')
 
         parameters_timestamps_data_max_len = \

myems-api/excelexporters/storesaving.py

@@ -608,7 +608,7 @@ def generate_excel(report,
 
         parameters_names_len = len(parameters_data['names'])
 
-        file_name = __file__.split('/')[-1].replace(".py", "")
+        file_name = ws.title
         parameters_ws = wb.create_sheet(file_name + 'Parameters')
 
         parameters_timestamps_data_max_len = \

myems-api/excelexporters/storestatistics.py

@@ -547,7 +547,7 @@ def generate_excel(report,
 
         parameters_names_len = len(parameters_data['names'])
 
-        file_name = __file__.split('/')[-1].replace(".py", "")
+        file_name = ws.title
         parameters_ws = wb.create_sheet(file_name + 'Parameters')
 
         parameters_timestamps_data_max_len = \

myems-api/excelexporters/tenantbatch.py

@@ -1,8 +1,6 @@
 import base64
 import uuid
 import os
-
-
 from openpyxl.styles import PatternFill, Border, Side, Alignment, Font
 from openpyxl.drawing.image import Image
 from openpyxl.utils import column_index_from_string, get_column_letter

myems-api/excelexporters/tenantcost.py

@@ -1,6 +1,7 @@
 import base64
 import uuid
 import os
+import re
 from decimal import Decimal
 from openpyxl.chart import PieChart, LineChart, Reference
 from openpyxl.styles import PatternFill, Border, Side, Alignment, Font
@@ -558,7 +559,7 @@ def generate_excel(report,
         parameters_data = report['parameters']
         parameters_names_len = len(parameters_data['names'])
 
-        file_name = __file__.split('/')[-1].replace(".py", "")
+        file_name = (re.sub(r'[^A-Z]', '', ws.title)) + '_'
         parameters_ws = wb.create_sheet(file_name + 'Parameters')
 
         parameters_timestamps_data_max_len = \

myems-api/excelexporters/tenantenergycategory.py

@@ -1,6 +1,7 @@
 import base64
 import uuid
 import os
+import re
 from openpyxl.chart import PieChart, LineChart, Reference
 from openpyxl.styles import PatternFill, Border, Side, Alignment, Font
 from openpyxl.drawing.image import Image
@@ -622,7 +623,7 @@ def generate_excel(report,
         parameters_data = report['parameters']
         parameters_names_len = len(parameters_data['names'])
 
-        file_name = __file__.split('/')[-1].replace(".py", "")
+        file_name = (re.sub(r'[^A-Z]', '', ws.title))+'_'
         parameters_ws = wb.create_sheet(file_name + 'Parameters')
 
         parameters_timestamps_data_max_len = \

myems-api/excelexporters/tenantenergyitem.py

@@ -1,6 +1,7 @@
 import base64
 import uuid
 import os
+import re
 from openpyxl.chart import PieChart, LineChart, Reference
 from openpyxl.styles import PatternFill, Border, Side, Alignment, Font
 from openpyxl.drawing.image import Image
@@ -455,7 +456,8 @@ def generate_excel(report,
 
         parameters_data = report['parameters']
         parameters_names_len = len(parameters_data['names'])
-        file_name = __file__.split('/')[-1].replace(".py", "")
+
+        file_name = (re.sub(r'[^A-Z]', '', ws.title))+'_'
         parameters_ws = wb.create_sheet(file_name + 'Parameters')
 
         parameters_timestamps_data_max_len = \

myems-api/excelexporters/tenantload.py

@@ -1,6 +1,7 @@
 import base64
 import uuid
 import os
+import re
 from openpyxl.chart import LineChart, Reference
 from openpyxl.styles import PatternFill, Border, Side, Alignment, Font
 from openpyxl.drawing.image import Image
@@ -501,7 +502,7 @@ def generate_excel(report, name, reporting_start_datetime_local, reporting_end_d
         parameters_data = report['parameters']
         parameters_names_len = len(parameters_data['names'])
 
-        file_name = __file__.split('/')[-1].replace(".py", "")
+        file_name = (re.sub(r'[^A-Z]', '', ws.title))+'_'
         parameters_ws = wb.create_sheet(file_name + 'Parameters')
 
         parameters_timestamps_data_max_len = \

myems-api/excelexporters/tenantsaving.py

@@ -1,6 +1,7 @@
 import base64
 import uuid
 import os
+import re
 from decimal import Decimal
 from openpyxl.chart import LineChart, PieChart, Reference
 from openpyxl.styles import PatternFill, Border, Side, Alignment, Font
@@ -602,7 +603,7 @@ def generate_excel(report,
         parameters_data = report['parameters']
         parameters_names_len = len(parameters_data['names'])
 
-        file_name = __file__.split('/')[-1].replace(".py", "")
+        file_name = (re.sub(r'[^A-Z]', '', ws.title))+'aving_'
         parameters_ws = wb.create_sheet(file_name + 'Parameters')
 
         parameters_timestamps_data_max_len = \

myems-api/excelexporters/tenantstatistics.py

@@ -1,6 +1,7 @@
 import base64
 import uuid
 import os
+import re
 from openpyxl.chart import LineChart, Reference
 from openpyxl.chart.label import DataLabelList
 from openpyxl.styles import PatternFill, Border, Side, Alignment, Font
@@ -539,7 +540,7 @@ def generate_excel(report,
         parameters_data = report['parameters']
         parameters_names_len = len(parameters_data['names'])
 
-        file_name = __file__.split('/')[-1].replace(".py", "")
+        file_name = (re.sub(r'[^A-Z]', '', ws.title))+'tatistics_'
         parameters_ws = wb.create_sheet(file_name + 'Parameters')
 
         parameters_timestamps_data_max_len = \