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,6 +29,36 @@ class Dashboard(View):
|
|||
|
||||
def get(self, request):
|
||||
"""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))
|
||||
now = timezone.now()
|
||||
start = request.GET.get("start")
|
||||
|
@ -90,12 +120,7 @@ class Dashboard(View):
|
|||
).count()
|
||||
},
|
||||
)
|
||||
|
||||
email_config_error = re.findall(
|
||||
r"[\s\@]", settings.EMAIL_SENDER_DOMAIN
|
||||
) or not re.match(regex.DOMAIN, settings.EMAIL_SENDER_DOMAIN)
|
||||
|
||||
data = {
|
||||
return {
|
||||
"start": start.strftime("%Y-%m-%d"),
|
||||
"end": end.strftime("%Y-%m-%d"),
|
||||
"interval": interval,
|
||||
|
@ -106,9 +131,7 @@ class Dashboard(View):
|
|||
"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(),
|
||||
"pending_domains": models.LinkDomain.objects.filter(status="pending").count(),
|
||||
"invite_requests": models.InviteRequest.objects.filter(
|
||||
ignored=False, invite__isnull=True
|
||||
).count(),
|
||||
|
@ -116,24 +139,8 @@ class Dashboard(View):
|
|||
"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
|
||||
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:
|
||||
"""Data for a chart"""
|
||||
|
|
Loading…
Reference in a new issue