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

Update templates (nav etc.)

Browse Source
This commit is contained in:
Christoph Urlacher
2024-02-14 14:38:48 +01:00
parent c56c94d794
commit dca8a833b8
2 changed files with 16 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
templates/base.jinja
View File

@ -29,11 +29,9 @@
</a> </a>
<div class="collapse navbar-collapse" id="navbarNavAltMarkup"> <div class="collapse navbar-collapse" id="navbarNavAltMarkup">
<div class="navbar-nav"> <div class="navbar-nav">
{{ nav_selector("raceguessresults", "Results for Races") }} {{ nav_selector("race", "Guess a Race") }}
{{ nav_selector("seasonguessresults", "Results for Season") }} {{ nav_selector("season", "Guess the Season") }}
{{ nav_selector("graphs", "Result Graphs") }} {{ nav_selector("graphs", "Result Graphs") }}
{{ nav_selector("raceguesses", "Guess a Race") }}
{{ nav_selector("seasonguesses", "Guess the Season") }}
{{ nav_selector("rules", "Rules") }} {{ nav_selector("rules", "Rules") }}
</div> </div>
</div> </div>

24
templates/raceguessresults.jinja → templates/race.jinja
View File

@ -9,14 +9,16 @@
<table class="table table-bordered"> <table class="table table-bordered">
<thead> <thead>
<tr> <tr>
<th scope="col" colspan="2" rowspan="3" class="text-center">Race</th> <th scope="col" rowspan="3" class="text-center">Race</th>
<th scope="col" colspan="{{ users | length * 2 }}" class="text-center">Call</th> <th scope="col" colspan="{{ users | length * 2 }}" class="text-center">Call</th>
<th scope="col" rowspan="2" colspan="2" class="text-center">Result</th> <th scope="col" rowspan="2" colspan="2" class="text-center">Result</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
{# Users List #}
<tr> <tr>
<td colspan="2">&nbsp;</td> <td>&nbsp;</td>
{% for user in users %} {% for user in users %}
<td colspan="2" class="text-center">{{ user.name }}</td> <td colspan="2" class="text-center">{{ user.name }}</td>
@ -24,8 +26,10 @@
<td colspan="2">&nbsp;</td> <td colspan="2">&nbsp;</td>
</tr> </tr>
{# P10/DNF Header #}
<tr> <tr>
<td colspan="2">&nbsp;</td> <td>&nbsp;</td>
{% for user in users %} {% for user in users %}
<td class="text-center">P10</td> <td class="text-center">P10</td>
@ -36,20 +40,20 @@
<td class="text-center">DNF</td> <td class="text-center">DNF</td>
</tr> </tr>
{# Race Results #}
{% for raceresult in raceresults %} {% for raceresult in raceresults %}
<tr> <tr>
<td>{{ raceresult.race.number }}</td>
<td>{{ raceresult.race.grandprix }}</td> <td>{{ raceresult.race.grandprix }}</td>
{% for user in users %} {% for user in users %}
{% set p10 = guesses.get(raceresult.race_id).get(user.name).p10.name %} {% set p10 = guesses.get(raceresult.race_id).get(user.name).p10.abbr %}
{% set dnf = guesses.get(raceresult.race_id).get(user.name).dnf.name %} {% set dnf = guesses.get(raceresult.race_id).get(user.name).dnf.abbr %}
<td class="{% if p10 == raceresult.p10.name %}text-success fw-bold{% endif %}">{{ p10 }}</td> <td class="{% if p10 == raceresult.p10.abbr %}text-success fw-bold{% endif %}">{{ p10 }}</td>
<td class="{% if dnf == raceresult.dnf.name %}text-success fw-bold{% endif %}">{{ dnf }}</td> <td class="{% if dnf == raceresult.dnf.abbr %}text-success fw-bold{% endif %}">{{ dnf }}</td>
{% endfor %} {% endfor %}
<td>{{ raceresult.p10.name }}</td> <td>{{ raceresult.p10.abbr }}</td>
<td class="{% if raceresult.dnf.name == 'NONE' %}text-muted{% endif %}">{{ raceresult.dnf.name }}</td> <td class="{% if raceresult.dnf.abbr == 'NON' %}text-muted{% endif %}">{{ raceresult.dnf.abbr }}</td>
</tr> </tr>
{% endfor %} {% endfor %}
</tbody> </tbody>