Rollover submit moved to POST

Changed archived lookup to active lookup

busManager/coord/models.py

@@ -265,7 +265,6 @@ class Traveller(models.Model):
 
         for travellerRoute in TravellerRoute.objects.filter(traveller=self):
             route_start = travellerRoute.travel_start_date
-            print(route_start)
             route_end = travellerRoute.travel_end_date
             if route_start is not None:
                 if new_start_date is None or new_start_date > route_start:

busManager/coord/templates/admin/rollover_form.html

@@ -11,6 +11,6 @@
     <form action="" method="post">
         {% csrf_token %}
         {{ form.as_p }}
-    </form>
         <input type="submit" style="padding: 15px 30px; font-size: 18px; background: var(--delete-button-bg);" value="Initiate!">
+    </form>
 {% endblock %}

busManager/coord/utils/rollover.py

@@ -5,7 +5,8 @@ from django.contrib.admin.views.decorators import staff_member_required
 from django.http import HttpResponseRedirect, HttpResponse
 from django.shortcuts import render
 
-from coord.models import Traveller
+from coord.models import Traveller, TravellerRoute
+from coord.scheduled_tasks import nightly_check_active_status
 
 
 # Any active year 12 without exit date set exit date before today
@@ -24,24 +25,19 @@ class RolloverForm(forms.Form):
 
 
 def execute_rollover(exit_date):
-    print(f"Setting exit date {exit_date}")
+    result = TravellerRoute.objects.filter(traveller__year_level='12', travel_end_date=None).update(travel_end_date=exit_date)
-    result = Traveller.objects.filter(year_level='12', travel_end_date=None).update(travel_end_date=exit_date)
+    nightly_check_active_status()
-    print(f"{result} Year 12s exited")
     today = datetime.date.today().strftime('%Y-%m-%d')
-    result = Traveller.objects.filter(travel_end_date__lt=today, is_archived=False).update(is_archived=True)
+    result = Traveller.objects.filter(is_active=True, year_level='11').update(year_level='12')
-    print(f"{result} travellers archived")
+    result += Traveller.objects.filter(is_active=True, year_level='10').update(year_level='11')
-    result = Traveller.objects.filter(is_archived=False, year_level='11').update(year_level='12')
+    result += Traveller.objects.filter(is_active=True, year_level='09').update(year_level='10')
-    result += Traveller.objects.filter(is_archived=False, year_level='10').update(year_level='11')
+    result += Traveller.objects.filter(is_active=True, year_level='08').update(year_level='09')
-    result += Traveller.objects.filter(is_archived=False, year_level='09').update(year_level='10')
+    result += Traveller.objects.filter(is_active=True, year_level='07').update(year_level='08')
-    result += Traveller.objects.filter(is_archived=False, year_level='08').update(year_level='09')
+    result += Traveller.objects.filter(is_active=True, year_level='06').update(year_level='07')
-    result += Traveller.objects.filter(is_archived=False, year_level='07').update(year_level='08')
+    result += Traveller.objects.filter(is_active=True, year_level='05').update(year_level='06')
-    result += Traveller.objects.filter(is_archived=False, year_level='06').update(year_level='07')
+    result += Traveller.objects.filter(is_active=True, year_level='04').update(year_level='05')
-    result += Traveller.objects.filter(is_archived=False, year_level='05').update(year_level='06')
+    result += Traveller.objects.filter(is_active=True, year_level='03').update(year_level='04')
-    result += Traveller.objects.filter(is_archived=False, year_level='04').update(year_level='05')
+    result += Traveller.objects.filter(is_active=True, year_level='02').update(year_level='03')
-    result += Traveller.objects.filter(is_archived=False, year_level='03').update(year_level='04')
+    result += Traveller.objects.filter(is_active=True, year_level='01').update(year_level='02')
-    result += Traveller.objects.filter(is_archived=False, year_level='02').update(year_level='03')
+    result += Traveller.objects.filter(is_active=True, year_level='00').update(year_level='01')
-    result += Traveller.objects.filter(is_archived=False, year_level='01').update(year_level='02')
+    result += Traveller.objects.filter(is_active=True, year_level='PS').update(year_level='00')
-    result += Traveller.objects.filter(is_archived=False, year_level='00').update(year_level='01')
-    result += Traveller.objects.filter(is_archived=False, year_level='PS').update(year_level='00')
-    print(f"{result} travellers modified")
-