diff --git a/src/core/templates/core/index.html b/src/core/templates/core/index.html index 63f0bab..8b02009 100644 --- a/src/core/templates/core/index.html +++ b/src/core/templates/core/index.html @@ -266,25 +266,15 @@
{{ announcement.title }}
Registration
-
Upper Division
+
Student Division
-
Lower Division
- - {% if num_faculty_teams > 0 %}
Faculty Division
diff --git a/src/core/templates/core/teams.html b/src/core/templates/core/teams.html index d961bf5..b1059ff 100644 --- a/src/core/templates/core/teams.html +++ b/src/core/templates/core/teams.html @@ -13,15 +13,15 @@

Registered Teams

-

Upper Division

+

Teams

@@ -34,7 +34,7 @@

Upper Division

- {% for team in upper_teams %} + {% for team in student_teams %}
{% if forloop.counter == 1 and contest.is_contest_complete %} @@ -84,79 +84,6 @@

Upper Division

-
-
-

Lower Division

- - -
- - - - - - - - - - - {% for team in lower_teams %} - - - - - - - {% endfor %} - -
Team NameQuestions AnsweredScoreTeam Members
- {% if forloop.counter == 1 and contest.is_contest_complete %} - 🥇 {{ team.name }} - 🥇 {{ team.name }} - {% elif forloop.counter == 2 and contest.is_contest_complete %} - 🥈 {{ team.name }} - 🥈 {{ team.name }} - {% elif forloop.counter == 3 and contest.is_contest_complete %} - 🥉 {{ team.name }} - 🥉 {{ team.name }} - {% else %} - {{ team.name }} - {{ team.name }} - {% endif %} - {{ team.questions_answered }}{{ team.score }} - - {% with team.get_members|last as last %} - {% for member in team.get_members %} - {% if member == last %} - {{ member }} - {% else %} - {{ member }},  - {% endif %} - {% endfor %} - {% endwith %} - - - {% with team.get_members|last as last %} - {% for member in team.get_members %} - {% if member == last %} - {{ member }} - {% else %} - {{ member }},  - {% endif %} - {% endfor %} - {% endwith %} - -
-
-
-
{% if num_faculty_teams > 0 %}
diff --git a/src/core/views.py b/src/core/views.py index 8eef1ea..b63855c 100644 --- a/src/core/views.py +++ b/src/core/views.py @@ -56,19 +56,11 @@ def get_context_data(self, **kwargs): teams_set = Team.objects.all() participants_set = Profile.objects.all() - # Aggregate upper division team and participant info - upper_teams_set = teams_set.filter(division=1).filter( - faculty=False).exclude(num_members=0) - context['num_upper_teams'] = upper_teams_set.count() - context['num_upper_participants'] = participants_set.filter( - team__division=1).count() - - # Aggregate lower division team and participant info - lower_teams_set = teams_set.filter(division=2).filter( - faculty=False).exclude(num_members=0) - context['num_lower_teams'] = lower_teams_set.count() - context['num_lower_participants'] = participants_set.filter( - team__division=2).count() + # instead of sorting by a division, now we will sort by faculty=False + student_teams_set = teams_set.filter(faculty=False).exclude(num_members=0) + context['num_student_teams'] = student_teams_set.count() + context['num_student_participants'] = participants_set.filter( + team__faculty=False).count() # Aggregate faculty team and participant info faculty_teams_set = teams_set.filter(faculty=True).exclude(num_members=0) @@ -113,17 +105,11 @@ def get_context_data(self, **kwargs): teams_set = Team.objects.all() participants_set = Profile.objects.all() - # Aggregate upper division team and participant info - upper_teams_set = teams_set.filter(division=1).filter(faculty=False).exclude(num_members=0) - context['upper_teams'] = upper_teams_set.order_by('-questions_answered', 'score', 'last_submission', 'name') - context['num_upper_teams'] = upper_teams_set.count() - context['num_upper_participants'] = participants_set.filter(team__division=1).count() - - # Aggregate lower division team and participant info - lower_teams_set = teams_set.filter(division=2).filter(faculty=False).exclude(num_members=0) - context['lower_teams'] = lower_teams_set.order_by('-questions_answered', 'score', 'last_submission', 'name') - context['num_lower_teams'] = lower_teams_set.count() - context['num_lower_participants'] = participants_set.filter(team__division=2).count() + # Sort by faculty=False to get all student teams regardless of Div + student_teams_set = teams_set.filter(faculty=False).exclude(num_members=0) + context['student_teams'] = student_teams_set.order_by('-questions_answered', 'score', 'last_submission', 'name') + context['num_student_teams'] = student_teams_set.count() + context['num_student_participants'] = participants_set.filter(team__faculty=False).count() # Aggregate faculty team and participant info faculty_teams_set = teams_set.filter(faculty=True).exclude(num_members=0)