Compare commits
2 Commits
991a1a177e
...
594653e3bf
| Author | SHA1 | Date | |
|---|---|---|---|
| 594653e3bf | |||
| 3d27099bbb |
@ -1,24 +1,25 @@
|
||||
name,number,date,pxx
|
||||
Bahrain,1,2023-03-05,4
|
||||
Saudi Arabia,2,2023-03-19,17
|
||||
Melbourne,3,2023-04-02,5
|
||||
Baku,4,2023-04-30,6
|
||||
Miami,5,2023-05-07,15
|
||||
Imola,6,2023-05-21,8
|
||||
Monaco,7,2023-05-28,9
|
||||
Barcelona,8,2023-06-04,13
|
||||
Montreal,9,2023-06-18,11
|
||||
Spielberg,10,2023-07-02,12
|
||||
Silverstone,11,2023-07-09,17
|
||||
Budapest,12,2023-07-23,12
|
||||
Spa,13,2023-07-30,13
|
||||
Zandvoort,14,2023-08-27,4
|
||||
Monza,15,2023-09-03,6
|
||||
Singapore,16,2023-09-17,10
|
||||
Suzuka,17,2023-09-24,11
|
||||
Qatar,18,2023-10-08,4
|
||||
Austin,19,2023-10-22,11
|
||||
Mexico,20,2023-10-29,17
|
||||
Brazil,21,2023-11-05,14
|
||||
Las Vegas,22,2023-11-18,8
|
||||
Abu Dhabi,23,2023-11-26,5
|
||||
Bahrain,1,2024-03-02,4
|
||||
Saudi Arabia,2,2024-03-09,17
|
||||
Australia,3,2024-03-24,5
|
||||
Japan,4,2024-04-07,11
|
||||
China,5,2024-04-21,15
|
||||
Miami,6,2024-05-05,6
|
||||
Emilia-Romagna,7,2024-05-21,19
|
||||
Monaco,8,2024-05-26,9
|
||||
Canada,9,2023-06-09,11
|
||||
Spain,10,2024-06-23,13
|
||||
Austria,11,2024-06-30,12
|
||||
Great Britain,12,2024-07-07,17
|
||||
Hungary,12,2023-07-23,12
|
||||
Belgium,13,2024-07-28,13
|
||||
Netherlands,14,2024-08-25,4
|
||||
Monza,15,2024-09-01,6
|
||||
Azerbaijan,16,2024-09-15,10
|
||||
Singapore,17,2024-09-22,6
|
||||
Austin,18,2024-10-20,11
|
||||
Mexico,19,2024-10-27,17
|
||||
Brazil,20,2024-11-03,14
|
||||
Las Vegas,21,2024-11-23,8
|
||||
Qatar,22,2024-12-01,4
|
||||
Abu Dhabi,23,2024-12-08,5
|
||||
|
@ -9,7 +9,7 @@ app.url_map.strict_slashes = False
|
||||
db: SQLAlchemy = SQLAlchemy()
|
||||
db.init_app(app)
|
||||
|
||||
# NOTE: These imports are required to register the routes. They need to be after "app" is declared
|
||||
# NOTE: These imports are required to register the routes. They need to be imported after "app" is declared
|
||||
import formula10.controller.race_controller # type: ignore
|
||||
import formula10.controller.season_controller # type: ignore
|
||||
import formula10.controller.admin_controller # type: ignore
|
||||
|
||||
@ -52,24 +52,28 @@
|
||||
<small><span class="fw-bold">Guess:</span> P{{ model.current_race.place_to_guess }}</small>
|
||||
</td>
|
||||
|
||||
{% for user in model.all_users() %}
|
||||
{% set user_guess = model.race_guesses_by(user_name=user.name, race_name=model.current_race.name) %}
|
||||
{% if model.all_users() | length > 0 %}
|
||||
{% for user in model.all_users() %}
|
||||
{% set user_guess = model.race_guesses_by(user_name=user.name, race_name=model.current_race.name) %}
|
||||
|
||||
<td class="text-center text-nowrap">
|
||||
{% if user_guess is not none %}
|
||||
<ul class="list-group list-group-flush">
|
||||
<li class="list-group-item" style="background-color: inherit;">
|
||||
{{ user_guess.pxx_guess.abbr }}
|
||||
</li>
|
||||
<li class="list-group-item" style="background-color: inherit;">
|
||||
{{ user_guess.dnf_guess.abbr }}
|
||||
</li>
|
||||
</ul>
|
||||
{% else %}
|
||||
|
||||
{% endif %}
|
||||
</td>
|
||||
{% endfor %}
|
||||
<td class="text-center text-nowrap">
|
||||
{% if user_guess is not none %}
|
||||
<ul class="list-group list-group-flush">
|
||||
<li class="list-group-item" style="background-color: inherit;">
|
||||
{{ user_guess.pxx_guess.abbr }}
|
||||
</li>
|
||||
<li class="list-group-item" style="background-color: inherit;">
|
||||
{{ user_guess.dnf_guess.abbr }}
|
||||
</li>
|
||||
</ul>
|
||||
{% else %}
|
||||
|
||||
{% endif %}
|
||||
</td>
|
||||
{% endfor %}
|
||||
{% else %}
|
||||
<td> </td>
|
||||
{% endif %}
|
||||
|
||||
<td> </td>
|
||||
</tr>
|
||||
@ -116,30 +120,34 @@
|
||||
<small><span class="fw-bold">Guessed:</span> P{{ past_result.race.place_to_guess }}</small>
|
||||
</td>
|
||||
|
||||
{% for user in model.all_users_or_active_user() %}
|
||||
<td class="text-center text-nowrap">
|
||||
{% set user_guess = model.race_guesses_by(user_name=user.name, race_name=past_result.race.name) %}
|
||||
{% if model.all_users_or_active_user() | length > 0 %}
|
||||
{% for user in model.all_users_or_active_user() %}
|
||||
<td class="text-center text-nowrap">
|
||||
{% set user_guess = model.race_guesses_by(user_name=user.name, race_name=past_result.race.name) %}
|
||||
|
||||
{% if user_guess is not none %}
|
||||
<ul class="list-group list-group-flush">
|
||||
<li class="list-group-item {{ pxx_guess_colorization(guessed_driver=user_guess.pxx_guess, result=past_result) }}">
|
||||
{% if user_guess is not none %}
|
||||
<ul class="list-group list-group-flush">
|
||||
<li class="list-group-item {{ pxx_guess_colorization(guessed_driver=user_guess.pxx_guess, result=past_result) }}">
|
||||
<span data-bs-toggle="tooltip"
|
||||
title="{{ past_result.driver_standing_points_string(user_guess.pxx_guess) }}">
|
||||
{{ user_guess.pxx_guess.abbr ~ past_result.driver_standing_position_string(user_guess.pxx_guess) }}
|
||||
</span>
|
||||
</li>
|
||||
<li class="list-group-item {{ dnf_guess_colorization(guessed_driver=user_guess.dnf_guess, result=past_result) }}">
|
||||
</li>
|
||||
<li class="list-group-item {{ dnf_guess_colorization(guessed_driver=user_guess.dnf_guess, result=past_result) }}">
|
||||
<span data-bs-toggle="tooltip"
|
||||
title="{{ past_result.driver_dnf_points_string(user_guess.dnf_guess) }}">
|
||||
{{ user_guess.dnf_guess.abbr }}
|
||||
</span>
|
||||
</li>
|
||||
</ul>
|
||||
{% else %}
|
||||
|
||||
{% endif %}
|
||||
</td>
|
||||
{% endfor %}
|
||||
</li>
|
||||
</ul>
|
||||
{% else %}
|
||||
|
||||
{% endif %}
|
||||
</td>
|
||||
{% endfor %}
|
||||
{% else %}
|
||||
<td> </td>
|
||||
{% endif %}
|
||||
|
||||
{# Actual result #}
|
||||
<td class="text-center text-nowrap">
|
||||
|
||||
Reference in New Issue
Block a user