Merge pull request #12 from FSU-ACM/release

Contest winners display

Author: mmcinnestaylor

README.md

@@ -100,3 +100,4 @@ We welcome contributions to the project! Check out `CONTRIBUTING.md` to learn ho
 
 - [Marlan McInnes-Taylor](https://github.com/mmcinnestaylor) *Creator*
 - [Daniel Riley](https://github.com/danielmriley)
+- [Preston Horne](https://github.com/prestonmhorne)

src/contestadmin/models.py

@@ -71,3 +71,11 @@ def get_participation(self):
             return self.FORMAT[self.participation - 1][1]
         else:
             return 'TBA'
+        
+
+    def is_contest_complete(self):
+        """
+        Returns true if contest is complete, false otherwise
+        """
+        
+        return self.results is not None

src/core/templates/core/teams.html

@@ -37,8 +37,19 @@ <h2>Upper Division</h2>
 						{% for team in upper_teams %}
 						<tr>
 							<td>
-								<span class="d-block d-md-none ml-1">{{ team.name }}</span>
-								<span class="d-none d-md-block ml-3">{{ team.name }}</span>
+								{% 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>
@@ -99,8 +110,19 @@ <h2>Lower Division</h2>
 						{% for team in lower_teams %}
 						<tr>
 							<td>
-								<span class="d-block d-md-none ml-1">{{ team.name }}</span>
-								<span class="d-none d-md-block ml-3">{{ team.name }}</span>
+								{% 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>
@@ -161,8 +183,19 @@ <h2>Faculty</h2>
 						{% for team in faculty_teams %}
 						<tr>
 							<td>
-								<span class="d-block d-md-none ml-1">{{ team.name }}</span>
-								<span class="d-none d-md-block ml-3">{{ team.name }}</span>
+								{% 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>

src/core/views.py

@@ -97,6 +97,10 @@ def teams(request):
 
     context = {}
 
+    # Get contest object or set to None
+    context['contest'] = cache.get_or_set(
+        'contest_model', Contest.objects.first(), CACHE_TIMEOUT)
+
     teams_set = Team.objects.all()
     participants_set = Profile.objects.all()