rafaelcaricio/moviewyrm
1
0
Fork 0
forked from mirrors/bookwyrm
Code Issues 4 Pull requests Projects Releases Wiki Activity

Adds filtering to admin panel

Browse source
This commit is contained in:
Mouse Reeve 2021-09-11 08:47:16 -07:00
parent 1f53ce33a8
commit 84b90db4bb
2 changed files with 63 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
bookwyrm/templates/settings/dashboard.html
View file

@ -63,13 +63,47 @@
<div class="block content">
<h2>{% trans "Instance Activity" %}</h2>
<form method="get" action="{% url 'settings-dashboard' %}" class="notification has-background-white-bis">
<div class="is-flex is-align-items-flex-end">
<div class="ml-1 mr-1">
<label class="label">
{% trans "Start date:" %}
<input class="input" type="date" name="start" value="{{ start }}">
</label>
</div>
<div class="ml-1 mr-1">
<label class="label">
{% trans "End date:" %}
<input class="input" type="date" name="end" value="{{ end }}">
</label>
</div>
<div class="ml-1 mr-1">
<label class="label">
{% trans "Interval:" %}
<div class="select">
<select name="days">
<option value="1" {% if interval == 1 %}selected{% endif %}>{% trans "Days" %}</option>
<option value="7" {% if interval == 7 %}selected{% endif %}>{% trans "Weeks" %}</option>
</select>
</div>
</label>
</div>
<div class="ml-1 mr-1">
<button class="button is-link" type="submit">{% trans "Submit" %}</button>
</div>
</div>
</form>
<div class="columns">
<div class="column">
<h3>{% trans "User signup activity" %}</h3>
<div class="box">
<canvas id="user_stats"></canvas>
</div>
</div>
<div class="column">
<h3>{% trans "Status activity" %}</h3>
<div class="box">
<canvas id="status_stats"></canvas>
</div>

45
bookwyrm/views/admin/dashboard.py
View file

@ -1,5 +1,6 @@
""" instance overview """
from datetime import timedelta
from dateutil.parser import parse
from django.contrib.auth.decorators import login_required, permission_required
from django.template.response import TemplateResponse
@ -21,43 +22,55 @@ class Dashboard(View):
def get(self, request):
"""list of users"""
buckets = 6
bucket_size = 1 # days
interval = int(request.GET.get("days", 1))
now = timezone.now()
user_queryset = models.User.objects.filter(local=True, is_active=True)
user_stats = {"labels": [], "total": [], "active": []}
interval_end = now - timedelta(days=buckets * bucket_size)
while interval_end < timezone.now():
status_queryset = models.Status.objects.filter(user__local=True, deleted=False)
status_stats = {"labels": [], "total": []}
start = request.GET.get("start")
if start:
start = timezone.make_aware(parse(start))
else:
start = now - timedelta(days=6 * interval)
end = request.GET.get("end")
end = timezone.make_aware(parse(end)) if end else now
interval_start = start
interval_end = interval_start + timedelta(days=interval)
while interval_end <= end:
user_stats["total"].append(
user_queryset.filter(created_date__day__lte=interval_end.day).count()
user_queryset.filter(created_date__lte=interval_end).count()
)
user_stats["active"].append(
user_queryset.filter(
last_active_date__gt=interval_end - timedelta(days=31),
created_date__day__lte=interval_end.day,
created_date__lte=interval_end,
).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_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__day__gt=interval_start.day,
created_date__day__lte=interval_end.day,
created_date__gt=interval_start,
created_date__lte=interval_end,
).count()
)
status_stats["labels"].append(interval_end.strftime("%b %d"))
interval_start = interval_end
interval_end += timedelta(days=bucket_size)
if interval_end >= end:
break
interval_end += timedelta(days=interval)
interval_end = interval_end if interval_end < end else end
data = {
"start": start.strftime("%Y-%m-%d"),
"end": end.strftime("%Y-%m-%d"),
"interval": interval,
"users": user_queryset.count(),
"active_users": user_queryset.filter(
last_active_date__gte=now - timedelta(days=31)