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
+59 -43
View File
@@ -21,7 +21,13 @@ from rest_framework import generics
from rest_framework import permissions
from members.models import Member, Request, Payment
from members.forms import MemberForm, PaymentForm, ApplicationForm, CSVValidationError, UploadFileForm
from members.forms import (
MemberForm,
PaymentForm,
ApplicationForm,
CSVValidationError,
UploadFileForm,
)
from members.tables import MemberTable, PaymentTable, RequestTable
from members.resources import MemberResource, PaymentResource, ApplicationResource
@@ -32,12 +38,15 @@ class MemberDetail(generics.RetrieveAPIView):
queryset = Member.objects.all()
serializer_class = MemberSerializer
permission_classes = (permissions.DjangoModelPermissions, )
throttle_classes = (BurstRateThrottle, SustainedRateThrottle, )
permission_classes = (permissions.DjangoModelPermissions,)
throttle_classes = (
BurstRateThrottle,
SustainedRateThrottle,
)
def error_view(request, message, status=400):
return render(request, 'error.html', {'error': message}, status=400)
return render(request, "error.html", {"error": message}, status=400)
def validate_recaptcha(response):
@@ -48,15 +57,15 @@ def validate_recaptcha(response):
:return: Boolean, success or not
"""
values = {
'secret': settings.GOOGLE_RECAPTCHA_SECRET_KEY,
'response': response,
"secret": settings.GOOGLE_RECAPTCHA_SECRET_KEY,
"response": response,
}
url = "https://www.google.com/recaptcha/api/siteverify"
headers = {'Content-type': 'application/x-www-form-urlencoded'}
headers = {"Content-type": "application/x-www-form-urlencoded"}
resp = requests.post(url, values, headers=headers)
try:
result = json.loads(resp.text)
logging.info('Recaptcha response: {}'.format(result))
logging.info("Recaptcha response: {}".format(result))
return result["success"]
except:
return False
@@ -87,81 +96,88 @@ def convert_table_to_html(table, request):
@ensure_csrf_cookie
@require_http_methods(["GET"])
@login_required(login_url='/admin/login')
@permission_required('members.change_member', raise_exception=True)
@login_required(login_url="/admin/login")
@permission_required("members.change_member", raise_exception=True)
def settings_page(request, *args, **kwargs):
"""Render member app settings page."""
return render(request, 'settings.html', {})
return render(request, "settings.html", {})
@ensure_csrf_cookie
@require_http_methods(["POST"])
@login_required(login_url='/admin/login')
@permission_required(['members.change_member', 'members.change_payment'], raise_exception=True)
@login_required(login_url="/admin/login")
@permission_required(
["members.change_member", "members.change_payment"], raise_exception=True
)
def import_csv(request, *args, **kwargs):
"""Get csv data imported to page and create members based on that."""
try:
csv_in_memory_file = request.FILES.get('csvFile')
csv_in_memory_file = request.FILES.get("csvFile")
csv_file = csv_in_memory_file.file
data = csv_file.read().decode('utf-8')
data = csv_file.read().decode("utf-8")
delimiter = request.POST.get('delimiter', ',')
payment_source = request.POST['payment_source']
delimiter = request.POST.get("delimiter", ",")
payment_source = request.POST["payment_source"]
except:
return error_view(request, _('Missing CSV file'))
return error_view(request, _("Missing CSV file"))
try:
result = MemberForm.csv_to_models(data, payment_source=payment_source, delimiter=delimiter)
result = MemberForm.csv_to_models(
data, payment_source=payment_source, delimiter=delimiter
)
except CSVValidationError as ex:
logging.exception('Model validation error')
logging.exception("Model validation error")
return error_view(request, ex.form_errors)
except Exception as ex:
logging.exception('Other error in CSV import')
logging.exception("Other error in CSV import")
return error_view(request, str(ex))
member_table = MemberTable(result.members,
request=request,
exclude=['id', 'options'],
attrs={'class': 'table table-bordered table-hover'})
member_table = MemberTable(
result.members,
request=request,
exclude=["id", "options"],
attrs={"class": "table table-bordered table-hover"},
)
member_table.paginate(page=request.GET.get('page', 1), per_page=999999)
member_table.paginate(page=request.GET.get("page", 1), per_page=999999)
member_table_html = convert_table_to_html(member_table, request)
payment_table = PaymentTable(result.payments,
request=request,
exclude=['id', 'options'],
attrs={'class': 'table table-bordered table-hover'})
payment_table = PaymentTable(
result.payments,
request=request,
exclude=["id", "options"],
attrs={"class": "table table-bordered table-hover"},
)
payment_table.paginate(page=request.GET.get('page', 1), per_page=999999)
payment_table.paginate(page=request.GET.get("page", 1), per_page=999999)
payment_table_html = convert_table_to_html(payment_table, request)
request.session['models'] = result
request.session['payment_source'] = payment_source
context = {
'members': member_table_html,
'payments': payment_table_html
}
return render(request, 'member_add_many_confirm.html', context)
request.session["models"] = result
request.session["payment_source"] = payment_source
context = {"members": member_table_html, "payments": payment_table_html}
return render(request, "member_add_many_confirm.html", context)
def make_excel_response(Resource):
res = Resource()
dataset = res.export()
response = HttpResponse(dataset.xlsx, content_type='application/vnd.ms-excel; charset=utf-8')
response['Content-Disposition'] = 'attachment; filename="export.xlsx"'
response = HttpResponse(
dataset.xlsx, content_type="application/vnd.ms-excel; charset=utf-8"
)
response["Content-Disposition"] = 'attachment; filename="export.xlsx"'
return response
@require_http_methods(['GET'])
@require_http_methods(["GET"])
def export_members_excel(request, *args, **kwargs):
return make_excel_response(MemberResource)
@require_http_methods(['GET'])
@require_http_methods(["GET"])
def export_payments_excel(request, *args, **kwargs):
return make_excel_response(PaymentResource)
@require_http_methods(['GET'])
@require_http_methods(["GET"])
def export_applications_excel(request, *args, **kwargs):
return make_excel_response(ApplicationResource)