Added creation and last edit entries. Plan to use for recent changes when sending out to companies.
Small cleanups
This commit is contained in:
@@ -136,7 +136,7 @@ class TravellerAdmin(MyImportExportModelAdmin, CloneModelAdmin, admin.ModelAdmin
|
|||||||
"emergency_contact_A_relation", "emergency_contact_B_firstname", "emergency_contact_B_lastname",
|
"emergency_contact_A_relation", "emergency_contact_B_firstname", "emergency_contact_B_lastname",
|
||||||
"emergency_contact_B_phone", "emergency_contact_B_relation"]
|
"emergency_contact_B_phone", "emergency_contact_B_relation"]
|
||||||
inlines = [TravellerRouteInline]
|
inlines = [TravellerRouteInline]
|
||||||
readonly_fields = ["fare_paying"]
|
readonly_fields = ["fare_paying", "created_on", "last_edit"]
|
||||||
fieldsets = [
|
fieldsets = [
|
||||||
(None, {
|
(None, {
|
||||||
'fields': [
|
'fields': [
|
||||||
@@ -172,6 +172,8 @@ class TravellerAdmin(MyImportExportModelAdmin, CloneModelAdmin, admin.ModelAdmin
|
|||||||
"application_form_completed",
|
"application_form_completed",
|
||||||
"parent_notified",
|
"parent_notified",
|
||||||
"seat_number",
|
"seat_number",
|
||||||
|
"created_on",
|
||||||
|
"last_edit",
|
||||||
]
|
]
|
||||||
}),
|
}),
|
||||||
('Adult Contacts', {
|
('Adult Contacts', {
|
||||||
|
|||||||
@@ -225,6 +225,9 @@ class Traveller(models.Model):
|
|||||||
emergency_contact_B_lastname = models.CharField(max_length=50, blank=True)
|
emergency_contact_B_lastname = models.CharField(max_length=50, blank=True)
|
||||||
emergency_contact_B_phone = models.CharField(max_length=15, blank=True)
|
emergency_contact_B_phone = models.CharField(max_length=15, blank=True)
|
||||||
emergency_contact_B_relation = models.CharField(max_length=50, choices=RELATIONS, blank=True)
|
emergency_contact_B_relation = models.CharField(max_length=50, choices=RELATIONS, blank=True)
|
||||||
|
|
||||||
|
created_on = models.DateTimeField(auto_now_add=True, blank=True, null=True)
|
||||||
|
last_edit = models.DateTimeField(auto_now=True, blank=True, null=True)
|
||||||
notes = models.TextField(blank=True, verbose_name='Admin Notes')
|
notes = models.TextField(blank=True, verbose_name='Admin Notes')
|
||||||
shuttle = models.ForeignKey(Shuttle, on_delete=models.SET_NULL, blank=True, null=True)
|
shuttle = models.ForeignKey(Shuttle, on_delete=models.SET_NULL, blank=True, null=True)
|
||||||
|
|
||||||
|
|||||||
@@ -3,9 +3,7 @@ from django.urls import path
|
|||||||
from . import views
|
from . import views
|
||||||
|
|
||||||
urlpatterns = [
|
urlpatterns = [
|
||||||
path("roll", views.bus_roll, name="Student Roll"),
|
|
||||||
path("contacts", views.emergency_contacts, name="Emergency Contacts"),
|
path("contacts", views.emergency_contacts, name="Emergency Contacts"),
|
||||||
path("stops", views.bus_summary, name="Stop Summary"),
|
path("stops", views.bus_summary, name="Stop Summary"),
|
||||||
path("summary", views.bus_numbers, name="Bus Summary"),
|
path("summary", views.bus_numbers, name="Bus Summary"),
|
||||||
path("testemail", views.TestEmail, name="Test Email")
|
|
||||||
]
|
]
|
||||||
|
|||||||
@@ -1,5 +1,4 @@
|
|||||||
from django.contrib.admin.views.decorators import staff_member_required
|
from django.contrib.admin.views.decorators import staff_member_required
|
||||||
from django.http import HttpResponse
|
|
||||||
from django.shortcuts import render
|
from django.shortcuts import render
|
||||||
from django.views.generic import ListView
|
from django.views.generic import ListView
|
||||||
|
|
||||||
@@ -7,10 +6,6 @@ from .context_helpers import bus_roll_context
|
|||||||
from .models import Company, Bus, Traveller, BusStop, TravellerRoute, Shuttle, Driver
|
from .models import Company, Bus, Traveller, BusStop, TravellerRoute, Shuttle, Driver
|
||||||
|
|
||||||
|
|
||||||
# def index(request):
|
|
||||||
# return HttpResponse("Hello, world. You're at the coord index.")
|
|
||||||
|
|
||||||
|
|
||||||
@staff_member_required
|
@staff_member_required
|
||||||
def bus_numbers(request):
|
def bus_numbers(request):
|
||||||
buses = []
|
buses = []
|
||||||
@@ -46,11 +41,6 @@ def bus_numbers(request):
|
|||||||
return render(request, 'reports/bus_numbers.html', {'buses': buses})
|
return render(request, 'reports/bus_numbers.html', {'buses': buses})
|
||||||
|
|
||||||
|
|
||||||
@staff_member_required
|
|
||||||
def bus_roll(request, queryset=None):
|
|
||||||
return render(request, 'reports/bus_roll.html', bus_roll_context(queryset))
|
|
||||||
|
|
||||||
|
|
||||||
@staff_member_required
|
@staff_member_required
|
||||||
def bus_summary(request, queryset=None):
|
def bus_summary(request, queryset=None):
|
||||||
bus_routes = []
|
bus_routes = []
|
||||||
@@ -121,4 +111,4 @@ def emergency_contacts(request, queryset=None):
|
|||||||
@staff_member_required
|
@staff_member_required
|
||||||
class CompanyList(ListView):
|
class CompanyList(ListView):
|
||||||
model = Company
|
model = Company
|
||||||
template_name = "companies.html"
|
template_name = "companies.html"
|
||||||
|
|||||||
Reference in New Issue
Block a user