Moved active status to a database entry apposed to a function

Added settings page
Cleaned up rollover page
This commit is contained in:
John Mullins
2023-12-21 16:14:56 +11:00
parent 1240ab2538
commit 25ddf1edfa
12 changed files with 128 additions and 58 deletions
+1 -14
View File
@@ -23,7 +23,7 @@ class RolloverForm(forms.Form):
agreement = forms.BooleanField(label='I have run an export/backup for travellers')
def _rollover(exit_date):
def execute_rollover(exit_date):
print(f"Setting exit date {exit_date}")
result = Traveller.objects.filter(year_level='12', travel_end_date=None).update(travel_end_date=exit_date)
print(f"{result} Year 12s exited")
@@ -45,16 +45,3 @@ def _rollover(exit_date):
result += Traveller.objects.filter(is_archived=False, year_level='PS').update(year_level='00')
print(f"{result} travellers modified")
@staff_member_required
def rollover(request):
# if 'confirm' in request.POST:
if request.method == 'POST':
form = RolloverForm(request.POST)
if form.is_valid():
_rollover(form.cleaned_data['exit_date'])
# rollover_mixin.message_user(request, "Users have been rolled over")
return HttpResponseRedirect('/')
form = RolloverForm()
return render(request, 'admin/rollover_form.html', context={'form': form})
+2 -2
View File
@@ -12,7 +12,7 @@ class SMSForm(forms.Form):
def send_sms(send_sms_mixin, request, queryset):
if 'send' in request.POST:
if 'confirm' in request.POST:
message = request.POST["message"]
send_to_parents = False
if request.POST.get("send_to_parents"):
@@ -26,7 +26,7 @@ def send_sms(send_sms_mixin, request, queryset):
total = 0
numbers = []
for traveller in queryset:
if only_include_active_travellers and not traveller.is_active():
if only_include_active_travellers and not traveller._is_active():
continue
numbers.append(traveller.get_parsed_numbers(parents=send_to_parents, emergency=send_to_emergency_contacts))