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

Colorize all guesses if points are awarded
All checks were successful
Build Formula10 Docker Image / build-docker (push) Successful in 37s
Details

Browse Source
This commit is contained in:
Christoph Urlacher
2024-02-19 23:44:14 +01:00
parent 7f82797066
commit 455637ca46
4 changed files with 22 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
model.py
View File

@ -210,9 +210,8 @@ class RaceResult(db.Model):
return self._excluded_drivers return self._excluded_drivers
@property def pxx(self, offset: int = 0) -> Driver:
def pxx(self) -> Driver: pxx_num: str = str(self.race.pxx + offset)
pxx_num: str = str(self.race.pxx)
if pxx_num not in self.pxx_drivers: if pxx_num not in self.pxx_drivers:
raise Exception(f"Error: Position {self.race.pxx} not contained in race result") raise Exception(f"Error: Position {self.race.pxx} not contained in race result")

8
static_data/races.csv
View File

@ -1,5 +1,5 @@
name,number,date,pxx name,number,date,pxx
Bahrain,1,2023-03-05,3 Bahrain,1,2023-03-05,4
Saudi Arabia,2,2023-03-19,17 Saudi Arabia,2,2023-03-19,17
Melbourne,3,2023-04-02,5 Melbourne,3,2023-04-02,5
Baku,4,2023-04-30,6 Baku,4,2023-04-30,6
@ -9,14 +9,14 @@ Monaco,7,2023-05-28,9
Barcelona,8,2023-06-04,13 Barcelona,8,2023-06-04,13
Montreal,9,2023-06-18,11 Montreal,9,2023-06-18,11
Spielberg,10,2023-07-02,12 Spielberg,10,2023-07-02,12
Silverstone,11,2023-07-09,18 Silverstone,11,2023-07-09,17
Budapest,12,2023-07-23,12 Budapest,12,2023-07-23,12
Spa,13,2023-07-30,13 Spa,13,2023-07-30,13
Zandvoort,14,2023-08-27,3 Zandvoort,14,2023-08-27,4
Monza,15,2023-09-03,6 Monza,15,2023-09-03,6
Singapore,16,2023-09-17,10 Singapore,16,2023-09-17,10
Suzuka,17,2023-09-24,11 Suzuka,17,2023-09-24,11
Qatar,18,2023-10-08,3 Qatar,18,2023-10-08,4
Austin,19,2023-10-22,11 Austin,19,2023-10-22,11
Mexico,20,2023-10-29,17 Mexico,20,2023-10-29,17
Brazil,21,2023-11-05,14 Brazil,21,2023-11-05,14

1 name number date pxx
2 Bahrain 1 2023-03-05 3 4
3 Saudi Arabia 2 2023-03-19 17
4 Melbourne 3 2023-04-02 5
5 Baku 4 2023-04-30 6
9 Barcelona 8 2023-06-04 13
10 Montreal 9 2023-06-18 11
11 Spielberg 10 2023-07-02 12
12 Silverstone 11 2023-07-09 18 17
13 Budapest 12 2023-07-23 12
14 Spa 13 2023-07-30 13
15 Zandvoort 14 2023-08-27 3 4
16 Monza 15 2023-09-03 6
17 Singapore 16 2023-09-17 10
18 Suzuka 17 2023-09-24 11
19 Qatar 18 2023-10-08 3 4
20 Austin 19 2023-10-22 11
21 Mexico 20 2023-10-29 17
22 Brazil 21 2023-11-05 14

10
templates/base.jinja
View File

@ -96,6 +96,16 @@
{% if active_page == page %}</u>{% endif %}</a> {% if active_page == page %}</u>{% endif %}</a>
{% endmacro %} {% endmacro %}
{% macro pxx_guess_colorization(driver_abbr='', result=none) %}
{% if driver_abbr == result.pxx(0).abbr %}text-success fw-bold{% endif %}
{% if driver_abbr == result.pxx(1).abbr %}text-warning fw-bold{% endif %}
{% if driver_abbr == result.pxx(2).abbr %}text-danger fw-bold{% endif %}
{% if driver_abbr == result.pxx(3).abbr %}fw-bold{% endif %}
{% if driver_abbr == result.pxx(-1).abbr %}text-warning fw-bold{% endif %}
{% if driver_abbr == result.pxx(-2).abbr %}text-danger fw-bold{% endif %}
{% if driver_abbr == result.pxx(-3).abbr %}fw-bold{% endif %}
{% endmacro %}
<head> <head>
<meta charset="UTF-8"> <meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0"> <meta name="viewport" content="width=device-width, initial-scale=1.0">

10
templates/race.jinja
View File

@ -70,7 +70,8 @@
<tr class="table-danger"> <tr class="table-danger">
<td class="text-nowrap"> <td class="text-nowrap">
<span class="fw-bold">{{ current_race.number }}:</span> <a href="/result" class="link-dark">{{ current_race.name }}</a><br> <span class="fw-bold">{{ current_race.number }}:</span> <a href="/result"
class="link-dark">{{ current_race.name }}</a><br>
<small><span class="fw-bold">Guess:</span> P{{ current_race.pxx }}</small> <small><span class="fw-bold">Guess:</span> P{{ current_race.pxx }}</small>
</td> </td>
@ -127,7 +128,8 @@
{% for past_result in model.all_race_results() %} {% for past_result in model.all_race_results() %}
<tr> <tr>
<td class="text-nowrap"> <td class="text-nowrap">
<span class="fw-bold">{{ past_result.race.number }}:</span> <a href="/result/{{ past_result.race.name }}" class="link-dark">{{ past_result.race.name }}</a><br> <span class="fw-bold">{{ past_result.race.number }}:</span> <a
href="/result/{{ past_result.race.name }}" class="link-dark">{{ past_result.race.name }}</a><br>
<small><span class="fw-bold">Guessed:</span> P{{ past_result.race.pxx }}</small> <small><span class="fw-bold">Guessed:</span> P{{ past_result.race.pxx }}</small>
</td> </td>
@ -142,7 +144,7 @@
{% if user_guess is not none %} {% if user_guess is not none %}
<ul class="list-group list-group-flush"> <ul class="list-group list-group-flush">
<li class="list-group-item {% if user_guess.pxx.abbr == past_result.pxx.abbr %}text-success fw-bold{% endif %}"> <li class="list-group-item {{ pxx_guess_colorization(user_guess.pxx.abbr, past_result) }}">
P{{ past_result.race.pxx }}: {{ user_guess.pxx.abbr }}</li> P{{ past_result.race.pxx }}: {{ user_guess.pxx.abbr }}</li>
<li class="list-group-item {% if user_guess.dnf.abbr == past_result.dnf.abbr %}text-success fw-bold{% endif %}"> <li class="list-group-item {% if user_guess.dnf.abbr == past_result.dnf.abbr %}text-success fw-bold{% endif %}">
DNF: {{ user_guess.dnf.abbr }}</li> DNF: {{ user_guess.dnf.abbr }}</li>
@ -155,7 +157,7 @@
<td class="text-center text-nowrap"> <td class="text-center text-nowrap">
<ul class="list-group list-group-flush"> <ul class="list-group list-group-flush">
<li class="list-group-item">P{{ past_result.race.pxx }}: {{ past_result.pxx.abbr }}</li> <li class="list-group-item">P{{ past_result.race.pxx }}: {{ past_result.pxx().abbr }}</li>
<li class="list-group-item {% if past_result.dnf.abbr == 'NON' %}text-muted{% endif %}"> <li class="list-group-item {% if past_result.dnf.abbr == 'NON' %}text-muted{% endif %}">
DNF: {{ past_result.dnf.abbr }}</li> DNF: {{ past_result.dnf.abbr }}</li>
</ul> </ul>