Skip to content

Leaderboard unify #69

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
hoangvu5 merged 3 commits into from
Mar 9, 2026
Merged

Leaderboard unify #69

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c837075
Change view to sort student teams by "faculty=False" for both Teams p…
the-sam-sepiol Mar 7, 2026
07b85dd
Propagated changes from views to html templates for index and teams
the-sam-sepiol Mar 7, 2026
ee62872
Fix participants label on Teams page
the-sam-sepiol Mar 9, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 5 additions & 15 deletions src/core/templates/core/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -266,25 +266,15 @@ <h5 class="card-title mb-0">{{ announcement.title }}</h5>
<i class="fa-regular fa-clipboard fa-fw"></i> Registration
</div>
<div class="card-body">
<h5>Upper Division</h5>
<h5>Student Division</h5>
<button type="button" class="btn btn-sm btn-primary mr-2 mb-3" disabled>
<i class="fa-solid fa-users fa-fw"></i> Teams <span class="badge badge-light">
{{ num_upper_teams }}</span>
<span class="sr-only">number of upper division teams</span>
{{ num_student_teams }}</span>
<span class="sr-only">number of student teams</span>
</button>
<button type="button" class="btn btn-sm btn-info mb-3" disabled>
<i class="fa-solid fa-user fa-fw"></i> Participants <span class="badge badge-light">{{ num_upper_participants }}</span>
<span class="sr-only">number of upper division participants</span>
</button>
<h5>Lower Division</h5>
<button type="button" class="btn btn-sm btn-primary mr-2 mb-3" disabled>
<i class="fa-solid fa-users fa-fw"></i> Teams <span class="badge badge-light">
{{ num_lower_teams }}</span>
<span class="sr-only">number of lower division teams</span>
</button>
<button type="button" class="btn btn-sm btn-info mb-3" disabled>
<i class="fa-solid fa-user fa-fw"></i> Participants <span class="badge badge-light">{{ num_lower_participants }}</span>
<span class="sr-only">number of lower division participants</span>
<i class="fa-solid fa-user fa-fw"></i> Participants <span class="badge badge-light">{{ num_student_participants }}</span>
<span class="sr-only">number of student participants</span>
</button>
{% if num_faculty_teams > 0 %}
<h5>Faculty Division</h5>
Expand Down
85 changes: 6 additions & 79 deletions src/core/templates/core/teams.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,15 @@
<h1 class="text-center">Registered Teams</h1>
<div class="row">
<div class="col">
<h2>Upper Division</h2>
<h2>Teams</h2>
<button type="button" class="btn btn-sm btn-primary mr-2" disabled>
<i class="fa-solid fa-users fa-fw"></i> Teams <span class="badge badge-light">
{{ num_upper_teams }}</span>
<span class="sr-only">number of upper division teams</span>
{{ num_student_teams }}</span>
<span class="sr-only">number of student teams</span>
</button>
<button type="button" class="btn btn-sm btn-info" disabled>
<i class="fa-solid fa-user fa-fw"></i> Participants <span class="badge badge-light">{{ num_upper_participants }}</span>
<span class="sr-only">number of upper division participants</span>
<i class="fa-solid fa-user fa-fw"></i> Participants <span class="badge badge-light">{{ num_student_participants }}</span>
<span class="sr-only">number of student participants</span>
</button>
<div class="table-responsive mt-2">
<table class="table table-sm table-striped shadow rounded">
Expand All @@ -34,7 +34,7 @@ <h2>Upper Division</h2>
</tr>
</thead>
<tbody class="bg-light">
{% for team in upper_teams %}
{% for team in student_teams %}
<tr>
<td>
{% if forloop.counter == 1 and contest.is_contest_complete %}
Expand Down Expand Up @@ -84,79 +84,6 @@ <h2>Upper Division</h2>
</div>
</div>
</div>
<div class="row">
<div class="col">
<h2>Lower Division</h2>
<button type="button" class="btn btn-sm btn-primary mr-2" disabled>
<i class="fa-solid fa-users fa-fw"></i> Teams <span class="badge badge-light">
{{ num_lower_teams }}</span>
<span class="sr-only">number of lower division teams</span>
</button>
<button type="button" class="btn btn-sm btn-info" disabled>
<i class="fa-solid fa-user fa-fw"></i> Participants <span class="badge badge-light">{{ num_lower_participants }}</span>
<span class="sr-only">number of lower division participants</span>
</button>
<div class="table-responsive mt-2">
<table class="table table-sm table-striped shadow ">
<thead class="thead-dark text-center">
<tr>
<th scope="col">Team Name</th>
<th scope="col">Questions Answered</th>
<th scope="col">Score</th>
<th scope="col">Team Members</th>
</tr>
</thead>
<tbody class="bg-light">
{% for team in lower_teams %}
<tr>
<td>
{% if forloop.counter == 1 and contest.is_contest_complete %}
<span class="d-block d-md-none ml-1">🥇&nbsp;{{ team.name }}</span>
<span class="d-none d-md-block ml-3">🥇&nbsp;{{ team.name }}</span>
{% elif forloop.counter == 2 and contest.is_contest_complete %}
<span class="d-block d-md-none ml-1">🥈&nbsp;{{ team.name }}</span>
<span class="d-none d-md-block ml-3">🥈&nbsp;{{ team.name }}</span>
{% elif forloop.counter == 3 and contest.is_contest_complete %}
<span class="d-block d-md-none ml-1">🥉&nbsp;{{ team.name }}</span>
<span class="d-none d-md-block ml-3">🥉&nbsp;{{ team.name }}</span>
{% else %}
<span class="d-block d-md-none ml-1">{{ team.name }}</span>
<span class="d-none d-md-block ml-3">{{ team.name }}</span>
{% endif %}
</td>
<td class="text-center">{{ team.questions_answered }}</td>
<td class="text-center">{{ team.score }}</td>
<td>
<span class="d-block d-md-none ml-2"><small>
{% with team.get_members|last as last %}
{% for member in team.get_members %}
{% if member == last %}
{{ member }}
{% else %}
{{ member }},&puncsp;
{% endif %}
{% endfor %}
{% endwith %}
</small></span>
<span class="d-none d-md-block ml-3"><small>
{% with team.get_members|last as last %}
{% for member in team.get_members %}
{% if member == last %}
{{ member }}
{% else %}
{{ member }},&puncsp;
{% endif %}
{% endfor %}
{% endwith %}
</small></span>
</td>
</tr>
{% endfor %}
</tbody>
</table>
</div>
</div>
</div>
{% if num_faculty_teams > 0 %}
<div class="row">
<div class="col">
Expand Down
34 changes: 10 additions & 24 deletions src/core/views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down
Loading