From fc64549c00a249bee43af543dd2cdd67bae209c6 Mon Sep 17 00:00:00 2001 From: Ryan Westfall Date: Mon, 8 Sep 2025 13:07:56 -0500 Subject: [PATCH] Allow for multiple entries on the scha board for positions --- schasite/views.py | 37 ++++++++++++++++++------------------- 1 file changed, 18 insertions(+), 19 deletions(-) diff --git a/schasite/views.py b/schasite/views.py index c6e6185..5266772 100644 --- a/schasite/views.py +++ b/schasite/views.py @@ -148,24 +148,23 @@ def calendar2(request): def scha_board2(request): - def get_officer(position_name): + def get_officers(position_name) -> list[SCHAOfficer]: try: - return SCHAOfficer.objects.get(position=position_name) + return SCHAOfficer.objects.filter(position=position_name) except: return None - officers = [ - get_officer("President"), - get_officer("1st Vice President"), - get_officer("2nd Vice President"), - get_officer("Treasurer"), - get_officer("Secretary"), - get_officer("Website"), - get_officer("Membership"), - get_officer("Directory"), - get_officer("Facebook"), - get_officer("Eblasts"), - ] + officers = [] + for position in ["President","1st Vice President", + "2nd Vice President", + "Treasurer", + "Secretary", + "Website", + "Membership", + "Directory", + "Facebook", + "Eblasts"]: + officers += get_officers(position) return render(request, "schasite/scha_board2.html", {"officers": officers}) @@ -244,10 +243,10 @@ def membership_form2(request): peopleForm1 = PeopleForm(person1_data) peopleForm2 = PeopleForm(person2_data) - + print("Validating the captcha form") - print(request.POST.get("captcha","")) + print(request.POST.get("captcha","")) captchaForm = CaptchaForm({ "captcha": request.POST.get("captcha","") }) @@ -255,9 +254,9 @@ def membership_form2(request): print(f"peopleForm1 form is: {peopleForm1.is_valid()}") - print(f"peopleForm2 form is: {peopleForm2.is_valid()}") - print(f"servicesForm form is: {servicesForm.is_valid()}") - + print(f"peopleForm2 form is: {peopleForm2.is_valid()}") + print(f"servicesForm form is: {servicesForm.is_valid()}") + if ( addressForm.is_valid()