Added stop_route to traveller list view. Performance should be okay
This commit is contained in:
@@ -132,7 +132,7 @@ class TravellerRouteInline(admin.TabularInline):
|
||||
|
||||
@admin.register(Traveller)
|
||||
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"]
|
||||
search_fields = ["first_name", "last_name", "residential_address"]
|
||||
cloneable_fields = ["last_name", "residential_address", "residential_suburb",
|
||||
@@ -214,6 +214,14 @@ class TravellerAdmin(MyImportExportModelAdmin, CloneModelAdmin, admin.ModelAdmin
|
||||
def yearly_rollover(self, request, queryset):
|
||||
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):
|
||||
print("Saving")
|
||||
if obj.is_archived and obj.travel_end_date is None:
|
||||
|
||||
Reference in New Issue
Block a user