christoph/flask-formula10
1
Fork 0
Code Issues 14 Actions Packages Activity

Reverse race order

Browse Source
This commit is contained in:
Christoph Urlacher
2024-02-14 19:30:47 +01:00
parent 150a185439
commit 46214514c8
2 changed files with 34 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
formula10.py
View File

@ -31,7 +31,7 @@ def save():
@app.route("/race") @app.route("/race")
def guessraceresults(): def guessraceresults():
users = User.query.all() users = User.query.all()
raceresults = RaceResult.query.all() raceresults = RaceResult.query.all()[::-1]
drivers = Driver.query.all() drivers = Driver.query.all()
guesses = dict() # The guesses for which raceresults exist guesses = dict() # The guesses for which raceresults exist
@ -45,7 +45,7 @@ def guessraceresults():
nextguesses[guess.user_id] = guess nextguesses[guess.user_id] = guess
# TODO: Getting by ID might be stupid, get by date instead? # TODO: Getting by ID might be stupid, get by date instead?
nextid = raceresults[-1].race_id + 1 if len(raceresults) > 0 else 1 nextid = raceresults[0].race_id + 1 if len(raceresults) > 0 else 1
nextrace = Race.query.filter_by(id=nextid).first() nextrace = Race.query.filter_by(id=nextid).first()
return render_template("race.jinja", return render_template("race.jinja",

64
templates/race.jinja
View File

@ -28,41 +28,10 @@
<td>&nbsp;</td> <td>&nbsp;</td>
</tr> </tr>
{# Race Results #}
{% for raceresult in raceresults %}
<tr>
<td>{{ raceresult.race.grandprix }}</td>
{% for user in users %}
<td>
{% if (raceresult.race_id in guesses) and (user.name in guesses.get(raceresult.race_id)) %}
{% set pxx = guesses.get(raceresult.race_id).get(user.name).pxx.abbr %}
{% set dnf = guesses.get(raceresult.race_id).get(user.name).dnf.abbr %}
<ul class="list-group list-group-flush">
<li class="list-group-item {% if pxx == raceresult.pxx.abbr %}text-success fw-bold{% endif %}">
P{{ raceresult.race.pxx }}: {{ pxx }}</li>
<li class="list-group-item {% if dnf == raceresult.dnf.abbr %}text-success fw-bold{% endif %}">
DNF: {{ dnf }}</li>
</ul>
{% endif %}
</td>
{% endfor %}
<td>
<ul class="list-group list-group-flush">
<li class="list-group-item">P{{ raceresult.race.pxx }}: {{ raceresult.pxx.abbr }}</li>
<li class="list-group-item {% if raceresult.dnf.abbr == 'NON' %}text-muted{% endif %}">
DNF: {{ raceresult.dnf.abbr }}</li>
</ul>
</td>
</tr>
{% endfor %}
{# Next Race Guess #} {# Next Race Guess #}
{% if nextrace is not none %} {% if nextrace is not none %}
<tr> <tr>
<td>{{ nextrace.grandprix }}</td> <td><span class="fw-bold">{{ nextrace.id }}:</span> {{ nextrace.grandprix }}</td>
{% for user in users %} {% for user in users %}
<td> <td>
@ -143,6 +112,37 @@
</form> </form>
</td> </td>
</tr> </tr>
{# Race Results #}
{% for raceresult in raceresults %}
<tr>
<td><span class="fw-bold">{{ raceresult.race.id }}:</span> {{ raceresult.race.grandprix }}</td>
{% for user in users %}
<td>
{% if (raceresult.race_id in guesses) and (user.name in guesses.get(raceresult.race_id)) %}
{% set pxx = guesses.get(raceresult.race_id).get(user.name).pxx.abbr %}
{% set dnf = guesses.get(raceresult.race_id).get(user.name).dnf.abbr %}
<ul class="list-group list-group-flush">
<li class="list-group-item {% if pxx == raceresult.pxx.abbr %}text-success fw-bold{% endif %}">
P{{ raceresult.race.pxx }}: {{ pxx }}</li>
<li class="list-group-item {% if dnf == raceresult.dnf.abbr %}text-success fw-bold{% endif %}">
DNF: {{ dnf }}</li>
</ul>
{% endif %}
</td>
{% endfor %}
<td>
<ul class="list-group list-group-flush">
<li class="list-group-item">P{{ raceresult.race.pxx }}: {{ raceresult.pxx.abbr }}</li>
<li class="list-group-item {% if raceresult.dnf.abbr == 'NON' %}text-muted{% endif %}">
DNF: {{ raceresult.dnf.abbr }}</li>
</ul>
</td>
</tr>
{% endfor %}
{% endif %} {% endif %}
</tbody> </tbody>