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

Fix race frontend issue with no users
All checks were successful
Build Formula10 Docker Image / build-docker (push) Successful in 21s
Details

Browse Source
This commit is contained in:
Christoph Urlacher
2024-02-26 16:28:08 +01:00
parent 3d27099bbb
commit 594653e3bf
2 changed files with 41 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
formula10/__init__.py
View File

@ -9,7 +9,7 @@ app.url_map.strict_slashes = False
db: SQLAlchemy = SQLAlchemy() db: SQLAlchemy = SQLAlchemy()
db.init_app(app) 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.race_controller # type: ignore
import formula10.controller.season_controller # type: ignore import formula10.controller.season_controller # type: ignore
import formula10.controller.admin_controller # type: ignore import formula10.controller.admin_controller # type: ignore

72
formula10/templates/race.jinja
View File

@ -52,24 +52,28 @@
<small><span class="fw-bold">Guess:</span> P{{ model.current_race.place_to_guess }}</small> <small><span class="fw-bold">Guess:</span> P{{ model.current_race.place_to_guess }}</small>
</td> </td>
{% for user in model.all_users() %} {% if model.all_users() | length > 0 %}
{% set user_guess = model.race_guesses_by(user_name=user.name, race_name=model.current_race.name) %} {% 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"> <td class="text-center text-nowrap">
{% 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" style="background-color: inherit;"> <li class="list-group-item" style="background-color: inherit;">
{{ user_guess.pxx_guess.abbr }} {{ user_guess.pxx_guess.abbr }}
</li> </li>
<li class="list-group-item" style="background-color: inherit;"> <li class="list-group-item" style="background-color: inherit;">
{{ user_guess.dnf_guess.abbr }} {{ user_guess.dnf_guess.abbr }}
</li> </li>
</ul> </ul>
{% else %} {% else %}
&nbsp; &nbsp;
{% endif %} {% endif %}
</td> </td>
{% endfor %} {% endfor %}
{% else %}
<td>&nbsp;</td>
{% endif %}
<td>&nbsp;</td> <td>&nbsp;</td>
</tr> </tr>
@ -116,30 +120,34 @@
<small><span class="fw-bold">Guessed:</span> P{{ past_result.race.place_to_guess }}</small> <small><span class="fw-bold">Guessed:</span> P{{ past_result.race.place_to_guess }}</small>
</td> </td>
{% for user in model.all_users_or_active_user() %} {% if model.all_users_or_active_user() | length > 0 %}
<td class="text-center text-nowrap"> {% for user in model.all_users_or_active_user() %}
{% set user_guess = model.race_guesses_by(user_name=user.name, race_name=past_result.race.name) %} <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 %} {% 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 {{ pxx_guess_colorization(guessed_driver=user_guess.pxx_guess, result=past_result) }}"> <li class="list-group-item {{ pxx_guess_colorization(guessed_driver=user_guess.pxx_guess, result=past_result) }}">
<span data-bs-toggle="tooltip" <span data-bs-toggle="tooltip"
title="{{ past_result.driver_standing_points_string(user_guess.pxx_guess) }}"> 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) }} {{ user_guess.pxx_guess.abbr ~ past_result.driver_standing_position_string(user_guess.pxx_guess) }}
</span> </span>
</li> </li>
<li class="list-group-item {{ dnf_guess_colorization(guessed_driver=user_guess.dnf_guess, result=past_result) }}"> <li class="list-group-item {{ dnf_guess_colorization(guessed_driver=user_guess.dnf_guess, result=past_result) }}">
<span data-bs-toggle="tooltip" <span data-bs-toggle="tooltip"
title="{{ past_result.driver_dnf_points_string(user_guess.dnf_guess) }}"> title="{{ past_result.driver_dnf_points_string(user_guess.dnf_guess) }}">
{{ user_guess.dnf_guess.abbr }} {{ user_guess.dnf_guess.abbr }}
</span> </span>
</li> </li>
</ul> </ul>
{% else %} {% else %}
&nbsp; &nbsp;
{% endif %} {% endif %}
</td> </td>
{% endfor %} {% endfor %}
{% else %}
<td>&nbsp;</td>
{% endif %}
{# Actual result #} {# Actual result #}
<td class="text-center text-nowrap"> <td class="text-center text-nowrap">