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

Allow specifying drivers as "inactive" and replace Logan Sargeant with Franco Colapinto
All checks were successful
Build Formula10 Docker Image / build-docker (push) Successful in 1m27s
Details

Browse Source
This commit is contained in:
Christoph Urlacher
2024-08-30 20:47:06 +02:00
parent 3340b77efe
commit b4c459ffe7
19 changed files with 160 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
formula10/templates/base.jinja
View File

@ -30,7 +30,7 @@
<option value="" selected disabled hidden></option>
{% if drivers == none %}
{% set drivers = model.all_drivers(include_none=include_none) %}
{% set drivers = model.all_drivers(include_none=include_none, include_inactive=False) %}
{% endif %}
{% for driver in drivers %}
@ -49,7 +49,7 @@
{% set user_has_chosen = namespace(driverpre=false) %}
{% if drivers == none %}
{% set drivers = model.all_drivers(include_none=include_none) %}
{% set drivers = model.all_drivers(include_none=include_none, include_inactive=False) %}
{% endif %}
{% for driver in drivers %}

8
formula10/templates/result.jinja
View File

@ -78,7 +78,7 @@
{# Place numbers #}
<ul class="list-group list-group-flush d-inline-block">
{% for driver in model.all_drivers_or_active_result_standing_drivers() %}
{% for driver in model.all_active_drivers_or_active_result_standing_drivers() %}
<li class="list-group-item p-1"><span id="place_number"
class="fw-bold">P{{ "%02d" % loop.index }}</span>:
</li>
@ -88,7 +88,7 @@
{# Drag and drop, "#columns .column" is the selector for the JS #}
<ul id="columns" class="list-group list-group-flush d-inline-block float-end">
{% for driver in model.all_drivers_or_active_result_standing_drivers() %}
{% for driver in model.all_active_drivers_or_active_result_standing_drivers() %}
<li class="list-group-item {% if race_result_open == true %}column{% endif %} p-1"
{% if race_result_open == true %}draggable="true"{% endif %}>
{{ driver.name }}
@ -170,7 +170,7 @@
{# Place numbers #}
<ul class="list-group list-group-flush d-inline-block">
{% for driver in model.all_drivers_or_active_result_sprint_standing_drivers() %}
{% for driver in model.all_active_drivers_or_active_result_sprint_standing_drivers() %}
<li class="list-group-item p-1"><span id="place_number"
class="fw-bold">P{{ "%02d" % loop.index }}</span>:
</li>
@ -179,7 +179,7 @@
{# Drag and drop, "#columns .column" is the selector for the JS #}
<ul id="columns" class="list-group list-group-flush d-inline-block float-end">
{% for driver in model.all_drivers_or_active_result_sprint_standing_drivers() %}
{% for driver in model.all_active_drivers_or_active_result_sprint_standing_drivers() %}
<li class="list-group-item {% if race_result_open == true %}column{% endif %} p-1"
{% if race_result_open == true %}draggable="true"{% endif %}>
{{ driver.name }}

10
formula10/templates/season.jinja
View File

@ -81,7 +81,7 @@
<div class="input-group mt-2" data-bs-toggle="tooltip"
title="Which driver will gain/lose the most places in comparison to last season's results?">
{{ driver_select_with_preselect(driver_match=user_guess.most_wdc_gained, name="gainedselect",
label="Most WDC pl. gained:", include_none=false, drivers=model.drivers_for_wdc_gained(),
label="Most WDC pl. gained:", include_none=false, drivers=model.active_drivers_for_wdc_gained(),
disabled=not season_guess_open,
border=("border-success" if points.most_gained_correct(user.name) else "")) }}
{{ driver_select_with_preselect(driver_match=user_guess.most_wdc_lost, name="lostselect",
@ -95,8 +95,8 @@
winners:</h6>
<div class="grid mt-2 container" style="row-gap: 0;">
{% for team in model.all_teams(include_none=false) %}
{% set driver_a = model.drivers_by(team_name=team.name)[0] %}
{% set driver_b = model.drivers_by(team_name=team.name)[1] %}
{% set driver_a = model.drivers_by(team_name=team.name, include_inactive=False)[0] %}
{% set driver_b = model.drivers_by(team_name=team.name, include_inactive=False)[1] %}
<div class="g-col-6">
<div class="form-check form-check-inline">
@ -131,8 +131,8 @@
title="Which driver will reach at least a single podium?">Drivers with podium(s):</h6>
<div class="grid mt-2 container" style="row-gap: 0;">
{% for team in model.all_teams(include_none=false) %}
{% set driver_a = model.drivers_by(team_name=team.name)[0] %}
{% set driver_b = model.drivers_by(team_name=team.name)[1] %}
{% set driver_a = model.drivers_by(team_name=team.name, include_inactive=False)[0] %}
{% set driver_b = model.drivers_by(team_name=team.name, include_inactive=False)[1] %}
<div class="g-col-6">
<div class="form-check form-check-inline">

2
formula10/templates/statistics.jinja
View File

@ -27,7 +27,7 @@
</thead>
<tbody>
{% for driver in points.drivers_sorted_by_points() %}
{% for driver in points.drivers_sorted_by_points(include_inactive=True) %}
{% set driver_standing = points.wdc_standing_by_driver()[driver.name] %}
<tr class="{% if driver_standing == 1 %}table-danger{% endif %}">
<td class="text-center text-nowrap">{{ driver_standing }}</td>