Refactored admin account activation and updated contest dashboard ui

- Generalized account activation process to include deactivation
- Moved walk-in team button to pre-contest section

Author: mmcinnestaylor

src/contestadmin/forms.py

@@ -43,12 +43,18 @@ class Meta:
         model = Profile
         fields = ["role"]
 
+    
+class AccountStatusForm(forms.Form):
+    STATUS = (
+        (0, 'Activate'),
+        (1, 'Deactivate')
+    )
 
-class ActivateAccountForm(forms.Form):
     username = forms.CharField(
         max_length=150,
         label='Username',
         help_text="Person's account username.")
+    status = forms.ChoiceField(choices=STATUS)
 
 
 class DesignateFacultyTeamForm(forms.Form):

src/contestadmin/templates/contestadmin/dashboard.html

@@ -25,6 +25,9 @@ <h1 class="text-center">Contest Dashboard</h1>
 				<i class="fa-solid fa-clock-rotate-left fa-fw"></i> Pre-Contest
 			</div>
 			<div class="card-body overflow-auto">
+				<div class="row justify-content-center">
+					<button type="button" class="btn btn-primary btn-sm my-1" data-toggle="modal" data-target="#walkinModal"> <i class="fa-solid fa-person-walking fa-fw"></i> Create Walk-in teams</button>
+				</div>
 				<div class="row justify-content-center">
 					<a class="btn btn-primary btn-sm my-1" href="{% url 'gen_dj_files' %}" onclick="return confirm('Are you certain you want to generate the DOMjudge files?');"><i class="fa-solid fa-file-circle-plus fa-fw"></i> Generate DOMjudge TSVs</a>
 					{% if dj_files_available %}					
@@ -73,7 +76,6 @@ <h1 class="text-center">Contest Dashboard</h1>
 			</div>
 			<div class="card-body overflow-auto">
 				<div class="row justify-content-center">
-					
 					{% if dj_results_processed %}					
 						<!--<button type="button" class="btn btn-primary btn-sm my-1" data-toggle="modal" data-target="#generateEcReportsModal">Generate Reports</button>-->
 						<a class="btn btn-primary btn-sm my-1" href="{% url 'gen_ec_reports' %}" onclick="return confirm('Are you certain you want to generate the extra credit files?');"><i class="fa-solid fa-file-circle-plus fa-fw"></i> Generate Reports</a>
@@ -106,6 +108,9 @@ <h1 class="text-center">Contest Dashboard</h1>
 			<div class="card-body overflow-auto">
 				<div class="row">
 					<div class="col-lg-6">
+						<div class="row justify-content-center">
+							<button type="button" class="btn btn-primary btn-sm my-1" data-toggle="modal" data-target="#accountStatusModal"><i class="fa-solid fa-user-gear fa-fw"></i> Update Account Status</button>
+						</div>
 						<div class="row justify-content-center">
 							<a class="btn btn-primary btn-sm my-1" href="{% url 'generate_team_csvs' %}" onclick="return confirm('Are you certain you want to generate the team data CSVs?');"><i class="fa-solid fa-file-circle-plus fa-fw"></i> Generate Team CSVs</a>
 							{% if team_csvs_available %}					
@@ -114,17 +119,11 @@ <h1 class="text-center">Contest Dashboard</h1>
 								<a class="btn text-secondary disabled" href="#" role="button"><i class="fa fa-download fa-md" aria-hidden="true"></i></a>
 							{% endif %}
 						</div>
-						<div class="row justify-content-center">
-							<button type="button" class="btn btn-primary btn-sm my-1" data-toggle="modal" data-target="#walkinModal"> <i class="fa-solid fa-person-walking fa-fw"></i> Create Walk-in teams</button>
-						</div>
-						<div class="row justify-content-center">
-							<button type="button" class="btn btn-primary btn-sm my-1" data-toggle="modal" data-target="#facultyTeamModal"><i
-									class="fa-solid fa-chalkboard-user fa-fw"></i> Designate Faculty Team</button>
-						</div>
 					</div>
 					<div class="col-lg-6">
 						<div class="row justify-content-center">
-							<button type="button" class="btn btn-primary btn-sm my-1" data-toggle="modal" data-target="#activateAccountModal"><i class="fa-solid fa-user-check fa-fw"></i> Activate User Account</button>
+							<button type="button" class="btn btn-primary btn-sm my-1" data-toggle="modal" data-target="#facultyTeamModal"><i
+									class="fa-solid fa-chalkboard-user fa-fw"></i> Designate Faculty Team</button>
 						</div>
 						<div class="row justify-content-center">
 							<button type="button" class="btn btn-primary btn-sm my-1" data-toggle="modal" data-target="#checkinModal"><i class="fa-solid fa-robot fa-fw"></i> Check in/out Users</button>
@@ -284,7 +283,6 @@ <h1 class="text-center">Contest Dashboard</h1>
 	</div>
 	<!-- Volunteer Summary card end -->
 
-
 	<!-- Create Walk-in Teams Modal -->
 	<div class="modal fade" id="walkinModal" tabindex="-1" role="dialog"
 		aria-labelledby="confirmClearModalCenterTitle" aria-hidden="true">
@@ -321,7 +319,6 @@ <h5 class="mb-0">{{ field.label_tag }}</h5>
 	</div>
 	<!-- End Create Walk-in Teams Modal -->
 
-
 	<!-- Checkin/Checkout Users Modal -->
 	<div class="modal fade" id="checkinModal" tabindex="-1" role="dialog" aria-labelledby="confirmClearModalCenterTitle"
 		aria-hidden="true">
@@ -357,20 +354,22 @@ <h5 class="modal-title" id="confirmClearModalLongTitle">Check in/out Users</h5>
 	</div>
 	<!-- End Create Walk-in Teams Modal -->
 
-
-	<!-- Activate Account Modal -->
-	<div class="modal fade" id="activateAccountModal" tabindex="-1" role="dialog"
+	<!-- Account Status Modal -->
+	<div class="modal fade" id="accountStatusModal" tabindex="-1" role="dialog"
 		aria-labelledby="confirmClearModalCenterTitle" aria-hidden="true">
 		<div class="modal-dialog modal-dialog-centered" role="document">
 			<div class="modal-content">
 				<div class="modal-header">
-					<h5 class="modal-title" id="confirmClearModalLongTitle">Activate User Account</h5>
+					<h5 class="modal-title" id="confirmClearModalLongTitle">Update Account Status</h5>
 				</div>
-				<form method="post" onSubmit="return confirm('Are you certain you want to activate this account?');">
+				<form method="post" onSubmit="return confirm('Are you certain you want to update this account?');">
 					<div class="modal-body overflow-auto">
 						{% csrf_token %}
 						<div class="form-group">
-							{{ activate_account_form.username | placeholder:"Username" }}
+							{{ account_status_form.username | placeholder:"Username" }}
+						</div>
+						<div class="form-group">
+							{{ account_status_form.status }}
 						</div>
 					</div>
 					<div class="card-footer">
@@ -381,8 +380,7 @@ <h5 class="modal-title" id="confirmClearModalLongTitle">Activate User Account</h
 			</div>
 		</div>
 	</div>
-	<!-- End Activate Account Modal -->
-
+	<!-- End Account Status Modal -->
 
 	<!-- Designate Faculty Team Modal -->
 	<div class="modal fade" id="facultyTeamModal" tabindex="-1" role="dialog"

src/contestadmin/views.py

@@ -259,7 +259,7 @@ def dashboard(request):
         channel_form = forms.ClearChannelForm(request.POST)
         update_password_form = forms.UpdatePasswordForm(request.POST)
         profile_role_form = forms.UpdateProfileRoleForm(request.POST)
-        activate_account_form = forms.ActivateAccountForm(request.POST)
+        account_status_form = forms.AccountStatusForm(request.POST)
         faculty_team_form = forms.DesignateFacultyTeamForm(request.POST)
 
         # Process walk-in team creation form
@@ -311,21 +311,35 @@ def dashboard(request):
             else:
                 messages.success(request, 'Updated user role.',
                                  fail_silently=True)
-        # Process admin account activation form
-        elif activate_account_form.is_valid():
+        # Process account status update form
+        elif account_status_form.is_valid():
             try:
                 account = User.objects.get(
-                    username=activate_account_form.cleaned_data['username'])
-                # Activate account
-                account.is_active = True
-                account.profile.email_confirmed = True
-                account.save()
+                    username=account_status_form.cleaned_data['username'])
             except:
                 messages.error(
-                    request, 'Account activation failed.', fail_silently=True)
+                    request, 'Unable to locate username in database.', fail_silently=True)
             else:
-                messages.success(
-                    request, 'Activated user account.', fail_silently=True)
+                if account_status_form.cleaned_data['status'] == '0':
+                    # Activate account
+                    account.is_active = True
+                    account.profile.email_confirmed = True
+                elif account_status_form.cleaned_data['status'] == '1':
+                    # Deactivate account
+                    account.is_active = False
+                
+                try:
+                    account.save()
+                except:
+                    messages.error(
+                        request, 'Account status update failed.', fail_silently=True)
+                else:
+                    if account_status_form.cleaned_data['status'] == '0':
+                        messages.success(
+                            request, 'Activated user account.', fail_silently=True)
+                    elif account_status_form.cleaned_data['status'] == '1':
+                        messages.success(
+                            request, 'Deactivated user account.', fail_silently=True)   
         # Process faculty team designation form
         elif faculty_team_form.is_valid():
             try:
@@ -372,7 +386,7 @@ def dashboard(request):
         channel_form = forms.ClearChannelForm()
         update_password_form = forms.UpdatePasswordForm()
         profile_role_form = forms.UpdateProfileRoleForm()
-        activate_account_form = forms.ActivateAccountForm()
+        account_status_form = forms.AccountStatusForm()
         faculty_team_form = forms.DesignateFacultyTeamForm()
 
 
@@ -407,7 +421,7 @@ def dashboard(request):
     context['channel_form'] = channel_form
     context['update_password_form'] = update_password_form
     context['profile_role_form'] = profile_role_form
-    context['activate_account_form'] = activate_account_form
+    context['account_status_form'] = account_status_form
     context["faculty_team_form"] = faculty_team_form
 
     return render(request, 'contestadmin/dashboard.html', context)