diff --git a/core/__pycache__/admin.cpython-311.pyc b/core/__pycache__/admin.cpython-311.pyc index c6c1cfd..1d14269 100644 Binary files a/core/__pycache__/admin.cpython-311.pyc and b/core/__pycache__/admin.cpython-311.pyc differ diff --git a/core/__pycache__/forms.cpython-311.pyc b/core/__pycache__/forms.cpython-311.pyc index a81cff1..6f72c17 100644 Binary files a/core/__pycache__/forms.cpython-311.pyc and b/core/__pycache__/forms.cpython-311.pyc differ diff --git a/core/__pycache__/models.cpython-311.pyc b/core/__pycache__/models.cpython-311.pyc index ccc4975..7b0eccf 100644 Binary files a/core/__pycache__/models.cpython-311.pyc and b/core/__pycache__/models.cpython-311.pyc differ diff --git a/core/__pycache__/urls.cpython-311.pyc b/core/__pycache__/urls.cpython-311.pyc index 1b0776e..363abb5 100644 Binary files a/core/__pycache__/urls.cpython-311.pyc and b/core/__pycache__/urls.cpython-311.pyc differ diff --git a/core/__pycache__/views.cpython-311.pyc b/core/__pycache__/views.cpython-311.pyc index 2874f74..c8bcb73 100644 Binary files a/core/__pycache__/views.cpython-311.pyc and b/core/__pycache__/views.cpython-311.pyc differ diff --git a/core/admin.py b/core/admin.py index 5b46c21..35068b0 100644 --- a/core/admin.py +++ b/core/admin.py @@ -1,18 +1,22 @@ from django.contrib import admin from .models import ( Tenant, TenantUserRole, InteractionType, DonationMethod, ElectionType, EventType, Voter, - VotingRecord, Event, EventParticipation, Donation, Interaction, VoterLikelihood + VotingRecord, Event, EventParticipation, Donation, Interaction, VoterLikelihood, CampaignSettings ) class TenantUserRoleInline(admin.TabularInline): model = TenantUserRole extra = 1 +class CampaignSettingsInline(admin.StackedInline): + model = CampaignSettings + can_delete = False + @admin.register(Tenant) class TenantAdmin(admin.ModelAdmin): list_display = ('name', 'slug', 'created_at') search_fields = ('name',) - inlines = [TenantUserRoleInline] + inlines = [TenantUserRoleInline, CampaignSettingsInline] @admin.register(TenantUserRole) class TenantUserRoleAdmin(admin.ModelAdmin): @@ -75,4 +79,9 @@ class EventAdmin(admin.ModelAdmin): @admin.register(EventParticipation) class EventParticipationAdmin(admin.ModelAdmin): list_display = ('voter', 'event', 'participation_type') - list_filter = ('event__tenant', 'event', 'participation_type') \ No newline at end of file + list_filter = ('event__tenant', 'event', 'participation_type') + +@admin.register(CampaignSettings) +class CampaignSettingsAdmin(admin.ModelAdmin): + list_display = ('tenant', 'donation_goal') + list_filter = ('tenant',) \ No newline at end of file diff --git a/core/forms.py b/core/forms.py index 2208cad..a025ab4 100644 --- a/core/forms.py +++ b/core/forms.py @@ -8,7 +8,7 @@ class VoterForm(forms.ModelForm): 'first_name', 'last_name', 'address_street', 'city', 'state', 'zip_code', 'county', 'latitude', 'longitude', 'phone', 'email', 'voter_id', 'district', 'precinct', - 'registration_date', 'is_targeted', 'candidate_support', 'yard_sign' + 'registration_date', 'is_targeted', 'candidate_support', 'yard_sign', 'window_sticker' ] widgets = { 'registration_date': forms.DateInput(attrs={'type': 'date'}), @@ -28,6 +28,7 @@ class VoterForm(forms.ModelForm): self.fields['candidate_support'].widget.attrs.update({'class': 'form-select'}) self.fields['yard_sign'].widget.attrs.update({'class': 'form-select'}) + self.fields['window_sticker'].widget.attrs.update({'class': 'form-select'}) class InteractionForm(forms.ModelForm): class Meta: @@ -106,3 +107,10 @@ class EventForm(forms.ModelForm): for field in self.fields.values(): field.widget.attrs.update({'class': 'form-control'}) self.fields['event_type'].widget.attrs.update({'class': 'form-select'}) + +class VoterImportForm(forms.Form): + file = forms.FileField(label="Select CSV file") + + def __init__(self, *args, **kwargs): + super().__init__(*args, **kwargs) + self.fields['file'].widget.attrs.update({'class': 'form-control'}) \ No newline at end of file diff --git a/core/migrations/0009_voter_window_sticker.py b/core/migrations/0009_voter_window_sticker.py new file mode 100644 index 0000000..691d6ee --- /dev/null +++ b/core/migrations/0009_voter_window_sticker.py @@ -0,0 +1,18 @@ +# Generated by Django 5.2.7 on 2026-01-24 23:46 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('core', '0008_alter_voter_latitude_alter_voter_longitude'), + ] + + operations = [ + migrations.AddField( + model_name='voter', + name='window_sticker', + field=models.CharField(choices=[('none', 'None'), ('wants', 'Wants Sticker'), ('has', 'Has Sticker')], default='none', max_length=20), + ), + ] diff --git a/core/migrations/0010_alter_voter_window_sticker_campaignsettings.py b/core/migrations/0010_alter_voter_window_sticker_campaignsettings.py new file mode 100644 index 0000000..a3a1431 --- /dev/null +++ b/core/migrations/0010_alter_voter_window_sticker_campaignsettings.py @@ -0,0 +1,31 @@ +# Generated by Django 5.2.7 on 2026-01-24 23:58 + +import django.db.models.deletion +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('core', '0009_voter_window_sticker'), + ] + + operations = [ + migrations.AlterField( + model_name='voter', + name='window_sticker', + field=models.CharField(choices=[('none', 'None'), ('wants', 'Wants Sticker'), ('has', 'Has Sticker')], default='none', max_length=20, verbose_name='Window Sticker Status'), + ), + migrations.CreateModel( + name='CampaignSettings', + fields=[ + ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('donation_goal', models.DecimalField(decimal_places=2, default=170000.0, max_digits=12)), + ('tenant', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, related_name='settings', to='core.tenant')), + ], + options={ + 'verbose_name': 'Campaign Settings', + 'verbose_name_plural': 'Campaign Settings', + }, + ), + ] diff --git a/core/migrations/__pycache__/0009_voter_window_sticker.cpython-311.pyc b/core/migrations/__pycache__/0009_voter_window_sticker.cpython-311.pyc new file mode 100644 index 0000000..6013c41 Binary files /dev/null and b/core/migrations/__pycache__/0009_voter_window_sticker.cpython-311.pyc differ diff --git a/core/migrations/__pycache__/0010_alter_voter_window_sticker_campaignsettings.cpython-311.pyc b/core/migrations/__pycache__/0010_alter_voter_window_sticker_campaignsettings.cpython-311.pyc new file mode 100644 index 0000000..11000e2 Binary files /dev/null and b/core/migrations/__pycache__/0010_alter_voter_window_sticker_campaignsettings.cpython-311.pyc differ diff --git a/core/models.py b/core/models.py index 7a0450d..9034959 100644 --- a/core/models.py +++ b/core/models.py @@ -95,6 +95,11 @@ class Voter(models.Model): ('wants', 'Wants a yard sign'), ('has', 'Has a yard sign'), ] + WINDOW_STICKER_CHOICES = [ + ('none', 'None'), + ('wants', 'Wants Sticker'), + ('has', 'Has Sticker'), + ] tenant = models.ForeignKey(Tenant, on_delete=models.CASCADE, related_name='voters') voter_id = models.CharField(max_length=50, blank=True) @@ -116,6 +121,7 @@ class Voter(models.Model): is_targeted = models.BooleanField(default=False) candidate_support = models.CharField(max_length=20, choices=SUPPORT_CHOICES, default='unknown') yard_sign = models.CharField(max_length=20, choices=YARD_SIGN_CHOICES, default='none') + window_sticker = models.CharField(max_length=20, choices=WINDOW_STICKER_CHOICES, default='none', verbose_name='Window Sticker Status') created_at = models.DateTimeField(auto_now_add=True) @@ -286,4 +292,14 @@ class VoterLikelihood(models.Model): unique_together = ('voter', 'election_type') def __str__(self): - return f"{self.voter} - {self.election_type}: {self.get_likelihood_display()}" \ No newline at end of file + return f"{self.voter} - {self.election_type}: {self.get_likelihood_display()}" +class CampaignSettings(models.Model): + tenant = models.OneToOneField(Tenant, on_delete=models.CASCADE, related_name='settings') + donation_goal = models.DecimalField(max_digits=12, decimal_places=2, default=170000.00) + + class Meta: + verbose_name = 'Campaign Settings' + verbose_name_plural = 'Campaign Settings' + + def __str__(self): + return f'Settings for {self.tenant.name}' diff --git a/core/templates/core/index.html b/core/templates/core/index.html index db73f03..91ce1a5 100644 --- a/core/templates/core/index.html +++ b/core/templates/core/index.html @@ -31,14 +31,18 @@ {% else %}
-
-

Dashboard: {{ selected_tenant.name }}

-
-
- - +
+

Dashboard: {{ selected_tenant.name }}

+ Switch Campaign +
+ + +
+
+ + + - Switch Campaign
@@ -46,60 +50,84 @@
-
-
-
Registered Voters
-

{{ metrics.total_registered_voters }}

+ +
+
+
Registered Voters
+

{{ metrics.total_registered_voters }}

+
-
+
-
-
-
Target Voters
-

{{ metrics.total_target_voters }}

+ +
+
+
Target Voters
+

{{ metrics.total_target_voters }}

+
-
+
-
-
-
Supporting
-

{{ metrics.total_supporting }}

+ +
+
+
Supporting
+

{{ metrics.total_supporting }}

+
-
+
-
-
-
Voter Addresses
-

{{ metrics.total_voter_addresses }}

+ +
+
+
Voter Addresses
+

{{ metrics.total_voter_addresses }}

+
-
+
-
-
-
Door Visits
-

{{ metrics.total_door_visits }}

+ +
+
+
Door Visits
+

{{ metrics.total_door_visits }}

+
-
+
-
-
-
Signs (Wants/Has)
-

{{ metrics.total_signs }}

+ +
+
+
Signs (Wants/Has)
+

{{ metrics.total_signs }}

+
-
+
-
-
-
Total Donations
-

${{ metrics.total_donations|floatformat:2 }}

+ +
+
+
Window Stickers (Wants/Has)
+

{{ metrics.total_window_stickers }}

+
-
+ +
+
+ +
+
+
Donation Goal
+

{{ metrics.donation_percentage }}%

+
+
+
@@ -117,4 +145,14 @@
{% endif %}
-{% endblock %} \ No newline at end of file + + +{% endblock %} diff --git a/core/templates/core/voter_detail.html b/core/templates/core/voter_detail.html index 3a3412a..f1895cf 100644 --- a/core/templates/core/voter_detail.html +++ b/core/templates/core/voter_detail.html @@ -137,7 +137,7 @@
Campaign Assets
-
+
Yard Sign Status
@@ -151,6 +151,20 @@ {% endif %}
+
+
+ Window Sticker Status +
+
+ {% if voter.window_sticker == 'has' %} + Has Sticker + {% elif voter.window_sticker == 'wants' %} + Wants Sticker + {% else %} + None + {% endif %} +
+
@@ -441,6 +455,10 @@ {{ voter_form.yard_sign }}
+
+ + {{ voter_form.window_sticker }} +
@@ -960,5 +978,4 @@ } }); -{% endblock %} - +{% endblock %} \ No newline at end of file diff --git a/core/templates/core/voter_import.html b/core/templates/core/voter_import.html new file mode 100644 index 0000000..13d1ec7 --- /dev/null +++ b/core/templates/core/voter_import.html @@ -0,0 +1,38 @@ +{% extends 'base.html' %} + +{% block content %} +
+
+
+
+
+
Import Voters for {{ selected_tenant.name }}
+
+
+
+
CSV Format Instructions
+

Please ensure your CSV file follows this column order:

+ + First Name, Last Name, Street Address, City, State, Zip, Phone, Email, Voter ID, District, Precinct + +

The first row (header) will be automatically skipped.

+
+ +
+ {% csrf_token %} +
+ {{ form.as_p }} +
+
+ + Cancel +
+
+
+
+
+
+
+{% endblock %} diff --git a/core/templates/core/voter_list.html b/core/templates/core/voter_list.html index b4010e1..94159db 100644 --- a/core/templates/core/voter_list.html +++ b/core/templates/core/voter_list.html @@ -4,7 +4,12 @@

Voter Registry

- + Add New Voter +
+ + Import Voters + + + Add New Voter +
@@ -25,48 +30,44 @@ - - + - - - + + + {% for voter in voters %} - - + + - - {% empty %} - @@ -76,4 +77,4 @@ -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/core/urls.py b/core/urls.py index a1d2ea2..d006913 100644 --- a/core/urls.py +++ b/core/urls.py @@ -5,6 +5,7 @@ urlpatterns = [ path('', views.index, name='index'), path('select-campaign//', views.select_campaign, name='select_campaign'), path('voters/', views.voter_list, name='voter_list'), + path('voters/import/', views.voter_import, name='voter_import'), path('voters//', views.voter_detail, name='voter_detail'), path('voters//edit/', views.voter_edit, name='voter_edit'), path('voters//geocode/', views.voter_geocode, name='voter_geocode'), diff --git a/core/views.py b/core/views.py index c56d0e8..04c1af6 100644 --- a/core/views.py +++ b/core/views.py @@ -1,10 +1,12 @@ +import csv +import io from django.http import JsonResponse from django.urls import reverse from django.shortcuts import render, redirect, get_object_or_404 from django.db.models import Q, Sum from django.contrib import messages -from .models import Voter, Tenant, Interaction, Donation, VoterLikelihood, EventParticipation, Event, EventType, InteractionType, DonationMethod, ElectionType -from .forms import VoterForm, InteractionForm, DonationForm, VoterLikelihoodForm, EventParticipationForm +from .models import Voter, Tenant, Interaction, Donation, VoterLikelihood, EventParticipation, Event, EventType, InteractionType, DonationMethod, ElectionType, CampaignSettings +from .forms import VoterForm, InteractionForm, DonationForm, VoterLikelihoodForm, EventParticipationForm, VoterImportForm import logging logger = logging.getLogger(__name__) @@ -23,14 +25,27 @@ def index(request): selected_tenant = Tenant.objects.filter(id=selected_tenant_id).first() if selected_tenant: voters = selected_tenant.voters.all() + total_donations = Donation.objects.filter(voter__tenant=selected_tenant).aggregate(total=Sum('amount'))['total'] or 0 + + # Get or create settings for the tenant + campaign_settings, _ = CampaignSettings.objects.get_or_create(tenant=selected_tenant) + donation_goal = campaign_settings.donation_goal + + donation_percentage = 0 + if donation_goal > 0: + donation_percentage = float(round((total_donations / donation_goal) * 100, 1)) + metrics = { - "total_registered_voters": voters.count(), - "total_target_voters": voters.filter(is_targeted=True).count(), - "total_supporting": voters.filter(candidate_support="supporting").count(), - "total_voter_addresses": voters.values("address").distinct().count(), - "total_door_visits": Interaction.objects.filter(voter__tenant=selected_tenant, type__name="Door Visit").count(), - "total_signs": voters.filter(Q(yard_sign="wants") | Q(yard_sign="has")).count(), - "total_donations": Donation.objects.filter(voter__tenant=selected_tenant).aggregate(total=Sum("amount"))["total"] or 0, + 'total_registered_voters': voters.count(), + 'total_target_voters': voters.filter(is_targeted=True).count(), + 'total_supporting': voters.filter(candidate_support='supporting').count(), + 'total_voter_addresses': voters.values('address').distinct().count(), + 'total_door_visits': Interaction.objects.filter(voter__tenant=selected_tenant, type__name='Door Visit').count(), + 'total_signs': voters.filter(Q(yard_sign='wants') | Q(yard_sign='has')).count(), + 'total_window_stickers': voters.filter(Q(window_sticker='wants') | Q(window_sticker='has')).count(), + 'total_donations': float(total_donations), + 'donation_goal': float(donation_goal), + 'donation_percentage': donation_percentage, } context = { @@ -53,15 +68,31 @@ def voter_list(request): """ List and search voters. Restricted to selected tenant. """ - selected_tenant_id = request.session.get('tenant_id') + selected_tenant_id = request.session.get("tenant_id") if not selected_tenant_id: messages.warning(request, "Please select a campaign first.") - return redirect('index') + return redirect("index") tenant = get_object_or_404(Tenant, id=selected_tenant_id) - query = request.GET.get('q') - voters = Voter.objects.filter(tenant=tenant) - + query = request.GET.get("q") + voters = Voter.objects.filter(tenant=tenant).order_by("last_name", "first_name") + + # Filtering based on dashboard metrics + if request.GET.get("is_targeted") == "true": + voters = voters.filter(is_targeted=True) + if request.GET.get("support") == "supporting": + voters = voters.filter(candidate_support="supporting") + if request.GET.get("has_address") == "true": + voters = voters.exclude(address__isnull=True).exclude(address="") + if request.GET.get("visited") == "true": + voters = voters.filter(interactions__type__name="Door Visit").distinct() + if request.GET.get("yard_sign") == "true": + voters = voters.filter(Q(yard_sign="wants") | Q(yard_sign="has")) + if request.GET.get("window_sticker") == "true": + voters = voters.filter(Q(window_sticker="wants") | Q(window_sticker="has")) + if request.GET.get("has_donations") == "true": + voters = voters.filter(donations__isnull=False).distinct() + if query: query = query.strip() search_filter = Q(first_name__icontains=query) | Q(last_name__icontains=query) | Q(voter_id__icontains=query) @@ -79,14 +110,77 @@ def voter_list(request): last_part = " ".join(parts[1:]) search_filter |= Q(first_name__icontains=first_part, last_name__icontains=last_part) - voters = voters.filter(search_filter) + voters = voters.filter(search_filter).order_by("last_name", "first_name") context = { - 'voters': voters, - 'query': query, - 'selected_tenant': tenant + "voters": voters, + "query": query, + "selected_tenant": tenant } - return render(request, 'core/voter_list.html', context) + return render(request, "core/voter_list.html", context) + +def voter_import(request): + """ + Import voters from a CSV file. + """ + 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) + + if request.method == 'POST': + form = VoterImportForm(request.POST, request.FILES) + if form.is_valid(): + csv_file = request.FILES['file'] + if not csv_file.name.endswith('.csv'): + messages.error(request, 'Please upload a CSV file.') + return redirect('voter_import') + + data_set = csv_file.read().decode('UTF-8') + io_string = io.StringIO(data_set) + next(io_string) # skip header + + count = 0 + errors = 0 + for row in csv.reader(io_string, delimiter=',', quotechar='"'): + try: + # CSV Format: first_name, last_name, address_street, city, state, zip_code, phone, email, voter_id, district, precinct + # Ensure row has enough columns + if len(row) < 2: continue + + voter, created = Voter.objects.update_or_create( + tenant=tenant, + voter_id=row[8] if len(row) > 8 else '', + defaults={ + 'first_name': row[0], + 'last_name': row[1], + 'address_street': row[2] if len(row) > 2 else '', + 'city': row[3] if len(row) > 3 else '', + 'state': row[4] if len(row) > 4 else '', + 'zip_code': row[5] if len(row) > 5 else '', + 'phone': row[6] if len(row) > 6 else '', + 'email': row[7] if len(row) > 7 else '', + 'district': row[9] if len(row) > 9 else '', + 'precinct': row[10] if len(row) > 10 else '', + } + ) + count += 1 + except Exception as e: + logger.error(f"Error importing row {row}: {e}") + errors += 1 + + if count > 0: + messages.success(request, f"Successfully imported {count} voters.") + if errors > 0: + messages.warning(request, f"Failed to import {errors} rows. Check logs for details.") + + return redirect('voter_list') + else: + form = VoterImportForm() + + return render(request, 'core/voter_import.html', {'form': form, 'selected_tenant': tenant}) def voter_detail(request, voter_id): """ diff --git a/core/views.py.tmp b/core/views.py.tmp new file mode 100644 index 0000000..24fc470 --- /dev/null +++ b/core/views.py.tmp @@ -0,0 +1,4 @@ + if request.GET.get("yard_sign") == "true": + voters = voters.filter(Q(yard_sign="wants") | Q(yard_sign="has")) + if request.GET.get("window_sticker") == "true": + voters = voters.filter(Q(window_sticker="wants") | Q(window_sticker="has"))
Voter IDNameName DistrictSupportYard SignActionsPhoneTarget VoterSupporter
{{ voter.voter_id|default:"N/A" }} -
{{ voter.first_name }} {{ voter.last_name }}
-
{{ voter.address|truncatechars:40 }}
+ 		+ + {{ voter.first_name }} {{ voter.last_name }} + +
{{ voter.address|default:"No address provided" }}
 {{ voter.district|default:"-" }}{{ voter.phone|default:"-" }} + {% if voter.is_targeted %} + Yes + {% else %} + No + {% endif %} + {% if voter.candidate_support == 'supporting' %} - Supporting + Supporting {% elif voter.candidate_support == 'not_supporting' %} - Not Supporting + Not Supporting {% else %} - Unknown + Unknown {% endif %} - {% if voter.yard_sign == 'has' %} - Has Sign - {% elif voter.yard_sign == 'wants' %} - Wants Sign - {% else %} - None - {% endif %} - - View 360° -
+

No voters found matching your search.