Added date range filter for start and end dates for travellers
This commit is contained in:
@@ -11,6 +11,7 @@ from django.utils.html import format_html
|
|||||||
from django.utils.http import urlencode
|
from django.utils.http import urlencode
|
||||||
from django.utils.translation import gettext_lazy
|
from django.utils.translation import gettext_lazy
|
||||||
from import_export.admin import ImportExportModelAdmin
|
from import_export.admin import ImportExportModelAdmin
|
||||||
|
from rangefilter.filters import DateRangeFilterBuilder
|
||||||
|
|
||||||
from .adminClone import CloneModelAdmin
|
from .adminClone import CloneModelAdmin
|
||||||
from .context_helpers import bus_roll_context, emergency_contacts_context, traveller_roll_context, \
|
from .context_helpers import bus_roll_context, emergency_contacts_context, traveller_roll_context, \
|
||||||
@@ -213,7 +214,16 @@ class TravellerRouteInline(admin.TabularInline):
|
|||||||
@admin.register(Traveller)
|
@admin.register(Traveller)
|
||||||
class TravellerAdmin(MyImportExportModelAdmin, CloneModelAdmin, admin.ModelAdmin, TravellerRollMixin):
|
class TravellerAdmin(MyImportExportModelAdmin, CloneModelAdmin, admin.ModelAdmin, TravellerRollMixin):
|
||||||
list_display = ["first_name", "last_name", "school", "year_level", "residential_address", "residential_suburb", "stop_route", "shuttle", "travel_start_date", "travel_end_date"]
|
list_display = ["first_name", "last_name", "school", "year_level", "residential_address", "residential_suburb", "stop_route", "shuttle", "travel_start_date", "travel_end_date"]
|
||||||
list_filter = ["school", "year_level", "eligibility_status", "bus_stops__bus", "shuttle", "residential_suburb", ("travel_end_date", DateFieldListFilter), ("is_archived", ArchiveFilter)]
|
list_filter = [
|
||||||
|
"school", "year_level", "eligibility_status", "bus_stops__bus", "shuttle", "residential_suburb",
|
||||||
|
("travel_start_date", DateRangeFilterBuilder(
|
||||||
|
title="Start date"
|
||||||
|
)),
|
||||||
|
("travel_end_date", DateRangeFilterBuilder(
|
||||||
|
title="End date"
|
||||||
|
)),
|
||||||
|
("is_archived", ArchiveFilter)
|
||||||
|
]
|
||||||
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",
|
||||||
"postal_address", "postal_suburb", "eligibility_status", "shuttle",
|
"postal_address", "postal_suburb", "eligibility_status", "shuttle",
|
||||||
|
|||||||
Reference in New Issue
Block a user