Added locations app

Moved contacts to new model
2026-02-26 13:34:32 +11:00
parent a24daed8f6
commit 4025c28eae
25 changed files with 576 additions and 75 deletions
@@ -1,5 +1,7 @@
+from django.db.models import Prefetch
+
 from transport.models import Bus, Driver, BusStop, Shuttle
-from traveller.models import TravellerRoute, Traveller
+from traveller.models import TravellerRoute, Traveller, Family


 def bus_summary_context():
@@ -52,37 +54,83 @@ def emergency_contacts_context(queryset=None):
    else:
        buses = queryset

-    bus_routes = []
-    for bus in buses:
-        drivers = []
-        for driver in Driver.objects.filter(bus=bus):
-            drivers.append(driver)
-        traveller_list = []
-        for travellerRoute in TravellerRoute.objects.filter(busStop__bus=bus):
-            traveller = travellerRoute.traveller
-            if not traveller._is_active():
-                continue
-            for family in traveller.get_families():
-                parent_a = ""
-                if family.parent_A_firstname:
-                    parent_a = f"{family.parent_A_firstname} {family.parent_A_lastname} ({family.parent_A_phone})"
-                parent_b = ""
-                if family.parent_B_firstname:
-                    parent_b = f"{family.parent_B_firstname} {family.parent_B_lastname} ({family.parent_B_phone})"
-                contact_a = ""
-                if family.emergency_contact_A_firstname:
-                    contact_a = f"{family.emergency_contact_A_firstname} {family.emergency_contact_A_lastname} ({family.emergency_contact_A_phone})"
-                contact_b = ""
-                if family.emergency_contact_B_firstname:
-                    contact_b = f"{family.emergency_contact_B_firstname} {family.emergency_contact_B_lastname} ({family.emergency_contact_B_phone})"
-                traveller_list.append({
-                    'traveller': traveller,
-                    'parent_a': parent_a,
-                    'parent_b': parent_b,
-                    'contact_a': contact_a,
-                    'contact_b': contact_b,
-                    'note': travellerRoute.notes
-                })
-        bus_routes.append({'bus': bus, 'drivers': drivers, 'travellers': traveller_list})
+    buses = buses.prefetch_related(
+        Prefetch(
+            "driver_set",
+            queryset=Driver.objects.all()
+        ),
+        Prefetch(
+            "busstop_set__traverseroute_set",
+            queryset=TravellerRoute.objects.select_related(
+                "traveller",
+                "busStop"
+            ).prefetch_related(
+                Prefetch(
+                    "traveller__family_set",
+                    queryset=Family.objects.select_related(
+                        "contact_A",
+                        "contact_B",
+                        "emergency_contact_A",
+                        "emergency_contact_B",
+                    )
+                )
+            )
+        )
+    )

-    return {'routes': bus_routes}
+    bus_routes = []
+
+    for bus in buses:
+
+        drivers = list(bus.driver_set.all())
+
+        traveller_list = []
+
+        traveller_routes = TravellerRoute.objects.filter(
+            busStop__bus=bus
+        ).select_related(
+            "traveller"
+        )
+
+        for travellerRoute in traveller_routes:
+
+            traveller = travellerRoute.traveller
+
+            if not traveller.is_active:
+                continue
+
+            for family in traveller.family_set.all():
+
+                parent_a = ""
+                parent_b = ""
+                contact_a = ""
+                contact_b = ""
+
+                if family.contact_A:
+                    parent_a = f"{family.contact_A.first_name} {family.contact_A.last_name} ({family.contact_A.phone})"
+
+                if family.contact_B:
+                    parent_b = f"{family.contact_B.first_name} {family.contact_B.last_name} ({family.contact_B.phone})"
+
+                if family.emergency_contact_A:
+                    contact_a = f"{family.emergency_contact_A.first_name} {family.emergency_contact_A.last_name} ({family.emergency_contact_A.phone})"
+
+                if family.emergency_contact_B:
+                    contact_b = f"{family.emergency_contact_B.first_name} {family.emergency_contact_B.last_name} ({family.emergency_contact_B.phone})"
+
+                traveller_list.append({
+                    "traveller": traveller,
+                    "parent_a": parent_a,
+                    "parent_b": parent_b,
+                    "contact_a": contact_a,
+                    "contact_b": contact_b,
+                    "note": travellerRoute.notes
+                })
+
+        bus_routes.append({
+            "bus": bus,
+            "drivers": drivers,
+            "travellers": traveller_list
+        })
+
+    return {"routes": bus_routes}