{{ event.date|date:"F d, Y" }}
@@ -97,7 +103,11 @@
{{ v.volunteer.first_name }} {{ v.volunteer.last_name }}
-
{{ v.role }} |
+
+
+ {{ v.role_type|default:"Assigned" }}
+
+ |
@@ -269,9 +279,8 @@
-
- {{ add_volunteer_form.role }}
- e.g., Driver, Caller, Organizer
+
+ {{ add_volunteer_form.role_type }}
+
+ {{ form.default_volunteer_role }}
+ {% if form.default_volunteer_role.errors %}
+ {{ form.default_volunteer_role.errors }}
+ {% endif %}
+
{{ form.date }}
diff --git a/core/urls.py b/core/urls.py
index c436512..c83001c 100644
--- a/core/urls.py
+++ b/core/urls.py
@@ -52,4 +52,8 @@ urlpatterns = [
path('volunteers/bulk-sms/', views.volunteer_bulk_send_sms, name='volunteer_bulk_send_sms'),
path('events//volunteer/add/', views.event_add_volunteer, name='event_add_volunteer'),
path('events/volunteer//delete/', views.event_remove_volunteer, name='event_remove_volunteer'),
+
+ # Door Visits
+ path('door-visits/', views.door_visits, name='door_visits'),
+ path('door-visits/log/', views.log_door_visit, name='log_door_visit'),
]
\ No newline at end of file
diff --git a/core/views.py b/core/views.py
index 74d8d4b..bf9b534 100644
--- a/core/views.py
+++ b/core/views.py
@@ -10,9 +10,10 @@ from django.shortcuts import render, redirect, get_object_or_404
from django.db.models import Q, Sum
from django.contrib import messages
from django.core.paginator import Paginator
-from .models import Voter, Tenant, Interaction, Donation, VoterLikelihood, EventParticipation, Event, EventType, InteractionType, DonationMethod, ElectionType, CampaignSettings, Volunteer, ParticipationStatus, VolunteerEvent, Interest
-from .forms import VoterForm, InteractionForm, DonationForm, VoterLikelihoodForm, EventParticipationForm, VoterImportForm, AdvancedVoterSearchForm, EventParticipantAddForm, EventForm, VolunteerForm, VolunteerEventForm, VolunteerEventAddForm
+from .models import Voter, Tenant, Interaction, Donation, VoterLikelihood, EventParticipation, Event, EventType, InteractionType, DonationMethod, ElectionType, CampaignSettings, Volunteer, ParticipationStatus, VolunteerEvent, Interest, VolunteerRole
+from .forms import VoterForm, InteractionForm, DonationForm, VoterLikelihoodForm, EventParticipationForm, VoterImportForm, AdvancedVoterSearchForm, EventParticipantAddForm, EventForm, VolunteerForm, VolunteerEventForm, VolunteerEventAddForm, DoorVisitLogForm
import logging
+import zoneinfo
from django.utils import timezone
logger = logging.getLogger(__name__)
@@ -700,7 +701,10 @@ def event_detail(request, event_id):
# Form for adding a new participant
add_form = EventParticipantAddForm(tenant=tenant)
# Form for adding a new volunteer
- add_volunteer_form = VolunteerEventAddForm(tenant=tenant)
+ default_role = event.default_volunteer_role
+ if not default_role and event.event_type:
+ default_role = event.event_type.default_volunteer_role
+ add_volunteer_form = VolunteerEventAddForm(tenant=tenant, initial={'role_type': default_role})
participation_statuses = ParticipationStatus.objects.filter(tenant=tenant, is_active=True)
@@ -1163,3 +1167,167 @@ def volunteer_bulk_send_sms(request):
messages.success(request, f"Bulk SMS process completed: {success_count} successful, {fail_count} failed/skipped.")
return redirect('volunteer_list')
+
+def door_visits(request):
+ """
+ Manage door knocking visits. Groups unvisited targeted voters by household.
+ """
+ selected_tenant_id = request.session.get("tenant_id")
+ if not selected_tenant_id:
+ messages.warning(request, "Please select a campaign first.")
+ return redirect("index")
+
+ tenant = get_object_or_404(Tenant, id=selected_tenant_id)
+
+ # Filters from GET parameters
+ district_filter = request.GET.get('district', '').strip()
+ neighborhood_filter = request.GET.get('neighborhood', '').strip()
+ address_filter = request.GET.get('address', '').strip()
+
+ # Initial queryset: unvisited targeted voters for this tenant
+ voters = Voter.objects.filter(tenant=tenant, door_visit=False, is_targeted=True)
+
+ # Apply filters if provided
+ if district_filter:
+ voters = voters.filter(district__icontains=district_filter)
+ if neighborhood_filter:
+ voters = voters.filter(neighborhood__icontains=neighborhood_filter)
+ if address_filter:
+ voters = voters.filter(Q(address_street__icontains=address_filter) | Q(address__icontains=address_filter))
+
+ # Grouping by household (unique address)
+ households_dict = {}
+ for voter in voters:
+ # Key for grouping is the unique address components
+ key = (voter.address_street, voter.city, voter.state, voter.zip_code)
+ if key not in households_dict:
+ # Parse street name and number for sorting
+ street_number = ""
+ street_name = voter.address_street
+ match = re.match(r'^(\d+)\s+(.*)$', voter.address_street)
+ if match:
+ street_number = match.group(1)
+ street_name = match.group(2)
+
+ try:
+ street_number_sort = int(street_number)
+ except ValueError:
+ street_number_sort = 0
+
+ households_dict[key] = {
+ 'address_street': voter.address_street,
+ 'city': voter.city,
+ 'state': voter.state,
+ 'zip_code': voter.zip_code,
+ 'neighborhood': voter.neighborhood,
+ 'district': voter.district,
+ 'street_name_sort': street_name.lower(),
+ 'street_number_sort': street_number_sort,
+ 'target_voters': []
+ }
+ households_dict[key]['target_voters'].append(voter)
+
+ households_list = list(households_dict.values())
+ households_list.sort(key=lambda x: (
+ (x['neighborhood'] or '').lower(),
+ x['street_name_sort'],
+ x['street_number_sort']
+ ))
+
+ paginator = Paginator(households_list, 50)
+ page_number = request.GET.get('page')
+ households_page = paginator.get_page(page_number)
+
+ context = {
+ 'selected_tenant': tenant,
+ 'households': households_page,
+ 'district_filter': district_filter,
+ 'neighborhood_filter': neighborhood_filter,
+ 'address_filter': address_filter,
+ 'visit_form': DoorVisitLogForm(),
+ }
+ return render(request, 'core/door_visits.html', context)
+
+def log_door_visit(request):
+ """
+ Mark all targeted voters at a specific address as visited, update their flags,
+ and create interaction records.
+ """
+ selected_tenant_id = request.session.get("tenant_id")
+ if not selected_tenant_id:
+ return redirect('index')
+
+ tenant = get_object_or_404(Tenant, id=selected_tenant_id)
+ campaign_settings, _ = CampaignSettings.objects.get_or_create(tenant=tenant)
+
+ # Get the volunteer linked to the current user
+ volunteer = Volunteer.objects.filter(user=request.user, tenant=tenant).first()
+
+ if request.method == 'POST':
+ form = DoorVisitLogForm(request.POST)
+ if form.is_valid():
+ address_street = request.POST.get('address_street')
+ city = request.POST.get('city')
+ state = request.POST.get('state')
+ zip_code = request.POST.get('zip_code')
+
+ outcome = form.cleaned_data['outcome']
+ notes = form.cleaned_data['notes']
+ wants_yard_sign = form.cleaned_data['wants_yard_sign']
+ candidate_support = form.cleaned_data['candidate_support']
+
+ # Determine date/time in campaign timezone
+ campaign_tz_name = campaign_settings.timezone or 'America/Chicago'
+ try:
+ tz = zoneinfo.ZoneInfo(campaign_tz_name)
+ except:
+ tz = zoneinfo.ZoneInfo('America/Chicago')
+
+ interaction_date = timezone.now().astimezone(tz)
+
+ # Get or create InteractionType
+ interaction_type, _ = InteractionType.objects.get_or_create(tenant=tenant, name="Door Visit")
+
+ # Find targeted voters at this exact address
+ voters = Voter.objects.filter(
+ tenant=tenant,
+ address_street=address_street,
+ city=city,
+ state=state,
+ zip_code=zip_code,
+ is_targeted=True
+ )
+
+ if not voters.exists():
+ messages.warning(request, f"No targeted voters found at {address_street}.")
+ return redirect('door_visits')
+
+ for voter in voters:
+ # 1) Update voter flags
+ voter.door_visit = True
+
+ # 2) If "Wants a Yard Sign" checkbox is selected
+ if wants_yard_sign:
+ voter.yard_sign = 'wants'
+
+ # 3) Update support status if Supporting or Not Supporting
+ if candidate_support in ['supporting', 'not_supporting']:
+ voter.candidate_support = candidate_support
+
+ voter.save()
+
+ # 4) Create interaction
+ Interaction.objects.create(
+ voter=voter,
+ volunteer=volunteer,
+ type=interaction_type,
+ date=interaction_date,
+ description=outcome,
+ notes=notes
+ )
+
+ messages.success(request, f"Door visit logged for {address_street}.")
+ else:
+ messages.error(request, "There was an error in the visit log form.")
+
+ return redirect('door_visits')
|