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

Modified the current_datetime_utcvariable in the statistics_hourly_data_by_period method

pull/77/head
Caozhenhui 2021-11-04 19:50:44 +08:00
parent 67f22d2dd3
commit bffef535ea
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -765,9 +765,7 @@ def statistics_hourly_data_by_period(rows_hourly, start_datetime_utc, end_dateti
variance = None variance = None
# calculate the start datetime in utc of the first day in local # calculate the start datetime in utc of the first day in local
start_datetime_local = start_datetime_utc + timedelta(hours=int(config.utc_offset[1:3])) start_datetime_local = start_datetime_utc + timedelta(hours=int(config.utc_offset[1:3]))
weekday = start_datetime_local.weekday() current_datetime_utc = start_datetime_local.replace(hour=0) - timedelta(hours=int(config.utc_offset[1:3]))
current_datetime_utc = \
start_datetime_local.replace(hour=0) - timedelta(days=weekday, hours=int(config.utc_offset[1:3]))
while current_datetime_utc <= end_datetime_utc: while current_datetime_utc <= end_datetime_utc:
sub_total = Decimal(0.0) sub_total = Decimal(0.0)
for row in rows_hourly: for row in rows_hourly:
@ -811,7 +809,9 @@ def statistics_hourly_data_by_period(rows_hourly, start_datetime_utc, end_dateti
variance = None variance = None
# calculate the start datetime in utc of the monday in the first week in local # calculate the start datetime in utc of the monday in the first week in local
start_datetime_local = start_datetime_utc + timedelta(hours=int(config.utc_offset[1:3])) start_datetime_local = start_datetime_utc + timedelta(hours=int(config.utc_offset[1:3]))
current_datetime_utc = start_datetime_local.replace(hour=0) - timedelta(hours=int(config.utc_offset[1:3])) weekday = start_datetime_local.weekday()
current_datetime_utc = \
start_datetime_local.replace(hour=0) - timedelta(days=weekday, hours=int(config.utc_offset[1:3]))
while current_datetime_utc <= end_datetime_utc: while current_datetime_utc <= end_datetime_utc:
sub_total = Decimal(0.0) sub_total = Decimal(0.0)
for row in rows_hourly: for row in rows_hourly: