zedfrigg/bookwyrm
1
0
Fork 0
Code Activity

Creates helper function for creating charts

Browse source
This commit is contained in:
Mouse Reeve 2022-07-03 08:28:24 -07:00
parent 516c4a9790
commit 89165fd909
1 changed files with 92 additions and 85 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -29,6 +29,36 @@ class Dashboard(View):
def get(self, request): def get(self, request):
"""list of users""" """list of users"""
data = get_charts_and_stats(request)
# Make sure email looks properly configured
email_config_error = re.findall(
r"[\s\@]", settings.EMAIL_SENDER_DOMAIN
) or not re.match(regex.DOMAIN, settings.EMAIL_SENDER_DOMAIN)
data["email_config_error"] = email_config_error
# pylint: disable=line-too-long
data[
"email_sender"
] = f"{settings.EMAIL_SENDER_NAME}@{settings.EMAIL_SENDER_DOMAIN}"
# check version
try:
release = get_data(settings.RELEASE_API, timeout=3)
available_version = release.get("tag_name", None)
if available_version and version.parse(available_version) > version.parse(
settings.VERSION
):
data["current_version"] = settings.VERSION
data["available_version"] = available_version
except ConnectorException:
pass
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)) interval = int(request.GET.get("days", 1))
now = timezone.now() now = timezone.now()
start = request.GET.get("start") start = request.GET.get("start")
@ -90,12 +120,7 @@ class Dashboard(View):
).count() ).count()
}, },
) )
return {
email_config_error = re.findall(
r"[\s\@]", settings.EMAIL_SENDER_DOMAIN
) or not re.match(regex.DOMAIN, settings.EMAIL_SENDER_DOMAIN)
data = {
"start": start.strftime("%Y-%m-%d"), "start": start.strftime("%Y-%m-%d"),
"end": end.strftime("%Y-%m-%d"), "end": end.strftime("%Y-%m-%d"),
"interval": interval, "interval": interval,
@ -106,9 +131,7 @@ class Dashboard(View):
"statuses": status_queryset.count(), "statuses": status_queryset.count(),
"works": models.Work.objects.count(), "works": models.Work.objects.count(),
"reports": models.Report.objects.filter(resolved=False).count(), "reports": models.Report.objects.filter(resolved=False).count(),
"pending_domains": models.LinkDomain.objects.filter( "pending_domains": models.LinkDomain.objects.filter(status="pending").count(),
status="pending"
).count(),
"invite_requests": models.InviteRequest.objects.filter( "invite_requests": models.InviteRequest.objects.filter(
ignored=False, invite__isnull=True ignored=False, invite__isnull=True
).count(), ).count(),
@ -116,24 +139,8 @@ class Dashboard(View):
"status_stats": status_chart.get_chart(start, end, interval), "status_stats": status_chart.get_chart(start, end, interval),
"register_stats": register_chart.get_chart(start, end, interval), "register_stats": register_chart.get_chart(start, end, interval),
"works_stats": works_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
try:
release = get_data(settings.RELEASE_API, timeout=3)
available_version = release.get("tag_name", None)
if available_version and version.parse(available_version) > version.parse(
settings.VERSION
):
data["current_version"] = settings.VERSION
data["available_version"] = available_version
except ConnectorException:
pass
return TemplateResponse(request, "settings/dashboard/dashboard.html", data)
class Chart: class Chart:
"""Data for a chart""" """Data for a chart"""