| {{ participation.event.date|date:"M d, Y" }} |
+ {{ participation.event.name|default:"(No Name)" }} |
{{ participation.event.event_type.name }} |
{% if participation.participation_status.name|lower == 'attended' %}
@@ -599,7 +601,7 @@
-
+
diff --git a/core/urls.py b/core/urls.py
index 0bcde88..39ae92f 100644
--- a/core/urls.py
+++ b/core/urls.py
@@ -7,6 +7,7 @@ urlpatterns = [
path('voters/', views.voter_list, name='voter_list'),
path('voters/advanced-search/', views.voter_advanced_search, name='voter_advanced_search'),
path('voters/export-csv/', views.export_voters_csv, name='export_voters_csv'),
+ path('voters/bulk-sms/', views.bulk_send_sms, name='bulk_send_sms'),
path('voters//', views.voter_detail, name='voter_detail'),
path('voters//edit/', views.voter_edit, name='voter_edit'),
path('voters//delete/', views.voter_delete, name='voter_delete'),
diff --git a/core/views.py b/core/views.py
index de09425..43c2add 100644
--- a/core/views.py
+++ b/core/views.py
@@ -1,3 +1,7 @@
+import base64
+import re
+import urllib.parse
+import urllib.request
import csv
import io
from django.http import JsonResponse, HttpResponse
@@ -540,6 +544,7 @@ def export_voters_csv(request):
])
return response
+
def voter_delete(request, voter_id):
"""
Delete a voter profile.
@@ -554,3 +559,106 @@ def voter_delete(request, voter_id):
return redirect('voter_list')
return redirect('voter_detail', voter_id=voter.id)
+
+def bulk_send_sms(request):
+ """
+ Sends bulk SMS to selected voters using Twilio API.
+ """
+ if request.method != 'POST':
+ return redirect('voter_advanced_search')
+
+ 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)
+ settings = getattr(tenant, 'settings', None)
+ if not settings:
+ messages.error(request, "Campaign settings not found.")
+ return redirect('voter_advanced_search')
+
+ account_sid = settings.twilio_account_sid
+ auth_token = settings.twilio_auth_token
+ from_number = settings.twilio_from_number
+
+ if not account_sid or not auth_token or not from_number:
+ messages.error(request, "Twilio configuration is incomplete in Campaign Settings.")
+ return redirect('voter_advanced_search')
+
+ voter_ids = request.POST.getlist('selected_voters')
+ message_body = request.POST.get('message_body')
+ client_time_str = request.POST.get('client_time')
+
+ interaction_date = timezone.now()
+ if client_time_str:
+ try:
+ from datetime import datetime
+ interaction_date = datetime.fromisoformat(client_time_str)
+ if timezone.is_naive(interaction_date):
+ interaction_date = timezone.make_aware(interaction_date)
+ except Exception as e:
+ logger.warning(f'Failed to parse client_time {client_time_str}: {e}')
+
+ if not message_body:
+ messages.error(request, "Message body cannot be empty.")
+ return redirect('voter_advanced_search')
+
+ voters = Voter.objects.filter(tenant=tenant, id__in=voter_ids, phone_type='cell').exclude(phone='')
+
+ if not voters.exists():
+ messages.warning(request, "No voters with a valid cell phone number were selected.")
+ return redirect('voter_advanced_search')
+
+ success_count = 0
+ fail_count = 0
+
+ auth_str = f"{account_sid}:{auth_token}"
+ auth_header = base64.b64encode(auth_str.encode()).decode()
+ url = f"https://api.twilio.com/2010-04-01/Accounts/{account_sid}/Messages.json"
+
+ # Get or create interaction type for SMS
+ interaction_type, _ = InteractionType.objects.get_or_create(tenant=tenant, name="SMS Text")
+
+ for voter in voters:
+ # Format phone to E.164 (assume US +1)
+ digits = re.sub(r'\D', '', str(voter.phone))
+ if len(digits) == 10:
+ to_number = f"+1{digits}"
+ elif len(digits) == 11 and digits.startswith('1'):
+ to_number = f"+{digits}"
+ else:
+ # Skip invalid phone numbers
+ fail_count += 1
+ continue
+
+ data_dict = {
+ 'To': to_number,
+ 'From': from_number,
+ 'Body': message_body
+ }
+ data = urllib.parse.urlencode(data_dict).encode()
+
+ req = urllib.request.Request(url, data=data, method='POST')
+ req.add_header("Authorization", f"Basic {auth_header}")
+
+ try:
+ with urllib.request.urlopen(req, timeout=10) as response:
+ if response.status in [200, 201]:
+ success_count += 1
+ # Log interaction
+ Interaction.objects.create(
+ voter=voter,
+ type=interaction_type,
+ date=interaction_date,
+ description='Mass SMS Text',
+ notes=message_body
+ )
+ else:
+ fail_count += 1
+ except Exception as e:
+ logger.error(f"Error sending SMS to {voter.phone}: {e}")
+ fail_count += 1
+
+ messages.success(request, f"Bulk SMS process completed: {success_count} successful, {fail_count} failed/skipped.")
+ return redirect('voter_advanced_search')
\ No newline at end of file
diff --git a/core/views.py.tmp b/core/views.py.tmp
deleted file mode 100644
index 24fc470..0000000
--- a/core/views.py.tmp
+++ /dev/null
@@ -1,4 +0,0 @@
- 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"))
diff --git a/core_admin_patch.py b/core_admin_patch.py
new file mode 100644
index 0000000..1bdd865
--- /dev/null
+++ b/core_admin_patch.py
@@ -0,0 +1,32 @@
+import sys
+
+with open('core/admin.py', 'r') as f:
+ content = f.read()
+
+old_block = """ defaults = {}
+ if participation_status_val and participation_status_val.strip():
+ defaults = {}
+ if participation_status_val and participation_status_val.strip():
+ status_obj, _ = ParticipationStatus.objects.get_or_create(tenant=tenant, name=participation_status_val.strip())
+ defaults['participation_status'] = status_obj
+ else:
+ # Default to 'Invited' if not specified
+ status_obj, _ = ParticipationStatus.objects.get_or_create(tenant=tenant, name='Invited')
+ defaults['participation_status'] = status_obj"""
+
+new_block = """ defaults = {}
+ if participation_status_val and participation_status_val.strip():
+ status_obj, _ = ParticipationStatus.objects.get_or_create(tenant=tenant, name=participation_status_val.strip())
+ defaults['participation_status'] = status_obj
+ else:
+ # Default to 'Invited' if not specified
+ status_obj, _ = ParticipationStatus.objects.get_or_create(tenant=tenant, name='Invited')
+ defaults['participation_status'] = status_obj"""
+
+if old_block in content:
+ new_content = content.replace(old_block, new_block)
+ with open('core/admin.py', 'w') as f:
+ f.write(new_content)
+ print("Patch applied successfully")
+else:
+ print("Old block not found")
diff --git a/patch_voter_detail_events.py b/patch_voter_detail_events.py
new file mode 100644
index 0000000..7757837
--- /dev/null
+++ b/patch_voter_detail_events.py
@@ -0,0 +1,44 @@
+
+import sys
+
+with open('core/templates/core/voter_detail.html', 'r') as f:
+ content = f.read()
+
+old_thead = '''
+ | Date |
+ Event Type |
+ Status |
+ Description |
+ Actions |
+ '''
+new_thead = '''
+ | Date |
+ Event Name |
+ Event Type |
+ Status |
+ Description |
+ Actions |
+ '''
+
+if old_thead in content:
+ content = content.replace(old_thead, new_thead)
+else:
+ print("Warning: old_thead not found")
+
+old_tbody = ''' {% for participation in event_participations %}
+
+ | {{ participation.event.date|date:"M d, Y" }} |
+ {{ participation.event.event_type.name }} | '''
+new_tbody = ''' {% for participation in event_participations %}
+
+ | {{ participation.event.date|date:"M d, Y" }} |
+ {{ participation.event.name|default:"(No Name)" }} |
+ {{ participation.event.event_type.name }} | '''
+
+if old_tbody in content:
+ content = content.replace(old_tbody, new_tbody)
+else:
+ print("Warning: old_tbody not found")
+
+with open('core/templates/core/voter_detail.html', 'w') as f:
+ f.write(content)
|