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

Date-lock race+season guesses + use errorpage more often
All checks were successful
Build Formula10 Docker Image / build-docker (push) Successful in 17s
Details

Browse Source
This commit is contained in:
Christoph Urlacher
2024-02-26 22:15:08 +01:00
parent 2a8c17633e
commit 97d67d49ce
7 changed files with 112 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
formula10/templates/base.jinja
View File

@ -189,7 +189,7 @@
<nav class="navbar fixed-top navbar-expand-lg bg-body-tertiary shadow-sm">
<div class="container-fluid">
<a class="navbar-brand" href="/race">
<a class="navbar-brand" href="/race/Everyone">
<img src="../static/image/f1_logo.svg" alt="Logo" width="120" height="30"
class="d-inline-block align-text-top">
Formula 10

6
formula10/templates/enter.jinja
View File

@ -51,8 +51,7 @@
{{ model.active_result_race_name_or_current_race_name() }}
</h5>
<form action="/result-enter/{{ model.active_result_race_name_or_current_race_name_sanitized() }}"
method="post">
<form action="/result-enter/{{ model.active_result_race_name_or_current_race_name_sanitized() }}" method="post">
<ul id="columns" class="list-group list-group-flush">
{% for driver in model.all_drivers_or_active_result_standing_drivers() %}
@ -90,7 +89,8 @@
</div>
{# Standing order #}
<input type="hidden" name="pxx-drivers" value="{{ driver.name }}"></li>
<input type="hidden" name="pxx-drivers" value="{{ driver.name }}">
</li>
{% endfor %}
</ul>

30
formula10/templates/race.jinja
View File

@ -50,7 +50,8 @@
<td class="text-nowrap">
<span class="fw-bold">{{ model.current_race.number }}:</span> {{ model.current_race.name }}<br>
<small><span class="fw-bold">Guess:</span> P{{ model.current_race.place_to_guess }}</small><br>
<small><span class="fw-bold">Date:</span> {{ model.current_race.date.strftime("%d.%m.%Y %H:%M") }}</small>
<small><span class="fw-bold">Date:</span> {{ model.current_race.date.strftime("%d.%m.%Y %H:%M") }}
</small>
</td>
{% if model.all_users() | length > 0 %}
@ -85,12 +86,21 @@
<tr class="table-danger">
<td class="text-nowrap">
<span class="fw-bold">{{ model.current_race.number }}:</span> {{ model.current_race.name }}<br>
<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><br>
<small><span class="fw-bold">Date:</span> {{ model.current_race.date.strftime("%d.%m.%Y %H:%M") }}
</td>
<td>
<form action="/race-guess/{{ model.current_race.name_sanitized }}/{{ model.active_user.name_sanitized }}"
method="post">
{% if model.race_guess_open(model.current_race) == true %}
{% set action_save_href = "/race-guess/" ~ model.current_race.name_sanitized ~ "/" ~ model.active_user.name_sanitized %}
{% set action_delete_href = "/race-guess-delete/" ~ model.current_race.name_sanitized ~ "/" ~ model.active_user.name_sanitized %}
{% else %}
{% set action_save_href = "" %}
{% set action_delete_href = "" %}
{% endif %}
{# Enter + Save guess #}
<form action="{{ action_save_href }}" method="post">
{% set user_guess = model.race_guesses_by(user_name=model.active_user.name, race_name=model.current_race.name) %}
{# Driver PXX Select #}
@ -101,11 +111,12 @@
{# Driver DNF Select #}
{{ driver_select_with_preselect(driver_match=user_guess.dnf_guess, name="dnfselect", label="DNF:", include_none=true) }}
<input type="submit" class="btn btn-danger mt-2 w-100" value="Save">
<input type="submit" class="btn btn-danger mt-2 w-100" value="Save" {% if model.race_guess_open(model.current_race) == false %}disabled="disabled"{% endif %}>
</form>
<form action="/race-guess-delete/{{ model.current_race.name_sanitized }}/{{ model.active_user.name_sanitized }}"
method="post">
<input type="submit" class="btn btn-dark mt-2 w-100" value="Delete">
{# Delete guess #}
<form action="{{ action_delete_href }}" method="post">
<input type="submit" class="btn btn-dark mt-2 w-100" value="Delete" {% if model.race_guess_open(model.current_race) == false %}disabled{% endif %}>
</form>
</td>
@ -119,7 +130,8 @@
<td class="text-nowrap">
<span class="fw-bold">{{ past_result.race.number }}:</span> {{ past_result.race.name }}<br>
<small><span class="fw-bold">Guessed:</span> P{{ past_result.race.place_to_guess }}</small><br>
<small><span class="fw-bold">Date:</span> {{ past_result.race.date.strftime("%d.%m.%Y %H:%M") }}</small>
<small><span class="fw-bold">Date:</span> {{ past_result.race.date.strftime("%d.%m.%Y %H:%M") }}
</small>
</td>
{% if model.all_users_or_active_user() | length > 0 %}

9
formula10/templates/season.jinja
View File

@ -28,7 +28,12 @@
{% set user_guess = model.season_guesses_by(user_name=user.name) %}
<form action="/season-guess/{{ user.name }}" method="post">
{% if model.season_guess_open() == true %}
{% set action_save_href = "/season-guess" ~ user.name %}
{% else %}
{% set action_save_href = "" %}
{% endif %}
<form action="{{ action_save_href }}" method="post">
{# Hot Take #}
<div class="form-floating">
@ -130,7 +135,7 @@
{% endfor %}
</div>
<input type="submit" class="btn btn-danger mt-2 w-100" value="Save">
<input type="submit" class="btn btn-danger mt-2 w-100" value="Save" {% if model.season_guess_open() == false %}disabled{% endif %}>
</form>
</div>