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

Modified comments

pull/76/head
Caozhenhui 2021-10-27 10:05:35 +08:00
parent fedcb71d3f
commit 0c1a2d9ab8
1 changed files with 1 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -69,32 +69,9 @@ def aggregate_hourly_data_by_period(rows_hourly, start_datetime_utc, end_datetim
current_datetime_utc = \ current_datetime_utc = \
start_datetime_local.replace(hour=0) - timedelta(days=weekday, hours=int(config.utc_offset[1:3])) 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:
# calculate the next datetime in utc
current_year = 0
current_month = 0
# Calculate the number of days per month next_datetime_utc = current_datetime_utc + timedelta(days=7)
temp_day = calendar.monthrange(current_datetime_utc.year, current_datetime_utc.month)[1]
# Calculate year, month and day parameters
if current_datetime_utc.day <= temp_day - 7:
current_day = current_datetime_utc.day + 7
elif current_datetime_utc.month == 12:
current_year = current_datetime_utc.year + 1
current_month = 1
current_day = 7 - (temp_day - current_datetime_utc.day)
else:
current_month = current_datetime_utc.month + 1
current_day = 7 - (temp_day - current_datetime_utc.day)
next_datetime_utc = datetime(year=current_year if current_year != 0 else current_datetime_utc.year,
month=current_month if current_month != 0 else current_datetime_utc.month,
day=current_day,
hour=current_datetime_utc.hour,
minute=current_datetime_utc.minute,
second=0,
microsecond=0,
tzinfo=None)
subtotal = Decimal(0.0) subtotal = Decimal(0.0)
for row in rows_hourly: for row in rows_hourly:
if current_datetime_utc <= row[0] < next_datetime_utc: if current_datetime_utc <= row[0] < next_datetime_utc: