diff --git a/schasite/static/css/style2.css b/schasite/static/css/style2.css index 0f033df..dc99fdf 100644 --- a/schasite/static/css/style2.css +++ b/schasite/static/css/style2.css @@ -4,7 +4,6 @@ } body { - padding-top: 56px; } section { diff --git a/schasite/templates/schasite/index2.html b/schasite/templates/schasite/index2.html index 6e8c7e0..1d9c347 100644 --- a/schasite/templates/schasite/index2.html +++ b/schasite/templates/schasite/index2.html @@ -3,21 +3,42 @@ {% block pagetitle %} Stonehedge Community Homeowners Association + {% endblock %} {% block content %}
+
+
-

Welcome to Stonehedge Community Homeowners Association

+ +

Welcome to Stonehedge Community Homeowners Association

A premier community dedicated to maintaining beautiful homes, safe neighborhoods, and a high quality of life for all residents.

Learn More -
-
- Stonehedge Community Homeowners Association -
+ +
+ + +
diff --git a/schasite/templates/schasite/membership_form2.html b/schasite/templates/schasite/membership_form2.html index f168960..1ebc5ed 100644 --- a/schasite/templates/schasite/membership_form2.html +++ b/schasite/templates/schasite/membership_form2.html @@ -74,7 +74,8 @@

New Member Information

-
+ + {% csrf_token %}
Household Information @@ -83,30 +84,27 @@
- +
Please provide your street address.
- +
- +
Please provide your city.
- - - - - +
Please select your state. @@ -114,7 +112,7 @@
- +
Please provide your ZIP code.
@@ -128,28 +126,28 @@
- +
Please provide first name.
- +
Please provide last name.
- +
Please provide a valid email.
- +
Please provide phone number.
@@ -174,19 +172,19 @@
- +
- +
- +
- +
@@ -199,50 +197,82 @@
- -
- -
- -
+ +
+ + +
+
+ + +
+
+ +
- -
- -
- -
+
+ + +
+
+ + +
+
+ +
- -
- - -
@@ -253,44 +283,54 @@
- +
- -
- -
+
+ + +
- -
- -
- -
+
+ + +
+ {% if captchaForm %} + {{ captchaForm }} + {% endif %}
diff --git a/schasite/views.py b/schasite/views.py index a5dd144..44178b2 100644 --- a/schasite/views.py +++ b/schasite/views.py @@ -1,5 +1,5 @@ from django.shortcuts import render, redirect -from .models import UsefulLinks, CalendarEvent, MembershipPerson, Payments, SCHAOfficer +from .models import UsefulLinks, CalendarEvent, MembershipPerson, Payments, SCHAOfficer, Membership from .forms import ( ChildrenForm, AddressForm, @@ -168,6 +168,8 @@ def dues2(request): def membership_form2(request): + print(request) + print(request.POST) def sanitize_phone_number(data): if len(data) > 0: data = data.replace("-", "") @@ -178,40 +180,84 @@ def membership_form2(request): if request.method == "POST": # before we pass in the data we want to sanitize the phone numbers - post_data = request.POST.copy() - post_data.update( - { - "person1-phone_number": sanitize_phone_number( - post_data["person1-phone_number"] - ) - } - ) - post_data.update( - { - "person2-phone_number": sanitize_phone_number( - post_data["person2-phone_number"] - ) - } - ) - membershipForm = ChildrenForm(post_data) - addressForm = AddressForm(post_data) - peopleForm1 = PeopleForm(post_data, prefix="person1") - peopleForm2 = PeopleForm(post_data, prefix="person2") - servicesForm = ServicesForm(post_data) - committeeForm = CommitteeForm(post_data) + address_data = { + "address_1": request.POST.get("streetAddress", ""), + "address_2": request.POST.get("unit", ""), + "city": request.POST.get("city", "60189"), + "state": request.POST.get("state", "IL"), + "zip_code": request.POST.get("zipCode", "60189"), + } + print(address_data) + addressForm = AddressForm(address_data) + print(f"is addressForm valid: {addressForm.is_valid()}") + if not addressForm.is_valid(): + print(f"addressForm Errors: {addressForm.errors}") + + services_data = { + "babysitting": True if request.POST.get("babysitting", "") == "on" else False, + "lawn_mowing": True if request.POST.get("lawn_mowing", "") == "on" else False, + "snow_shoveling": True if request.POST.get("snow_shoveling", "") == "on" else False, + "leaf_raking": True if request.POST.get("leaf_raking", "") == "on" else False, + "petsitting": True if request.POST.get("petsitting", "") == "on" else False, + "house_sitting": True if request.POST.get("house_sitting", "") == "on" else False, + "other": True if request.POST.get("other", "") == "on" else False, + "other_desc": True if request.POST.get("other_desc", "") == "on" else False, + + } + + committee_data = { + "block_captain": True if request.POST.get("block_captain", "") == "on" else False, + "coordinator": True if request.POST.get("coordinator", "") == "on" else False, + "egg_hunt": True if request.POST.get("egg_hunt", "") == "on" else False, + "spring_garage_sale": True if request.POST.get("spring_garage_sale", "") == "on" else False, + "golf_outing": True if request.POST.get("golf_outing", "") == "on" else False, + "ice_cream_social": True if request.POST.get("ice_cream_social", "") == "on" else False, + "fall_garage_sale": True if request.POST.get("fall_garage_sale", "") == "on" else False, + "halloween_party": True if request.POST.get("halloween_party", "") == "on" else False, + "santa_visit": True if request.POST.get("santa_visit", "") == "on" else False, + "website": True if request.POST.get("website", "") == "on" else False, + "civic_affair": True if request.POST.get("civic_affair", "") == "on" else False, + "phone_directory": True if request.POST.get("phone_directory", "") == "on" else False, + "no_preference": True if request.POST.get("no_preference", "") == "on" else False, + } + + servicesForm = ServicesForm(services_data) + committeeForm = CommitteeForm(committee_data) + person1_data = { + "first_name": request.POST.get("firstName1"), + "last_name": request.POST.get("lastName1"), + "email": request.POST.get("email1"), + "phone_number": sanitize_phone_number(request.POST.get("phone1")), + } + person2_data = { + "frist_name": request.POST.get("firstName2"), + "last_name": request.POST.get("lastName2"), + "email": request.POST.get("email2"), + "phone_number": sanitize_phone_number(request.POST.get("phone2")), + + } + + peopleForm1 = PeopleForm(person1_data) + peopleForm2 = PeopleForm(person2_data) + print(peopleForm1) + breakpoint() + + + for form in [addressForm, servicesForm, committeeForm, peopleForm1, peopleForm2]: + print(f"is form valid: {form.is_valid()}") + if not form.is_valid(): + print(f"form Errors: {form.errors}") + # captchaForm = CaptchaForm(post_data) if ( - membershipForm.is_valid() - and addressForm.is_valid() + addressForm.is_valid() and committeeForm.is_valid() and (peopleForm1.is_valid() or peopleForm2.is_valid()) and servicesForm.is_valid() ): # and captchaForm.is_valid(): with transaction.atomic(): - membershipForm = ChildrenForm({**post_data}) - membership = membershipForm.save(commit=False) - membership.save() + membership = Membership.objects.create() if peopleForm1.is_valid(): people1_obj = peopleForm1.save(commit=False) @@ -235,14 +281,13 @@ def membership_form2(request): address_obj.membership = membership address_obj.save() - return redirect("index") + return redirect("index2") else: return render( request, "schasite/membership_form2.html", { - "membershipForm": ChildrenForm, "peopleForm1": peopleForm1, "peopleForm2": peopleForm2, "addressForm": addressForm, @@ -256,7 +301,6 @@ def membership_form2(request): request, "schasite/membership_form2.html", { - "membershipForm": ChildrenForm(), "peopleForm1": PeopleForm(prefix="person1"), "peopleForm2": PeopleForm(prefix="person2"), "committeeForm": CommitteeForm(),