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

Added stop_route to traveller list view. Performance should be okay

Browse Source
This commit is contained in:
John Mullins
2023-08-29 16:54:13 +10:00
parent ab22868584
commit f7dde89de2
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
busManager/coord/admin.py
+9 -1
View File
@@ -132,7 +132,7 @@ class TravellerRouteInline(admin.TabularInline):
@admin.register(Traveller) @admin.register(Traveller)
class TravellerAdmin(MyImportExportModelAdmin, CloneModelAdmin, admin.ModelAdmin): class TravellerAdmin(MyImportExportModelAdmin, CloneModelAdmin, admin.ModelAdmin):
list_display = ["first_name", "last_name", "school", "year_level", "residential_address", "residential_suburb", "travel_start_date", "travel_end_date"] list_display = ["first_name", "last_name", "school", "year_level", "residential_address", "residential_suburb", "stop_route", "travel_start_date", "travel_end_date"]
list_filter = ["school", "eligibility_status", "bus_stops__bus", "residential_suburb", ("travel_end_date", DateFieldListFilter), "is_archived"] list_filter = ["school", "eligibility_status", "bus_stops__bus", "residential_suburb", ("travel_end_date", DateFieldListFilter), "is_archived"]
search_fields = ["first_name", "last_name", "residential_address"] search_fields = ["first_name", "last_name", "residential_address"]
cloneable_fields = ["last_name", "residential_address", "residential_suburb", cloneable_fields = ["last_name", "residential_address", "residential_suburb",
@@ -214,6 +214,14 @@ class TravellerAdmin(MyImportExportModelAdmin, CloneModelAdmin, admin.ModelAdmin
def yearly_rollover(self, request, queryset): def yearly_rollover(self, request, queryset):
pass pass
def stop_route(self, obj):
stops = BusStop.objects.filter(traveller__id__exact=obj.id)
if stops.count() == 0:
return ""
if stops.count() == 1:
return stops.first()
return "Multiple"
def save_model(self, request, obj, form, change): def save_model(self, request, obj, form, change):
print("Saving") print("Saving")
if obj.is_archived and obj.travel_end_date is None: if obj.is_archived and obj.travel_end_date is None: