@@ -346,8 +370,38 @@
{{ voter_form.last_name }}
-
- {{ voter_form.address }}
+
+ {{ voter_form.address_street }}
+
+
+
+ {{ voter_form.city }}
+
+
+
+ {{ voter_form.state }}
+
+
+
+ {{ voter_form.zip_code }}
+
+
+
+
+
+
+
+ {{ voter_form.county }}
+
+
+
+ {{ voter_form.latitude }}
+
+
+
+ {{ voter_form.longitude }}
@@ -373,6 +427,14 @@
{{ voter_form.registration_date }}
+
+
+ {{ voter_form.is_targeted }}
+
+
+
{{ voter_form.candidate_support }}
@@ -816,6 +878,79 @@
tab.show();
}
}
+
+ {% 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();
+ } catch (e) {
+ console.error("Leaflet map initialization failed:", e);
+ }
+ {% endif %}
+
+ // Manual Geocode Logic
+ const geocodeBtn = document.getElementById('manualGeocodeBtn');
+ const statusDiv = document.getElementById('geocodeStatus');
+
+ if (geocodeBtn) {
+ geocodeBtn.addEventListener('click', function() {
+ const street = document.querySelector('[name="address_street"]').value;
+ const city = document.querySelector('[name="city"]').value;
+ const state = document.querySelector('[name="state"]').value;
+ const zip = document.querySelector('[name="zip_code"]').value;
+
+ if (!street && !city) {
+ statusDiv.innerHTML = '
Please enter at least a street or city.';
+ statusDiv.style.display = 'block';
+ return;
+ }
+
+ geocodeBtn.disabled = true;
+ geocodeBtn.innerHTML = '
Geocoding...';
+ statusDiv.style.display = 'none';
+
+ const formData = new FormData();
+ formData.append('address_street', street);
+ formData.append('city', city);
+ formData.append('state', state);
+ formData.append('zip_code', zip);
+ formData.append('csrfmiddlewaretoken', '{{ csrf_token }}');
+
+ fetch('{% url "voter_geocode" voter.id %}', {
+ method: 'POST',
+ body: formData,
+ headers: {
+ 'X-Requested-With': 'XMLHttpRequest'
+ }
+ })
+ .then(response => response.json())
+ .then(data => {
+ if (data.success) {
+ document.querySelector('[name="latitude"]').value = data.latitude;
+ document.querySelector('[name="longitude"]').value = data.longitude;
+ statusDiv.innerHTML = '
Coordinates updated!';
+ } else {
+ statusDiv.innerHTML = '
' + (data.error || 'Geocoding failed.') + '';
+ }
+ })
+ .catch(error => {
+ console.error('Error:', error);
+ statusDiv.innerHTML = '
An error occurred during geocoding.';
+ })
+ .finally(() => {
+ geocodeBtn.disabled = false;
+ geocodeBtn.innerHTML = '
Manual Geocode Address';
+ statusDiv.style.display = 'block';
+ });
+ });
+ }
});
-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/core/urls.py b/core/urls.py
index e2038a7..1bf1955 100644
--- a/core/urls.py
+++ b/core/urls.py
@@ -7,6 +7,7 @@ urlpatterns = [
path('voters/', views.voter_list, name='voter_list'),
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'),
path('voters//interaction/add/', views.add_interaction, name='add_interaction'),
path('interaction//edit/', views.edit_interaction, name='edit_interaction'),
@@ -29,4 +30,4 @@ urlpatterns = [
path('maintenance/event-types/add/', views.event_type_add, name='event_type_add'),
path('maintenance/event-types//edit/', views.event_type_edit, name='event_type_edit'),
path('maintenance/event-types//delete/', views.event_type_delete, name='event_type_delete'),
-]
\ No newline at end of file
+]
diff --git a/core/views.py b/core/views.py
index 802b2a8..0641876 100644
--- a/core/views.py
+++ b/core/views.py
@@ -1,3 +1,4 @@
+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
@@ -331,4 +332,40 @@ def event_type_delete(request, type_id):
messages.success(request, "Event type deleted.")
except Exception as e:
messages.error(request, f"Cannot delete event type: {e}")
- return redirect('event_type_list')
\ No newline at end of file
+ return redirect('event_type_list')
+
+def voter_geocode(request, voter_id):
+ """
+ Manually trigger geocoding for a voter, potentially using values from the request.
+ """
+ selected_tenant_id = request.session.get('tenant_id')
+ tenant = get_object_or_404(Tenant, id=selected_tenant_id)
+ voter = get_object_or_404(Voter, id=voter_id, tenant=tenant)
+
+ if request.method == 'POST':
+ street = request.POST.get('address_street', voter.address_street)
+ city = request.POST.get('city', voter.city)
+ state = request.POST.get('state', voter.state)
+ zip_code = request.POST.get('zip_code', voter.zip_code)
+
+ parts = [street, city, state, zip_code]
+ 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()
+
+ if temp_voter.latitude and temp_voter.longitude:
+ return JsonResponse({
+ 'success': True,
+ 'latitude': str(temp_voter.latitude),
+ 'longitude': str(temp_voter.longitude),
+ 'address': full_address
+ })
+ else:
+ return JsonResponse({
+ 'success': False,
+ 'error': 'Geocoding failed. Please check the address.'
+ })
+
+ return JsonResponse({'success': False, 'error': 'Invalid request method.'})
diff --git a/requirements.txt b/requirements.txt
index e22994c..31477b3 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,3 +1,4 @@
Django==5.2.7
mysqlclient==2.2.7
python-dotenv==1.1.1
+geopy==2.4.1
\ No newline at end of file