jessikitty/bus-manager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed address and added active status to route context

Browse Source
This commit is contained in:
John Mullins
2024-08-26 14:30:15 +10:00
parent aac0358adc
commit 60172160bf
1 changed files with 22 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
busManager/coord/context_helpers.py
+22 -15
View File
@@ -137,22 +137,29 @@ def school_travellerRoute_context(school):
def traveller_route_context(traveller_route): def traveller_route_context(traveller_route):
traveller = traveller_route.traveller traveller = traveller_route.traveller
bus_stop = traveller_route.busStop bus_stop = traveller_route.busStop
families = traveller.get_families()
address = ""
for family in families:
if address:
address += ";"
address = address + f"{family.residential_address} {family.residential_suburb}"
return { return {
'first_name': traveller.first_name, 'first_name': traveller.first_name,
'last_name': traveller.last_name, 'last_name': traveller.last_name,
'school': traveller.school, 'active': traveller.is_active,
'dob': traveller.dob, 'school': traveller.school,
'year_level': traveller.year_level, 'dob': traveller.dob,
'address': f"{traveller.residential_address} {traveller.residential_suburb}", 'year_level': traveller.year_level,
'start_date': traveller.travel_start_date, 'address': address,
'end_date': traveller.travel_end_date, 'start_date': traveller.travel_start_date,
'eligibility': traveller.get_eligibility_status_display(), 'end_date': traveller.travel_end_date,
'shuttle': traveller.shuttle, 'eligibility': traveller.get_eligibility_status_display(),
'route': traveller_route.busStop.bus, 'shuttle': traveller.shuttle,
'stop': f"#{bus_stop.get_stop_number()} - {bus_stop.address}", 'route': traveller_route.busStop.bus,
'pickup': bus_stop.am_time, 'stop': f"#{bus_stop.get_stop_number()} - {bus_stop.address}",
'drop-off': bus_stop.pm_time 'pickup': bus_stop.am_time,
} 'drop-off': bus_stop.pm_time
}
def emergency_contacts_context(queryset=None): def emergency_contacts_context(queryset=None):