Added date selector to rolls
This commit is contained in:
@@ -14,6 +14,7 @@ from .adminClone import CloneModelAdmin
|
||||
from .context_helpers import *
|
||||
from .email_helpers import email_companies_bus_roll, render_to_pdf, email_school_roll, \
|
||||
email_companies_emergency_contacts
|
||||
from .forms import roll_date_selector
|
||||
from .models import *
|
||||
from .utils.send_sms import send_sms
|
||||
|
||||
@@ -23,6 +24,9 @@ class BusRollMixin:
|
||||
def show_bus_roll(self, request, queryset):
|
||||
return render_to_pdf('reports/bus_roll.html', bus_roll_context(queryset))
|
||||
|
||||
def show_bus_roll_on_date(self, request, queryset):
|
||||
return roll_date_selector(self, request, queryset)
|
||||
|
||||
def show_emergency_contacts(self, request, queryset):
|
||||
return render_to_pdf('reports/emergency_contacts.html', emergency_contacts_context(queryset))
|
||||
|
||||
@@ -67,6 +71,9 @@ class SchoolRollMixin:
|
||||
def show_school_travellers(self, request, queryset):
|
||||
return render_to_pdf('reports/school_roll.html', school_roll_context(queryset))
|
||||
|
||||
def show_school_travellers_on_date(self, request, queryset):
|
||||
return render_to_pdf('reports/school_roll.html', school_roll_context(queryset))
|
||||
|
||||
def export_travellers_to_csv(self, request, queryset):
|
||||
traveller_list = []
|
||||
for school in queryset:
|
||||
@@ -147,7 +154,7 @@ class BusesAdmin(MyImportExportModelAdmin, admin.ModelAdmin, BusRollMixin):
|
||||
list_filter = ["company"]
|
||||
list_display = ["route_name", "company", "contract_number", "seating_capacity", "route_travellers"]
|
||||
readonly_fields = ["traveller_count"]
|
||||
actions = ["show_bus_roll", "show_emergency_contacts", "sms_traveller_contacts", "email_bus_roll", "email_emergency_contacts"]
|
||||
actions = ["show_bus_roll", "show_bus_roll_on_date", "show_emergency_contacts", "sms_traveller_contacts", "email_bus_roll", "email_emergency_contacts"]
|
||||
inlines = [DriverInline, BusStopInline]
|
||||
fieldsets = [
|
||||
(None, {'fields': [
|
||||
|
||||
Reference in New Issue
Block a user