#A05. As Admin, I would like to manually trigger an event that divides teams/judges evenly. (#124)

Author: stefdworschak

accounts/lists.py

@@ -17,15 +17,17 @@
     ('', 'Select Learning Stage'),
     ('programme_preliminaries', 'Programme Preliminaries'),
     ('programming_paradigms', 'Programming Paradigms'),
-    ('html_fundamentals', 'HTML Fundamentals'),
-    ('css_fundamentals', 'CSS Fundamentals'),
+    ('html_essentials', 'HTML Essentials'),
+    ('css_essentials', 'CSS Essentials'),
     ('user_centric_frontend_development', 'User Centric Frontend Development'),
-    ('javascript_fundamentals', 'Javascript Fundamentals'),
+    ('comparative_programming_languages_essentials', 'Comparative Programming Languages Essentials'),
+    ('javascript_essentials', 'Javascript Essentials'),
     ('interactive_frontend_development', 'Interactive Frontend Development'),
-    ('python_fundamentals', 'Python Fundamentals'),
+    ('python_essentials', 'Python essentials'),
     ('practical_python', 'Practical Python'),
     ('data_centric_development', 'Data Centric Development'),
-    ('full_stack_frameworks with django', 'Full Stack Frameworks with Django'),
+    ('backend_development','Backend Development'),
+    ('full_stack_frameworks_with_django', 'Full Stack Frameworks with Django'),
     ('alumni', 'Alumni'),
     ('staff', 'Staff'),
 )

accounts/models.py

@@ -2,6 +2,7 @@
 from django.contrib.auth.models import AbstractUser
 
 from .lists import USER_TYPES_CHOICES, LMS_MODULES_CHOICES
+from teams.lists import LMS_LEVELS
 
 
 class Organisation(models.Model):
@@ -44,13 +45,20 @@ class CustomUser(AbstractUser):
         default=Organisation.DEFAULT_PK
     )
 
+    class Meta:
+        verbose_name = 'User'
+        verbose_name_plural = 'Users'
+
     def __str__(self):
         """  Return Class object to string via the user email value  """
         return self.username
 
     def human_readable_current_lms_module(self):
         return self.current_lms_module.replace('_', ' ')
 
-    class Meta:
-        verbose_name = 'User'
-        verbose_name_plural = 'Users'
+    def to_team_member(self):
+        return {
+            'userid': self.id,
+            'name': self.username,
+            'level': LMS_LEVELS[self.current_lms_module]
+        }

hackathon/models.py

@@ -67,7 +67,6 @@ class Hackathon(models.Model):
         default='not_yet_started',
         choices=JUDGING_STATUS_CHOICES
     )
-    
 
     def __str__(self):
         return self.display_name
@@ -132,6 +131,11 @@ class HackTeam(models.Model):
 
     def __str__(self):
         return self.display_name
+    
+    class Meta:
+        verbose_name = 'Hack Team'
+        verbose_name_plural = 'Hack Teams'
+        unique_together = ['display_name', 'hackathon']
 
 
 class HackProject(models.Model):

hackathon/urls.py

@@ -10,11 +10,13 @@
     check_projects_scores,
     view_hackathon
 )
+from teams.views import change_teams
 
 urlpatterns = [
     path('', HackathonListView.as_view(), name="hackathon-list"),
     path("<int:hack_id>/team/<int:team_id>/judging/", judging, name="judging"),
     path("<int:hack_id>/final_score", check_projects_scores, name="final_score"),
+    path("<int:hackathon_id>/change_teams/", change_teams, name="change_teams"),
     path("create_hackathon", create_hackathon, name='create_hackathon'),
     path("<int:hackathon_id>/", view_hackathon,
          name='view_hackathon'),
@@ -24,4 +26,3 @@
          name="delete_hackathon"),
     path('enroll/', enroll_toggle, name='enroll_toggle'),
 ]
-

hackathon/views.py

@@ -182,7 +182,7 @@ def create_hackathon(request):
             form.save()
             messages.success(
                 request, 'Thanks for submitting a new Hackathon event!')
-        return redirect("hackathon:hackathon-list-scores")
+        return redirect("hackathon:hackathon-list")
 
 
 @login_required

main/settings.py

@@ -36,6 +36,7 @@
     "profiles",
     "resources",
     "submissions",
+    "teams",
 ]
 
 MIDDLEWARE = [

main/urls.py

@@ -11,4 +11,5 @@
     path("hackathon/", include(("hackathon.urls", "hackathon"),
                                namespace='hackathon')),
     path("submission/", include("submissions.urls")),
+    path("teams/", include("teams.urls")),
 ]

requirements.txt

@@ -2,7 +2,7 @@ asgiref==3.2.10
 certifi==2020.6.20
 chardet==3.0.4
 defusedxml==0.6.0
-Django==3.1.1
+Django==3.1.3
 django-allauth==0.42.0
 django-crispy-forms==1.9.2
 dj-database-url==0.5.0

static/css/style.css

@@ -329,6 +329,19 @@ h1.table_titles{
     margin: 0.8rem 0 0;
 }
 
+/* Distribute teams page */
+ol.team-drop-area {
+    min-height: 50px;
+}
+
+form.distribute-teams-form, form.clear-teams-form {
+    display: inline-block;
+}
+
+.team-score-container {
+    float:right
+}
+
 .hackathon-sub-details::after {
     content: '';
     display: block;

static/js/teams.js

@@ -0,0 +1,105 @@
+/*  */
+let teams = JSON.parse(document.getElementById('_teams').textContent);
+let leftover_participants = JSON.parse(document.getElementById('_leftover_participants').textContent);
+
+addNewTeam();
+distributeTeams();
+
+function allowDrop(ev) {
+    ev.preventDefault();
+  }
+  
+function drag(ev) {
+    ev.dataTransfer.setData('text', ev.target.id);
+}
+
+function drop(ev) {
+    /* Drop event which triggers functions to update the team score and the
+    team object used to create or edit the teams */
+    let targetElement;
+    ev.preventDefault();
+    let data = ev.dataTransfer.getData('text');
+    let movingElement = document.getElementById(data);
+    let movingElementParent = movingElement.parentElement;
+    if(ev.target.nodeName == 'LI') {
+        targetElement = ev.target.parentElement.id;
+        ev.target.parentElement.appendChild(movingElement);
+    } else {
+        targetElement = ev.target.id;
+        ev.target.appendChild(movingElement);
+    }
+
+    changeTeamData(movingElement, movingElementParent.id, targetElement);
+    changeTeamScores(movingElement, movingElementParent.id, targetElement);
+}
+
+function changeTeamScores(movedElement, movedElementParentId, targetElementId){
+    /* Deducts the participant's experience level from the 
+    the overall score for the team the participant was previously part of
+    and adds it to the new team's score */
+    let movedLevel = parseInt(movedElement.dataset.level);
+    if (targetElementId != 'leftover_participants'){
+        let teamScoreSpan = document.getElementById(targetElementId +'_score');
+        teamScoreSpan.innerText = parseInt(teamScoreSpan.innerText) + movedLevel;
+    }
+
+    if(movedElementParentId.includes('team')) {
+        let removeScoreSpan = document.getElementById(movedElementParentId +'_score');
+        removeScoreSpan.innerText = parseInt(removeScoreSpan.innerText) - movedLevel;
+    }
+}
+
+function changeTeamData(movedElement, movedElementParentId, targetElementId){
+    /* Removes the participant from the team the participant was previously 
+    part of and adds it to the new team in the team data object which is used
+    to create or edit the teams */
+    let team = movedElementParentId.includes('team')
+                ? teams[movedElementParentId]
+                : leftover_participants;
+    let targetTeam = targetElementId.includes('team')
+                    ? teams[targetElementId]
+                    : leftover_participants;
+    let userid = movedElement.dataset.userid;
+    let user = team.filter(x => x.userid == userid)[0];
+    targetTeam.push(user)
+
+    if(movedElementParentId.includes('team')){
+        teams[movedElementParentId] = teams[movedElementParentId]
+                                        .filter(x => x.userid != userid);
+    } else {
+        leftover_participants = leftover_participants
+                                    .filter(x => x.userid != userid);
+    }
+    $('input[name="teams"]').val(JSON.stringify(teams));
+}
+
+function addNewTeam(){
+    $('.add-team').click(function(){
+        let numTeams = $('.team').length;
+        let teamName = `team_${numTeams+1}`;
+        let teamDisplayName = `Team ${numTeams+1}`;
+        let teamTemplate = `<section class="card shadow mb-3 mt-3">
+        <div class="card-body">
+            <h5 class="p-orange card-title">${teamDisplayName}
+            <span style="float:right">Team Score: <span id="${teamName}_score">0</span>
+            </span></h5>
+            <ol class="team team-drop-area" id="${teamName}"
+                ondrop="drop(event)" ondragover="allowDrop(event)"></ol>
+        </div>
+    </section>`;
+        $('#team-list').append($(teamTemplate));
+        teams[teamName] = [];
+    });
+}
+
+function distributeTeams(){
+    $('.distribute-teams-form').on('submit', function(event){
+        if(leftover_participants.length > 0) {
+            let confirm_msg = 'Some participants have not been assigned to a team. Do you still want to proceed?';
+            let confirmation = window.confirmconfirm_msg(confirm_msg);
+            if(!confirmation){
+                event.preventDefault();
+            }
+        }
+    });
+}