Moved active status to a database entry apposed to a function
Added settings page Cleaned up rollover page
This commit is contained in:
@@ -58,7 +58,7 @@ class SchoolRollMixin:
|
||||
traveller_list = []
|
||||
for school in queryset:
|
||||
for travellerRoute in TravellerRoute.objects.filter(traveller__school=school):
|
||||
if not travellerRoute.traveller.is_active():
|
||||
if not travellerRoute.traveller._is_active():
|
||||
continue
|
||||
traveller_list.append(traveller_route_context(travellerRoute))
|
||||
|
||||
@@ -92,25 +92,6 @@ class TravellerRollMixin:
|
||||
return response
|
||||
|
||||
|
||||
class ArchiveFilter(BooleanFieldListFilter):
|
||||
parameter_name = 'is_archived'
|
||||
|
||||
def choices(self, changelist):
|
||||
field_choices = dict(self.field.flatchoices)
|
||||
for lookup, title in (
|
||||
(None, gettext_lazy("All")),
|
||||
("0", field_choices.get(True, gettext_lazy("Current Year"))),
|
||||
("1", field_choices.get(False, gettext_lazy("Archived"))),
|
||||
):
|
||||
yield {
|
||||
"selected": self.lookup_val == lookup and not self.lookup_val2,
|
||||
"query_string": changelist.get_query_string(
|
||||
{self.lookup_kwarg: lookup}, [self.lookup_kwarg2]
|
||||
),
|
||||
"display": title,
|
||||
}
|
||||
|
||||
|
||||
class HiddenNowTime(widgets.TimeInput):
|
||||
pass
|
||||
|
||||
@@ -192,7 +173,7 @@ class TravellerRouteInline(admin.TabularInline):
|
||||
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_filter = [
|
||||
("is_archived", ArchiveFilter), "school", "year_level", "eligibility_status", "bus_stops__bus", "shuttle", "residential_suburb",
|
||||
"is_active", "school", "year_level", "eligibility_status", "bus_stops__bus", "shuttle", "residential_suburb",
|
||||
("travel_start_date", DateRangeFilterBuilder(
|
||||
title="Start date"
|
||||
)),
|
||||
@@ -209,7 +190,7 @@ class TravellerAdmin(MyImportExportModelAdmin, CloneModelAdmin, admin.ModelAdmin
|
||||
"emergency_contact_A_relation", "emergency_contact_B_firstname", "emergency_contact_B_lastname",
|
||||
"emergency_contact_B_phone", "emergency_contact_B_relation"]
|
||||
inlines = [TravellerRouteInline]
|
||||
readonly_fields = ["fare_paying", "created_on", "last_edit", "is_archived"]
|
||||
readonly_fields = ["travel_start_date", "travel_end_date", "fare_paying", "created_on", "last_edit", "is_active"]
|
||||
actions = ["export_to_csv", "send_sms", "confirmation_letter", "letter_creator"]
|
||||
fieldsets = [
|
||||
(None, {
|
||||
@@ -248,7 +229,7 @@ class TravellerAdmin(MyImportExportModelAdmin, CloneModelAdmin, admin.ModelAdmin
|
||||
"seat_number",
|
||||
"created_on",
|
||||
"last_edit",
|
||||
"is_archived",
|
||||
"is_active",
|
||||
]
|
||||
}),
|
||||
('Adult Contacts', {
|
||||
|
||||
Reference in New Issue
Block a user