From c92857d73b36efebafecbce0029321421739892e Mon Sep 17 00:00:00 2001
From: Flatlogic Bot <support@flatlogic.com>
Date: Sun, 8 Feb 2026 04:06:08 +0000
Subject: [PATCH] 3.1

---
 config/__pycache__/settings.cpython-311.pyc | Bin 5953 -> 5953 bytes
 core/__pycache__/urls.cpython-311.pyc       | Bin 7287 -> 7287 bytes
 core/__pycache__/views.cpython-311.pyc      | Bin 114516 -> 114957 bytes
 core/views.py                               |  16 ++-
 door_views_update.py                        | 121 +++++++++++++++++++-
 5 files changed, 130 insertions(+), 7 deletions(-)

diff --git a/config/__pycache__/settings.cpython-311.pyc b/config/__pycache__/settings.cpython-311.pyc
index f390f90fb445142863fbaa4b5395c10f8fd9e57d..09c1038786f04f1fba8039c7618df8c3c04db6c5 100644
GIT binary patch
delta 20
acmX@8cTkUeIWI340}$-G(!P<~OdJ3|n+4MV

delta 20
acmX@8cTkUeIWI340}#kOuiMCNCJq2Qjs-se

diff --git a/core/__pycache__/urls.cpython-311.pyc b/core/__pycache__/urls.cpython-311.pyc
index d28eeba16bcbe54172312090659aad03428d2a43..78e4e575b3a2802284eb45d7a835ba47a1095394 100644
GIT binary patch
delta 20
acmexv@!f)ZIWI340}!0N(!P;9M+N{%;Rc-m

delta 20
acmexv@!f)ZIWI340}y<dZQ013BLe_N$_5bt

diff --git a/core/__pycache__/views.cpython-311.pyc b/core/__pycache__/views.cpython-311.pyc
index 84daac24a6398498cee3ec746d31981bf4b8d960..eebca543e84b34b36324a874f85b6931454e3e56 100644
GIT binary patch
delta 1846
zcmZ`)du&rx7(ZWcZ*gna?$LIvTj@%RSjb+mIgt@*7>h;>;*c=V%)#B$Lh-a?2)DfC
zF~?p~@JzDBLBa}bxG^zTAVbWO`G;VbS+ExIK`;_SaK<GV9>()+l$Y@&=XZbi`+ncK
z-#y=V?j89@)3kk(J`@)hOZYHd+Fd=iYMcHuJ)~E_ZI)F5jhf9WLg*IuWd$78$jAeV
zrxJWB*sT0q4JTFFCNwr9w6KpoFh4CguHq0eRC#NC<yBsf<SX@5`~0+l-SNPR*n`|T
zQ$vW41mhc4D5uuI5*-{=v>V}XRpwy~Zv_rr$m)1vG=!@qR(L%gZ(V8ay3+Mte>p9!
zmgrHI6M(I7M(Gbgv059?#R8vy6~?dxH_Qz-2Wpjb+d&Wn)tiZIXeZoIw*q~Eo!kY7
ziX?L&QI4xg<pJYk9dJvM|E1_XAvM#YTuPRcFrRKdCq}?18|e($7(CZ&4*n5I5E3W2
zS(@C%v+w5fzA!0<_!qNY2~ww<)+RcL|JA6A5GSD`5XlrUm5{aSI<i41A$7o(?S{PB
zuBePBIpYyNGs>yaUlQenaMeuaUIi((cuq5-j{k@<#zjKBoD_WPBXh9TVwhu+bv2pM
zfJ#zHq?C5O94i|NxDl@@Q74fs4|!)+aLIO)5Lc7UTI<0DsqAz;*yGZkRIq#XkeH-u
zH2PORSck~k&RM~-#Z#Y=tUHJ_rN`FAE7y(H8y^9)zcR`(ht6CSv*!1~ASTPnoq5ci
z1LkM%hdx#rApSLvgeFV&Cn`6Y@t$x52Qm$sK#DxMGap}LVagL_v&bshA`7xwHcO6n
zF_7wi=aE&3<djn%Pq~=5rm?LJupYYEtp=!1pc{Aq-NcilBb>SPY}+1qK6~OAacjij
zDf9VD*H`<h{iRYF@9Bxth5=g;wjyk1kv%Xk;XTfM*i`8hJCyEZ7aIAVm$26wp*W2W
zqO=el|08^Z-D-qf%>e4ovYaN!g*id{6({@RZ4g;Y6R<6Vc<RQF?><!RNB9uoU4-T6
zy@OBaLb!{-5LO^~I7Bo)FZGv8RD)86LC4T{09g{U9}#pMTxs+Z<h=;EuXI4A=6IIv
zZ-#vMid|@i=|<X)ksSyRzA9|285XM3cnI4T084Ow=TmHD3mCPRxQtBVn`9Q1jV*8w
zG#TRDKS>4)d;mLOn5p(cncZrue<f^59kI-~XvsdZs{Z9GM)STGFIqGEw8O@N5n}<H
z<b^7>dM^~u3OlpDbLM^P%o}#*k2v$gPd^uSWR5syhwYBA%|2>1OxKSR4i|M(+I+)0
z$LLh$>Ry-%S$IGP#RX!KmJDfQiwcAxleH*c7|Itp|2o^Sh^WpJ-6Df{UJo1<`#u;G
z#49}i8pYBE8`L>{_{!tmbDgiXl=k3#Edrm!rJmTb8=TW$aIgE=U_031d-iKPtb_=2
zcYqE0SXl?S#h-Y{4kgq9xoWt|emDs8#B1EtrA#>lAvGLjLtS8V9^<Bsx&>t(Pq~!7
z48O0mmzyFntG#R1dCIY>VHOjDS#XUNgkVYh3GSu+2*)vvPgzF@+|J8rIEpZWd7VI4
zAA*9m&k;^B)e&%s*Ev6}WFLVxL4*0Yw9FlXOm?>$65@YD;ltjz%&a|-uKk@`uVIA`
z6PDfv%azU^cpb!>+&re-J`P5JHpS2j2LMhe$NFFqxbRm)&mdrXP~2mR8$$7s6my`s
hD!s{U{a^(_nb!}SwB{;+LKr2FU6u;UHv_N>{ss2-)Jy;X

delta 1569
zcmaJ>ZERCj7`{)t7F^fvd$5hMZj@~e1RQM6fFv%$57cOIgy4Xbx!bYg#o}!@2)hMc
z5Si>t%6Ne+Th%c)_6d_+Ma|S7#KaiE449208WNN!W=3O(B*gQ!)Im%<$$9Q`-|zFj
z=iZjaIg|Iyw)d^pcuA~7uN?B+-u}Anybbmm?4#v1Xf_87lBDjZ&uehn+`wGZl^yUI
z5YT_{-~)rDnT0J3t<<gH$puFvRszC_wca|PyVk47K9}P0`PC-6tDrJIB$P|clH`+u
zNpDr^AML`11cY?UKHM=Z>tXkH2sq7bk0?y-<!C82UPbZlan<d1)qDMJ)#Z`ZJ}M62
zHC)io1yB)ZNfgFLvHwu!QgS&~2U`Pm`e%(W8jaZ2OBdh3uLgCJ#t-3Ldh9StS2~1o
zWNFr&iyz<xF|MZhpO0}#5>^FN{t_~ClLRe_DgI+r6fv?U`Co{cNK$b7$&6qq-DdZ1
zoE7enc1UtYr&WvB5}y!aeo}HZ=3z;2Lu0zpx^pSjHo>`key5>V^khKn=t9IcGxjRU
znX^0;ai%LxNJ&L=pMT50R+453Eu*)qkzXWd9hBtk!3DjdVFTQ>$O@$RT`|t(gdSz<
zVpFP?8Y&LHQ=VRybKgyjWI*ibg5-C{xNu9A7xKtv^?@`JV^~D(GLlT`T3To&ACG>k
zLvo2`&@wcm7N@1i_D)k^p5OC8BuUQG<~>|uh2+eq%|}p=GxW_795y(uRNIVI_UQE#
zdDZBpWwxK;KvYIb3sz)ji0JBChDIUwaYOCudVW7h_7*tt3_aa~ilT6$Qswiz>ODS>
z-z8Ux3-^Cc&(Vz*l$bx^OrKItD@srr%$s)5#LF;ILo0~fHAtjYZHV90$yOReCFfNH
zgv~y$>UYbknQ#7a)}3M9NoJ|ct}`SEaL!kUnU65M%5XnxM;pp;k-lz2A<b>aI?NB+
z#<OXnKvW>UsC3H}5losR4*h0a@YdBlvKL};aN<U){!2T0V9qtI{$0wYj-xn;OOzEv
z6~!Gx#nNfV@@tOLZylwV9c7b_vgv}yr}7p}<>t*~+X`(nl7LGI3s3kiCoGz=>rKay
z4`k9{2Nvkz4*Y4fd@s^&<+N)+7{+G0XGFeUaSC^g$s>Hey?ltD1#DCYXloa8F+y4w
z@-RhRUD$%}=<ld7s~hE}>%yg8-`<UqIQ&Q*?_o{+4Iw(g8K#d9<3+u+2kYa|M+f?l
z>*yD{eF;xhDT-URZ{i<^IxIxtN2<NMb}Me~`8E2Y4=c<Z#hDeE+QNPmC5?)A^(?~>
z7kG{~^`qPoW<ejrB#-JWt40~dS*A05NFVpZY57U;L9S{ra_%}^K7$-%G>s*eCZ5g@
zAvx(L`^`=?Ojn0sH{BA_tNPs`jKOqU@SFPB2+{!3zZ}IWU{tR@hiBpBAF6tRfk&)z
v!&PpR%12VU4wXZxw`pn&IWXvdjiJGkQ3<TYjP%fBuYtarfKwlxz&88?deNU*

diff --git a/core/views.py b/core/views.py
index a44313c..693abe1 100644
--- a/core/views.py
+++ b/core/views.py
@@ -1844,6 +1844,19 @@ def door_visit_history(request):
             v_name = f"{v_obj.first_name} {v_obj.last_name}".strip() or v_obj.email if v_obj else "N/A"
             volunteer_counts[v_name] = volunteer_counts.get(v_name, 0) + 1
 
+            # Parse street name and number for sorting
+            street_number = ""
+            street_name = v.address_street or ""
+            match = re.match(r'^(\d+)\s+(.*)$', street_name)
+            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
+
             visited_households[key] = {
                 'address_display': addr,
                 'address_street': v.address_street,
@@ -1856,6 +1869,7 @@ def door_visit_history(request):
                 'longitude': float(v.longitude) if v.longitude else None,
                 'street_name_sort': street_name.lower(),
                 'street_number_sort': street_number_sort,
+                'last_visit_date': interaction.date,
                 'target_voters': [],
                 'voters_json': []
             }
@@ -1869,7 +1883,7 @@ def door_visit_history(request):
     history_list = list(visited_households.values())
     history_list.sort(key=lambda x: x["last_visit_date"], reverse=True)
 
-    paginator = Paginator(history_list, 50);
+    paginator = Paginator(history_list, 50)
     page_number = request.GET.get("page")
     history_page = paginator.get_page(page_number)
 
diff --git a/door_views_update.py b/door_views_update.py
index 616727e..bf21f0c 100644
--- a/door_views_update.py
+++ b/door_views_update.py
@@ -1,16 +1,125 @@
 import sys
+import re
 
 file_path = 'core/views.py'
 with open(file_path, 'r') as f:
     content = f.read()
 
-old_code = 'visited_households[key]["voters_at_address"].add(f"{v.first_name} {v.last_name}")'
-new_code = 'visited_households[key]["voters_at_address"].add((v.id, f"{v.first_name} {v.last_name}"))'
+# Define the new function as a single string
+new_func = """def door_visit_history(request):
+    """
+    Shows a distinct list of Door visit interactions for addresses.
+    """
+    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)
+    
+    # Date filter
+    start_date = request.GET.get("start_date")
+    end_date = request.GET.get("end_date")
+    
+    # Get all "Door Visit" interactions for this tenant
+    interactions = Interaction.objects.filter(
+        voter__tenant=tenant,
+        type__name="Door Visit"
+    ).select_related("voter", "volunteer")
 
-if old_code in content:
-    new_content = content.replace(old_code, new_code)
+    if start_date or end_date:
+        try:
+            if start_date:
+                d = parse_date(start_date)
+                if d:
+                    start_dt = timezone.make_aware(datetime.combine(d, time.min))
+                    interactions = interactions.filter(date__gte=start_dt)
+            if end_date:
+                d = parse_date(end_date)
+                if d:
+                    # Use lt with next day to capture everything on the end_date
+                    end_dt = timezone.make_aware(datetime.combine(d + timedelta(days=1), time.min))
+                    interactions = interactions.filter(date__lt=end_dt)
+        except Exception as e:
+            logger.error(f"Error filtering door visit history by date: {e}")
+
+    # Summary of counts per volunteer
+    # Grouping by household (unique address)
+    visited_households = {}
+    volunteer_counts = {}
+
+    for interaction in interactions.order_by("-date"):
+        v = interaction.voter
+        addr = v.address.strip() if v.address else f"{v.address_street}, {v.city}, {v.state} {v.zip_code}".strip(", ")
+        if not addr:
+            continue
+            
+        key = addr.lower()
+        
+        if key not in visited_households:
+            # Calculate volunteer summary - only once per household
+            v_obj = interaction.volunteer
+            v_name = f"{v_obj.first_name} {v_obj.last_name}".strip() or v_obj.email if v_obj else "N/A"
+            volunteer_counts[v_name] = volunteer_counts.get(v_name, 0) + 1
+
+            # Parse street name and number for sorting
+            street_number = ""
+            street_name = v.address_street or ""
+            match = re.match(r'^(\d+)\s+(.*)$', street_name)
+            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
+
+            visited_households[key] = {
+                'address_display': addr,
+                'address_street': v.address_street,
+                'city': v.city,
+                'state': v.state,
+                'zip_code': v.zip_code,
+                'neighborhood': v.neighborhood,
+                'district': v.district,
+                'latitude': float(v.latitude) if v.latitude else None,
+                'longitude': float(v.longitude) if v.longitude else None,
+                'street_name_sort': street_name.lower(),
+                'street_number_sort': street_number_sort,
+                'last_visit_date': interaction.date,
+                'target_voters': [],
+                'voters_json': []
+            }
+        
+        visited_households[key]["voters_json"].append({'id': v.id, 'name': f"{v.first_name} {v.last_name}"})
+        visited_households[key]['target_voters'].append(v)
+
+    # Sort volunteer counts by total (descending)
+    sorted_volunteer_counts = sorted(volunteer_counts.items(), key=lambda x: x[1], reverse=True)
+
+    history_list = list(visited_households.values())
+    history_list.sort(key=lambda x: x["last_visit_date"], reverse=True)
+
+    paginator = Paginator(history_list, 50)
+    page_number = request.GET.get("page")
+    history_page = paginator.get_page(page_number)
+
+    context = {
+        "selected_tenant": tenant,
+        "history": history_page,
+        "start_date": start_date, "end_date": end_date,
+        "volunteer_counts": sorted_volunteer_counts,
+    }
+    return render(request, "core/door_visit_history.html", context)
+"""
+
+# Use regex to find and replace the function
+pattern = r'def door_visit_history\(request\):.*?return render\(request, "core/door_visit_history\.html", context\)'
+new_content = re.sub(pattern, new_func, content, flags=re.DOTALL)
+
+if new_content != content:
     with open(file_path, 'w') as f:
         f.write(new_content)
-    print("Successfully patched core/views.py")
+    print("Successfully updated door_visit_history")
 else:
-    print("Could not find the target line in core/views.py")
+    print("Could not find function to replace")
\ No newline at end of file