seg_yinzy
/
myems
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Added the time scale of weekly to all required files

pull/77/head
Caozhenhui 2021-11-01 11:28:07 +08:00
parent 01bce323b9
commit 9ea6c505a5
53 changed files with 306 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
myems-api/reports/combinedequipmentcost.py
View File

@ -60,7 +60,7 @@ class Reporting:
raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_PERIOD_TYPE') raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_PERIOD_TYPE')
else: else:
period_type = str.strip(period_type) period_type = str.strip(period_type)
if period_type not in ['hourly', 'daily', 'monthly', 'yearly']: if period_type not in ['hourly', 'daily', 'weekly', 'monthly', 'yearly']:
raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_PERIOD_TYPE') raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_PERIOD_TYPE')
timezone_offset = int(config.utc_offset[1:3]) * 60 + int(config.utc_offset[4:6]) timezone_offset = int(config.utc_offset[1:3]) * 60 + int(config.utc_offset[4:6])
@ -286,6 +286,8 @@ class Reporting:
current_datetime = current_datetime_local.strftime('%Y-%m-%dT%H:%M:%S') current_datetime = current_datetime_local.strftime('%Y-%m-%dT%H:%M:%S')
elif period_type == 'daily': elif period_type == 'daily':
current_datetime = current_datetime_local.strftime('%Y-%m-%d') current_datetime = current_datetime_local.strftime('%Y-%m-%d')
elif period_type == 'weekly':
current_datetime = current_datetime_local.strftime('%Y-%m-%d')
elif period_type == 'monthly': elif period_type == 'monthly':
current_datetime = current_datetime_local.strftime('%Y-%m') current_datetime = current_datetime_local.strftime('%Y-%m')
elif period_type == 'yearly': elif period_type == 'yearly':
@ -337,6 +339,8 @@ class Reporting:
current_datetime = current_datetime_local.strftime('%Y-%m-%dT%H:%M:%S') current_datetime = current_datetime_local.strftime('%Y-%m-%dT%H:%M:%S')
elif period_type == 'daily': elif period_type == 'daily':
current_datetime = current_datetime_local.strftime('%Y-%m-%d') current_datetime = current_datetime_local.strftime('%Y-%m-%d')
elif period_type == 'weekly':
current_datetime = current_datetime_local.strftime('%Y-%m-%d')
elif period_type == 'monthly': elif period_type == 'monthly':
current_datetime = current_datetime_local.strftime('%Y-%m') current_datetime = current_datetime_local.strftime('%Y-%m')
elif period_type == 'yearly': elif period_type == 'yearly':

10
myems-api/reports/combinedequipmentefficiency.py
View File

@ -60,7 +60,7 @@ class Reporting:
raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_PERIOD_TYPE') raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_PERIOD_TYPE')
else: else:
period_type = str.strip(period_type) period_type = str.strip(period_type)
if period_type not in ['hourly', 'daily', 'monthly', 'yearly']: if period_type not in ['hourly', 'daily', 'weekly', 'monthly', 'yearly']:
raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_PERIOD_TYPE') raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_PERIOD_TYPE')
timezone_offset = int(config.utc_offset[1:3]) * 60 + int(config.utc_offset[4:6]) timezone_offset = int(config.utc_offset[1:3]) * 60 + int(config.utc_offset[4:6])
@ -436,6 +436,8 @@ class Reporting:
current_datetime = current_datetime_local.strftime('%Y-%m-%dT%H:%M:%S') current_datetime = current_datetime_local.strftime('%Y-%m-%dT%H:%M:%S')
elif period_type == 'daily': elif period_type == 'daily':
current_datetime = current_datetime_local.strftime('%Y-%m-%d') current_datetime = current_datetime_local.strftime('%Y-%m-%d')
elif period_type == 'weekly':
current_datetime = current_datetime_local.strftime('%Y-%m-%d')
elif period_type == 'monthly': elif period_type == 'monthly':
current_datetime = current_datetime_local.strftime('%Y-%m') current_datetime = current_datetime_local.strftime('%Y-%m')
elif period_type == 'yearly': elif period_type == 'yearly':
@ -455,6 +457,8 @@ class Reporting:
current_datetime = current_datetime_local.strftime('%Y-%m-%dT%H:%M:%S') current_datetime = current_datetime_local.strftime('%Y-%m-%dT%H:%M:%S')
elif period_type == 'daily': elif period_type == 'daily':
current_datetime = current_datetime_local.strftime('%Y-%m-%d') current_datetime = current_datetime_local.strftime('%Y-%m-%d')
elif period_type == 'weekly':
current_datetime = current_datetime_local.strftime('%Y-%m-%d')
elif period_type == 'monthly': elif period_type == 'monthly':
current_datetime = current_datetime_local.strftime('%Y-%m') current_datetime = current_datetime_local.strftime('%Y-%m')
elif period_type == 'yearly': elif period_type == 'yearly':
@ -573,6 +577,8 @@ class Reporting:
current_datetime = current_datetime_local.strftime('%Y-%m-%dT%H:%M:%S') current_datetime = current_datetime_local.strftime('%Y-%m-%dT%H:%M:%S')
elif period_type == 'daily': elif period_type == 'daily':
current_datetime = current_datetime_local.strftime('%Y-%m-%d') current_datetime = current_datetime_local.strftime('%Y-%m-%d')
elif period_type == 'weekly':
current_datetime = current_datetime_local.strftime('%Y-%m-%d')
elif period_type == 'monthly': elif period_type == 'monthly':
current_datetime = current_datetime_local.strftime('%Y-%m') current_datetime = current_datetime_local.strftime('%Y-%m')
elif period_type == 'yearly': elif period_type == 'yearly':
@ -592,6 +598,8 @@ class Reporting:
current_datetime = current_datetime_local.strftime('%Y-%m-%dT%H:%M:%S') current_datetime = current_datetime_local.strftime('%Y-%m-%dT%H:%M:%S')
elif period_type == 'daily': elif period_type == 'daily':
current_datetime = current_datetime_local.strftime('%Y-%m-%d') current_datetime = current_datetime_local.strftime('%Y-%m-%d')
elif period_type == 'weekly':
current_datetime = current_datetime_local.strftime('%Y-%m-%d')
elif period_type == 'monthly': elif period_type == 'monthly':
current_datetime = current_datetime_local.strftime('%Y-%m') current_datetime = current_datetime_local.strftime('%Y-%m')
elif period_type == 'yearly': elif period_type == 'yearly':

6
myems-api/reports/combinedequipmentenergycategory.py
View File

@ -60,7 +60,7 @@ class Reporting:
raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_PERIOD_TYPE') raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_PERIOD_TYPE')
else: else:
period_type = str.strip(period_type) period_type = str.strip(period_type)
if period_type not in ['hourly', 'daily', 'monthly', 'yearly']: if period_type not in ['hourly', 'daily', 'weekly', 'monthly', 'yearly']:
raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_PERIOD_TYPE') raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_PERIOD_TYPE')
timezone_offset = int(config.utc_offset[1:3]) * 60 + int(config.utc_offset[4:6]) timezone_offset = int(config.utc_offset[1:3]) * 60 + int(config.utc_offset[4:6])
@ -291,6 +291,8 @@ class Reporting:
current_datetime = current_datetime_local.strftime('%Y-%m-%dT%H:%M:%S') current_datetime = current_datetime_local.strftime('%Y-%m-%dT%H:%M:%S')
elif period_type == 'daily': elif period_type == 'daily':
current_datetime = current_datetime_local.strftime('%Y-%m-%d') current_datetime = current_datetime_local.strftime('%Y-%m-%d')
elif period_type == 'weekly':
current_datetime = current_datetime_local.strftime('%Y-%m-%d')
elif period_type == 'monthly': elif period_type == 'monthly':
current_datetime = current_datetime_local.strftime('%Y-%m') current_datetime = current_datetime_local.strftime('%Y-%m')
elif period_type == 'yearly': elif period_type == 'yearly':
@ -349,6 +351,8 @@ class Reporting:
current_datetime = current_datetime_local.strftime('%Y-%m-%dT%H:%M:%S') current_datetime = current_datetime_local.strftime('%Y-%m-%dT%H:%M:%S')
elif period_type == 'daily': elif period_type == 'daily':
current_datetime = current_datetime_local.strftime('%Y-%m-%d') current_datetime = current_datetime_local.strftime('%Y-%m-%d')
elif period_type == 'weekly':
current_datetime = current_datetime_local.strftime('%Y-%m-%d')
elif period_type == 'monthly': elif period_type == 'monthly':
current_datetime = current_datetime_local.strftime('%Y-%m') current_datetime = current_datetime_local.strftime('%Y-%m')
elif period_type == 'yearly': elif period_type == 'yearly':

6
myems-api/reports/combinedequipmentenergyitem.py
View File

@ -60,7 +60,7 @@ class Reporting:
raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_PERIOD_TYPE') raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_PERIOD_TYPE')
else: else:
period_type = str.strip(period_type) period_type = str.strip(period_type)
if period_type not in ['hourly', 'daily', 'monthly', 'yearly']: if period_type not in ['hourly', 'daily', 'weekly', 'monthly', 'yearly']:
raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_PERIOD_TYPE') raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_PERIOD_TYPE')
timezone_offset = int(config.utc_offset[1:3]) * 60 + int(config.utc_offset[4:6]) timezone_offset = int(config.utc_offset[1:3]) * 60 + int(config.utc_offset[4:6])
@ -290,6 +290,8 @@ class Reporting:
current_datetime = current_datetime_local.strftime('%Y-%m-%dT%H:%M:%S') current_datetime = current_datetime_local.strftime('%Y-%m-%dT%H:%M:%S')
elif period_type == 'daily': elif period_type == 'daily':
current_datetime = current_datetime_local.strftime('%Y-%m-%d') current_datetime = current_datetime_local.strftime('%Y-%m-%d')
elif period_type == 'weekly':
current_datetime = current_datetime_local.strftime('%Y-%m-%d')
elif period_type == 'monthly': elif period_type == 'monthly':
current_datetime = current_datetime_local.strftime('%Y-%m') current_datetime = current_datetime_local.strftime('%Y-%m')
elif period_type == 'yearly': elif period_type == 'yearly':
@ -341,6 +343,8 @@ class Reporting:
current_datetime = current_datetime_local.strftime('%Y-%m-%dT%H:%M:%S') current_datetime = current_datetime_local.strftime('%Y-%m-%dT%H:%M:%S')
elif period_type == 'daily': elif period_type == 'daily':
current_datetime = current_datetime_local.strftime('%Y-%m-%d') current_datetime = current_datetime_local.strftime('%Y-%m-%d')
elif period_type == 'weekly':
current_datetime = current_datetime_local.strftime('%Y-%m-%d')
elif period_type == 'monthly': elif period_type == 'monthly':
current_datetime = current_datetime_local.strftime('%Y-%m') current_datetime = current_datetime_local.strftime('%Y-%m')
elif period_type == 'yearly': elif period_type == 'yearly':

6
myems-api/reports/combinedequipmentincome.py
View File

@ -60,7 +60,7 @@ class Reporting:
raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_PERIOD_TYPE') raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_PERIOD_TYPE')
else: else:
period_type = str.strip(period_type) period_type = str.strip(period_type)
if period_type not in ['hourly', 'daily', 'monthly', 'yearly']: if period_type not in ['hourly', 'daily', 'weekly', 'monthly', 'yearly']:
raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_PERIOD_TYPE') raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_PERIOD_TYPE')
timezone_offset = int(config.utc_offset[1:3]) * 60 + int(config.utc_offset[4:6]) timezone_offset = int(config.utc_offset[1:3]) * 60 + int(config.utc_offset[4:6])
@ -286,6 +286,8 @@ class Reporting:
current_datetime = current_datetime_local.strftime('%Y-%m-%dT%H:%M:%S') current_datetime = current_datetime_local.strftime('%Y-%m-%dT%H:%M:%S')
elif period_type == 'daily': elif period_type == 'daily':
current_datetime = current_datetime_local.strftime('%Y-%m-%d') current_datetime = current_datetime_local.strftime('%Y-%m-%d')
elif period_type == 'weekly':
current_datetime = current_datetime_local.strftime('%Y-%m-%d')
elif period_type == 'monthly': elif period_type == 'monthly':
current_datetime = current_datetime_local.strftime('%Y-%m') current_datetime = current_datetime_local.strftime('%Y-%m')
elif period_type == 'yearly': elif period_type == 'yearly':
@ -333,6 +335,8 @@ class Reporting:
current_datetime = current_datetime_local.strftime('%Y-%m-%dT%H:%M:%S') current_datetime = current_datetime_local.strftime('%Y-%m-%dT%H:%M:%S')
elif period_type == 'daily': elif period_type == 'daily':
current_datetime = current_datetime_local.strftime('%Y-%m-%d') current_datetime = current_datetime_local.strftime('%Y-%m-%d')
elif period_type == 'weekly':
current_datetime = current_datetime_local.strftime('%Y-%m-%d')
elif period_type == 'monthly': elif period_type == 'monthly':
current_datetime = current_datetime_local.strftime('%Y-%m') current_datetime = current_datetime_local.strftime('%Y-%m')
elif period_type == 'yearly': elif period_type == 'yearly':

6
myems-api/reports/combinedequipmentload.py
View File

@ -60,7 +60,7 @@ class Reporting:
raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_PERIOD_TYPE') raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_PERIOD_TYPE')
else: else:
period_type = str.strip(period_type) period_type = str.strip(period_type)
if period_type not in ['hourly', 'daily', 'monthly', 'yearly']: if period_type not in ['hourly', 'daily', 'weekly', 'monthly', 'yearly']:
raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_PERIOD_TYPE') raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_PERIOD_TYPE')
timezone_offset = int(config.utc_offset[1:3]) * 60 + int(config.utc_offset[4:6]) timezone_offset = int(config.utc_offset[1:3]) * 60 + int(config.utc_offset[4:6])
@ -298,6 +298,8 @@ class Reporting:
current_datetime = current_datetime_local.strftime('%Y-%m-%dT%H:%M:%S') current_datetime = current_datetime_local.strftime('%Y-%m-%dT%H:%M:%S')
elif period_type == 'daily': elif period_type == 'daily':
current_datetime = current_datetime_local.strftime('%Y-%m-%d') current_datetime = current_datetime_local.strftime('%Y-%m-%d')
elif period_type == 'weekly':
current_datetime = current_datetime_local.strftime('%Y-%m-%d')
elif period_type == 'monthly': elif period_type == 'monthly':
current_datetime = current_datetime_local.strftime('%Y-%m') current_datetime = current_datetime_local.strftime('%Y-%m')
elif period_type == 'yearly': elif period_type == 'yearly':
@ -355,6 +357,8 @@ class Reporting:
current_datetime = current_datetime_local.strftime('%Y-%m-%dT%H:%M:%S') current_datetime = current_datetime_local.strftime('%Y-%m-%dT%H:%M:%S')
elif period_type == 'daily': elif period_type == 'daily':
current_datetime = current_datetime_local.strftime('%Y-%m-%d') current_datetime = current_datetime_local.strftime('%Y-%m-%d')
elif period_type == 'weekly':
current_datetime = current_datetime_local.strftime('%Y-%m-%d')
elif period_type == 'monthly': elif period_type == 'monthly':
current_datetime = current_datetime_local.strftime('%Y-%m') current_datetime = current_datetime_local.strftime('%Y-%m')
elif period_type == 'yearly': elif period_type == 'yearly':

6
myems-api/reports/combinedequipmentoutput.py
View File

@ -60,7 +60,7 @@ class Reporting:
raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_PERIOD_TYPE') raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_PERIOD_TYPE')
else: else:
period_type = str.strip(period_type) period_type = str.strip(period_type)
if period_type not in ['hourly', 'daily', 'monthly', 'yearly']: if period_type not in ['hourly', 'daily', 'weekly', 'monthly', 'yearly']:
raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_PERIOD_TYPE') raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_PERIOD_TYPE')
timezone_offset = int(config.utc_offset[1:3]) * 60 + int(config.utc_offset[4:6]) timezone_offset = int(config.utc_offset[1:3]) * 60 + int(config.utc_offset[4:6])
@ -286,6 +286,8 @@ class Reporting:
current_datetime = current_datetime_local.strftime('%Y-%m-%dT%H:%M:%S') current_datetime = current_datetime_local.strftime('%Y-%m-%dT%H:%M:%S')
elif period_type == 'daily': elif period_type == 'daily':
current_datetime = current_datetime_local.strftime('%Y-%m-%d') current_datetime = current_datetime_local.strftime('%Y-%m-%d')
elif period_type == 'weekly':
current_datetime = current_datetime_local.strftime('%Y-%m-%d')
elif period_type == 'monthly': elif period_type == 'monthly':
current_datetime = current_datetime_local.strftime('%Y-%m') current_datetime = current_datetime_local.strftime('%Y-%m')
elif period_type == 'yearly': elif period_type == 'yearly':
@ -333,6 +335,8 @@ class Reporting:
current_datetime = current_datetime_local.strftime('%Y-%m-%dT%H:%M:%S') current_datetime = current_datetime_local.strftime('%Y-%m-%dT%H:%M:%S')
elif period_type == 'daily': elif period_type == 'daily':
current_datetime = current_datetime_local.strftime('%Y-%m-%d') current_datetime = current_datetime_local.strftime('%Y-%m-%d')
elif period_type == 'weekly':
current_datetime = current_datetime_local.strftime('%Y-%m-%d')
elif period_type == 'monthly': elif period_type == 'monthly':
current_datetime = current_datetime_local.strftime('%Y-%m') current_datetime = current_datetime_local.strftime('%Y-%m')
elif period_type == 'yearly': elif period_type == 'yearly':

10
myems-api/reports/combinedequipmentsaving.py
View File

@ -60,7 +60,7 @@ class Reporting:
raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_PERIOD_TYPE') raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_PERIOD_TYPE')
else: else:
period_type = str.strip(period_type) period_type = str.strip(period_type)
if period_type not in ['hourly', 'daily', 'monthly', 'yearly']: if period_type not in ['hourly', 'daily', 'weekly', 'monthly', 'yearly']:
raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_PERIOD_TYPE') raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_PERIOD_TYPE')
timezone_offset = int(config.utc_offset[1:3]) * 60 + int(config.utc_offset[4:6]) timezone_offset = int(config.utc_offset[1:3]) * 60 + int(config.utc_offset[4:6])
@ -312,6 +312,8 @@ class Reporting:
current_datetime = current_datetime_local.strftime('%Y-%m-%dT%H:%M:%S') current_datetime = current_datetime_local.strftime('%Y-%m-%dT%H:%M:%S')
elif period_type == 'daily': elif period_type == 'daily':
current_datetime = current_datetime_local.strftime('%Y-%m-%d') current_datetime = current_datetime_local.strftime('%Y-%m-%d')
elif period_type == 'weekly':
current_datetime = current_datetime_local.strftime('%Y-%m-%d')
elif period_type == 'monthly': elif period_type == 'monthly':
current_datetime = current_datetime_local.strftime('%Y-%m') current_datetime = current_datetime_local.strftime('%Y-%m')
elif period_type == 'yearly': elif period_type == 'yearly':
@ -351,6 +353,8 @@ class Reporting:
current_datetime = current_datetime_local.strftime('%Y-%m-%dT%H:%M:%S') current_datetime = current_datetime_local.strftime('%Y-%m-%dT%H:%M:%S')
elif period_type == 'daily': elif period_type == 'daily':
current_datetime = current_datetime_local.strftime('%Y-%m-%d') current_datetime = current_datetime_local.strftime('%Y-%m-%d')
elif period_type == 'weekly':
current_datetime = current_datetime_local.strftime('%Y-%m-%d')
elif period_type == 'monthly': elif period_type == 'monthly':
current_datetime = current_datetime_local.strftime('%Y-%m') current_datetime = current_datetime_local.strftime('%Y-%m')
elif period_type == 'yearly': elif period_type == 'yearly':
@ -427,6 +431,8 @@ class Reporting:
current_datetime = current_datetime_local.strftime('%Y-%m-%dT%H:%M:%S') current_datetime = current_datetime_local.strftime('%Y-%m-%dT%H:%M:%S')
elif period_type == 'daily': elif period_type == 'daily':
current_datetime = current_datetime_local.strftime('%Y-%m-%d') current_datetime = current_datetime_local.strftime('%Y-%m-%d')
elif period_type == 'weekly':
current_datetime = current_datetime_local.strftime('%Y-%m-%d')
elif period_type == 'monthly': elif period_type == 'monthly':
current_datetime = current_datetime_local.strftime('%Y-%m') current_datetime = current_datetime_local.strftime('%Y-%m')
elif period_type == 'yearly': elif period_type == 'yearly':
@ -466,6 +472,8 @@ class Reporting:
current_datetime = current_datetime_local.strftime('%Y-%m-%dT%H:%M:%S') current_datetime = current_datetime_local.strftime('%Y-%m-%dT%H:%M:%S')
elif period_type == 'daily': elif period_type == 'daily':
current_datetime = current_datetime_local.strftime('%Y-%m-%d') current_datetime = current_datetime_local.strftime('%Y-%m-%d')
elif period_type == 'weekly':
current_datetime = current_datetime_local.strftime('%Y-%m-%d')
elif period_type == 'monthly': elif period_type == 'monthly':
current_datetime = current_datetime_local.strftime('%Y-%m') current_datetime = current_datetime_local.strftime('%Y-%m')
elif period_type == 'yearly': elif period_type == 'yearly':

6
myems-api/reports/combinedequipmentstatistics.py
View File

@ -60,7 +60,7 @@ class Reporting:
raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_PERIOD_TYPE') raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_PERIOD_TYPE')
else: else:
period_type = str.strip(period_type) period_type = str.strip(period_type)
if period_type not in ['hourly', 'daily', 'monthly', 'yearly']: if period_type not in ['hourly', 'daily', 'weekly', 'monthly', 'yearly']:
raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_PERIOD_TYPE') raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_PERIOD_TYPE')
timezone_offset = int(config.utc_offset[1:3]) * 60 + int(config.utc_offset[4:6]) timezone_offset = int(config.utc_offset[1:3]) * 60 + int(config.utc_offset[4:6])
@ -299,6 +299,8 @@ class Reporting:
current_datetime = current_datetime_local.strftime('%Y-%m-%dT%H:%M:%S') current_datetime = current_datetime_local.strftime('%Y-%m-%dT%H:%M:%S')
elif period_type == 'daily': elif period_type == 'daily':
current_datetime = current_datetime_local.strftime('%Y-%m-%d') current_datetime = current_datetime_local.strftime('%Y-%m-%d')
elif period_type == 'weekly':
current_datetime = current_datetime_local.strftime('%Y-%m-%d')
elif period_type == 'monthly': elif period_type == 'monthly':
current_datetime = current_datetime_local.strftime('%Y-%m') current_datetime = current_datetime_local.strftime('%Y-%m')
elif period_type == 'yearly': elif period_type == 'yearly':
@ -359,6 +361,8 @@ class Reporting:
current_datetime = current_datetime_local.strftime('%Y-%m-%dT%H:%M:%S') current_datetime = current_datetime_local.strftime('%Y-%m-%dT%H:%M:%S')
elif period_type == 'daily': elif period_type == 'daily':
current_datetime = current_datetime_local.strftime('%Y-%m-%d') current_datetime = current_datetime_local.strftime('%Y-%m-%d')
elif period_type == 'weekly':
current_datetime = current_datetime_local.strftime('%Y-%m-%d')
elif period_type == 'monthly': elif period_type == 'monthly':
current_datetime = current_datetime_local.strftime('%Y-%m') current_datetime = current_datetime_local.strftime('%Y-%m')
elif period_type == 'yearly': elif period_type == 'yearly':

10
myems-api/reports/dashboard.py
View File

@ -54,7 +54,7 @@ class Reporting:
raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_PERIOD_TYPE') raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_PERIOD_TYPE')
else: else:
period_type = str.strip(period_type) period_type = str.strip(period_type)
if period_type not in ['hourly', 'daily', 'monthly', 'yearly']: if period_type not in ['hourly', 'daily', 'weekly', 'monthly', 'yearly']:
raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_PERIOD_TYPE') raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_PERIOD_TYPE')
timezone_offset = int(config.utc_offset[1:3]) * 60 + int(config.utc_offset[4:6]) timezone_offset = int(config.utc_offset[1:3]) * 60 + int(config.utc_offset[4:6])
@ -312,6 +312,8 @@ class Reporting:
current_datetime = current_datetime_local.strftime('%Y-%m-%dT%H:%M:%S') current_datetime = current_datetime_local.strftime('%Y-%m-%dT%H:%M:%S')
elif period_type == 'daily': elif period_type == 'daily':
current_datetime = current_datetime_local.strftime('%Y-%m-%d') current_datetime = current_datetime_local.strftime('%Y-%m-%d')
elif period_type == 'weekly':
current_datetime = current_datetime_local.strftime('%Y-%m-%d')
elif period_type == 'monthly': elif period_type == 'monthly':
current_datetime = current_datetime_local.strftime('%Y-%m') current_datetime = current_datetime_local.strftime('%Y-%m')
elif period_type == 'yearly': elif period_type == 'yearly':
@ -359,6 +361,8 @@ class Reporting:
current_datetime = current_datetime_local.strftime('%Y-%m-%dT%H:%M:%S') current_datetime = current_datetime_local.strftime('%Y-%m-%dT%H:%M:%S')
elif period_type == 'daily': elif period_type == 'daily':
current_datetime = current_datetime_local.strftime('%Y-%m-%d') current_datetime = current_datetime_local.strftime('%Y-%m-%d')
elif period_type == 'weekly':
current_datetime = current_datetime_local.strftime('%Y-%m-%d')
elif period_type == 'monthly': elif period_type == 'monthly':
current_datetime = current_datetime_local.strftime('%Y-%m') current_datetime = current_datetime_local.strftime('%Y-%m')
elif period_type == 'yearly': elif period_type == 'yearly':
@ -413,6 +417,8 @@ class Reporting:
current_datetime = current_datetime_local.strftime('%Y-%m-%dT%H:%M:%S') current_datetime = current_datetime_local.strftime('%Y-%m-%dT%H:%M:%S')
elif period_type == 'daily': elif period_type == 'daily':
current_datetime = current_datetime_local.strftime('%Y-%m-%d') current_datetime = current_datetime_local.strftime('%Y-%m-%d')
elif period_type == 'weekly':
current_datetime = current_datetime_local.strftime('%Y-%m-%d')
elif period_type == 'monthly': elif period_type == 'monthly':
current_datetime = current_datetime_local.strftime('%Y-%m') current_datetime = current_datetime_local.strftime('%Y-%m')
elif period_type == 'yearly': elif period_type == 'yearly':
@ -480,6 +486,8 @@ class Reporting:
current_datetime = current_datetime_local.strftime('%Y-%m-%dT%H:%M:%S') current_datetime = current_datetime_local.strftime('%Y-%m-%dT%H:%M:%S')
elif period_type == 'daily': elif period_type == 'daily':
current_datetime = current_datetime_local.strftime('%Y-%m-%d') current_datetime = current_datetime_local.strftime('%Y-%m-%d')
elif period_type == 'weekly':
current_datetime = current_datetime_local.strftime('%Y-%m-%d')
elif period_type == 'monthly': elif period_type == 'monthly':
current_datetime = current_datetime_local.strftime('%Y-%m') current_datetime = current_datetime_local.strftime('%Y-%m')
elif period_type == 'yearly': elif period_type == 'yearly':

6
myems-api/reports/equipmentcost.py
View File

@ -54,7 +54,7 @@ class Reporting:
raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_PERIOD_TYPE') raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_PERIOD_TYPE')
else: else:
period_type = str.strip(period_type) period_type = str.strip(period_type)
if period_type not in ['hourly', 'daily', 'monthly', 'yearly']: if period_type not in ['hourly', 'daily', 'weekly', 'monthly', 'yearly']:
raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_PERIOD_TYPE') raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_PERIOD_TYPE')
timezone_offset = int(config.utc_offset[1:3]) * 60 + int(config.utc_offset[4:6]) timezone_offset = int(config.utc_offset[1:3]) * 60 + int(config.utc_offset[4:6])
@ -264,6 +264,8 @@ class Reporting:
current_datetime = current_datetime_local.strftime('%Y-%m-%dT%H:%M:%S') current_datetime = current_datetime_local.strftime('%Y-%m-%dT%H:%M:%S')
elif period_type == 'daily': elif period_type == 'daily':
current_datetime = current_datetime_local.strftime('%Y-%m-%d') current_datetime = current_datetime_local.strftime('%Y-%m-%d')
elif period_type == 'weekly':
current_datetime = current_datetime_local.strftime('%Y-%m-%d')
elif period_type == 'monthly': elif period_type == 'monthly':
current_datetime = current_datetime_local.strftime('%Y-%m') current_datetime = current_datetime_local.strftime('%Y-%m')
elif period_type == 'yearly': elif period_type == 'yearly':
@ -314,6 +316,8 @@ class Reporting:
current_datetime = current_datetime_local.strftime('%Y-%m-%dT%H:%M:%S') current_datetime = current_datetime_local.strftime('%Y-%m-%dT%H:%M:%S')
elif period_type == 'daily': elif period_type == 'daily':
current_datetime = current_datetime_local.strftime('%Y-%m-%d') current_datetime = current_datetime_local.strftime('%Y-%m-%d')
elif period_type == 'weekly':
current_datetime = current_datetime_local.strftime('%Y-%m-%d')
elif period_type == 'monthly': elif period_type == 'monthly':
current_datetime = current_datetime_local.strftime('%Y-%m') current_datetime = current_datetime_local.strftime('%Y-%m')
elif period_type == 'yearly': elif period_type == 'yearly':

10
myems-api/reports/equipmentefficiency.py
View File

@ -54,7 +54,7 @@ class Reporting:
raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_PERIOD_TYPE') raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_PERIOD_TYPE')
else: else:
period_type = str.strip(period_type) period_type = str.strip(period_type)
if period_type not in ['hourly', 'daily', 'monthly', 'yearly']: if period_type not in ['hourly', 'daily', 'weekly', 'monthly', 'yearly']:
raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_PERIOD_TYPE') raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_PERIOD_TYPE')
timezone_offset = int(config.utc_offset[1:3]) * 60 + int(config.utc_offset[4:6]) timezone_offset = int(config.utc_offset[1:3]) * 60 + int(config.utc_offset[4:6])
@ -350,6 +350,8 @@ class Reporting:
current_datetime = current_datetime_local.strftime('%Y-%m-%dT%H:%M:%S') current_datetime = current_datetime_local.strftime('%Y-%m-%dT%H:%M:%S')
elif period_type == 'daily': elif period_type == 'daily':
current_datetime = current_datetime_local.strftime('%Y-%m-%d') current_datetime = current_datetime_local.strftime('%Y-%m-%d')
elif period_type == 'weekly':
current_datetime = current_datetime_local.strftime('%Y-%m-%d')
elif period_type == 'monthly': elif period_type == 'monthly':
current_datetime = current_datetime_local.strftime('%Y-%m') current_datetime = current_datetime_local.strftime('%Y-%m')
elif period_type == 'yearly': elif period_type == 'yearly':
@ -369,6 +371,8 @@ class Reporting:
current_datetime = current_datetime_local.strftime('%Y-%m-%dT%H:%M:%S') current_datetime = current_datetime_local.strftime('%Y-%m-%dT%H:%M:%S')
elif period_type == 'daily': elif period_type == 'daily':
current_datetime = current_datetime_local.strftime('%Y-%m-%d') current_datetime = current_datetime_local.strftime('%Y-%m-%d')
elif period_type == 'weekly':
current_datetime = current_datetime_local.strftime('%Y-%m-%d')
elif period_type == 'monthly': elif period_type == 'monthly':
current_datetime = current_datetime_local.strftime('%Y-%m') current_datetime = current_datetime_local.strftime('%Y-%m')
elif period_type == 'yearly': elif period_type == 'yearly':
@ -487,6 +491,8 @@ class Reporting:
current_datetime = current_datetime_local.strftime('%Y-%m-%dT%H:%M:%S') current_datetime = current_datetime_local.strftime('%Y-%m-%dT%H:%M:%S')
elif period_type == 'daily': elif period_type == 'daily':
current_datetime = current_datetime_local.strftime('%Y-%m-%d') current_datetime = current_datetime_local.strftime('%Y-%m-%d')
elif period_type == 'weekly':
current_datetime = current_datetime_local.strftime('%Y-%m-%d')
elif period_type == 'monthly': elif period_type == 'monthly':
current_datetime = current_datetime_local.strftime('%Y-%m') current_datetime = current_datetime_local.strftime('%Y-%m')
elif period_type == 'yearly': elif period_type == 'yearly':
@ -506,6 +512,8 @@ class Reporting:
current_datetime = current_datetime_local.strftime('%Y-%m-%dT%H:%M:%S') current_datetime = current_datetime_local.strftime('%Y-%m-%dT%H:%M:%S')
elif period_type == 'daily': elif period_type == 'daily':
current_datetime = current_datetime_local.strftime('%Y-%m-%d') current_datetime = current_datetime_local.strftime('%Y-%m-%d')
elif period_type == 'weekly':
current_datetime = current_datetime_local.strftime('%Y-%m-%d')
elif period_type == 'monthly': elif period_type == 'monthly':
current_datetime = current_datetime_local.strftime('%Y-%m') current_datetime = current_datetime_local.strftime('%Y-%m')
elif period_type == 'yearly': elif period_type == 'yearly':

6
myems-api/reports/equipmentenergycategory.py
View File

@ -54,7 +54,7 @@ class Reporting:
raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_PERIOD_TYPE') raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_PERIOD_TYPE')
else: else:
period_type = str.strip(period_type) period_type = str.strip(period_type)
if period_type not in ['hourly', 'daily', 'monthly', 'yearly']: if period_type not in ['hourly', 'daily', 'weekly', 'monthly', 'yearly']:
raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_PERIOD_TYPE') raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_PERIOD_TYPE')
timezone_offset = int(config.utc_offset[1:3]) * 60 + int(config.utc_offset[4:6]) timezone_offset = int(config.utc_offset[1:3]) * 60 + int(config.utc_offset[4:6])
@ -269,6 +269,8 @@ class Reporting:
current_datetime = current_datetime_local.strftime('%Y-%m-%dT%H:%M:%S') current_datetime = current_datetime_local.strftime('%Y-%m-%dT%H:%M:%S')
elif period_type == 'daily': elif period_type == 'daily':
current_datetime = current_datetime_local.strftime('%Y-%m-%d') current_datetime = current_datetime_local.strftime('%Y-%m-%d')
elif period_type == 'weekly':
current_datetime = current_datetime_local.strftime('%Y-%m-%d')
elif period_type == 'monthly': elif period_type == 'monthly':
current_datetime = current_datetime_local.strftime('%Y-%m') current_datetime = current_datetime_local.strftime('%Y-%m')
elif period_type == 'yearly': elif period_type == 'yearly':
@ -326,6 +328,8 @@ class Reporting:
current_datetime = current_datetime_local.strftime('%Y-%m-%dT%H:%M:%S') current_datetime = current_datetime_local.strftime('%Y-%m-%dT%H:%M:%S')
elif period_type == 'daily': elif period_type == 'daily':
current_datetime = current_datetime_local.strftime('%Y-%m-%d') current_datetime = current_datetime_local.strftime('%Y-%m-%d')
elif period_type == 'weekly':
current_datetime = current_datetime_local.strftime('%Y-%m-%d')
elif period_type == 'monthly': elif period_type == 'monthly':
current_datetime = current_datetime_local.strftime('%Y-%m') current_datetime = current_datetime_local.strftime('%Y-%m')
elif period_type == 'yearly': elif period_type == 'yearly':

6
myems-api/reports/equipmentenergyitem.py
View File

@ -54,7 +54,7 @@ class Reporting:
raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_PERIOD_TYPE') raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_PERIOD_TYPE')
else: else:
period_type = str.strip(period_type) period_type = str.strip(period_type)
if period_type not in ['hourly', 'daily', 'monthly', 'yearly']: if period_type not in ['hourly', 'daily', 'weekly', 'monthly', 'yearly']:
raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_PERIOD_TYPE') raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_PERIOD_TYPE')
timezone_offset = int(config.utc_offset[1:3]) * 60 + int(config.utc_offset[4:6]) timezone_offset = int(config.utc_offset[1:3]) * 60 + int(config.utc_offset[4:6])
@ -268,6 +268,8 @@ class Reporting:
current_datetime = current_datetime_local.strftime('%Y-%m-%dT%H:%M:%S') current_datetime = current_datetime_local.strftime('%Y-%m-%dT%H:%M:%S')
elif period_type == 'daily': elif period_type == 'daily':
current_datetime = current_datetime_local.strftime('%Y-%m-%d') current_datetime = current_datetime_local.strftime('%Y-%m-%d')
elif period_type == 'weekly':
current_datetime = current_datetime_local.strftime('%Y-%m-%d')
elif period_type == 'monthly': elif period_type == 'monthly':
current_datetime = current_datetime_local.strftime('%Y-%m') current_datetime = current_datetime_local.strftime('%Y-%m')
elif period_type == 'yearly': elif period_type == 'yearly':
@ -318,6 +320,8 @@ class Reporting:
current_datetime = current_datetime_local.strftime('%Y-%m-%dT%H:%M:%S') current_datetime = current_datetime_local.strftime('%Y-%m-%dT%H:%M:%S')
elif period_type == 'daily': elif period_type == 'daily':
current_datetime = current_datetime_local.strftime('%Y-%m-%d') current_datetime = current_datetime_local.strftime('%Y-%m-%d')
elif period_type == 'weekly':
current_datetime = current_datetime_local.strftime('%Y-%m-%d')
elif period_type == 'monthly': elif period_type == 'monthly':
current_datetime = current_datetime_local.strftime('%Y-%m') current_datetime = current_datetime_local.strftime('%Y-%m')
elif period_type == 'yearly': elif period_type == 'yearly':

6
myems-api/reports/equipmentincome.py
View File

@ -54,7 +54,7 @@ class Reporting:
raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_PERIOD_TYPE') raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_PERIOD_TYPE')
else: else:
period_type = str.strip(period_type) period_type = str.strip(period_type)
if period_type not in ['hourly', 'daily', 'monthly', 'yearly']: if period_type not in ['hourly', 'daily', 'weekly', 'monthly', 'yearly']:
raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_PERIOD_TYPE') raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_PERIOD_TYPE')
timezone_offset = int(config.utc_offset[1:3]) * 60 + int(config.utc_offset[4:6]) timezone_offset = int(config.utc_offset[1:3]) * 60 + int(config.utc_offset[4:6])
@ -264,6 +264,8 @@ class Reporting:
current_datetime = current_datetime_local.strftime('%Y-%m-%dT%H:%M:%S') current_datetime = current_datetime_local.strftime('%Y-%m-%dT%H:%M:%S')
elif period_type == 'daily': elif period_type == 'daily':
current_datetime = current_datetime_local.strftime('%Y-%m-%d') current_datetime = current_datetime_local.strftime('%Y-%m-%d')
elif period_type == 'weekly':
current_datetime = current_datetime_local.strftime('%Y-%m-%d')
elif period_type == 'monthly': elif period_type == 'monthly':
current_datetime = current_datetime_local.strftime('%Y-%m') current_datetime = current_datetime_local.strftime('%Y-%m')
elif period_type == 'yearly': elif period_type == 'yearly':
@ -310,6 +312,8 @@ class Reporting:
current_datetime = current_datetime_local.strftime('%Y-%m-%dT%H:%M:%S') current_datetime = current_datetime_local.strftime('%Y-%m-%dT%H:%M:%S')
elif period_type == 'daily': elif period_type == 'daily':
current_datetime = current_datetime_local.strftime('%Y-%m-%d') current_datetime = current_datetime_local.strftime('%Y-%m-%d')
elif period_type == 'weekly':
current_datetime = current_datetime_local.strftime('%Y-%m-%d')
elif period_type == 'monthly': elif period_type == 'monthly':
current_datetime = current_datetime_local.strftime('%Y-%m') current_datetime = current_datetime_local.strftime('%Y-%m')
elif period_type == 'yearly': elif period_type == 'yearly':

6
myems-api/reports/equipmentload.py
View File

@ -54,7 +54,7 @@ class Reporting:
raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_PERIOD_TYPE') raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_PERIOD_TYPE')
else: else:
period_type = str.strip(period_type) period_type = str.strip(period_type)
if period_type not in ['hourly', 'daily', 'monthly', 'yearly']: if period_type not in ['hourly', 'daily', 'weekly', 'monthly', 'yearly']:
raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_PERIOD_TYPE') raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_PERIOD_TYPE')
timezone_offset = int(config.utc_offset[1:3]) * 60 + int(config.utc_offset[4:6]) timezone_offset = int(config.utc_offset[1:3]) * 60 + int(config.utc_offset[4:6])
@ -277,6 +277,8 @@ class Reporting:
current_datetime = current_datetime_local.strftime('%Y-%m-%dT%H:%M:%S') current_datetime = current_datetime_local.strftime('%Y-%m-%dT%H:%M:%S')
elif period_type == 'daily': elif period_type == 'daily':
current_datetime = current_datetime_local.strftime('%Y-%m-%d') current_datetime = current_datetime_local.strftime('%Y-%m-%d')
elif period_type == 'weekly':
current_datetime = current_datetime_local.strftime('%Y-%m-%d')
elif period_type == 'monthly': elif period_type == 'monthly':
current_datetime = current_datetime_local.strftime('%Y-%m') current_datetime = current_datetime_local.strftime('%Y-%m')
elif period_type == 'yearly': elif period_type == 'yearly':
@ -334,6 +336,8 @@ class Reporting:
current_datetime = current_datetime_local.strftime('%Y-%m-%dT%H:%M:%S') current_datetime = current_datetime_local.strftime('%Y-%m-%dT%H:%M:%S')
elif period_type == 'daily': elif period_type == 'daily':
current_datetime = current_datetime_local.strftime('%Y-%m-%d') current_datetime = current_datetime_local.strftime('%Y-%m-%d')
elif period_type == 'weekly':
current_datetime = current_datetime_local.strftime('%Y-%m-%d')
elif period_type == 'monthly': elif period_type == 'monthly':
current_datetime = current_datetime_local.strftime('%Y-%m') current_datetime = current_datetime_local.strftime('%Y-%m')
elif period_type == 'yearly': elif period_type == 'yearly':

6
myems-api/reports/equipmentoutput.py
View File

@ -54,7 +54,7 @@ class Reporting:
raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_PERIOD_TYPE') raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_PERIOD_TYPE')
else: else:
period_type = str.strip(period_type) period_type = str.strip(period_type)
if period_type not in ['hourly', 'daily', 'monthly', 'yearly']: if period_type not in ['hourly', 'daily', 'weekly', 'monthly', 'yearly']:
raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_PERIOD_TYPE') raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_PERIOD_TYPE')
timezone_offset = int(config.utc_offset[1:3]) * 60 + int(config.utc_offset[4:6]) timezone_offset = int(config.utc_offset[1:3]) * 60 + int(config.utc_offset[4:6])
@ -264,6 +264,8 @@ class Reporting:
current_datetime = current_datetime_local.strftime('%Y-%m-%dT%H:%M:%S') current_datetime = current_datetime_local.strftime('%Y-%m-%dT%H:%M:%S')
elif period_type == 'daily': elif period_type == 'daily':
current_datetime = current_datetime_local.strftime('%Y-%m-%d') current_datetime = current_datetime_local.strftime('%Y-%m-%d')
elif period_type == 'weekly':
current_datetime = current_datetime_local.strftime('%Y-%m-%d')
elif period_type == 'monthly': elif period_type == 'monthly':
current_datetime = current_datetime_local.strftime('%Y-%m') current_datetime = current_datetime_local.strftime('%Y-%m')
elif period_type == 'yearly': elif period_type == 'yearly':
@ -310,6 +312,8 @@ class Reporting:
current_datetime = current_datetime_local.strftime('%Y-%m-%dT%H:%M:%S') current_datetime = current_datetime_local.strftime('%Y-%m-%dT%H:%M:%S')
elif period_type == 'daily': elif period_type == 'daily':
current_datetime = current_datetime_local.strftime('%Y-%m-%d') current_datetime = current_datetime_local.strftime('%Y-%m-%d')
elif period_type == 'weekly':
current_datetime = current_datetime_local.strftime('%Y-%m-%d')
elif period_type == 'monthly': elif period_type == 'monthly':
current_datetime = current_datetime_local.strftime('%Y-%m') current_datetime = current_datetime_local.strftime('%Y-%m')
elif period_type == 'yearly': elif period_type == 'yearly':

10
myems-api/reports/equipmentsaving.py
View File

@ -54,7 +54,7 @@ class Reporting:
raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_PERIOD_TYPE') raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_PERIOD_TYPE')
else: else:
period_type = str.strip(period_type) period_type = str.strip(period_type)
if period_type not in ['hourly', 'daily', 'monthly', 'yearly']: if period_type not in ['hourly', 'daily', 'weekly', 'monthly', 'yearly']:
raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_PERIOD_TYPE') raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_PERIOD_TYPE')
timezone_offset = int(config.utc_offset[1:3]) * 60 + int(config.utc_offset[4:6]) timezone_offset = int(config.utc_offset[1:3]) * 60 + int(config.utc_offset[4:6])
@ -290,6 +290,8 @@ class Reporting:
current_datetime = current_datetime_local.strftime('%Y-%m-%dT%H:%M:%S') current_datetime = current_datetime_local.strftime('%Y-%m-%dT%H:%M:%S')
elif period_type == 'daily': elif period_type == 'daily':
current_datetime = current_datetime_local.strftime('%Y-%m-%d') current_datetime = current_datetime_local.strftime('%Y-%m-%d')
elif period_type == 'weekly':
current_datetime = current_datetime_local.strftime('%Y-%m-%d')
elif period_type == 'monthly': elif period_type == 'monthly':
current_datetime = current_datetime_local.strftime('%Y-%m') current_datetime = current_datetime_local.strftime('%Y-%m')
elif period_type == 'yearly': elif period_type == 'yearly':
@ -328,6 +330,8 @@ class Reporting:
current_datetime = current_datetime_local.strftime('%Y-%m-%dT%H:%M:%S') current_datetime = current_datetime_local.strftime('%Y-%m-%dT%H:%M:%S')
elif period_type == 'daily': elif period_type == 'daily':
current_datetime = current_datetime_local.strftime('%Y-%m-%d') current_datetime = current_datetime_local.strftime('%Y-%m-%d')
elif period_type == 'weekly':
current_datetime = current_datetime_local.strftime('%Y-%m-%d')
elif period_type == 'monthly': elif period_type == 'monthly':
current_datetime = current_datetime_local.strftime('%Y-%m') current_datetime = current_datetime_local.strftime('%Y-%m')
elif period_type == 'yearly': elif period_type == 'yearly':
@ -403,6 +407,8 @@ class Reporting:
current_datetime = current_datetime_local.strftime('%Y-%m-%dT%H:%M:%S') current_datetime = current_datetime_local.strftime('%Y-%m-%dT%H:%M:%S')
elif period_type == 'daily': elif period_type == 'daily':
current_datetime = current_datetime_local.strftime('%Y-%m-%d') current_datetime = current_datetime_local.strftime('%Y-%m-%d')
elif period_type == 'weekly':
current_datetime = current_datetime_local.strftime('%Y-%m-%d')
elif period_type == 'monthly': elif period_type == 'monthly':
current_datetime = current_datetime_local.strftime('%Y-%m') current_datetime = current_datetime_local.strftime('%Y-%m')
elif period_type == 'yearly': elif period_type == 'yearly':
@ -441,6 +447,8 @@ class Reporting:
current_datetime = current_datetime_local.strftime('%Y-%m-%dT%H:%M:%S') current_datetime = current_datetime_local.strftime('%Y-%m-%dT%H:%M:%S')
elif period_type == 'daily': elif period_type == 'daily':
current_datetime = current_datetime_local.strftime('%Y-%m-%d') current_datetime = current_datetime_local.strftime('%Y-%m-%d')
elif period_type == 'weekly':
current_datetime = current_datetime_local.strftime('%Y-%m-%d')
elif period_type == 'monthly': elif period_type == 'monthly':
current_datetime = current_datetime_local.strftime('%Y-%m') current_datetime = current_datetime_local.strftime('%Y-%m')
elif period_type == 'yearly': elif period_type == 'yearly':

6
myems-api/reports/equipmentstatistics.py
View File

@ -54,7 +54,7 @@ class Reporting:
raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_PERIOD_TYPE') raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_PERIOD_TYPE')
else: else:
period_type = str.strip(period_type) period_type = str.strip(period_type)
if period_type not in ['hourly', 'daily', 'monthly', 'yearly']: if period_type not in ['hourly', 'daily', 'weekly', 'monthly', 'yearly']:
raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_PERIOD_TYPE') raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_PERIOD_TYPE')
timezone_offset = int(config.utc_offset[1:3]) * 60 + int(config.utc_offset[4:6]) timezone_offset = int(config.utc_offset[1:3]) * 60 + int(config.utc_offset[4:6])
@ -278,6 +278,8 @@ class Reporting:
current_datetime = current_datetime_local.strftime('%Y-%m-%dT%H:%M:%S') current_datetime = current_datetime_local.strftime('%Y-%m-%dT%H:%M:%S')
elif period_type == 'daily': elif period_type == 'daily':
current_datetime = current_datetime_local.strftime('%Y-%m-%d') current_datetime = current_datetime_local.strftime('%Y-%m-%d')
elif period_type == 'weekly':
current_datetime = current_datetime_local.strftime('%Y-%m-%d')
elif period_type == 'monthly': elif period_type == 'monthly':
current_datetime = current_datetime_local.strftime('%Y-%m') current_datetime = current_datetime_local.strftime('%Y-%m')
elif period_type == 'yearly': elif period_type == 'yearly':
@ -338,6 +340,8 @@ class Reporting:
current_datetime = current_datetime_local.strftime('%Y-%m-%dT%H:%M:%S') current_datetime = current_datetime_local.strftime('%Y-%m-%dT%H:%M:%S')
elif period_type == 'daily': elif period_type == 'daily':
current_datetime = current_datetime_local.strftime('%Y-%m-%d') current_datetime = current_datetime_local.strftime('%Y-%m-%d')
elif period_type == 'weekly':
current_datetime = current_datetime_local.strftime('%Y-%m-%d')
elif period_type == 'monthly': elif period_type == 'monthly':
current_datetime = current_datetime_local.strftime('%Y-%m') current_datetime = current_datetime_local.strftime('%Y-%m')
elif period_type == 'yearly': elif period_type == 'yearly':

6
myems-api/reports/metercost.py
View File

@ -59,7 +59,7 @@ class Reporting:
raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_PERIOD_TYPE') raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_PERIOD_TYPE')
else: else:
period_type = str.strip(period_type) period_type = str.strip(period_type)
if period_type not in ['hourly', 'daily', 'monthly', 'yearly']: if period_type not in ['hourly', 'daily', 'weekly', 'monthly', 'yearly']:
raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_PERIOD_TYPE') raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_PERIOD_TYPE')
timezone_offset = int(config.utc_offset[1:3]) * 60 + int(config.utc_offset[4:6]) timezone_offset = int(config.utc_offset[1:3]) * 60 + int(config.utc_offset[4:6])
@ -220,6 +220,8 @@ class Reporting:
current_datetime = current_datetime_local.strftime('%Y-%m-%dT%H:%M:%S') current_datetime = current_datetime_local.strftime('%Y-%m-%dT%H:%M:%S')
elif period_type == 'daily': elif period_type == 'daily':
current_datetime = current_datetime_local.strftime('%Y-%m-%d') current_datetime = current_datetime_local.strftime('%Y-%m-%d')
elif period_type == 'weekly':
current_datetime = current_datetime_local.strftime('%Y-%m-%d')
elif period_type == 'monthly': elif period_type == 'monthly':
current_datetime = current_datetime_local.strftime('%Y-%m') current_datetime = current_datetime_local.strftime('%Y-%m')
elif period_type == 'yearly': elif period_type == 'yearly':
@ -287,6 +289,8 @@ class Reporting:
current_datetime = current_datetime_local.strftime('%Y-%m-%dT%H:%M:%S') current_datetime = current_datetime_local.strftime('%Y-%m-%dT%H:%M:%S')
elif period_type == 'daily': elif period_type == 'daily':
current_datetime = current_datetime_local.strftime('%Y-%m-%d') current_datetime = current_datetime_local.strftime('%Y-%m-%d')
elif period_type == 'weekly':
current_datetime = current_datetime_local.strftime('%Y-%m-%d')
elif period_type == 'monthly': elif period_type == 'monthly':
current_datetime = current_datetime_local.strftime('%Y-%m') current_datetime = current_datetime_local.strftime('%Y-%m')
elif period_type == 'yearly': elif period_type == 'yearly':

8
myems-api/reports/metersubmetersbalance.py
View File

@ -51,7 +51,7 @@ class Reporting:
raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_PERIOD_TYPE') raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_PERIOD_TYPE')
else: else:
period_type = str.strip(period_type) period_type = str.strip(period_type)
if period_type not in ['hourly', 'daily', 'monthly', 'yearly']: if period_type not in ['hourly', 'daily', 'weekly', 'monthly', 'yearly']:
raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_PERIOD_TYPE') raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_PERIOD_TYPE')
timezone_offset = int(config.utc_offset[1:3]) * 60 + int(config.utc_offset[4:6]) timezone_offset = int(config.utc_offset[1:3]) * 60 + int(config.utc_offset[4:6])
@ -183,6 +183,8 @@ class Reporting:
current_datetime = current_datetime_local.strftime('%Y-%m-%dT%H:%M:%S') current_datetime = current_datetime_local.strftime('%Y-%m-%dT%H:%M:%S')
elif period_type == 'daily': elif period_type == 'daily':
current_datetime = current_datetime_local.strftime('%Y-%m-%d') current_datetime = current_datetime_local.strftime('%Y-%m-%d')
elif period_type == 'weekly':
current_datetime = current_datetime_local.strftime('%Y-%m-%d')
elif period_type == 'monthly': elif period_type == 'monthly':
current_datetime = current_datetime_local.strftime('%Y-%m') current_datetime = current_datetime_local.strftime('%Y-%m')
elif period_type == 'yearly': elif period_type == 'yearly':
@ -225,6 +227,8 @@ class Reporting:
current_datetime = current_datetime_local.strftime('%Y-%m-%dT%H:%M:%S') current_datetime = current_datetime_local.strftime('%Y-%m-%dT%H:%M:%S')
elif period_type == 'daily': elif period_type == 'daily':
current_datetime = current_datetime_local.strftime('%Y-%m-%d') current_datetime = current_datetime_local.strftime('%Y-%m-%d')
elif period_type == 'weekly':
current_datetime = current_datetime_local.strftime('%Y-%m-%d')
elif period_type == 'monthly': elif period_type == 'monthly':
current_datetime = current_datetime_local.strftime('%Y-%m') current_datetime = current_datetime_local.strftime('%Y-%m')
elif period_type == 'yearly': elif period_type == 'yearly':
@ -284,6 +288,8 @@ class Reporting:
current_datetime = current_datetime_local.strftime('%Y-%m-%dT%H:%M:%S') current_datetime = current_datetime_local.strftime('%Y-%m-%dT%H:%M:%S')
elif period_type == 'daily': elif period_type == 'daily':
current_datetime = current_datetime_local.strftime('%Y-%m-%d') current_datetime = current_datetime_local.strftime('%Y-%m-%d')
elif period_type == 'weekly':
current_datetime = current_datetime_local.strftime('%Y-%m-%d')
elif period_type == 'monthly': elif period_type == 'monthly':
current_datetime = current_datetime_local.strftime('%Y-%m') current_datetime = current_datetime_local.strftime('%Y-%m')
elif period_type == 'yearly': elif period_type == 'yearly':

6
myems-api/reports/offlinemetercost.py
View File

@ -57,7 +57,7 @@ class Reporting:
raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_PERIOD_TYPE') raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_PERIOD_TYPE')
else: else:
period_type = str.strip(period_type) period_type = str.strip(period_type)
if period_type not in ['hourly', 'daily', 'monthly', 'yearly']: if period_type not in ['hourly', 'daily', 'weekly', 'monthly', 'yearly']:
raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_PERIOD_TYPE') raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_PERIOD_TYPE')
timezone_offset = int(config.utc_offset[1:3]) * 60 + int(config.utc_offset[4:6]) timezone_offset = int(config.utc_offset[1:3]) * 60 + int(config.utc_offset[4:6])
@ -198,6 +198,8 @@ class Reporting:
current_datetime = current_datetime_local.strftime('%Y-%m-%dT%H:%M:%S') current_datetime = current_datetime_local.strftime('%Y-%m-%dT%H:%M:%S')
elif period_type == 'daily': elif period_type == 'daily':
current_datetime = current_datetime_local.strftime('%Y-%m-%d') current_datetime = current_datetime_local.strftime('%Y-%m-%d')
elif period_type == 'weekly':
current_datetime = current_datetime_local.strftime('%Y-%m-%d')
elif period_type == 'monthly': elif period_type == 'monthly':
current_datetime = current_datetime_local.strftime('%Y-%m') current_datetime = current_datetime_local.strftime('%Y-%m')
elif period_type == 'yearly': elif period_type == 'yearly':
@ -265,6 +267,8 @@ class Reporting:
current_datetime = current_datetime_local.strftime('%Y-%m-%dT%H:%M:%S') current_datetime = current_datetime_local.strftime('%Y-%m-%dT%H:%M:%S')
elif period_type == 'daily': elif period_type == 'daily':
current_datetime = current_datetime_local.strftime('%Y-%m-%d') current_datetime = current_datetime_local.strftime('%Y-%m-%d')
elif period_type == 'weekly':
current_datetime = current_datetime_local.strftime('%Y-%m-%d')
elif period_type == 'monthly': elif period_type == 'monthly':
current_datetime = current_datetime_local.strftime('%Y-%m') current_datetime = current_datetime_local.strftime('%Y-%m')
elif period_type == 'yearly': elif period_type == 'yearly':

6
myems-api/reports/offlinemeterenergy.py
View File

@ -55,7 +55,7 @@ class Reporting:
raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_PERIOD_TYPE') raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_PERIOD_TYPE')
else: else:
period_type = str.strip(period_type) period_type = str.strip(period_type)
if period_type not in ['hourly', 'daily', 'monthly', 'yearly']: if period_type not in ['hourly', 'daily', 'weekly', 'monthly', 'yearly']:
raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_PERIOD_TYPE') raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_PERIOD_TYPE')
timezone_offset = int(config.utc_offset[1:3]) * 60 + int(config.utc_offset[4:6]) timezone_offset = int(config.utc_offset[1:3]) * 60 + int(config.utc_offset[4:6])
@ -185,6 +185,8 @@ class Reporting:
current_datetime = current_datetime_local.strftime('%Y-%m-%dT%H:%M:%S') current_datetime = current_datetime_local.strftime('%Y-%m-%dT%H:%M:%S')
elif period_type == 'daily': elif period_type == 'daily':
current_datetime = current_datetime_local.strftime('%Y-%m-%d') current_datetime = current_datetime_local.strftime('%Y-%m-%d')
elif period_type == 'weekly':
current_datetime = current_datetime_local.strftime('%Y-%m-%d')
elif period_type == 'monthly': elif period_type == 'monthly':
current_datetime = current_datetime_local.strftime('%Y-%m') current_datetime = current_datetime_local.strftime('%Y-%m')
elif period_type == 'yearly': elif period_type == 'yearly':
@ -228,6 +230,8 @@ class Reporting:
current_datetime = current_datetime_local.strftime('%Y-%m-%dT%H:%M:%S') current_datetime = current_datetime_local.strftime('%Y-%m-%dT%H:%M:%S')
elif period_type == 'daily': elif period_type == 'daily':
current_datetime = current_datetime_local.strftime('%Y-%m-%d') current_datetime = current_datetime_local.strftime('%Y-%m-%d')
elif period_type == 'weekly':
current_datetime = current_datetime_local.strftime('%Y-%m-%d')
elif period_type == 'monthly': elif period_type == 'monthly':
current_datetime = current_datetime_local.strftime('%Y-%m') current_datetime = current_datetime_local.strftime('%Y-%m')
elif period_type == 'yearly': elif period_type == 'yearly':

6
myems-api/reports/shopfloorcost.py
View File

@ -55,7 +55,7 @@ class Reporting:
raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_PERIOD_TYPE') raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_PERIOD_TYPE')
else: else:
period_type = str.strip(period_type) period_type = str.strip(period_type)
if period_type not in ['hourly', 'daily', 'monthly', 'yearly']: if period_type not in ['hourly', 'daily', 'weekly', 'monthly', 'yearly']:
raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_PERIOD_TYPE') raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_PERIOD_TYPE')
timezone_offset = int(config.utc_offset[1:3]) * 60 + int(config.utc_offset[4:6]) timezone_offset = int(config.utc_offset[1:3]) * 60 + int(config.utc_offset[4:6])
@ -279,6 +279,8 @@ class Reporting:
current_datetime = current_datetime_local.strftime('%Y-%m-%dT%H:%M:%S') current_datetime = current_datetime_local.strftime('%Y-%m-%dT%H:%M:%S')
elif period_type == 'daily': elif period_type == 'daily':
current_datetime = current_datetime_local.strftime('%Y-%m-%d') current_datetime = current_datetime_local.strftime('%Y-%m-%d')
elif period_type == 'weekly':
current_datetime = current_datetime_local.strftime('%Y-%m-%d')
elif period_type == 'monthly': elif period_type == 'monthly':
current_datetime = current_datetime_local.strftime('%Y-%m') current_datetime = current_datetime_local.strftime('%Y-%m')
elif period_type == 'yearly': elif period_type == 'yearly':
@ -329,6 +331,8 @@ class Reporting:
current_datetime = current_datetime_local.strftime('%Y-%m-%dT%H:%M:%S') current_datetime = current_datetime_local.strftime('%Y-%m-%dT%H:%M:%S')
elif period_type == 'daily': elif period_type == 'daily':
current_datetime = current_datetime_local.strftime('%Y-%m-%d') current_datetime = current_datetime_local.strftime('%Y-%m-%d')
elif period_type == 'weekly':
current_datetime = current_datetime_local.strftime('%Y-%m-%d')
elif period_type == 'monthly': elif period_type == 'monthly':
current_datetime = current_datetime_local.strftime('%Y-%m') current_datetime = current_datetime_local.strftime('%Y-%m')
elif period_type == 'yearly': elif period_type == 'yearly':

6
myems-api/reports/shopfloorenergycategory.py
View File

@ -55,7 +55,7 @@ class Reporting:
raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_PERIOD_TYPE') raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_PERIOD_TYPE')
else: else:
period_type = str.strip(period_type) period_type = str.strip(period_type)
if period_type not in ['hourly', 'daily', 'monthly', 'yearly']: if period_type not in ['hourly', 'daily', 'weekly', 'monthly', 'yearly']:
raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_PERIOD_TYPE') raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_PERIOD_TYPE')
timezone_offset = int(config.utc_offset[1:3]) * 60 + int(config.utc_offset[4:6]) timezone_offset = int(config.utc_offset[1:3]) * 60 + int(config.utc_offset[4:6])
@ -284,6 +284,8 @@ class Reporting:
current_datetime = current_datetime_local.strftime('%Y-%m-%dT%H:%M:%S') current_datetime = current_datetime_local.strftime('%Y-%m-%dT%H:%M:%S')
elif period_type == 'daily': elif period_type == 'daily':
current_datetime = current_datetime_local.strftime('%Y-%m-%d') current_datetime = current_datetime_local.strftime('%Y-%m-%d')
elif period_type == 'weekly':
current_datetime = current_datetime_local.strftime('%Y-%m-%d')
elif period_type == 'monthly': elif period_type == 'monthly':
current_datetime = current_datetime_local.strftime('%Y-%m') current_datetime = current_datetime_local.strftime('%Y-%m')
elif period_type == 'yearly': elif period_type == 'yearly':
@ -341,6 +343,8 @@ class Reporting:
current_datetime = current_datetime_local.strftime('%Y-%m-%dT%H:%M:%S') current_datetime = current_datetime_local.strftime('%Y-%m-%dT%H:%M:%S')
elif period_type == 'daily': elif period_type == 'daily':
current_datetime = current_datetime_local.strftime('%Y-%m-%d') current_datetime = current_datetime_local.strftime('%Y-%m-%d')
elif period_type == 'weekly':
current_datetime = current_datetime_local.strftime('%Y-%m-%d')
elif period_type == 'monthly': elif period_type == 'monthly':
current_datetime = current_datetime_local.strftime('%Y-%m') current_datetime = current_datetime_local.strftime('%Y-%m')
elif period_type == 'yearly': elif period_type == 'yearly':

6
myems-api/reports/shopfloorenergyitem.py
View File

@ -55,7 +55,7 @@ class Reporting:
raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_PERIOD_TYPE') raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_PERIOD_TYPE')
else: else:
period_type = str.strip(period_type) period_type = str.strip(period_type)
if period_type not in ['hourly', 'daily', 'monthly', 'yearly']: if period_type not in ['hourly', 'daily', 'weekly', 'monthly', 'yearly']:
raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_PERIOD_TYPE') raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_PERIOD_TYPE')
timezone_offset = int(config.utc_offset[1:3]) * 60 + int(config.utc_offset[4:6]) timezone_offset = int(config.utc_offset[1:3]) * 60 + int(config.utc_offset[4:6])
@ -283,6 +283,8 @@ class Reporting:
current_datetime = current_datetime_local.strftime('%Y-%m-%dT%H:%M:%S') current_datetime = current_datetime_local.strftime('%Y-%m-%dT%H:%M:%S')
elif period_type == 'daily': elif period_type == 'daily':
current_datetime = current_datetime_local.strftime('%Y-%m-%d') current_datetime = current_datetime_local.strftime('%Y-%m-%d')
elif period_type == 'weekly':
current_datetime = current_datetime_local.strftime('%Y-%m-%d')
elif period_type == 'monthly': elif period_type == 'monthly':
current_datetime = current_datetime_local.strftime('%Y-%m') current_datetime = current_datetime_local.strftime('%Y-%m')
elif period_type == 'yearly': elif period_type == 'yearly':
@ -333,6 +335,8 @@ class Reporting:
current_datetime = current_datetime_local.strftime('%Y-%m-%dT%H:%M:%S') current_datetime = current_datetime_local.strftime('%Y-%m-%dT%H:%M:%S')
elif period_type == 'daily': elif period_type == 'daily':
current_datetime = current_datetime_local.strftime('%Y-%m-%d') current_datetime = current_datetime_local.strftime('%Y-%m-%d')
elif period_type == 'weekly':
current_datetime = current_datetime_local.strftime('%Y-%m-%d')
elif period_type == 'monthly': elif period_type == 'monthly':
current_datetime = current_datetime_local.strftime('%Y-%m') current_datetime = current_datetime_local.strftime('%Y-%m')
elif period_type == 'yearly': elif period_type == 'yearly':

6
myems-api/reports/shopfloorload.py
View File

@ -55,7 +55,7 @@ class Reporting:
raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_PERIOD_TYPE') raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_PERIOD_TYPE')
else: else:
period_type = str.strip(period_type) period_type = str.strip(period_type)
if period_type not in ['hourly', 'daily', 'monthly', 'yearly']: if period_type not in ['hourly', 'daily', 'weekly', 'monthly', 'yearly']:
raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_PERIOD_TYPE') raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_PERIOD_TYPE')
timezone_offset = int(config.utc_offset[1:3]) * 60 + int(config.utc_offset[4:6]) timezone_offset = int(config.utc_offset[1:3]) * 60 + int(config.utc_offset[4:6])
@ -292,6 +292,8 @@ class Reporting:
current_datetime = current_datetime_local.strftime('%Y-%m-%dT%H:%M:%S') current_datetime = current_datetime_local.strftime('%Y-%m-%dT%H:%M:%S')
elif period_type == 'daily': elif period_type == 'daily':
current_datetime = current_datetime_local.strftime('%Y-%m-%d') current_datetime = current_datetime_local.strftime('%Y-%m-%d')
elif period_type == 'weekly':
current_datetime = current_datetime_local.strftime('%Y-%m-%d')
elif period_type == 'monthly': elif period_type == 'monthly':
current_datetime = current_datetime_local.strftime('%Y-%m') current_datetime = current_datetime_local.strftime('%Y-%m')
elif period_type == 'yearly': elif period_type == 'yearly':
@ -349,6 +351,8 @@ class Reporting:
current_datetime = current_datetime_local.strftime('%Y-%m-%dT%H:%M:%S') current_datetime = current_datetime_local.strftime('%Y-%m-%dT%H:%M:%S')
elif period_type == 'daily': elif period_type == 'daily':
current_datetime = current_datetime_local.strftime('%Y-%m-%d') current_datetime = current_datetime_local.strftime('%Y-%m-%d')
elif period_type == 'weekly':
current_datetime = current_datetime_local.strftime('%Y-%m-%d')
elif period_type == 'monthly': elif period_type == 'monthly':
current_datetime = current_datetime_local.strftime('%Y-%m') current_datetime = current_datetime_local.strftime('%Y-%m')
elif period_type == 'yearly': elif period_type == 'yearly':

10
myems-api/reports/shopfloorsaving.py
View File

@ -55,7 +55,7 @@ class Reporting:
raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_PERIOD_TYPE') raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_PERIOD_TYPE')
else: else:
period_type = str.strip(period_type) period_type = str.strip(period_type)
if period_type not in ['hourly', 'daily', 'monthly', 'yearly']: if period_type not in ['hourly', 'daily', 'weekly', 'monthly', 'yearly']:
raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_PERIOD_TYPE') raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_PERIOD_TYPE')
timezone_offset = int(config.utc_offset[1:3]) * 60 + int(config.utc_offset[4:6]) timezone_offset = int(config.utc_offset[1:3]) * 60 + int(config.utc_offset[4:6])
@ -305,6 +305,8 @@ class Reporting:
current_datetime = current_datetime_local.strftime('%Y-%m-%dT%H:%M:%S') current_datetime = current_datetime_local.strftime('%Y-%m-%dT%H:%M:%S')
elif period_type == 'daily': elif period_type == 'daily':
current_datetime = current_datetime_local.strftime('%Y-%m-%d') current_datetime = current_datetime_local.strftime('%Y-%m-%d')
elif period_type == 'weekly':
current_datetime = current_datetime_local.strftime('%Y-%m-%d')
elif period_type == 'monthly': elif period_type == 'monthly':
current_datetime = current_datetime_local.strftime('%Y-%m') current_datetime = current_datetime_local.strftime('%Y-%m')
elif period_type == 'yearly': elif period_type == 'yearly':
@ -343,6 +345,8 @@ class Reporting:
current_datetime = current_datetime_local.strftime('%Y-%m-%dT%H:%M:%S') current_datetime = current_datetime_local.strftime('%Y-%m-%dT%H:%M:%S')
elif period_type == 'daily': elif period_type == 'daily':
current_datetime = current_datetime_local.strftime('%Y-%m-%d') current_datetime = current_datetime_local.strftime('%Y-%m-%d')
elif period_type == 'weekly':
current_datetime = current_datetime_local.strftime('%Y-%m-%d')
elif period_type == 'monthly': elif period_type == 'monthly':
current_datetime = current_datetime_local.strftime('%Y-%m') current_datetime = current_datetime_local.strftime('%Y-%m')
elif period_type == 'yearly': elif period_type == 'yearly':
@ -418,6 +422,8 @@ class Reporting:
current_datetime = current_datetime_local.strftime('%Y-%m-%dT%H:%M:%S') current_datetime = current_datetime_local.strftime('%Y-%m-%dT%H:%M:%S')
elif period_type == 'daily': elif period_type == 'daily':
current_datetime = current_datetime_local.strftime('%Y-%m-%d') current_datetime = current_datetime_local.strftime('%Y-%m-%d')
elif period_type == 'weekly':
current_datetime = current_datetime_local.strftime('%Y-%m-%d')
elif period_type == 'monthly': elif period_type == 'monthly':
current_datetime = current_datetime_local.strftime('%Y-%m') current_datetime = current_datetime_local.strftime('%Y-%m')
elif period_type == 'yearly': elif period_type == 'yearly':
@ -456,6 +462,8 @@ class Reporting:
current_datetime = current_datetime_local.strftime('%Y-%m-%dT%H:%M:%S') current_datetime = current_datetime_local.strftime('%Y-%m-%dT%H:%M:%S')
elif period_type == 'daily': elif period_type == 'daily':
current_datetime = current_datetime_local.strftime('%Y-%m-%d') current_datetime = current_datetime_local.strftime('%Y-%m-%d')
elif period_type == 'weekly':
current_datetime = current_datetime_local.strftime('%Y-%m-%d')
elif period_type == 'monthly': elif period_type == 'monthly':
current_datetime = current_datetime_local.strftime('%Y-%m') current_datetime = current_datetime_local.strftime('%Y-%m')
elif period_type == 'yearly': elif period_type == 'yearly':

6
myems-api/reports/shopfloorstatistics.py
View File

@ -55,7 +55,7 @@ class Reporting:
raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_PERIOD_TYPE') raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_PERIOD_TYPE')
else: else:
period_type = str.strip(period_type) period_type = str.strip(period_type)
if period_type not in ['hourly', 'daily', 'monthly', 'yearly']: if period_type not in ['hourly', 'daily', 'weekly', 'monthly', 'yearly']:
raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_PERIOD_TYPE') raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_PERIOD_TYPE')
timezone_offset = int(config.utc_offset[1:3]) * 60 + int(config.utc_offset[4:6]) timezone_offset = int(config.utc_offset[1:3]) * 60 + int(config.utc_offset[4:6])
@ -293,6 +293,8 @@ class Reporting:
current_datetime = current_datetime_local.strftime('%Y-%m-%dT%H:%M:%S') current_datetime = current_datetime_local.strftime('%Y-%m-%dT%H:%M:%S')
elif period_type == 'daily': elif period_type == 'daily':
current_datetime = current_datetime_local.strftime('%Y-%m-%d') current_datetime = current_datetime_local.strftime('%Y-%m-%d')
elif period_type == 'weekly':
current_datetime = current_datetime_local.strftime('%Y-%m-%d')
elif period_type == 'monthly': elif period_type == 'monthly':
current_datetime = current_datetime_local.strftime('%Y-%m') current_datetime = current_datetime_local.strftime('%Y-%m')
elif period_type == 'yearly': elif period_type == 'yearly':
@ -353,6 +355,8 @@ class Reporting:
current_datetime = current_datetime_local.strftime('%Y-%m-%dT%H:%M:%S') current_datetime = current_datetime_local.strftime('%Y-%m-%dT%H:%M:%S')
elif period_type == 'daily': elif period_type == 'daily':
current_datetime = current_datetime_local.strftime('%Y-%m-%d') current_datetime = current_datetime_local.strftime('%Y-%m-%d')
elif period_type == 'weekly':
current_datetime = current_datetime_local.strftime('%Y-%m-%d')
elif period_type == 'monthly': elif period_type == 'monthly':
current_datetime = current_datetime_local.strftime('%Y-%m') current_datetime = current_datetime_local.strftime('%Y-%m')
elif period_type == 'yearly': elif period_type == 'yearly':

6
myems-api/reports/spacecost.py
View File

@ -57,7 +57,7 @@ class Reporting:
raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_PERIOD_TYPE') raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_PERIOD_TYPE')
else: else:
period_type = str.strip(period_type) period_type = str.strip(period_type)
if period_type not in ['hourly', 'daily', 'monthly', 'yearly']: if period_type not in ['hourly', 'daily', 'weekly', 'monthly', 'yearly']:
raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_PERIOD_TYPE') raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_PERIOD_TYPE')
timezone_offset = int(config.utc_offset[1:3]) * 60 + int(config.utc_offset[4:6]) timezone_offset = int(config.utc_offset[1:3]) * 60 + int(config.utc_offset[4:6])
@ -294,6 +294,8 @@ class Reporting:
current_datetime = current_datetime_local.strftime('%Y-%m-%dT%H:%M:%S') current_datetime = current_datetime_local.strftime('%Y-%m-%dT%H:%M:%S')
elif period_type == 'daily': elif period_type == 'daily':
current_datetime = current_datetime_local.strftime('%Y-%m-%d') current_datetime = current_datetime_local.strftime('%Y-%m-%d')
elif period_type == 'weekly':
current_datetime = current_datetime_local.strftime('%Y-%m-%d')
elif period_type == 'monthly': elif period_type == 'monthly':
current_datetime = current_datetime_local.strftime('%Y-%m') current_datetime = current_datetime_local.strftime('%Y-%m')
elif period_type == 'yearly': elif period_type == 'yearly':
@ -343,6 +345,8 @@ class Reporting:
current_datetime = current_datetime_local.strftime('%Y-%m-%dT%H:%M:%S') current_datetime = current_datetime_local.strftime('%Y-%m-%dT%H:%M:%S')
elif period_type == 'daily': elif period_type == 'daily':
current_datetime = current_datetime_local.strftime('%Y-%m-%d') current_datetime = current_datetime_local.strftime('%Y-%m-%d')
elif period_type == 'weekly':
current_datetime = current_datetime_local.strftime('%Y-%m-%d')
elif period_type == 'monthly': elif period_type == 'monthly':
current_datetime = current_datetime_local.strftime('%Y-%m') current_datetime = current_datetime_local.strftime('%Y-%m')
elif period_type == 'yearly': elif period_type == 'yearly':

10
myems-api/reports/spaceefficiency.py
View File

@ -57,7 +57,7 @@ class Reporting:
raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_PERIOD_TYPE') raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_PERIOD_TYPE')
else: else:
period_type = str.strip(period_type) period_type = str.strip(period_type)
if period_type not in ['hourly', 'daily', 'monthly', 'yearly']: if period_type not in ['hourly', 'daily', 'weekly', 'monthly', 'yearly']:
raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_PERIOD_TYPE') raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_PERIOD_TYPE')
timezone_offset = int(config.utc_offset[1:3]) * 60 + int(config.utc_offset[4:6]) timezone_offset = int(config.utc_offset[1:3]) * 60 + int(config.utc_offset[4:6])
@ -307,6 +307,8 @@ class Reporting:
current_datetime = current_datetime_local.strftime('%Y-%m-%dT%H:%M:%S') current_datetime = current_datetime_local.strftime('%Y-%m-%dT%H:%M:%S')
elif period_type == 'daily': elif period_type == 'daily':
current_datetime = current_datetime_local.strftime('%Y-%m-%d') current_datetime = current_datetime_local.strftime('%Y-%m-%d')
elif period_type == 'weekly':
current_datetime = current_datetime_local.strftime('%Y-%m-%d')
elif period_type == 'monthly': elif period_type == 'monthly':
current_datetime = current_datetime_local.strftime('%Y-%m') current_datetime = current_datetime_local.strftime('%Y-%m')
elif period_type == 'yearly': elif period_type == 'yearly':
@ -352,6 +354,8 @@ class Reporting:
current_datetime = current_datetime_local.strftime('%Y-%m-%dT%H:%M:%S') current_datetime = current_datetime_local.strftime('%Y-%m-%dT%H:%M:%S')
elif period_type == 'daily': elif period_type == 'daily':
current_datetime = current_datetime_local.strftime('%Y-%m-%d') current_datetime = current_datetime_local.strftime('%Y-%m-%d')
elif period_type == 'weekly':
current_datetime = current_datetime_local.strftime('%Y-%m-%d')
elif period_type == 'monthly': elif period_type == 'monthly':
current_datetime = current_datetime_local.strftime('%Y-%m') current_datetime = current_datetime_local.strftime('%Y-%m')
elif period_type == 'yearly': elif period_type == 'yearly':
@ -397,6 +401,8 @@ class Reporting:
current_datetime = current_datetime_local.strftime('%Y-%m-%dT%H:%M:%S') current_datetime = current_datetime_local.strftime('%Y-%m-%dT%H:%M:%S')
elif period_type == 'daily': elif period_type == 'daily':
current_datetime = current_datetime_local.strftime('%Y-%m-%d') current_datetime = current_datetime_local.strftime('%Y-%m-%d')
elif period_type == 'weekly':
current_datetime = current_datetime_local.strftime('%Y-%m-%d')
elif period_type == 'monthly': elif period_type == 'monthly':
current_datetime = current_datetime_local.strftime('%Y-%m') current_datetime = current_datetime_local.strftime('%Y-%m')
elif period_type == 'yearly': elif period_type == 'yearly':
@ -443,6 +449,8 @@ class Reporting:
current_datetime = current_datetime_local.strftime('%Y-%m-%dT%H:%M:%S') current_datetime = current_datetime_local.strftime('%Y-%m-%dT%H:%M:%S')
elif period_type == 'daily': elif period_type == 'daily':
current_datetime = current_datetime_local.strftime('%Y-%m-%d') current_datetime = current_datetime_local.strftime('%Y-%m-%d')
elif period_type == 'weekly':
current_datetime = current_datetime_local.strftime('%Y-%m-%d')
elif period_type == 'monthly': elif period_type == 'monthly':
current_datetime = current_datetime_local.strftime('%Y-%m') current_datetime = current_datetime_local.strftime('%Y-%m')
elif period_type == 'yearly': elif period_type == 'yearly':

6
myems-api/reports/spaceenergycategory.py
View File

@ -57,7 +57,7 @@ class Reporting:
raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_PERIOD_TYPE') raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_PERIOD_TYPE')
else: else:
period_type = str.strip(period_type) period_type = str.strip(period_type)
if period_type not in ['hourly', 'daily', 'monthly', 'yearly']: if period_type not in ['hourly', 'daily', 'weekly', 'monthly', 'yearly']:
raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_PERIOD_TYPE') raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_PERIOD_TYPE')
timezone_offset = int(config.utc_offset[1:3]) * 60 + int(config.utc_offset[4:6]) timezone_offset = int(config.utc_offset[1:3]) * 60 + int(config.utc_offset[4:6])
@ -299,6 +299,8 @@ class Reporting:
current_datetime = current_datetime_local.strftime('%Y-%m-%dT%H:%M:%S') current_datetime = current_datetime_local.strftime('%Y-%m-%dT%H:%M:%S')
elif period_type == 'daily': elif period_type == 'daily':
current_datetime = current_datetime_local.strftime('%Y-%m-%d') current_datetime = current_datetime_local.strftime('%Y-%m-%d')
elif period_type == 'weekly':
current_datetime = current_datetime_local.strftime('%Y-%m-%d')
elif period_type == 'monthly': elif period_type == 'monthly':
current_datetime = current_datetime_local.strftime('%Y-%m') current_datetime = current_datetime_local.strftime('%Y-%m')
elif period_type == 'yearly': elif period_type == 'yearly':
@ -355,6 +357,8 @@ class Reporting:
current_datetime = current_datetime_local.strftime('%Y-%m-%dT%H:%M:%S') current_datetime = current_datetime_local.strftime('%Y-%m-%dT%H:%M:%S')
elif period_type == 'daily': elif period_type == 'daily':
current_datetime = current_datetime_local.strftime('%Y-%m-%d') current_datetime = current_datetime_local.strftime('%Y-%m-%d')
elif period_type == 'weekly':
current_datetime = current_datetime_local.strftime('%Y-%m-%d')
elif period_type == 'monthly': elif period_type == 'monthly':
current_datetime = current_datetime_local.strftime('%Y-%m') current_datetime = current_datetime_local.strftime('%Y-%m')
elif period_type == 'yearly': elif period_type == 'yearly':

6
myems-api/reports/spaceenergyitem.py
View File

@ -57,7 +57,7 @@ class Reporting:
raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_PERIOD_TYPE') raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_PERIOD_TYPE')
else: else:
period_type = str.strip(period_type) period_type = str.strip(period_type)
if period_type not in ['hourly', 'daily', 'monthly', 'yearly']: if period_type not in ['hourly', 'daily', 'weekly', 'monthly', 'yearly']:
raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_PERIOD_TYPE') raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_PERIOD_TYPE')
timezone_offset = int(config.utc_offset[1:3]) * 60 + int(config.utc_offset[4:6]) timezone_offset = int(config.utc_offset[1:3]) * 60 + int(config.utc_offset[4:6])
@ -298,6 +298,8 @@ class Reporting:
current_datetime = current_datetime_local.strftime('%Y-%m-%dT%H:%M:%S') current_datetime = current_datetime_local.strftime('%Y-%m-%dT%H:%M:%S')
elif period_type == 'daily': elif period_type == 'daily':
current_datetime = current_datetime_local.strftime('%Y-%m-%d') current_datetime = current_datetime_local.strftime('%Y-%m-%d')
elif period_type == 'weekly':
current_datetime = current_datetime_local.strftime('%Y-%m-%d')
elif period_type == 'monthly': elif period_type == 'monthly':
current_datetime = current_datetime_local.strftime('%Y-%m') current_datetime = current_datetime_local.strftime('%Y-%m')
elif period_type == 'yearly': elif period_type == 'yearly':
@ -347,6 +349,8 @@ class Reporting:
current_datetime = current_datetime_local.strftime('%Y-%m-%dT%H:%M:%S') current_datetime = current_datetime_local.strftime('%Y-%m-%dT%H:%M:%S')
elif period_type == 'daily': elif period_type == 'daily':
current_datetime = current_datetime_local.strftime('%Y-%m-%d') current_datetime = current_datetime_local.strftime('%Y-%m-%d')
elif period_type == 'weekly':
current_datetime = current_datetime_local.strftime('%Y-%m-%d')
elif period_type == 'monthly': elif period_type == 'monthly':
current_datetime = current_datetime_local.strftime('%Y-%m') current_datetime = current_datetime_local.strftime('%Y-%m')
elif period_type == 'yearly': elif period_type == 'yearly':

6
myems-api/reports/spaceincome.py
View File

@ -57,7 +57,7 @@ class Reporting:
raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_PERIOD_TYPE') raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_PERIOD_TYPE')
else: else:
period_type = str.strip(period_type) period_type = str.strip(period_type)
if period_type not in ['hourly', 'daily', 'monthly', 'yearly']: if period_type not in ['hourly', 'daily', 'weekly', 'monthly', 'yearly']:
raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_PERIOD_TYPE') raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_PERIOD_TYPE')
timezone_offset = int(config.utc_offset[1:3]) * 60 + int(config.utc_offset[4:6]) timezone_offset = int(config.utc_offset[1:3]) * 60 + int(config.utc_offset[4:6])
@ -294,6 +294,8 @@ class Reporting:
current_datetime = current_datetime_local.strftime('%Y-%m-%dT%H:%M:%S') current_datetime = current_datetime_local.strftime('%Y-%m-%dT%H:%M:%S')
elif period_type == 'daily': elif period_type == 'daily':
current_datetime = current_datetime_local.strftime('%Y-%m-%d') current_datetime = current_datetime_local.strftime('%Y-%m-%d')
elif period_type == 'weekly':
current_datetime = current_datetime_local.strftime('%Y-%m-%d')
elif period_type == 'monthly': elif period_type == 'monthly':
current_datetime = current_datetime_local.strftime('%Y-%m') current_datetime = current_datetime_local.strftime('%Y-%m')
elif period_type == 'yearly': elif period_type == 'yearly':
@ -339,6 +341,8 @@ class Reporting:
current_datetime = current_datetime_local.strftime('%Y-%m-%dT%H:%M:%S') current_datetime = current_datetime_local.strftime('%Y-%m-%dT%H:%M:%S')
elif period_type == 'daily': elif period_type == 'daily':
current_datetime = current_datetime_local.strftime('%Y-%m-%d') current_datetime = current_datetime_local.strftime('%Y-%m-%d')
elif period_type == 'weekly':
current_datetime = current_datetime_local.strftime('%Y-%m-%d')
elif period_type == 'monthly': elif period_type == 'monthly':
current_datetime = current_datetime_local.strftime('%Y-%m') current_datetime = current_datetime_local.strftime('%Y-%m')
elif period_type == 'yearly': elif period_type == 'yearly':

6
myems-api/reports/spaceload.py
View File

@ -55,7 +55,7 @@ class Reporting:
raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_PERIOD_TYPE') raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_PERIOD_TYPE')
else: else:
period_type = str.strip(period_type) period_type = str.strip(period_type)
if period_type not in ['hourly', 'daily', 'monthly', 'yearly']: if period_type not in ['hourly', 'daily', 'weekly', 'monthly', 'yearly']:
raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_PERIOD_TYPE') raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_PERIOD_TYPE')
timezone_offset = int(config.utc_offset[1:3]) * 60 + int(config.utc_offset[4:6]) timezone_offset = int(config.utc_offset[1:3]) * 60 + int(config.utc_offset[4:6])
@ -292,6 +292,8 @@ class Reporting:
current_datetime = current_datetime_local.strftime('%Y-%m-%dT%H:%M:%S') current_datetime = current_datetime_local.strftime('%Y-%m-%dT%H:%M:%S')
elif period_type == 'daily': elif period_type == 'daily':
current_datetime = current_datetime_local.strftime('%Y-%m-%d') current_datetime = current_datetime_local.strftime('%Y-%m-%d')
elif period_type == 'weekly':
current_datetime = current_datetime_local.strftime('%Y-%m-%d')
elif period_type == 'monthly': elif period_type == 'monthly':
current_datetime = current_datetime_local.strftime('%Y-%m') current_datetime = current_datetime_local.strftime('%Y-%m')
elif period_type == 'yearly': elif period_type == 'yearly':
@ -349,6 +351,8 @@ class Reporting:
current_datetime = current_datetime_local.strftime('%Y-%m-%dT%H:%M:%S') current_datetime = current_datetime_local.strftime('%Y-%m-%dT%H:%M:%S')
elif period_type == 'daily': elif period_type == 'daily':
current_datetime = current_datetime_local.strftime('%Y-%m-%d') current_datetime = current_datetime_local.strftime('%Y-%m-%d')
elif period_type == 'weekly':
current_datetime = current_datetime_local.strftime('%Y-%m-%d')
elif period_type == 'monthly': elif period_type == 'monthly':
current_datetime = current_datetime_local.strftime('%Y-%m') current_datetime = current_datetime_local.strftime('%Y-%m')
elif period_type == 'yearly': elif period_type == 'yearly':

6
myems-api/reports/spaceoutput.py
View File

@ -57,7 +57,7 @@ class Reporting:
raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_PERIOD_TYPE') raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_PERIOD_TYPE')
else: else:
period_type = str.strip(period_type) period_type = str.strip(period_type)
if period_type not in ['hourly', 'daily', 'monthly', 'yearly']: if period_type not in ['hourly', 'daily', 'weekly', 'monthly', 'yearly']:
raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_PERIOD_TYPE') raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_PERIOD_TYPE')
timezone_offset = int(config.utc_offset[1:3]) * 60 + int(config.utc_offset[4:6]) timezone_offset = int(config.utc_offset[1:3]) * 60 + int(config.utc_offset[4:6])
@ -294,6 +294,8 @@ class Reporting:
current_datetime = current_datetime_local.strftime('%Y-%m-%dT%H:%M:%S') current_datetime = current_datetime_local.strftime('%Y-%m-%dT%H:%M:%S')
elif period_type == 'daily': elif period_type == 'daily':
current_datetime = current_datetime_local.strftime('%Y-%m-%d') current_datetime = current_datetime_local.strftime('%Y-%m-%d')
elif period_type == 'weekly':
current_datetime = current_datetime_local.strftime('%Y-%m-%d')
elif period_type == 'monthly': elif period_type == 'monthly':
current_datetime = current_datetime_local.strftime('%Y-%m') current_datetime = current_datetime_local.strftime('%Y-%m')
elif period_type == 'yearly': elif period_type == 'yearly':
@ -339,6 +341,8 @@ class Reporting:
current_datetime = current_datetime_local.strftime('%Y-%m-%dT%H:%M:%S') current_datetime = current_datetime_local.strftime('%Y-%m-%dT%H:%M:%S')
elif period_type == 'daily': elif period_type == 'daily':
current_datetime = current_datetime_local.strftime('%Y-%m-%d') current_datetime = current_datetime_local.strftime('%Y-%m-%d')
elif period_type == 'weekly':
current_datetime = current_datetime_local.strftime('%Y-%m-%d')
elif period_type == 'monthly': elif period_type == 'monthly':
current_datetime = current_datetime_local.strftime('%Y-%m') current_datetime = current_datetime_local.strftime('%Y-%m')
elif period_type == 'yearly': elif period_type == 'yearly':

10
myems-api/reports/spacesaving.py
View File

@ -57,7 +57,7 @@ class Reporting:
raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_PERIOD_TYPE') raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_PERIOD_TYPE')
else: else:
period_type = str.strip(period_type) period_type = str.strip(period_type)
if period_type not in ['hourly', 'daily', 'monthly', 'yearly']: if period_type not in ['hourly', 'daily', 'weekly', 'monthly', 'yearly']:
raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_PERIOD_TYPE') raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_PERIOD_TYPE')
timezone_offset = int(config.utc_offset[1:3]) * 60 + int(config.utc_offset[4:6]) timezone_offset = int(config.utc_offset[1:3]) * 60 + int(config.utc_offset[4:6])
@ -320,6 +320,8 @@ class Reporting:
current_datetime = current_datetime_local.strftime('%Y-%m-%dT%H:%M:%S') current_datetime = current_datetime_local.strftime('%Y-%m-%dT%H:%M:%S')
elif period_type == 'daily': elif period_type == 'daily':
current_datetime = current_datetime_local.strftime('%Y-%m-%d') current_datetime = current_datetime_local.strftime('%Y-%m-%d')
elif period_type == 'weekly':
current_datetime = current_datetime_local.strftime('%Y-%m-%d')
elif period_type == 'monthly': elif period_type == 'monthly':
current_datetime = current_datetime_local.strftime('%Y-%m') current_datetime = current_datetime_local.strftime('%Y-%m')
elif period_type == 'yearly': elif period_type == 'yearly':
@ -357,6 +359,8 @@ class Reporting:
current_datetime = current_datetime_local.strftime('%Y-%m-%dT%H:%M:%S') current_datetime = current_datetime_local.strftime('%Y-%m-%dT%H:%M:%S')
elif period_type == 'daily': elif period_type == 'daily':
current_datetime = current_datetime_local.strftime('%Y-%m-%d') current_datetime = current_datetime_local.strftime('%Y-%m-%d')
elif period_type == 'weekly':
current_datetime = current_datetime_local.strftime('%Y-%m-%d')
elif period_type == 'monthly': elif period_type == 'monthly':
current_datetime = current_datetime_local.strftime('%Y-%m') current_datetime = current_datetime_local.strftime('%Y-%m')
elif period_type == 'yearly': elif period_type == 'yearly':
@ -431,6 +435,8 @@ class Reporting:
current_datetime = current_datetime_local.strftime('%Y-%m-%dT%H:%M:%S') current_datetime = current_datetime_local.strftime('%Y-%m-%dT%H:%M:%S')
elif period_type == 'daily': elif period_type == 'daily':
current_datetime = current_datetime_local.strftime('%Y-%m-%d') current_datetime = current_datetime_local.strftime('%Y-%m-%d')
elif period_type == 'weekly':
current_datetime = current_datetime_local.strftime('%Y-%m-%d')
elif period_type == 'monthly': elif period_type == 'monthly':
current_datetime = current_datetime_local.strftime('%Y-%m') current_datetime = current_datetime_local.strftime('%Y-%m')
elif period_type == 'yearly': elif period_type == 'yearly':
@ -468,6 +474,8 @@ class Reporting:
current_datetime = current_datetime_local.strftime('%Y-%m-%dT%H:%M:%S') current_datetime = current_datetime_local.strftime('%Y-%m-%dT%H:%M:%S')
elif period_type == 'daily': elif period_type == 'daily':
current_datetime = current_datetime_local.strftime('%Y-%m-%d') current_datetime = current_datetime_local.strftime('%Y-%m-%d')
elif period_type == 'weekly':
current_datetime = current_datetime_local.strftime('%Y-%m-%d')
elif period_type == 'monthly': elif period_type == 'monthly':
current_datetime = current_datetime_local.strftime('%Y-%m') current_datetime = current_datetime_local.strftime('%Y-%m')
elif period_type == 'yearly': elif period_type == 'yearly':

6
myems-api/reports/spacestatistics.py
View File

@ -55,7 +55,7 @@ class Reporting:
raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_PERIOD_TYPE') raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_PERIOD_TYPE')
else: else:
period_type = str.strip(period_type) period_type = str.strip(period_type)
if period_type not in ['hourly', 'daily', 'monthly', 'yearly']: if period_type not in ['hourly', 'daily', 'weekly', 'monthly', 'yearly']:
raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_PERIOD_TYPE') raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_PERIOD_TYPE')
timezone_offset = int(config.utc_offset[1:3]) * 60 + int(config.utc_offset[4:6]) timezone_offset = int(config.utc_offset[1:3]) * 60 + int(config.utc_offset[4:6])
@ -293,6 +293,8 @@ class Reporting:
current_datetime = current_datetime_local.strftime('%Y-%m-%dT%H:%M:%S') current_datetime = current_datetime_local.strftime('%Y-%m-%dT%H:%M:%S')
elif period_type == 'daily': elif period_type == 'daily':
current_datetime = current_datetime_local.strftime('%Y-%m-%d') current_datetime = current_datetime_local.strftime('%Y-%m-%d')
elif period_type == 'weekly':
current_datetime = current_datetime_local.strftime('%Y-%m-%d')
elif period_type == 'monthly': elif period_type == 'monthly':
current_datetime = current_datetime_local.strftime('%Y-%m') current_datetime = current_datetime_local.strftime('%Y-%m')
elif period_type == 'yearly': elif period_type == 'yearly':
@ -352,6 +354,8 @@ class Reporting:
current_datetime = current_datetime_local.strftime('%Y-%m-%dT%H:%M:%S') current_datetime = current_datetime_local.strftime('%Y-%m-%dT%H:%M:%S')
elif period_type == 'daily': elif period_type == 'daily':
current_datetime = current_datetime_local.strftime('%Y-%m-%d') current_datetime = current_datetime_local.strftime('%Y-%m-%d')
elif period_type == 'weekly':
current_datetime = current_datetime_local.strftime('%Y-%m-%d')
elif period_type == 'monthly': elif period_type == 'monthly':
current_datetime = current_datetime_local.strftime('%Y-%m') current_datetime = current_datetime_local.strftime('%Y-%m')
elif period_type == 'yearly': elif period_type == 'yearly':

6
myems-api/reports/storecost.py
View File

@ -55,7 +55,7 @@ class Reporting:
raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_PERIOD_TYPE') raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_PERIOD_TYPE')
else: else:
period_type = str.strip(period_type) period_type = str.strip(period_type)
if period_type not in ['hourly', 'daily', 'monthly', 'yearly']: if period_type not in ['hourly', 'daily', 'weekly', 'monthly', 'yearly']:
raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_PERIOD_TYPE') raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_PERIOD_TYPE')
timezone_offset = int(config.utc_offset[1:3]) * 60 + int(config.utc_offset[4:6]) timezone_offset = int(config.utc_offset[1:3]) * 60 + int(config.utc_offset[4:6])
@ -279,6 +279,8 @@ class Reporting:
current_datetime = current_datetime_local.strftime('%Y-%m-%dT%H:%M:%S') current_datetime = current_datetime_local.strftime('%Y-%m-%dT%H:%M:%S')
elif period_type == 'daily': elif period_type == 'daily':
current_datetime = current_datetime_local.strftime('%Y-%m-%d') current_datetime = current_datetime_local.strftime('%Y-%m-%d')
elif period_type == 'weekly':
current_datetime = current_datetime_local.strftime('%Y-%m-%d')
elif period_type == 'monthly': elif period_type == 'monthly':
current_datetime = current_datetime_local.strftime('%Y-%m') current_datetime = current_datetime_local.strftime('%Y-%m')
elif period_type == 'yearly': elif period_type == 'yearly':
@ -328,6 +330,8 @@ class Reporting:
current_datetime = current_datetime_local.strftime('%Y-%m-%dT%H:%M:%S') current_datetime = current_datetime_local.strftime('%Y-%m-%dT%H:%M:%S')
elif period_type == 'daily': elif period_type == 'daily':
current_datetime = current_datetime_local.strftime('%Y-%m-%d') current_datetime = current_datetime_local.strftime('%Y-%m-%d')
elif period_type == 'weekly':
current_datetime = current_datetime_local.strftime('%Y-%m-%d')
elif period_type == 'monthly': elif period_type == 'monthly':
current_datetime = current_datetime_local.strftime('%Y-%m') current_datetime = current_datetime_local.strftime('%Y-%m')
elif period_type == 'yearly': elif period_type == 'yearly':

6
myems-api/reports/storeenergycategory.py
View File

@ -55,7 +55,7 @@ class Reporting:
raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_PERIOD_TYPE') raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_PERIOD_TYPE')
else: else:
period_type = str.strip(period_type) period_type = str.strip(period_type)
if period_type not in ['hourly', 'daily', 'monthly', 'yearly']: if period_type not in ['hourly', 'daily', 'weekly', 'monthly', 'yearly']:
raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_PERIOD_TYPE') raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_PERIOD_TYPE')
timezone_offset = int(config.utc_offset[1:3]) * 60 + int(config.utc_offset[4:6]) timezone_offset = int(config.utc_offset[1:3]) * 60 + int(config.utc_offset[4:6])
@ -284,6 +284,8 @@ class Reporting:
current_datetime = current_datetime_local.strftime('%Y-%m-%dT%H:%M:%S') current_datetime = current_datetime_local.strftime('%Y-%m-%dT%H:%M:%S')
elif period_type == 'daily': elif period_type == 'daily':
current_datetime = current_datetime_local.strftime('%Y-%m-%d') current_datetime = current_datetime_local.strftime('%Y-%m-%d')
elif period_type == 'weekly':
current_datetime = current_datetime_local.strftime('%Y-%m-%d')
elif period_type == 'monthly': elif period_type == 'monthly':
current_datetime = current_datetime_local.strftime('%Y-%m') current_datetime = current_datetime_local.strftime('%Y-%m')
elif period_type == 'yearly': elif period_type == 'yearly':
@ -340,6 +342,8 @@ class Reporting:
current_datetime = current_datetime_local.strftime('%Y-%m-%dT%H:%M:%S') current_datetime = current_datetime_local.strftime('%Y-%m-%dT%H:%M:%S')
elif period_type == 'daily': elif period_type == 'daily':
current_datetime = current_datetime_local.strftime('%Y-%m-%d') current_datetime = current_datetime_local.strftime('%Y-%m-%d')
elif period_type == 'weekly':
current_datetime = current_datetime_local.strftime('%Y-%m-%d')
elif period_type == 'monthly': elif period_type == 'monthly':
current_datetime = current_datetime_local.strftime('%Y-%m') current_datetime = current_datetime_local.strftime('%Y-%m')
elif period_type == 'yearly': elif period_type == 'yearly':

6
myems-api/reports/storeenergyitem.py
View File

@ -55,7 +55,7 @@ class Reporting:
raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_PERIOD_TYPE') raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_PERIOD_TYPE')
else: else:
period_type = str.strip(period_type) period_type = str.strip(period_type)
if period_type not in ['hourly', 'daily', 'monthly', 'yearly']: if period_type not in ['hourly', 'daily', 'weekly', 'monthly', 'yearly']:
raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_PERIOD_TYPE') raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_PERIOD_TYPE')
timezone_offset = int(config.utc_offset[1:3]) * 60 + int(config.utc_offset[4:6]) timezone_offset = int(config.utc_offset[1:3]) * 60 + int(config.utc_offset[4:6])
@ -283,6 +283,8 @@ class Reporting:
current_datetime = current_datetime_local.strftime('%Y-%m-%dT%H:%M:%S') current_datetime = current_datetime_local.strftime('%Y-%m-%dT%H:%M:%S')
elif period_type == 'daily': elif period_type == 'daily':
current_datetime = current_datetime_local.strftime('%Y-%m-%d') current_datetime = current_datetime_local.strftime('%Y-%m-%d')
elif period_type == 'weekly':
current_datetime = current_datetime_local.strftime('%Y-%m-%d')
elif period_type == 'monthly': elif period_type == 'monthly':
current_datetime = current_datetime_local.strftime('%Y-%m') current_datetime = current_datetime_local.strftime('%Y-%m')
elif period_type == 'yearly': elif period_type == 'yearly':
@ -332,6 +334,8 @@ class Reporting:
current_datetime = current_datetime_local.strftime('%Y-%m-%dT%H:%M:%S') current_datetime = current_datetime_local.strftime('%Y-%m-%dT%H:%M:%S')
elif period_type == 'daily': elif period_type == 'daily':
current_datetime = current_datetime_local.strftime('%Y-%m-%d') current_datetime = current_datetime_local.strftime('%Y-%m-%d')
elif period_type == 'weekly':
current_datetime = current_datetime_local.strftime('%Y-%m-%d')
elif period_type == 'monthly': elif period_type == 'monthly':
current_datetime = current_datetime_local.strftime('%Y-%m') current_datetime = current_datetime_local.strftime('%Y-%m')
elif period_type == 'yearly': elif period_type == 'yearly':

6
myems-api/reports/storeload.py
View File

@ -55,7 +55,7 @@ class Reporting:
raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_PERIOD_TYPE') raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_PERIOD_TYPE')
else: else:
period_type = str.strip(period_type) period_type = str.strip(period_type)
if period_type not in ['hourly', 'daily', 'monthly', 'yearly']: if period_type not in ['hourly', 'daily', 'weekly', 'monthly', 'yearly']:
raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_PERIOD_TYPE') raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_PERIOD_TYPE')
timezone_offset = int(config.utc_offset[1:3]) * 60 + int(config.utc_offset[4:6]) timezone_offset = int(config.utc_offset[1:3]) * 60 + int(config.utc_offset[4:6])
@ -292,6 +292,8 @@ class Reporting:
current_datetime = current_datetime_local.strftime('%Y-%m-%dT%H:%M:%S') current_datetime = current_datetime_local.strftime('%Y-%m-%dT%H:%M:%S')
elif period_type == 'daily': elif period_type == 'daily':
current_datetime = current_datetime_local.strftime('%Y-%m-%d') current_datetime = current_datetime_local.strftime('%Y-%m-%d')
elif period_type == 'weekly':
current_datetime = current_datetime_local.strftime('%Y-%m-%d')
elif period_type == 'monthly': elif period_type == 'monthly':
current_datetime = current_datetime_local.strftime('%Y-%m') current_datetime = current_datetime_local.strftime('%Y-%m')
elif period_type == 'yearly': elif period_type == 'yearly':
@ -349,6 +351,8 @@ class Reporting:
current_datetime = current_datetime_local.strftime('%Y-%m-%dT%H:%M:%S') current_datetime = current_datetime_local.strftime('%Y-%m-%dT%H:%M:%S')
elif period_type == 'daily': elif period_type == 'daily':
current_datetime = current_datetime_local.strftime('%Y-%m-%d') current_datetime = current_datetime_local.strftime('%Y-%m-%d')
elif period_type == 'weekly':
current_datetime = current_datetime_local.strftime('%Y-%m-%d')
elif period_type == 'monthly': elif period_type == 'monthly':
current_datetime = current_datetime_local.strftime('%Y-%m') current_datetime = current_datetime_local.strftime('%Y-%m')
elif period_type == 'yearly': elif period_type == 'yearly':

10
myems-api/reports/storesaving.py
View File

@ -55,7 +55,7 @@ class Reporting:
raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_PERIOD_TYPE') raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_PERIOD_TYPE')
else: else:
period_type = str.strip(period_type) period_type = str.strip(period_type)
if period_type not in ['hourly', 'daily', 'monthly', 'yearly']: if period_type not in ['hourly', 'daily', 'weekly', 'monthly', 'yearly']:
raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_PERIOD_TYPE') raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_PERIOD_TYPE')
timezone_offset = int(config.utc_offset[1:3]) * 60 + int(config.utc_offset[4:6]) timezone_offset = int(config.utc_offset[1:3]) * 60 + int(config.utc_offset[4:6])
@ -305,6 +305,8 @@ class Reporting:
current_datetime = current_datetime_local.strftime('%Y-%m-%dT%H:%M:%S') current_datetime = current_datetime_local.strftime('%Y-%m-%dT%H:%M:%S')
elif period_type == 'daily': elif period_type == 'daily':
current_datetime = current_datetime_local.strftime('%Y-%m-%d') current_datetime = current_datetime_local.strftime('%Y-%m-%d')
elif period_type == 'weekly':
current_datetime = current_datetime_local.strftime('%Y-%m-%d')
elif period_type == 'monthly': elif period_type == 'monthly':
current_datetime = current_datetime_local.strftime('%Y-%m') current_datetime = current_datetime_local.strftime('%Y-%m')
elif period_type == 'yearly': elif period_type == 'yearly':
@ -342,6 +344,8 @@ class Reporting:
current_datetime = current_datetime_local.strftime('%Y-%m-%dT%H:%M:%S') current_datetime = current_datetime_local.strftime('%Y-%m-%dT%H:%M:%S')
elif period_type == 'daily': elif period_type == 'daily':
current_datetime = current_datetime_local.strftime('%Y-%m-%d') current_datetime = current_datetime_local.strftime('%Y-%m-%d')
elif period_type == 'weekly':
current_datetime = current_datetime_local.strftime('%Y-%m-%d')
elif period_type == 'monthly': elif period_type == 'monthly':
current_datetime = current_datetime_local.strftime('%Y-%m') current_datetime = current_datetime_local.strftime('%Y-%m')
elif period_type == 'yearly': elif period_type == 'yearly':
@ -416,6 +420,8 @@ class Reporting:
current_datetime = current_datetime_local.strftime('%Y-%m-%dT%H:%M:%S') current_datetime = current_datetime_local.strftime('%Y-%m-%dT%H:%M:%S')
elif period_type == 'daily': elif period_type == 'daily':
current_datetime = current_datetime_local.strftime('%Y-%m-%d') current_datetime = current_datetime_local.strftime('%Y-%m-%d')
elif period_type == 'weekly':
current_datetime = current_datetime_local.strftime('%Y-%m-%d')
elif period_type == 'monthly': elif period_type == 'monthly':
current_datetime = current_datetime_local.strftime('%Y-%m') current_datetime = current_datetime_local.strftime('%Y-%m')
elif period_type == 'yearly': elif period_type == 'yearly':
@ -453,6 +459,8 @@ class Reporting:
current_datetime = current_datetime_local.strftime('%Y-%m-%dT%H:%M:%S') current_datetime = current_datetime_local.strftime('%Y-%m-%dT%H:%M:%S')
elif period_type == 'daily': elif period_type == 'daily':
current_datetime = current_datetime_local.strftime('%Y-%m-%d') current_datetime = current_datetime_local.strftime('%Y-%m-%d')
elif period_type == 'weekly':
current_datetime = current_datetime_local.strftime('%Y-%m-%d')
elif period_type == 'monthly': elif period_type == 'monthly':
current_datetime = current_datetime_local.strftime('%Y-%m') current_datetime = current_datetime_local.strftime('%Y-%m')
elif period_type == 'yearly': elif period_type == 'yearly':

6
myems-api/reports/storestatistics.py
View File

@ -56,7 +56,7 @@ class Reporting:
raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_PERIOD_TYPE') raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_PERIOD_TYPE')
else: else:
period_type = str.strip(period_type) period_type = str.strip(period_type)
if period_type not in ['hourly', 'daily', 'monthly', 'yearly']: if period_type not in ['hourly', 'daily', 'weekly', 'monthly', 'yearly']:
raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_PERIOD_TYPE') raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_PERIOD_TYPE')
timezone_offset = int(config.utc_offset[1:3]) * 60 + int(config.utc_offset[4:6]) timezone_offset = int(config.utc_offset[1:3]) * 60 + int(config.utc_offset[4:6])
@ -294,6 +294,8 @@ class Reporting:
current_datetime = current_datetime_local.strftime('%Y-%m-%dT%H:%M:%S') current_datetime = current_datetime_local.strftime('%Y-%m-%dT%H:%M:%S')
elif period_type == 'daily': elif period_type == 'daily':
current_datetime = current_datetime_local.strftime('%Y-%m-%d') current_datetime = current_datetime_local.strftime('%Y-%m-%d')
elif period_type == 'weekly':
current_datetime = current_datetime_local.strftime('%Y-%m-%d')
elif period_type == 'monthly': elif period_type == 'monthly':
current_datetime = current_datetime_local.strftime('%Y-%m') current_datetime = current_datetime_local.strftime('%Y-%m')
elif period_type == 'yearly': elif period_type == 'yearly':
@ -353,6 +355,8 @@ class Reporting:
current_datetime = current_datetime_local.strftime('%Y-%m-%dT%H:%M:%S') current_datetime = current_datetime_local.strftime('%Y-%m-%dT%H:%M:%S')
elif period_type == 'daily': elif period_type == 'daily':
current_datetime = current_datetime_local.strftime('%Y-%m-%d') current_datetime = current_datetime_local.strftime('%Y-%m-%d')
elif period_type == 'weekly':
current_datetime = current_datetime_local.strftime('%Y-%m-%d')
elif period_type == 'monthly': elif period_type == 'monthly':
current_datetime = current_datetime_local.strftime('%Y-%m') current_datetime = current_datetime_local.strftime('%Y-%m')
elif period_type == 'yearly': elif period_type == 'yearly':

4
myems-api/reports/tenantbill.py
View File

@ -211,6 +211,8 @@ class Reporting:
current_datetime = current_datetime_local.strftime('%Y-%m-%dT%H:%M:%S') current_datetime = current_datetime_local.strftime('%Y-%m-%dT%H:%M:%S')
elif period_type == 'daily': elif period_type == 'daily':
current_datetime = current_datetime_local.strftime('%Y-%m-%d') current_datetime = current_datetime_local.strftime('%Y-%m-%d')
elif period_type == 'weekly':
current_datetime = current_datetime_local.strftime('%Y-%m-%d')
elif period_type == 'monthly': elif period_type == 'monthly':
current_datetime = current_datetime_local.strftime('%Y-%m') current_datetime = current_datetime_local.strftime('%Y-%m')
elif period_type == 'yearly': elif period_type == 'yearly':
@ -256,6 +258,8 @@ class Reporting:
current_datetime = current_datetime_local.strftime('%Y-%m-%dT%H:%M:%S') current_datetime = current_datetime_local.strftime('%Y-%m-%dT%H:%M:%S')
elif period_type == 'daily': elif period_type == 'daily':
current_datetime = current_datetime_local.strftime('%Y-%m-%d') current_datetime = current_datetime_local.strftime('%Y-%m-%d')
elif period_type == 'weekly':
current_datetime = current_datetime_local.strftime('%Y-%m-%d')
elif period_type == 'monthly': elif period_type == 'monthly':
current_datetime = current_datetime_local.strftime('%Y-%m') current_datetime = current_datetime_local.strftime('%Y-%m')
elif period_type == 'yearly': elif period_type == 'yearly':

6
myems-api/reports/tenantcost.py
View File

@ -55,7 +55,7 @@ class Reporting:
raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_PERIOD_TYPE') raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_PERIOD_TYPE')
else: else:
period_type = str.strip(period_type) period_type = str.strip(period_type)
if period_type not in ['hourly', 'daily', 'monthly', 'yearly']: if period_type not in ['hourly', 'daily', 'weekly', 'monthly', 'yearly']:
raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_PERIOD_TYPE') raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_PERIOD_TYPE')
timezone_offset = int(config.utc_offset[1:3]) * 60 + int(config.utc_offset[4:6]) timezone_offset = int(config.utc_offset[1:3]) * 60 + int(config.utc_offset[4:6])
@ -279,6 +279,8 @@ class Reporting:
current_datetime = current_datetime_local.strftime('%Y-%m-%dT%H:%M:%S') current_datetime = current_datetime_local.strftime('%Y-%m-%dT%H:%M:%S')
elif period_type == 'daily': elif period_type == 'daily':
current_datetime = current_datetime_local.strftime('%Y-%m-%d') current_datetime = current_datetime_local.strftime('%Y-%m-%d')
elif period_type == 'weekly':
current_datetime = current_datetime_local.strftime('%Y-%m-%d')
elif period_type == 'monthly': elif period_type == 'monthly':
current_datetime = current_datetime_local.strftime('%Y-%m') current_datetime = current_datetime_local.strftime('%Y-%m')
elif period_type == 'yearly': elif period_type == 'yearly':
@ -328,6 +330,8 @@ class Reporting:
current_datetime = current_datetime_local.strftime('%Y-%m-%dT%H:%M:%S') current_datetime = current_datetime_local.strftime('%Y-%m-%dT%H:%M:%S')
elif period_type == 'daily': elif period_type == 'daily':
current_datetime = current_datetime_local.strftime('%Y-%m-%d') current_datetime = current_datetime_local.strftime('%Y-%m-%d')
elif period_type == 'weekly':
current_datetime = current_datetime_local.strftime('%Y-%m-%d')
elif period_type == 'monthly': elif period_type == 'monthly':
current_datetime = current_datetime_local.strftime('%Y-%m') current_datetime = current_datetime_local.strftime('%Y-%m')
elif period_type == 'yearly': elif period_type == 'yearly':

6
myems-api/reports/tenantenergycategory.py
View File

@ -55,7 +55,7 @@ class Reporting:
raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_PERIOD_TYPE') raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_PERIOD_TYPE')
else: else:
period_type = str.strip(period_type) period_type = str.strip(period_type)
if period_type not in ['hourly', 'daily', 'monthly', 'yearly']: if period_type not in ['hourly', 'daily', 'weekly', 'monthly', 'yearly']:
raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_PERIOD_TYPE') raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_PERIOD_TYPE')
timezone_offset = int(config.utc_offset[1:3]) * 60 + int(config.utc_offset[4:6]) timezone_offset = int(config.utc_offset[1:3]) * 60 + int(config.utc_offset[4:6])
@ -284,6 +284,8 @@ class Reporting:
current_datetime = current_datetime_local.strftime('%Y-%m-%dT%H:%M:%S') current_datetime = current_datetime_local.strftime('%Y-%m-%dT%H:%M:%S')
elif period_type == 'daily': elif period_type == 'daily':
current_datetime = current_datetime_local.strftime('%Y-%m-%d') current_datetime = current_datetime_local.strftime('%Y-%m-%d')
elif period_type == 'weekly':
current_datetime = current_datetime_local.strftime('%Y-%m-%d')
elif period_type == 'monthly': elif period_type == 'monthly':
current_datetime = current_datetime_local.strftime('%Y-%m') current_datetime = current_datetime_local.strftime('%Y-%m')
elif period_type == 'yearly': elif period_type == 'yearly':
@ -340,6 +342,8 @@ class Reporting:
current_datetime = current_datetime_local.strftime('%Y-%m-%dT%H:%M:%S') current_datetime = current_datetime_local.strftime('%Y-%m-%dT%H:%M:%S')
elif period_type == 'daily': elif period_type == 'daily':
current_datetime = current_datetime_local.strftime('%Y-%m-%d') current_datetime = current_datetime_local.strftime('%Y-%m-%d')
elif period_type == 'weekly':
current_datetime = current_datetime_local.strftime('%Y-%m-%d')
elif period_type == 'monthly': elif period_type == 'monthly':
current_datetime = current_datetime_local.strftime('%Y-%m') current_datetime = current_datetime_local.strftime('%Y-%m')
elif period_type == 'yearly': elif period_type == 'yearly':

6
myems-api/reports/tenantenergyitem.py
View File

@ -55,7 +55,7 @@ class Reporting:
raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_PERIOD_TYPE') raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_PERIOD_TYPE')
else: else:
period_type = str.strip(period_type) period_type = str.strip(period_type)
if period_type not in ['hourly', 'daily', 'monthly', 'yearly']: if period_type not in ['hourly', 'daily', 'weekly', 'monthly', 'yearly']:
raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_PERIOD_TYPE') raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_PERIOD_TYPE')
timezone_offset = int(config.utc_offset[1:3]) * 60 + int(config.utc_offset[4:6]) timezone_offset = int(config.utc_offset[1:3]) * 60 + int(config.utc_offset[4:6])
@ -283,6 +283,8 @@ class Reporting:
current_datetime = current_datetime_local.strftime('%Y-%m-%dT%H:%M:%S') current_datetime = current_datetime_local.strftime('%Y-%m-%dT%H:%M:%S')
elif period_type == 'daily': elif period_type == 'daily':
current_datetime = current_datetime_local.strftime('%Y-%m-%d') current_datetime = current_datetime_local.strftime('%Y-%m-%d')
elif period_type == 'weekly':
current_datetime = current_datetime_local.strftime('%Y-%m-%d')
elif period_type == 'monthly': elif period_type == 'monthly':
current_datetime = current_datetime_local.strftime('%Y-%m') current_datetime = current_datetime_local.strftime('%Y-%m')
elif period_type == 'yearly': elif period_type == 'yearly':
@ -332,6 +334,8 @@ class Reporting:
current_datetime = current_datetime_local.strftime('%Y-%m-%dT%H:%M:%S') current_datetime = current_datetime_local.strftime('%Y-%m-%dT%H:%M:%S')
elif period_type == 'daily': elif period_type == 'daily':
current_datetime = current_datetime_local.strftime('%Y-%m-%d') current_datetime = current_datetime_local.strftime('%Y-%m-%d')
elif period_type == 'weekly':
current_datetime = current_datetime_local.strftime('%Y-%m-%d')
elif period_type == 'monthly': elif period_type == 'monthly':
current_datetime = current_datetime_local.strftime('%Y-%m') current_datetime = current_datetime_local.strftime('%Y-%m')
elif period_type == 'yearly': elif period_type == 'yearly':

6
myems-api/reports/tenantload.py
View File

@ -55,7 +55,7 @@ class Reporting:
raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_PERIOD_TYPE') raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_PERIOD_TYPE')
else: else:
period_type = str.strip(period_type) period_type = str.strip(period_type)
if period_type not in ['hourly', 'daily', 'monthly', 'yearly']: if period_type not in ['hourly', 'daily', 'weekly', 'monthly', 'yearly']:
raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_PERIOD_TYPE') raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_PERIOD_TYPE')
timezone_offset = int(config.utc_offset[1:3]) * 60 + int(config.utc_offset[4:6]) timezone_offset = int(config.utc_offset[1:3]) * 60 + int(config.utc_offset[4:6])
@ -292,6 +292,8 @@ class Reporting:
current_datetime = current_datetime_local.strftime('%Y-%m-%dT%H:%M:%S') current_datetime = current_datetime_local.strftime('%Y-%m-%dT%H:%M:%S')
elif period_type == 'daily': elif period_type == 'daily':
current_datetime = current_datetime_local.strftime('%Y-%m-%d') current_datetime = current_datetime_local.strftime('%Y-%m-%d')
elif period_type == 'weekly':
current_datetime = current_datetime_local.strftime('%Y-%m-%d')
elif period_type == 'monthly': elif period_type == 'monthly':
current_datetime = current_datetime_local.strftime('%Y-%m') current_datetime = current_datetime_local.strftime('%Y-%m')
elif period_type == 'yearly': elif period_type == 'yearly':
@ -349,6 +351,8 @@ class Reporting:
current_datetime = current_datetime_local.strftime('%Y-%m-%dT%H:%M:%S') current_datetime = current_datetime_local.strftime('%Y-%m-%dT%H:%M:%S')
elif period_type == 'daily': elif period_type == 'daily':
current_datetime = current_datetime_local.strftime('%Y-%m-%d') current_datetime = current_datetime_local.strftime('%Y-%m-%d')
elif period_type == 'weekly':
current_datetime = current_datetime_local.strftime('%Y-%m-%d')
elif period_type == 'monthly': elif period_type == 'monthly':
current_datetime = current_datetime_local.strftime('%Y-%m') current_datetime = current_datetime_local.strftime('%Y-%m')
elif period_type == 'yearly': elif period_type == 'yearly':

10
myems-api/reports/tenantsaving.py
View File

@ -55,7 +55,7 @@ class Reporting:
raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_PERIOD_TYPE') raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_PERIOD_TYPE')
else: else:
period_type = str.strip(period_type) period_type = str.strip(period_type)
if period_type not in ['hourly', 'daily', 'monthly', 'yearly']: if period_type not in ['hourly', 'daily', 'weekly', 'monthly', 'yearly']:
raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_PERIOD_TYPE') raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_PERIOD_TYPE')
timezone_offset = int(config.utc_offset[1:3]) * 60 + int(config.utc_offset[4:6]) timezone_offset = int(config.utc_offset[1:3]) * 60 + int(config.utc_offset[4:6])
@ -305,6 +305,8 @@ class Reporting:
current_datetime = current_datetime_local.strftime('%Y-%m-%dT%H:%M:%S') current_datetime = current_datetime_local.strftime('%Y-%m-%dT%H:%M:%S')
elif period_type == 'daily': elif period_type == 'daily':
current_datetime = current_datetime_local.strftime('%Y-%m-%d') current_datetime = current_datetime_local.strftime('%Y-%m-%d')
elif period_type == 'weekly':
current_datetime = current_datetime_local.strftime('%Y-%m-%d')
elif period_type == 'monthly': elif period_type == 'monthly':
current_datetime = current_datetime_local.strftime('%Y-%m') current_datetime = current_datetime_local.strftime('%Y-%m')
elif period_type == 'yearly': elif period_type == 'yearly':
@ -342,6 +344,8 @@ class Reporting:
current_datetime = current_datetime_local.strftime('%Y-%m-%dT%H:%M:%S') current_datetime = current_datetime_local.strftime('%Y-%m-%dT%H:%M:%S')
elif period_type == 'daily': elif period_type == 'daily':
current_datetime = current_datetime_local.strftime('%Y-%m-%d') current_datetime = current_datetime_local.strftime('%Y-%m-%d')
elif period_type == 'weekly':
current_datetime = current_datetime_local.strftime('%Y-%m-%d')
elif period_type == 'monthly': elif period_type == 'monthly':
current_datetime = current_datetime_local.strftime('%Y-%m') current_datetime = current_datetime_local.strftime('%Y-%m')
elif period_type == 'yearly': elif period_type == 'yearly':
@ -416,6 +420,8 @@ class Reporting:
current_datetime = current_datetime_local.strftime('%Y-%m-%dT%H:%M:%S') current_datetime = current_datetime_local.strftime('%Y-%m-%dT%H:%M:%S')
elif period_type == 'daily': elif period_type == 'daily':
current_datetime = current_datetime_local.strftime('%Y-%m-%d') current_datetime = current_datetime_local.strftime('%Y-%m-%d')
elif period_type == 'weekly':
current_datetime = current_datetime_local.strftime('%Y-%m-%d')
elif period_type == 'monthly': elif period_type == 'monthly':
current_datetime = current_datetime_local.strftime('%Y-%m') current_datetime = current_datetime_local.strftime('%Y-%m')
elif period_type == 'yearly': elif period_type == 'yearly':
@ -453,6 +459,8 @@ class Reporting:
current_datetime = current_datetime_local.strftime('%Y-%m-%dT%H:%M:%S') current_datetime = current_datetime_local.strftime('%Y-%m-%dT%H:%M:%S')
elif period_type == 'daily': elif period_type == 'daily':
current_datetime = current_datetime_local.strftime('%Y-%m-%d') current_datetime = current_datetime_local.strftime('%Y-%m-%d')
elif period_type == 'weekly':
current_datetime = current_datetime_local.strftime('%Y-%m-%d')
elif period_type == 'monthly': elif period_type == 'monthly':
current_datetime = current_datetime_local.strftime('%Y-%m') current_datetime = current_datetime_local.strftime('%Y-%m')
elif period_type == 'yearly': elif period_type == 'yearly':

6
myems-api/reports/tenantstatistics.py
View File

@ -55,7 +55,7 @@ class Reporting:
raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_PERIOD_TYPE') raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_PERIOD_TYPE')
else: else:
period_type = str.strip(period_type) period_type = str.strip(period_type)
if period_type not in ['hourly', 'daily', 'monthly', 'yearly']: if period_type not in ['hourly', 'daily', 'weekly', 'monthly', 'yearly']:
raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_PERIOD_TYPE') raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_PERIOD_TYPE')
timezone_offset = int(config.utc_offset[1:3]) * 60 + int(config.utc_offset[4:6]) timezone_offset = int(config.utc_offset[1:3]) * 60 + int(config.utc_offset[4:6])
@ -293,6 +293,8 @@ class Reporting:
current_datetime = current_datetime_local.strftime('%Y-%m-%dT%H:%M:%S') current_datetime = current_datetime_local.strftime('%Y-%m-%dT%H:%M:%S')
elif period_type == 'daily': elif period_type == 'daily':
current_datetime = current_datetime_local.strftime('%Y-%m-%d') current_datetime = current_datetime_local.strftime('%Y-%m-%d')
elif period_type == 'weekly':
current_datetime = current_datetime_local.strftime('%Y-%m-%d')
elif period_type == 'monthly': elif period_type == 'monthly':
current_datetime = current_datetime_local.strftime('%Y-%m') current_datetime = current_datetime_local.strftime('%Y-%m')
elif period_type == 'yearly': elif period_type == 'yearly':
@ -352,6 +354,8 @@ class Reporting:
current_datetime = current_datetime_local.strftime('%Y-%m-%dT%H:%M:%S') current_datetime = current_datetime_local.strftime('%Y-%m-%dT%H:%M:%S')
elif period_type == 'daily': elif period_type == 'daily':
current_datetime = current_datetime_local.strftime('%Y-%m-%d') current_datetime = current_datetime_local.strftime('%Y-%m-%d')
elif period_type == 'weekly':
current_datetime = current_datetime_local.strftime('%Y-%m-%d')
elif period_type == 'monthly': elif period_type == 'monthly':
current_datetime = current_datetime_local.strftime('%Y-%m') current_datetime = current_datetime_local.strftime('%Y-%m')
elif period_type == 'yearly': elif period_type == 'yearly':

6
myems-api/reports/virtualmetercost.py
View File

@ -57,7 +57,7 @@ class Reporting:
raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_PERIOD_TYPE') raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_PERIOD_TYPE')
else: else:
period_type = str.strip(period_type) period_type = str.strip(period_type)
if period_type not in ['hourly', 'daily', 'monthly', 'yearly']: if period_type not in ['hourly', 'daily', 'weekly', 'monthly', 'yearly']:
raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_PERIOD_TYPE') raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_PERIOD_TYPE')
timezone_offset = int(config.utc_offset[1:3]) * 60 + int(config.utc_offset[4:6]) timezone_offset = int(config.utc_offset[1:3]) * 60 + int(config.utc_offset[4:6])
@ -197,6 +197,8 @@ class Reporting:
current_datetime = current_datetime_local.strftime('%Y-%m-%dT%H:%M:%S') current_datetime = current_datetime_local.strftime('%Y-%m-%dT%H:%M:%S')
elif period_type == 'daily': elif period_type == 'daily':
current_datetime = current_datetime_local.strftime('%Y-%m-%d') current_datetime = current_datetime_local.strftime('%Y-%m-%d')
elif period_type == 'weekly':
current_datetime = current_datetime_local.strftime('%Y-%m-%d')
elif period_type == 'monthly': elif period_type == 'monthly':
current_datetime = current_datetime_local.strftime('%Y-%m') current_datetime = current_datetime_local.strftime('%Y-%m')
elif period_type == 'yearly': elif period_type == 'yearly':
@ -264,6 +266,8 @@ class Reporting:
current_datetime = current_datetime_local.strftime('%Y-%m-%dT%H:%M:%S') current_datetime = current_datetime_local.strftime('%Y-%m-%dT%H:%M:%S')
elif period_type == 'daily': elif period_type == 'daily':
current_datetime = current_datetime_local.strftime('%Y-%m-%d') current_datetime = current_datetime_local.strftime('%Y-%m-%d')
elif period_type == 'weekly':
current_datetime = current_datetime_local.strftime('%Y-%m-%d')
elif period_type == 'monthly': elif period_type == 'monthly':
current_datetime = current_datetime_local.strftime('%Y-%m') current_datetime = current_datetime_local.strftime('%Y-%m')
elif period_type == 'yearly': elif period_type == 'yearly':

6
myems-api/reports/virtualmeterenergy.py
View File

@ -55,7 +55,7 @@ class Reporting:
raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_PERIOD_TYPE') raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_PERIOD_TYPE')
else: else:
period_type = str.strip(period_type) period_type = str.strip(period_type)
if period_type not in ['hourly', 'daily', 'monthly', 'yearly']: if period_type not in ['hourly', 'daily', 'weekly', 'monthly', 'yearly']:
raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_PERIOD_TYPE') raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_PERIOD_TYPE')
timezone_offset = int(config.utc_offset[1:3]) * 60 + int(config.utc_offset[4:6]) timezone_offset = int(config.utc_offset[1:3]) * 60 + int(config.utc_offset[4:6])
@ -188,6 +188,8 @@ class Reporting:
current_datetime = current_datetime_local.strftime('%Y-%m-%dT%H:%M:%S') current_datetime = current_datetime_local.strftime('%Y-%m-%dT%H:%M:%S')
elif period_type == 'daily': elif period_type == 'daily':
current_datetime = current_datetime_local.strftime('%Y-%m-%d') current_datetime = current_datetime_local.strftime('%Y-%m-%d')
elif period_type == 'weekly':
current_datetime = current_datetime_local.strftime('%Y-%m-%d')
elif period_type == 'monthly': elif period_type == 'monthly':
current_datetime = current_datetime_local.strftime('%Y-%m') current_datetime = current_datetime_local.strftime('%Y-%m')
elif period_type == 'yearly': elif period_type == 'yearly':
@ -231,6 +233,8 @@ class Reporting:
current_datetime = current_datetime_local.strftime('%Y-%m-%dT%H:%M:%S') current_datetime = current_datetime_local.strftime('%Y-%m-%dT%H:%M:%S')
elif period_type == 'daily': elif period_type == 'daily':
current_datetime = current_datetime_local.strftime('%Y-%m-%d') current_datetime = current_datetime_local.strftime('%Y-%m-%d')
elif period_type == 'weekly':
current_datetime = current_datetime_local.strftime('%Y-%m-%d')
elif period_type == 'monthly': elif period_type == 'monthly':
current_datetime = current_datetime_local.strftime('%Y-%m') current_datetime = current_datetime_local.strftime('%Y-%m')
elif period_type == 'yearly': elif period_type == 'yearly':