From cf26d8c7004f53f4524999f9b93d0ea4ab0c07e7 Mon Sep 17 00:00:00 2001 From: tianlinzhong <673359306@qq.com> Date: Mon, 18 Oct 2021 10:57:35 +0800 Subject: [PATCH] Rename All Parameter Worksheet Names in Excel Exporters --- myems-api/excelexporters/combinedequipmentcost.py | 3 ++- myems-api/excelexporters/combinedequipmentenergycategory.py | 3 ++- myems-api/excelexporters/combinedequipmentenergyitem.py | 3 ++- myems-api/excelexporters/combinedequipmentincome.py | 3 ++- myems-api/excelexporters/combinedequipmentload.py | 3 ++- myems-api/excelexporters/combinedequipmentoutput.py | 3 ++- myems-api/excelexporters/combinedequipmentsaving.py | 3 ++- myems-api/excelexporters/combinedequipmentstatistics.py | 3 ++- myems-api/excelexporters/equipmentcost.py | 3 ++- myems-api/excelexporters/equipmentefficiency.py | 3 ++- myems-api/excelexporters/equipmentenergycategory.py | 3 ++- myems-api/excelexporters/equipmentenergyitem.py | 3 ++- myems-api/excelexporters/equipmentincome.py | 3 ++- myems-api/excelexporters/equipmentload.py | 3 ++- myems-api/excelexporters/equipmentoutput.py | 3 ++- myems-api/excelexporters/equipmentsaving.py | 3 ++- myems-api/excelexporters/equipmentstatistics.py | 3 ++- myems-api/excelexporters/metercost.py | 3 ++- myems-api/excelexporters/meterenergy.py | 3 ++- myems-api/excelexporters/metersubmetersbalance.py | 3 ++- myems-api/excelexporters/metertrend.py | 3 ++- myems-api/excelexporters/shopfloorcost.py | 3 ++- myems-api/excelexporters/shopfloorenergycategory.py | 3 ++- myems-api/excelexporters/shopfloorenergyitem.py | 3 ++- myems-api/excelexporters/shopfloorload.py | 3 ++- myems-api/excelexporters/shopfloorsaving.py | 3 ++- myems-api/excelexporters/shopfloorstatistics.py | 3 ++- myems-api/excelexporters/spacecost.py | 3 ++- myems-api/excelexporters/spaceefficiency.py | 3 ++- myems-api/excelexporters/spaceenergycategory.py | 3 ++- myems-api/excelexporters/spaceenergyitem.py | 3 ++- myems-api/excelexporters/spaceincome.py | 3 ++- myems-api/excelexporters/spaceload.py | 3 ++- myems-api/excelexporters/spaceoutput.py | 3 ++- myems-api/excelexporters/spacesaving.py | 3 ++- myems-api/excelexporters/spacestatistics.py | 3 ++- myems-api/excelexporters/storecost.py | 3 ++- myems-api/excelexporters/storeenergycategory.py | 3 ++- myems-api/excelexporters/storeenergyitem.py | 3 ++- myems-api/excelexporters/storeload.py | 3 ++- myems-api/excelexporters/storesaving.py | 3 ++- myems-api/excelexporters/storestatistics.py | 3 ++- myems-api/excelexporters/tenantcost.py | 3 ++- myems-api/excelexporters/tenantenergycategory.py | 3 ++- myems-api/excelexporters/tenantenergyitem.py | 4 +++- myems-api/excelexporters/tenantload.py | 3 ++- myems-api/excelexporters/tenantsaving.py | 3 ++- myems-api/excelexporters/tenantstatistics.py | 3 ++- 48 files changed, 97 insertions(+), 48 deletions(-) diff --git a/myems-api/excelexporters/combinedequipmentcost.py b/myems-api/excelexporters/combinedequipmentcost.py index f2a3e2cf..78324d93 100644 --- a/myems-api/excelexporters/combinedequipmentcost.py +++ b/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 = \ diff --git a/myems-api/excelexporters/combinedequipmentenergycategory.py b/myems-api/excelexporters/combinedequipmentenergycategory.py index 8ccd0008..296cc653 100644 --- a/myems-api/excelexporters/combinedequipmentenergycategory.py +++ b/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 = \ diff --git a/myems-api/excelexporters/combinedequipmentenergyitem.py b/myems-api/excelexporters/combinedequipmentenergyitem.py index 32ab2068..e22ce540 100644 --- a/myems-api/excelexporters/combinedequipmentenergyitem.py +++ b/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 = \ diff --git a/myems-api/excelexporters/combinedequipmentincome.py b/myems-api/excelexporters/combinedequipmentincome.py index b29056fb..2c4be3c7 100644 --- a/myems-api/excelexporters/combinedequipmentincome.py +++ b/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 = \ diff --git a/myems-api/excelexporters/combinedequipmentload.py b/myems-api/excelexporters/combinedequipmentload.py index 6da5eea5..10e5d1dc 100644 --- a/myems-api/excelexporters/combinedequipmentload.py +++ b/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 = \ diff --git a/myems-api/excelexporters/combinedequipmentoutput.py b/myems-api/excelexporters/combinedequipmentoutput.py index eaa3af17..65d862b2 100644 --- a/myems-api/excelexporters/combinedequipmentoutput.py +++ b/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 = \ diff --git a/myems-api/excelexporters/combinedequipmentsaving.py b/myems-api/excelexporters/combinedequipmentsaving.py index 4f66bd53..0e9593e6 100644 --- a/myems-api/excelexporters/combinedequipmentsaving.py +++ b/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 = \ diff --git a/myems-api/excelexporters/combinedequipmentstatistics.py b/myems-api/excelexporters/combinedequipmentstatistics.py index e1d33e0a..91c029ff 100644 --- a/myems-api/excelexporters/combinedequipmentstatistics.py +++ b/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 = \ diff --git a/myems-api/excelexporters/equipmentcost.py b/myems-api/excelexporters/equipmentcost.py index 6b6a2a2a..ccaa7941 100644 --- a/myems-api/excelexporters/equipmentcost.py +++ b/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 = \ diff --git a/myems-api/excelexporters/equipmentefficiency.py b/myems-api/excelexporters/equipmentefficiency.py index cdfa9be7..591735a4 100644 --- a/myems-api/excelexporters/equipmentefficiency.py +++ b/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 = \ diff --git a/myems-api/excelexporters/equipmentenergycategory.py b/myems-api/excelexporters/equipmentenergycategory.py index 2c3ef490..8dd0ec2a 100644 --- a/myems-api/excelexporters/equipmentenergycategory.py +++ b/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 = \ diff --git a/myems-api/excelexporters/equipmentenergyitem.py b/myems-api/excelexporters/equipmentenergyitem.py index ca3104c9..d9ca5775 100644 --- a/myems-api/excelexporters/equipmentenergyitem.py +++ b/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 = \ diff --git a/myems-api/excelexporters/equipmentincome.py b/myems-api/excelexporters/equipmentincome.py index bf0815e5..f727f7c9 100644 --- a/myems-api/excelexporters/equipmentincome.py +++ b/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 = \ diff --git a/myems-api/excelexporters/equipmentload.py b/myems-api/excelexporters/equipmentload.py index d9ff7619..ec472b1a 100644 --- a/myems-api/excelexporters/equipmentload.py +++ b/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 = \ diff --git a/myems-api/excelexporters/equipmentoutput.py b/myems-api/excelexporters/equipmentoutput.py index 95e6382d..e3456ecc 100644 --- a/myems-api/excelexporters/equipmentoutput.py +++ b/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 = \ diff --git a/myems-api/excelexporters/equipmentsaving.py b/myems-api/excelexporters/equipmentsaving.py index bdd278ce..1908282c 100644 --- a/myems-api/excelexporters/equipmentsaving.py +++ b/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 = \ diff --git a/myems-api/excelexporters/equipmentstatistics.py b/myems-api/excelexporters/equipmentstatistics.py index e6d52d1d..6d3596e6 100644 --- a/myems-api/excelexporters/equipmentstatistics.py +++ b/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 = \ diff --git a/myems-api/excelexporters/metercost.py b/myems-api/excelexporters/metercost.py index ed24aebc..d90d4754 100644 --- a/myems-api/excelexporters/metercost.py +++ b/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 = \ diff --git a/myems-api/excelexporters/meterenergy.py b/myems-api/excelexporters/meterenergy.py index 6ec00f95..68ed3fdd 100644 --- a/myems-api/excelexporters/meterenergy.py +++ b/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 = \ diff --git a/myems-api/excelexporters/metersubmetersbalance.py b/myems-api/excelexporters/metersubmetersbalance.py index abd5470c..a5717ca2 100644 --- a/myems-api/excelexporters/metersubmetersbalance.py +++ b/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 = \ diff --git a/myems-api/excelexporters/metertrend.py b/myems-api/excelexporters/metertrend.py index 01d4f7ad..d8739c82 100644 --- a/myems-api/excelexporters/metertrend.py +++ b/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 = \ diff --git a/myems-api/excelexporters/shopfloorcost.py b/myems-api/excelexporters/shopfloorcost.py index 5ab44930..8da166e9 100644 --- a/myems-api/excelexporters/shopfloorcost.py +++ b/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 = \ diff --git a/myems-api/excelexporters/shopfloorenergycategory.py b/myems-api/excelexporters/shopfloorenergycategory.py index d2a0eb81..bfc5f086 100644 --- a/myems-api/excelexporters/shopfloorenergycategory.py +++ b/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 = \ diff --git a/myems-api/excelexporters/shopfloorenergyitem.py b/myems-api/excelexporters/shopfloorenergyitem.py index a9f98b29..85ca6fac 100644 --- a/myems-api/excelexporters/shopfloorenergyitem.py +++ b/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 = \ diff --git a/myems-api/excelexporters/shopfloorload.py b/myems-api/excelexporters/shopfloorload.py index 7e36567b..949796fd 100644 --- a/myems-api/excelexporters/shopfloorload.py +++ b/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 = \ diff --git a/myems-api/excelexporters/shopfloorsaving.py b/myems-api/excelexporters/shopfloorsaving.py index 552bccbb..9d982b05 100644 --- a/myems-api/excelexporters/shopfloorsaving.py +++ b/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 = \ diff --git a/myems-api/excelexporters/shopfloorstatistics.py b/myems-api/excelexporters/shopfloorstatistics.py index 4694256d..6e5f35d9 100644 --- a/myems-api/excelexporters/shopfloorstatistics.py +++ b/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 = \ diff --git a/myems-api/excelexporters/spacecost.py b/myems-api/excelexporters/spacecost.py index 023468c2..b16730e4 100644 --- a/myems-api/excelexporters/spacecost.py +++ b/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 = \ diff --git a/myems-api/excelexporters/spaceefficiency.py b/myems-api/excelexporters/spaceefficiency.py index b7c72bbc..b4dc251f 100644 --- a/myems-api/excelexporters/spaceefficiency.py +++ b/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 = \ diff --git a/myems-api/excelexporters/spaceenergycategory.py b/myems-api/excelexporters/spaceenergycategory.py index 3150d771..395d19d6 100644 --- a/myems-api/excelexporters/spaceenergycategory.py +++ b/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 = \ diff --git a/myems-api/excelexporters/spaceenergyitem.py b/myems-api/excelexporters/spaceenergyitem.py index 3e7abe13..51d973a4 100644 --- a/myems-api/excelexporters/spaceenergyitem.py +++ b/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 = \ diff --git a/myems-api/excelexporters/spaceincome.py b/myems-api/excelexporters/spaceincome.py index 0a19a344..f7690eba 100644 --- a/myems-api/excelexporters/spaceincome.py +++ b/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 = \ diff --git a/myems-api/excelexporters/spaceload.py b/myems-api/excelexporters/spaceload.py index 9e5d88ad..d2905f6e 100644 --- a/myems-api/excelexporters/spaceload.py +++ b/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 = \ diff --git a/myems-api/excelexporters/spaceoutput.py b/myems-api/excelexporters/spaceoutput.py index 4ae2f770..a3ce80ae 100644 --- a/myems-api/excelexporters/spaceoutput.py +++ b/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 = \ diff --git a/myems-api/excelexporters/spacesaving.py b/myems-api/excelexporters/spacesaving.py index 788c6dd7..6f9a66f4 100644 --- a/myems-api/excelexporters/spacesaving.py +++ b/myems-api/excelexporters/spacesaving.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 @@ -698,7 +699,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 = \ diff --git a/myems-api/excelexporters/spacestatistics.py b/myems-api/excelexporters/spacestatistics.py index d1bdcf01..b6695b81 100644 --- a/myems-api/excelexporters/spacestatistics.py +++ b/myems-api/excelexporters/spacestatistics.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 @@ -540,7 +541,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 = \ diff --git a/myems-api/excelexporters/storecost.py b/myems-api/excelexporters/storecost.py index 41da2261..fdf6700b 100644 --- a/myems-api/excelexporters/storecost.py +++ b/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 = \ diff --git a/myems-api/excelexporters/storeenergycategory.py b/myems-api/excelexporters/storeenergycategory.py index 510f617b..875dcd60 100644 --- a/myems-api/excelexporters/storeenergycategory.py +++ b/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 = \ diff --git a/myems-api/excelexporters/storeenergyitem.py b/myems-api/excelexporters/storeenergyitem.py index 84c60f8d..0753598a 100644 --- a/myems-api/excelexporters/storeenergyitem.py +++ b/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 = \ diff --git a/myems-api/excelexporters/storeload.py b/myems-api/excelexporters/storeload.py index 2bdd67ca..4e6e5b83 100644 --- a/myems-api/excelexporters/storeload.py +++ b/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 = \ diff --git a/myems-api/excelexporters/storesaving.py b/myems-api/excelexporters/storesaving.py index b78c2294..349b2d08 100644 --- a/myems-api/excelexporters/storesaving.py +++ b/myems-api/excelexporters/storesaving.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 = ws.title parameters_ws = wb.create_sheet(file_name + 'Parameters') parameters_timestamps_data_max_len = \ diff --git a/myems-api/excelexporters/storestatistics.py b/myems-api/excelexporters/storestatistics.py index 2acb5ded..12cca66d 100644 --- a/myems-api/excelexporters/storestatistics.py +++ b/myems-api/excelexporters/storestatistics.py @@ -1,5 +1,6 @@ import base64 import os +import re import uuid from openpyxl import Workbook from openpyxl.chart import LineChart, Reference @@ -547,7 +548,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 = \ diff --git a/myems-api/excelexporters/tenantcost.py b/myems-api/excelexporters/tenantcost.py index b5676555..70ce4f2b 100644 --- a/myems-api/excelexporters/tenantcost.py +++ b/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 = \ diff --git a/myems-api/excelexporters/tenantenergycategory.py b/myems-api/excelexporters/tenantenergycategory.py index d97c0785..b3d6a021 100644 --- a/myems-api/excelexporters/tenantenergycategory.py +++ b/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 = \ diff --git a/myems-api/excelexporters/tenantenergyitem.py b/myems-api/excelexporters/tenantenergyitem.py index e3f84349..10008d2e 100644 --- a/myems-api/excelexporters/tenantenergyitem.py +++ b/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 = \ diff --git a/myems-api/excelexporters/tenantload.py b/myems-api/excelexporters/tenantload.py index c337a02c..60fc77f1 100644 --- a/myems-api/excelexporters/tenantload.py +++ b/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 = \ diff --git a/myems-api/excelexporters/tenantsaving.py b/myems-api/excelexporters/tenantsaving.py index 0f0f7dab..8c43ec13 100644 --- a/myems-api/excelexporters/tenantsaving.py +++ b/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 = \ diff --git a/myems-api/excelexporters/tenantstatistics.py b/myems-api/excelexporters/tenantstatistics.py index 2d9ea217..ec408767 100644 --- a/myems-api/excelexporters/tenantstatistics.py +++ b/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 = \