From 51eec5257ba86de9d5182b653942175588617b5b Mon Sep 17 00:00:00 2001
From: John Mullins <john.mullins@education.vic.gov.au>
Date: Tue, 29 Aug 2023 12:44:42 +1000
Subject: [PATCH] Added creation and last edit entries. Plan to use for recent
 changes when sending out to companies. Small cleanups

---
 busManager/coord/admin.py  |  4 +++-
 busManager/coord/models.py |  3 +++
 busManager/coord/urls.py   |  2 --
 busManager/coord/views.py  | 12 +-----------
 4 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/busManager/coord/admin.py b/busManager/coord/admin.py
index 092625e..50a220e 100644
--- a/busManager/coord/admin.py
+++ b/busManager/coord/admin.py
@@ -136,7 +136,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"]
+    readonly_fields = ["fare_paying", "created_on", "last_edit"]
     fieldsets = [
         (None, {
             'fields': [
@@ -172,6 +172,8 @@ class TravellerAdmin(MyImportExportModelAdmin, CloneModelAdmin, admin.ModelAdmin
                 "application_form_completed",
                 "parent_notified",
                 "seat_number",
+                "created_on",
+                "last_edit",
             ]
         }),
         ('Adult Contacts', {
diff --git a/busManager/coord/models.py b/busManager/coord/models.py
index 3861486..b18135a 100644
--- a/busManager/coord/models.py
+++ b/busManager/coord/models.py
@@ -225,6 +225,9 @@ class Traveller(models.Model):
     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_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')
     shuttle = models.ForeignKey(Shuttle, on_delete=models.SET_NULL, blank=True, null=True)
 
diff --git a/busManager/coord/urls.py b/busManager/coord/urls.py
index 0badad9..a52d748 100644
--- a/busManager/coord/urls.py
+++ b/busManager/coord/urls.py
@@ -3,9 +3,7 @@ from django.urls import path
 from . import views
 
 urlpatterns = [
-    path("roll", views.bus_roll, name="Student Roll"),
     path("contacts", views.emergency_contacts, name="Emergency Contacts"),
     path("stops", views.bus_summary, name="Stop Summary"),
     path("summary", views.bus_numbers, name="Bus Summary"),
-    path("testemail", views.TestEmail, name="Test Email")
 ]
diff --git a/busManager/coord/views.py b/busManager/coord/views.py
index 67ff878..ed5d537 100644
--- a/busManager/coord/views.py
+++ b/busManager/coord/views.py
@@ -1,5 +1,4 @@
 from django.contrib.admin.views.decorators import staff_member_required
-from django.http import HttpResponse
 from django.shortcuts import render
 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
 
 
-# def index(request):
-#    return HttpResponse("Hello, world. You're at the coord index.")
-
-
 @staff_member_required
 def bus_numbers(request):
     buses = []
@@ -46,11 +41,6 @@ def bus_numbers(request):
     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
 def bus_summary(request, queryset=None):
     bus_routes = []
@@ -121,4 +111,4 @@ def emergency_contacts(request, queryset=None):
 @staff_member_required
 class CompanyList(ListView):
     model = Company
-    template_name = "companies.html"
\ No newline at end of file
+    template_name = "companies.html"