mirror of
https://github.com/bookwyrm-social/bookwyrm.git
synced 2024-09-28 06:12:03 +00:00
Creates helper function for creating charts
This commit is contained in:
parent
516c4a9790
commit
89165fd909
1 changed files with 92 additions and 85 deletions
|
@ -29,96 +29,18 @@ class Dashboard(View):
|
||||||
|
|
||||||
def get(self, request):
|
def get(self, request):
|
||||||
"""list of users"""
|
"""list of users"""
|
||||||
interval = int(request.GET.get("days", 1))
|
data = get_charts_and_stats(request)
|
||||||
now = timezone.now()
|
|
||||||
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
|
|
||||||
start = start.replace(hour=0, minute=0, second=0)
|
|
||||||
|
|
||||||
user_queryset = models.User.objects.filter(local=True)
|
|
||||||
user_chart = Chart(
|
|
||||||
queryset=user_queryset,
|
|
||||||
queries={
|
|
||||||
"total": lambda q, s, e: q.filter(
|
|
||||||
Q(is_active=True) | Q(deactivation_date__gt=e),
|
|
||||||
created_date__lte=e,
|
|
||||||
).count(),
|
|
||||||
"active": lambda q, s, e: q.filter(
|
|
||||||
Q(is_active=True) | Q(deactivation_date__gt=e),
|
|
||||||
created_date__lte=e,
|
|
||||||
)
|
|
||||||
.filter(
|
|
||||||
last_active_date__gt=e - timedelta(days=31),
|
|
||||||
)
|
|
||||||
.count(),
|
|
||||||
},
|
|
||||||
)
|
|
||||||
|
|
||||||
status_queryset = models.Status.objects.filter(user__local=True, deleted=False)
|
|
||||||
status_chart = Chart(
|
|
||||||
queryset=status_queryset,
|
|
||||||
queries={
|
|
||||||
"total": lambda q, s, e: q.filter(
|
|
||||||
created_date__gt=s,
|
|
||||||
created_date__lte=e,
|
|
||||||
).count()
|
|
||||||
},
|
|
||||||
)
|
|
||||||
|
|
||||||
register_chart = Chart(
|
|
||||||
queryset=user_queryset,
|
|
||||||
queries={
|
|
||||||
"total": lambda q, s, e: q.filter(
|
|
||||||
created_date__gt=s,
|
|
||||||
created_date__lte=e,
|
|
||||||
).count()
|
|
||||||
},
|
|
||||||
)
|
|
||||||
|
|
||||||
works_chart = Chart(
|
|
||||||
queryset=models.Work.objects,
|
|
||||||
queries={
|
|
||||||
"total": lambda q, s, e: q.filter(
|
|
||||||
created_date__gt=s,
|
|
||||||
created_date__lte=e,
|
|
||||||
).count()
|
|
||||||
},
|
|
||||||
)
|
|
||||||
|
|
||||||
|
# Make sure email looks properly configured
|
||||||
email_config_error = re.findall(
|
email_config_error = re.findall(
|
||||||
r"[\s\@]", settings.EMAIL_SENDER_DOMAIN
|
r"[\s\@]", settings.EMAIL_SENDER_DOMAIN
|
||||||
) or not re.match(regex.DOMAIN, settings.EMAIL_SENDER_DOMAIN)
|
) or not re.match(regex.DOMAIN, settings.EMAIL_SENDER_DOMAIN)
|
||||||
|
|
||||||
data = {
|
data["email_config_error"] = email_config_error
|
||||||
"start": start.strftime("%Y-%m-%d"),
|
# pylint: disable=line-too-long
|
||||||
"end": end.strftime("%Y-%m-%d"),
|
data[
|
||||||
"interval": interval,
|
"email_sender"
|
||||||
"users": user_queryset.filter(is_active=True).count(),
|
] = f"{settings.EMAIL_SENDER_NAME}@{settings.EMAIL_SENDER_DOMAIN}"
|
||||||
"active_users": user_queryset.filter(
|
|
||||||
is_active=True, last_active_date__gte=now - timedelta(days=31)
|
|
||||||
).count(),
|
|
||||||
"statuses": status_queryset.count(),
|
|
||||||
"works": models.Work.objects.count(),
|
|
||||||
"reports": models.Report.objects.filter(resolved=False).count(),
|
|
||||||
"pending_domains": models.LinkDomain.objects.filter(
|
|
||||||
status="pending"
|
|
||||||
).count(),
|
|
||||||
"invite_requests": models.InviteRequest.objects.filter(
|
|
||||||
ignored=False, invite__isnull=True
|
|
||||||
).count(),
|
|
||||||
"user_stats": user_chart.get_chart(start, end, interval),
|
|
||||||
"status_stats": status_chart.get_chart(start, end, interval),
|
|
||||||
"register_stats": register_chart.get_chart(start, end, interval),
|
|
||||||
"works_stats": works_chart.get_chart(start, end, interval),
|
|
||||||
"email_config_error": email_config_error,
|
|
||||||
"email_sender": f"{settings.EMAIL_SENDER_NAME}@{settings.EMAIL_SENDER_DOMAIN}",
|
|
||||||
}
|
|
||||||
|
|
||||||
# check version
|
# check version
|
||||||
try:
|
try:
|
||||||
|
@ -135,6 +57,91 @@ class Dashboard(View):
|
||||||
return TemplateResponse(request, "settings/dashboard/dashboard.html", data)
|
return TemplateResponse(request, "settings/dashboard/dashboard.html", data)
|
||||||
|
|
||||||
|
|
||||||
|
def get_charts_and_stats(request):
|
||||||
|
"""Defines the dashbaord charts"""
|
||||||
|
interval = int(request.GET.get("days", 1))
|
||||||
|
now = timezone.now()
|
||||||
|
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
|
||||||
|
start = start.replace(hour=0, minute=0, second=0)
|
||||||
|
|
||||||
|
user_queryset = models.User.objects.filter(local=True)
|
||||||
|
user_chart = Chart(
|
||||||
|
queryset=user_queryset,
|
||||||
|
queries={
|
||||||
|
"total": lambda q, s, e: q.filter(
|
||||||
|
Q(is_active=True) | Q(deactivation_date__gt=e),
|
||||||
|
created_date__lte=e,
|
||||||
|
).count(),
|
||||||
|
"active": lambda q, s, e: q.filter(
|
||||||
|
Q(is_active=True) | Q(deactivation_date__gt=e),
|
||||||
|
created_date__lte=e,
|
||||||
|
)
|
||||||
|
.filter(
|
||||||
|
last_active_date__gt=e - timedelta(days=31),
|
||||||
|
)
|
||||||
|
.count(),
|
||||||
|
},
|
||||||
|
)
|
||||||
|
|
||||||
|
status_queryset = models.Status.objects.filter(user__local=True, deleted=False)
|
||||||
|
status_chart = Chart(
|
||||||
|
queryset=status_queryset,
|
||||||
|
queries={
|
||||||
|
"total": lambda q, s, e: q.filter(
|
||||||
|
created_date__gt=s,
|
||||||
|
created_date__lte=e,
|
||||||
|
).count()
|
||||||
|
},
|
||||||
|
)
|
||||||
|
|
||||||
|
register_chart = Chart(
|
||||||
|
queryset=user_queryset,
|
||||||
|
queries={
|
||||||
|
"total": lambda q, s, e: q.filter(
|
||||||
|
created_date__gt=s,
|
||||||
|
created_date__lte=e,
|
||||||
|
).count()
|
||||||
|
},
|
||||||
|
)
|
||||||
|
|
||||||
|
works_chart = Chart(
|
||||||
|
queryset=models.Work.objects,
|
||||||
|
queries={
|
||||||
|
"total": lambda q, s, e: q.filter(
|
||||||
|
created_date__gt=s,
|
||||||
|
created_date__lte=e,
|
||||||
|
).count()
|
||||||
|
},
|
||||||
|
)
|
||||||
|
return {
|
||||||
|
"start": start.strftime("%Y-%m-%d"),
|
||||||
|
"end": end.strftime("%Y-%m-%d"),
|
||||||
|
"interval": interval,
|
||||||
|
"users": user_queryset.filter(is_active=True).count(),
|
||||||
|
"active_users": user_queryset.filter(
|
||||||
|
is_active=True, last_active_date__gte=now - timedelta(days=31)
|
||||||
|
).count(),
|
||||||
|
"statuses": status_queryset.count(),
|
||||||
|
"works": models.Work.objects.count(),
|
||||||
|
"reports": models.Report.objects.filter(resolved=False).count(),
|
||||||
|
"pending_domains": models.LinkDomain.objects.filter(status="pending").count(),
|
||||||
|
"invite_requests": models.InviteRequest.objects.filter(
|
||||||
|
ignored=False, invite__isnull=True
|
||||||
|
).count(),
|
||||||
|
"user_stats": user_chart.get_chart(start, end, interval),
|
||||||
|
"status_stats": status_chart.get_chart(start, end, interval),
|
||||||
|
"register_stats": register_chart.get_chart(start, end, interval),
|
||||||
|
"works_stats": works_chart.get_chart(start, end, interval),
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
class Chart:
|
class Chart:
|
||||||
"""Data for a chart"""
|
"""Data for a chart"""
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue