+
{{ voter_form.longitude }}
@@ -882,16 +880,25 @@
{% if voter.latitude and voter.longitude %}
// Initialize Map
try {
- var map = L.map('voterMap').setView([{{ voter.latitude }}, {{ voter.longitude }}], 15);
- L.tileLayer('https://tile.openstreetmap.org/{z}/{x}/{y}.png', {
- maxZoom: 19,
- attribution: '©
OpenStreetMap'
- }).addTo(map);
- L.marker([{{ voter.latitude }}, {{ voter.longitude }}]).addTo(map)
- .bindPopup('{{ voter.first_name }} {{ voter.last_name }}
{{ voter.address_street }}')
- .openPopup();
+ const position = { lat: {{ voter.latitude }}, lng: {{ voter.longitude }} };
+ const map = new google.maps.Map(document.getElementById("voterMap"), {
+ zoom: 15,
+ center: position,
+ });
+ const marker = new google.maps.Marker({
+ position: position,
+ map: map,
+ title: "{{ voter.first_name }} {{ voter.last_name }}",
+ });
+ const infowindow = new google.maps.InfoWindow({
+ content: "
{{ voter.first_name }} {{ voter.last_name }}{{ voter.address_street }}",
+ });
+ marker.addListener("click", () => {
+ infowindow.open(map, marker);
+ });
+ infowindow.open(map, marker);
} catch (e) {
- console.error("Leaflet map initialization failed:", e);
+ console.error("Google Maps initialization failed:", e);
}
{% endif %}
@@ -934,7 +941,7 @@
.then(data => {
if (data.success) {
document.querySelector('[name="latitude"]').value = data.latitude;
- document.querySelector('[name="longitude"]').value = data.longitude;
+ document.querySelector('[name="longitude"]').value = String(data.longitude).substring(0, 12);
statusDiv.innerHTML = '
Coordinates updated!';
} else {
statusDiv.innerHTML = '
' + (data.error || 'Geocoding failed.') + '';
@@ -954,3 +961,4 @@
});
{% endblock %}
+
diff --git a/core/views.py b/core/views.py
index 0641876..80e7a0c 100644
--- a/core/views.py
+++ b/core/views.py
@@ -1,10 +1,13 @@
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
+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, EventTypeForm
+import logging
+
+logger = logging.getLogger(__name__)
def index(request):
"""
@@ -14,12 +17,26 @@ def index(request):
tenants = Tenant.objects.all()
selected_tenant_id = request.session.get('tenant_id')
selected_tenant = None
+ metrics = {}
+
if selected_tenant_id:
selected_tenant = Tenant.objects.filter(id=selected_tenant_id).first()
+ if selected_tenant:
+ voters = selected_tenant.voters.all()
+ 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,
+ }
context = {
'tenants': tenants,
'selected_tenant': selected_tenant,
+ 'metrics': metrics,
}
return render(request, 'core/index.html', context)
@@ -108,11 +125,32 @@ def voter_edit(request, voter_id):
voter = get_object_or_404(Voter, id=voter_id, tenant=tenant)
if request.method == 'POST':
+ # Log incoming coordinate data for debugging
+ lat_raw = request.POST.get('latitude')
+ lon_raw = request.POST.get('longitude')
+ logger.info(f"Voter Edit POST: lat={lat_raw}, lon={lon_raw}")
+
form = VoterForm(request.POST, instance=voter)
if form.is_valid():
- form.save()
+ # If coordinates were provided in POST, ensure they are applied to the instance
+ # This handles cases where readonly or other widget settings might interfere
+ voter = form.save(commit=False)
+ if lat_raw:
+ try:
+ voter.latitude = lat_raw
+ except: pass
+ if lon_raw:
+ try:
+ voter.longitude = lon_raw
+ except: pass
+
+ voter.save()
messages.success(request, "Voter profile updated successfully.")
- return redirect('voter_detail', voter_id=voter.id)
+ else:
+ logger.warning(f"Voter Edit Form Invalid: {form.errors}")
+ for field, errors in form.errors.items():
+ for error in errors:
+ messages.error(request, f"Error in {field}: {error}")
return redirect('voter_detail', voter_id=voter.id)
def add_interaction(request, voter_id):
@@ -352,10 +390,16 @@ def voter_geocode(request, voter_id):
full_address = ", ".join([p for p in parts if p])
# Use a temporary instance to avoid saving until the user clicks "Save" in the modal
- temp_voter = Voter(address=full_address)
- temp_voter.geocode_address()
+ temp_voter = Voter(
+ address_street=street,
+ city=city,
+ state=state,
+ zip_code=zip_code,
+ address=full_address
+ )
+ success, error_msg = temp_voter.geocode_address()
- if temp_voter.latitude and temp_voter.longitude:
+ if success:
return JsonResponse({
'success': True,
'latitude': str(temp_voter.latitude),
@@ -365,7 +409,7 @@ def voter_geocode(request, voter_id):
else:
return JsonResponse({
'success': False,
- 'error': 'Geocoding failed. Please check the address.'
+ 'error': f"Geocoding failed: {error_msg or 'No results found.'}"
})
return JsonResponse({'success': False, 'error': 'Invalid request method.'})
diff --git a/test_manual_save_v2.py b/test_manual_save_v2.py
new file mode 100644
index 0000000..ce510c7
--- /dev/null
+++ b/test_manual_save_v2.py
@@ -0,0 +1,64 @@
+import os
+import django
+
+os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'config.settings')
+django.setup()
+
+from core.models import Voter, Tenant
+from decimal import Decimal
+
+# Ensure we have a tenant
+tenant, _ = Tenant.objects.get_or_create(name="Test Tenant", slug="test-tenant")
+
+# 1. Create a voter with no coordinates
+voter = Voter.objects.create(
+ tenant=tenant,
+ first_name="Manual",
+ last_name="Test",
+ address_street="1600 Amphitheatre Parkway",
+ city="Mountain View",
+ state="CA",
+ zip_code="94043"
+)
+
+print(f"Initial voter: {voter.first_name} {voter.last_name}")
+print(f"Coordinates: {voter.latitude}, {voter.longitude}")
+
+# 2. Simulate manual geocode (updating latitude/longitude before save)
+manual_lat = Decimal("37.422476400")
+manual_lon = Decimal("-122.084249900")
+
+# Simulate what happens in voter_edit view
+# The form instance will have the new coordinates from request.POST
+voter.latitude = manual_lat
+voter.longitude = manual_lon
+
+print(f"Updating coordinates manually to: {voter.latitude}, {voter.longitude}")
+voter.save()
+
+# 3. Reload from DB and verify
+voter.refresh_from_db()
+print(f"After save, coordinates in DB: {voter.latitude}, {voter.longitude}")
+
+if voter.latitude == manual_lat and voter.longitude == manual_lon:
+ print("SUCCESS: Manual coordinates preserved.")
+else:
+ print("FAILURE: Manual coordinates overwritten or not saved.")
+
+# 4. Now test if changing address but NOT coordinates triggers geocode (which might overwrite)
+voter.address_street = "1 Infinite Loop"
+voter.city = "Cupertino"
+# Note: we are NOT changing latitude/longitude here, so coords_provided should be False in save()
+print(f"Changing address to {voter.address_street} but keeping coordinates.")
+voter.save()
+
+voter.refresh_from_db()
+print(f"After address change, coordinates in DB: {voter.latitude}, {voter.longitude}")
+# It should have updated coordinates to Apple's HQ if geocoding worked,
+# OR at least it shouldn't be the old Google HQ coordinates if it triggered geocode.
+# Actually, it SHOULD have triggered geocode.
+
+if voter.latitude != manual_lat:
+ print("SUCCESS: Auto-geocode triggered for address change.")
+else:
+ print("INFO: Auto-geocode might not have triggered or returned same coordinates (unlikely).")