format files with black

This commit is contained in:
Aarni Halinen
2022-01-13 22:10:24 +02:00
parent a0f062c697
commit 11efcdd579
178 changed files with 3763 additions and 2324 deletions
+72 -61
View File
@@ -21,52 +21,53 @@ from members.views import error_view
@ensure_csrf_cookie
@require_http_methods(["GET"])
@login_required(login_url='/admin/login')
@permission_required('members.read_application', raise_exception=True)
@login_required(login_url="/admin/login")
@permission_required("members.read_application", raise_exception=True)
def application_list(request, *args, **kwargs):
"""List member applications not yet processed."""
applications = Request.objects.all()
application_count = len(applications)
table = RequestTable(applications,
request=request,
exclude=['id'],
attrs={'class': 'table table-bordered table-hover'})
table = RequestTable(
applications,
request=request,
exclude=["id"],
attrs={"class": "table table-bordered table-hover"},
)
table.paginate(page=request.GET.get('page', 1), per_page=25)
table.paginate(page=request.GET.get("page", 1), per_page=25)
table_html = convert_table_to_html(table, request)
context = {
'table': table_html,
'application_count': application_count,
'notification': request.GET.get('notification', None)
"table": table_html,
"application_count": application_count,
"notification": request.GET.get("notification", None),
}
return render(request, 'application_list.html', context)
return render(request, "application_list.html", context)
@ensure_csrf_cookie
@require_http_methods(["GET"])
@login_required(login_url='/admin/login')
@permission_required('members.change_request', raise_exception=True)
@login_required(login_url="/admin/login")
@permission_required("members.change_request", raise_exception=True)
def application_edit(request, *args, **kwargs):
"""Edit member request information."""
i = kwargs.pop('index', None)
i = kwargs.pop("index", None)
if i is None:
return error_view(request, _('No application id specified'))
return error_view(request, _("No application id specified"))
else:
application = Request.objects.get(id=i)
form = ApplicationForm(instance=application)
return render(
request,
'application_edit.html',
{'application_id': i, 'form': form})
request, "application_edit.html", {"application_id": i, "form": form}
)
@ensure_csrf_cookie
@require_http_methods(["POST"])
@login_required(login_url='/admin/login')
@permission_required('members.add_member', raise_exception=True)
@login_required(login_url="/admin/login")
@permission_required("members.add_member", raise_exception=True)
def application_accept(request, *args, **kwargs):
"""Accept application."""
id = request.POST.get('id', None)
id = request.POST.get("id", None)
if id is not None:
application = Request.objects.get(id=id)
else:
@@ -78,9 +79,12 @@ def application_accept(request, *args, **kwargs):
application = form.save()
if Member.objects.filter(email=application.email).exists():
return error_view(request, _(
'Email {} is already in use by a member. Application cannot be accepted.'
).format(application.email))
return error_view(
request,
_(
"Email {} is already in use by a member. Application cannot be accepted."
).format(application.email),
)
member = application.to_member()
member.save()
@@ -88,24 +92,25 @@ def application_accept(request, *args, **kwargs):
logging.info(
"Accepted application in member "
"register with the following info: {}"
.format(form))
notification = "{} {}.".format(_("Successfully accepted application"),
str(application))
"register with the following info: {}".format(form)
)
notification = "{} {}.".format(
_("Successfully accepted application"), str(application)
)
subject = _('Jäsenhakemuksesi Sähköinsinöörikiltaan on hyväksytty!')
subject = _("Jäsenhakemuksesi Sähköinsinöörikiltaan on hyväksytty!")
message = render_to_string(
'members:email_application_accept.html', {
'first_name': application.first_name
}
"members:email_application_accept.html",
{"first_name": application.first_name},
)
send_email(member.email, subject, message)
return HttpResponseRedirect(
'/members/list?notification={}'.format(html.escape(notification)))
"/members/list?notification={}".format(html.escape(notification))
)
except Exception as ex:
logging.exception('Exception while accepting application')
logging.exception("Exception while accepting application")
return error_view(request, str(ex))
else:
logging.info(form)
@@ -114,52 +119,55 @@ def application_accept(request, *args, **kwargs):
@ensure_csrf_cookie
@require_http_methods(["POST"])
@login_required(login_url='/admin/login')
@permission_required('members.delete_request', raise_exception=True)
@login_required(login_url="/admin/login")
@permission_required("members.delete_request", raise_exception=True)
def application_delete(request, *args, **kwargs):
"""Delete member application."""
try:
id = request.POST['id']
id = request.POST["id"]
except KeyError:
return error_view(request, _('No application id specified'))
return error_view(request, _("No application id specified"))
try:
application = Request.objects.get(id=id)
notification = "{} {}.".format(_("Successfully deleted application"),
str(application))
notification = "{} {}.".format(
_("Successfully deleted application"), str(application)
)
application.delete()
logging.info(
"Delete application in member register with the following id: {}"
.format(id))
"Delete application in member register with the following id: {}".format(id)
)
return HttpResponseRedirect(
'/members/applications?notification={}'
.format(html.escape(notification)))
"/members/applications?notification={}".format(html.escape(notification))
)
except:
return error_view(request, _('Could not delete application object'))
return error_view(request, _("Could not delete application object"))
@ensure_csrf_cookie
@require_http_methods(["GET"])
@login_required(login_url='/admin/login')
@permission_required('members.delete_request', raise_exception=True)
@login_required(login_url="/admin/login")
@permission_required("members.delete_request", raise_exception=True)
def application_delete_confirm(request, *args, **kwargs):
"""Confirm application deletion."""
i = kwargs.pop('index', None)
i = kwargs.pop("index", None)
if i is None:
return error_view(request, _('No application id specified'))
return error_view(request, _("No application id specified"))
else:
application = Request.objects.get(id=i)
form = ApplicationForm(instance=application)
return render(request,
'application_delete_confirm.html',
{'application_id': i, 'form': form})
return render(
request,
"application_delete_confirm.html",
{"application_id": i, "form": form},
)
@ensure_csrf_cookie
def application_form(request, *args, **kwargs):
"""Render member application form."""
form = ApplicationForm()
return render(request, 'application_index.html', {'form': form})
return render(request, "application_index.html", {"form": form})
@ensure_csrf_cookie
@@ -171,19 +179,22 @@ def application_submit(request, *args, **kwargs):
form.save()
try:
application = form.instance
email = form.cleaned_data.get('email', '')
email = form.cleaned_data.get("email", "")
subject = _('Jäsenhakemuksesi Sähköinsinöörikiltaan on lähetetty onnistuneesti!')
subject = _(
"Jäsenhakemuksesi Sähköinsinöörikiltaan on lähetetty onnistuneesti!"
)
message = render_to_string(
'members:email_application_submit.html', {
'application': application,
'ayy': _('Kyllä') if application.AYY else _('Ei'),
'jas': _('Kyllä') if application.jas else _('Ei')
}
"members:email_application_submit.html",
{
"application": application,
"ayy": _("Kyllä") if application.AYY else _("Ei"),
"jas": _("Kyllä") if application.jas else _("Ei"),
},
)
send_email(email, subject, message)
finally:
return render(request, 'application_success.html', {})
return render(request, "application_success.html", {})
else:
return error_view(request, form.errors)