theluyuan/shynet
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix hourly chart bug

Browse Source
This commit is contained in:
CasperVerswijvelt 2021-04-28 18:08:26 +02:00
parent 78bea501a8
commit 7c69b0bd81
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
shynet/core/models.py
View File

@ -205,7 +205,7 @@ class Service(models.Model):
avg_session_duration = None avg_session_duration = None
# Show hourly chart for date ranges of 3 days or less, otherwise daily chart # Show hourly chart for date ranges of 3 days or less, otherwise daily chart
if (end_time - start_time).days <= 3: if (end_time - start_time).days < 3:
session_chart_tooltip_format = "MM/dd HH:mm" session_chart_tooltip_format = "MM/dd HH:mm"
session_chart_data = { session_chart_data = {
k["hour"]: k["count"] k["hour"]: k["count"]
@ -214,10 +214,10 @@ class Service(models.Model):
.annotate(count=models.Count("uuid")) .annotate(count=models.Count("uuid"))
.order_by("hour") .order_by("hour")
} }
for hour_offset in range(int((end_time - start_time).seconds / 3600) + 1): for hour_offset in range(int((end_time - start_time).total_seconds() / 3600) + 1):
hour = (start_time + timezone.timedelta(hours=hour_offset)) hour = (start_time + timezone.timedelta(hours=hour_offset))
if hour not in session_chart_data: if hour not in session_chart_data:
session_chart_data[hour] = 0 if hour < tz_now else None session_chart_data[hour] = 0 if hour <= tz_now else None
else: else:
session_chart_tooltip_format = "MMM d" session_chart_tooltip_format = "MMM d"
session_chart_data = { session_chart_data = {
@ -230,7 +230,7 @@ class Service(models.Model):
for day_offset in range((end_time - start_time).days + 1): for day_offset in range((end_time - start_time).days + 1):
day = (start_time + timezone.timedelta(days=day_offset)).date() day = (start_time + timezone.timedelta(days=day_offset)).date()
if day not in session_chart_data: if day not in session_chart_data:
session_chart_data[day] = 0 if day < tz_now.date() else None session_chart_data[day] = 0 if day <= tz_now.date() else None
return { return {
"currently_online": currently_online, "currently_online": currently_online,