yul/bookwyrm-mastodon
1
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Tidies up charts

Browse Source
This commit is contained in:
Mouse Reeve
2021-09-11 07:09:05 -07:00
parent a79fb14686
commit 19cdda372c
4 changed files with 76 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
bookwyrm/views/admin/dashboard.py
View File

@ -30,34 +30,33 @@ class Dashboard(View):
user_stats = {"labels": [], "total": [], "active": []}
interval_end = now - timedelta(days=buckets * bucket_size)
while interval_end < timezone.now():
user_stats["total"].append(user_queryset.filter(
created_date__lte=interval_end
).count())
user_stats["active"].append(user_queryset.filter(
local=True,
is_active=True,
last_active_date__gte=interval_end - timedelta(days=31),
created_date__lte=interval_end
).count())
user_stats["labels"].append(interval_end.strftime("%Y-%m-%d"))
user_stats["total"].append(
user_queryset.filter(created_date__day__lte=interval_end.day).count()
)
user_stats["active"].append(
user_queryset.filter(
last_active_date__gt=interval_end - timedelta(days=31),
created_date__day__lte=interval_end.day,
).count()
)
user_stats["labels"].append(interval_end.strftime("%b %d"))
interval_end += timedelta(days=bucket_size)
status_queryset = models.Status.objects.filter(
user__local=True, deleted=False
)
status_queryset = models.Status.objects.filter(user__local=True, deleted=False)
status_stats = {"labels": [], "total": []}
interval_start = now - timedelta(days=buckets * bucket_size)
interval_end = interval_start + timedelta(days=bucket_size)
while interval_end < timezone.now():
status_stats["total"].append(status_queryset.filter(
created_date__gte=interval_start,
created_date__lte=interval_end,
).count())
status_stats["labels"].append(interval_start.strftime("%Y-%m-%d"))
status_stats["total"].append(
status_queryset.filter(
created_date__day__gt=interval_start.day,
created_date__day__lte=interval_end.day,
).count()
)
status_stats["labels"].append(interval_end.strftime("%b %d"))
interval_start = interval_end
interval_end += timedelta(days=bucket_size)
data = {
"users": user_queryset.count(),
"active_users": user_queryset.filter(