Allowing judges to enroll either as judge or participant but not both (…

…#187)
Code-Institute-Community · Jun 3, 2021 · 6de9dcf · 6de9dcf
1 parent e12425a
commit 6de9dcf
Show file tree

Hide file tree

Showing 3 changed files with 47 additions and 26 deletions.
diff --git a/hackathon/templates/hackathon/includes/enrollpart.html b/hackathon/templates/hackathon/includes/enrollpart.html
@@ -4,7 +4,7 @@
 <form id="enroll-form" action="{% url 'hackathon:enroll_toggle' %}" method="POST">
     {% csrf_token %}
     <!--It only sends the hackathon ID.-->
-    <input type="hidden" name="hackathon-id" value="{{ hackathon.id }}" />
+    <input type="hidden" name="hackathon-id" value="{{ hackathon.id }}">
     <!-- Must be one long string for the JS script to switch words correctly.
     An alternative would be to have two different buttons.-->
     <button id="enroll-part" type="submit" 
@@ -21,7 +21,7 @@
     {% if request.user in hackathon.participants.all %}
     <form id="enroll-form" action="{% url 'hackathon:enroll_toggle' %}" method="POST">
         {% csrf_token %}
-        <input type="hidden" name="hackathon-id" value="{{ hackathon.id }}" />
+        <input type="hidden" name="hackathon-id" value="{{ hackathon.id }}">
         <button id="enroll-part" type="submit" class="btn btn-ci mt-4 mb-2 form-control">
             Withdraw from the Hackaton
         </button>

diff --git a/hackathon/templates/hackathon/includes/enrollstaff.html b/hackathon/templates/hackathon/includes/enrollstaff.html
@@ -1,9 +1,8 @@
+{% if request.user not in hackathon.participants.all %}
 <form id="enroll-form" action="{% url 'hackathon:enroll_toggle' %}" method="POST">
     {% csrf_token %}
-    <!--It only sends the hackathon ID.-->
+    <input type="hidden" name="enrollment-type" value="judge" />
     <input type="hidden" name="hackathon-id" value="{{ hackathon.id }}" />
-    <!-- Must be one long string for the JS script to switch words correctly.
-    An alternative would be to have two different buttons.-->
     <button id="enroll-judge" type="submit" class="dropdown-item" 
         {% if hackathon.status == 'finished' or hackathon.status == 'deleted' %}
             disabled
@@ -16,3 +15,22 @@
         {% endif %}
     </button>
 </form>
+{% endif %}
+{% if request.user not in hackathon.judges.all %}
+<form id="enroll-form" action="{% url 'hackathon:enroll_toggle' %}" method="POST">
+    {% csrf_token %}
+    <input type="hidden" name="hackathon-id" value="{{ hackathon.id }}" />
+    <button id="enroll-judge" type="submit" class="dropdown-item" 
+        {% if hackathon.status == 'finished' or hackathon.status == 'deleted' %}
+            disabled
+        {% endif %}
+    >
+        {% if user in hackathon.participants.all %}
+            Withdraw as Participant
+        {% else %}
+            Enroll as Participant
+        {% endif %}
+    </button>
+</form>
+{% endif %}
+
diff --git a/hackathon/views.py b/hackathon/views.py
@@ -398,29 +398,32 @@ def delete_hackathon(request, hackathon_id):
 
 @login_required
 def enroll_toggle(request):
-    user = request.user
-    data = {}
     if request.method == "POST":
-        # Gets the PK of the Hackathon and then the related Hackathon
-        hackathon_id = request.POST.get("hackathon-id")
-        hackathon = Hackathon.objects.get(pk=hackathon_id)
-        if user.user_type == UserType.STAFF:
-            if user in hackathon.judges.all():
-                hackathon.judges.remove(user)
-                messages.success(request, "You have withdrawn from judging.")
-            else:
-                hackathon.judges.add(user)
-                messages.success(request, "You have enrolled as a judge.")
+        judge_user_types = [
+            UserType.SUPERUSER, UserType.STAFF, UserType.FACILITATOR_ADMIN,
+            UserType.FACILITATOR_JUDGE, UserType.PARTNER_ADMIN,
+            UserType.PARTNER_JUDGE,
+        ]
+        hackathon = get_object_or_404(Hackathon,
+                                      id=request.POST.get("hackathon-id"))
+        if request.user in hackathon.judges.all():
+            hackathon.judges.remove(request.user)
+            messages.success(request, "You have withdrawn from judging.")
+        elif request.user in hackathon.participants.all():
+            hackathon.participants.remove(request.user)
+            messages.success(request,
+                             "You have withdrawn from this Hackaton.")
+        elif (request.POST.get('enrollment-type') == 'judge'
+                and request.user.user_type in judge_user_types):
+            hackathon.judges.add(request.user)
+            messages.success(request, "You have enrolled as a judge.")
         else:
-            if user in hackathon.participants.all():
-                hackathon.participants.remove(user)
-                messages.success(request,
-                                 "You have withdrawn from this Hackaton.")
-            else:
-                hackathon.participants.add(user)
-                messages.success(request, "You have enrolled successfully.")
-        return redirect(reverse('hackathon:view_hackathon',
-                                kwargs={'hackathon_id': hackathon_id}))
+            hackathon.participants.add(request.user)
+            messages.success(request, "You have enrolled successfully.")
+
+        return redirect(reverse(
+            'hackathon:view_hackathon',
+            kwargs={'hackathon_id': request.POST.get("hackathon-id")}))
     else:
         return HttpResponse(status=403)