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

added weekly to i18n of Web UI

pull/78/MERGE
13621160019@163.com 2021-11-04 21:18:50 +08:00
parent 2c748d2eee
commit cfe749e44d
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
myems-api/core/utilities.py
View File

@ -12,7 +12,7 @@ import statistics
# rows_hourly: list of (start_datetime_utc, actual_value), should belong to one energy_category_id # rows_hourly: list of (start_datetime_utc, actual_value), should belong to one energy_category_id
# start_datetime_utc: start datetime in utc # start_datetime_utc: start datetime in utc
# end_datetime_utc: end datetime in utc # end_datetime_utc: end datetime in utc
# period_type: one of the following period types, 'hourly', 'daily', 'weekly', 'monthly' and 'yearly' # period_type: use one of the period types, 'hourly', 'daily', 'weekly', 'monthly' and 'yearly'
# Note: this procedure doesn't work with multiple energy categories # Note: this procedure doesn't work with multiple energy categories
######################################################################################################################## ########################################################################################################################
def aggregate_hourly_data_by_period(rows_hourly, start_datetime_utc, end_datetime_utc, period_type): def aggregate_hourly_data_by_period(rows_hourly, start_datetime_utc, end_datetime_utc, period_type):
@ -403,7 +403,7 @@ def get_energy_category_peak_types(cost_center_id, energy_category_id, start_dat
# rows_hourly: list of (start_datetime_utc, actual_value), should belong to one energy_category_id # rows_hourly: list of (start_datetime_utc, actual_value), should belong to one energy_category_id
# start_datetime_utc: start datetime in utc # start_datetime_utc: start datetime in utc
# end_datetime_utc: end datetime in utc # end_datetime_utc: end datetime in utc
# period_type: one of the following period types, 'hourly', 'daily', 'monthly' and 'yearly' # period_type: use one of the period types, 'hourly', 'daily', 'weekly', 'monthly' and 'yearly'
# Returns: periodically data of average and maximum # Returns: periodically data of average and maximum
# Note: this procedure doesn't work with multiple energy categories # Note: this procedure doesn't work with multiple energy categories
######################################################################################################################## ########################################################################################################################
@ -692,7 +692,7 @@ def averaging_hourly_data_by_period(rows_hourly, start_datetime_utc, end_datetim
# rows_hourly: list of (start_datetime_utc, actual_value), should belong to one energy_category_id # rows_hourly: list of (start_datetime_utc, actual_value), should belong to one energy_category_id
# start_datetime_utc: start datetime in utc # start_datetime_utc: start datetime in utc
# end_datetime_utc: end datetime in utc # end_datetime_utc: end datetime in utc
# period_type: one of the following period types, 'hourly', 'daily', 'monthly' and 'yearly' # period_type: use one of the period types, 'hourly', 'daily', 'weekly', 'monthly' and 'yearly'
# Returns: periodically data of values and statistics of mean, median, minimum, maximum, stdev and variance # Returns: periodically data of values and statistics of mean, median, minimum, maximum, stdev and variance
# Note: this procedure doesn't work with multiple energy categories # Note: this procedure doesn't work with multiple energy categories
######################################################################################################################## ########################################################################################################################

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

@ -34,7 +34,7 @@ class Reporting:
tenant_id = req.params.get('tenantid') tenant_id = req.params.get('tenantid')
reporting_start_datetime_local = req.params.get('reportingperiodstartdatetime') reporting_start_datetime_local = req.params.get('reportingperiodstartdatetime')
reporting_end_datetime_local = req.params.get('reportingperiodenddatetime') reporting_end_datetime_local = req.params.get('reportingperiodenddatetime')
# This value is intentionally left daily
period_type = 'daily' period_type = 'daily'
################################################################################################################ ################################################################################################################

2
web/src/i18n.js
View File

@ -122,6 +122,7 @@ const resources = {
"Period Types": "Period Types", "Period Types": "Period Types",
"Yearly": "Yearly", "Yearly": "Yearly",
"Monthly": "Monthly", "Monthly": "Monthly",
"Weekly": "Weekly",
"Daily": "Daily", "Daily": "Daily",
"Hourly": "Hourly", "Hourly": "Hourly",
"Submit": "Submit", "Submit": "Submit",
@ -867,6 +868,7 @@ const resources = {
"Period Types": "Periodentypen", "Period Types": "Periodentypen",
"Yearly": "Jährlich", "Yearly": "Jährlich",
"Monthly": "Monatlich", "Monthly": "Monatlich",
"Weekly": "Wöchentlich",
"Daily": "Täglich", "Daily": "Täglich",
"Hourly": "Stündlich", "Hourly": "Stündlich",
"Submit": "einreichen", "Submit": "einreichen",