This commit is contained in:
2024-02-14 12:54:04 +01:00
parent ff9def9e4b
commit 1ce2142899
2 changed files with 46 additions and 42 deletions

View File

@ -16,22 +16,23 @@
<body>
<nav class="navbar navbar-expand-lg bg-body-tertiary">
<div class="container-fluid">
<a class="navbar-brand" href="/">
<img src="../static/image/f1_logo.svg" alt="Logo" width="120" height="30" class="d-inline-block align-text-top">
<nav class="navbar navbar-expand-lg bg-body-tertiary">
<div class="container-fluid">
<a class="navbar-brand" href="/">
<img src="../static/image/f1_logo.svg" alt="Logo" width="120" height="30"
class="d-inline-block align-text-top">
Formula <i>10</i>
</a>
<div class="collapse navbar-collapse" id="navbarNavAltMarkup">
</a>
<div class="collapse navbar-collapse" id="navbarNavAltMarkup">
<div class="navbar-nav">
{# <a class="nav-link {% if page == 'teams' %}active{% endif %}" href="/teams">Teams</a> #}
{# <a class="nav-link {% if page == 'drivers' %}active{% endif %}" href="/drivers">Drivers</a> #}
{# <a class="nav-link {% if page == 'teams' %}active{% endif %}" href="/teams">Teams</a> #}
{# <a class="nav-link {% if page == 'drivers' %}active{% endif %}" href="/drivers">Drivers</a> #}
</div>
</div>
</div>
</nav>
</div>
</nav>
{% block body %}{% endblock body %}
{% block body %}{% endblock body %}
</body>

View File

@ -2,51 +2,54 @@
{% block title %}Formula 10{% endblock title %}
{% block body %}
<table class="table table-bordered">
<thead>
<thead>
<tr>
<th scope="col" colspan="2" rowspan="3" class="text-center">Race</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" colspan="2" rowspan="3" class="text-center">Race</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>
</tr>
</thead>
<tbody>
</thead>
<tbody>
<tr>
<td colspan="2">&nbsp;</td>
<td colspan="2">&nbsp;</td>
{% for user in users %}
<td colspan="2" class="text-center">{{ user.name }}</td>
{% endfor %}
{% for user in users %}
<td colspan="2" class="text-center">{{ user.name }}</td>
{% endfor %}
<td colspan="2">&nbsp;</td>
<td colspan="2">&nbsp;</td>
</tr>
<tr>
<td colspan="2">&nbsp;</td>
<td colspan="2">&nbsp;</td>
{% for user in users %}
<td class="text-center">P10</td>
<td class="text-center">DNF</td>
{% endfor %}
{% for user in users %}
<td class="text-center">P10</td>
<td class="text-center">DNF</td>
{% endfor %}
<td class="text-center">P10</td>
<td class="text-center">DNF</td>
<td class="text-center">P10</td>
<td class="text-center">DNF</td>
</tr>
{% for raceresult in raceresults %}
<tr>
<td>{{ raceresult.race.number }}</td>
<td>{{ raceresult.race.grandprix.name }}</td>
<tr>
<td>{{ raceresult.race.number }}</td>
<td>{{ raceresult.race.grandprix.name }}</td>
{% for user in users %}
{% set p10 = guesses.get(raceresult.race_id).get(user.name).p10.name %}
{% set dnf = guesses.get(raceresult.race_id).get(user.name).dnf.name %}
<td class="{% if p10 == raceresult.p10.name %}text-success fw-bold{% endif %}">{{ p10 }}</td>
<td class="{% if dnf == raceresult.dnf.name %}text-success fw-bold{% endif %}">{{ dnf }}</td>
{% endfor %}
{% for user in users %}
{% set p10 = guesses.get(raceresult.race_id).get(user.name).p10.name %}
{% set dnf = guesses.get(raceresult.race_id).get(user.name).dnf.name %}
<td class="{% if p10 == raceresult.p10.name %}text-success fw-bold{% endif %}">{{ p10 }}</td>
<td class="{% if dnf == raceresult.dnf.name %}text-success fw-bold{% endif %}">{{ dnf }}</td>
{% endfor %}
<td>{{ raceresult.p10.name }}</td>
<td class="{% if raceresult.dnf.name == 'NONE' %}text-muted{% endif %}">{{ raceresult.dnf.name }}</td>
</tr>
<td>{{ raceresult.p10.name }}</td>
<td class="{% if raceresult.dnf.name == 'NONE' %}text-muted{% endif %}">{{ raceresult.dnf.name }}</td>
</tr>
{% endfor %}
</tbody>
</tbody>
</table>
{% endblock body %}