Compare commits
4 Commits
openf1
...
6e20275dcd
| Author | SHA1 | Date | |
|---|---|---|---|
| 6e20275dcd | |||
| 10cf690ee2 | |||
| 628e2cd99a | |||
| e57109caf4 |
@ -2,6 +2,7 @@ from typing import List
|
|||||||
from urllib.parse import unquote
|
from urllib.parse import unquote
|
||||||
from flask import redirect, render_template, request
|
from flask import redirect, render_template, request
|
||||||
from werkzeug import Response
|
from werkzeug import Response
|
||||||
|
from formula10.controller.error_controller import error_redirect
|
||||||
|
|
||||||
from formula10.database.update_queries import update_race_result, update_user
|
from formula10.database.update_queries import update_race_result, update_user
|
||||||
from formula10.domain.domain_model import Model
|
from formula10.domain.domain_model import Model
|
||||||
@ -31,9 +32,16 @@ def result_enter_post(race_name: str) -> Response:
|
|||||||
dnfs: List[str] = request.form.getlist("dnf-drivers")
|
dnfs: List[str] = request.form.getlist("dnf-drivers")
|
||||||
excluded: List[str] = request.form.getlist("excluded-drivers")
|
excluded: List[str] = request.form.getlist("excluded-drivers")
|
||||||
|
|
||||||
# @todo Ugly
|
# Extra stats for points calculation
|
||||||
|
fastest_lap: str | None = request.form.get("fastest-lap")
|
||||||
|
sprint_pxxs: List[str] = request.form.getlist("sprint-pxx-drivers")
|
||||||
|
sprint_dnf_drivers: List[str] = request.form.getlist("sprint-dnf-drivers")
|
||||||
|
|
||||||
|
if fastest_lap is None:
|
||||||
|
return error_redirect("Data was not saved, because fastest lap was not set.")
|
||||||
|
|
||||||
race_id: int = Model().race_by(race_name=race_name).id
|
race_id: int = Model().race_by(race_name=race_name).id
|
||||||
return update_race_result(race_id, pxxs, first_dnfs, dnfs, excluded)
|
return update_race_result(race_id, pxxs, first_dnfs, dnfs, excluded, int(fastest_lap), sprint_pxxs, sprint_dnf_drivers)
|
||||||
|
|
||||||
|
|
||||||
@app.route("/user")
|
@app.route("/user")
|
||||||
|
|||||||
@ -1,5 +1,5 @@
|
|||||||
from datetime import datetime
|
from datetime import datetime
|
||||||
from sqlalchemy import DateTime, Integer, String
|
from sqlalchemy import Boolean, DateTime, Integer, String
|
||||||
from sqlalchemy.orm import Mapped, mapped_column
|
from sqlalchemy.orm import Mapped, mapped_column
|
||||||
|
|
||||||
from formula10 import db
|
from formula10 import db
|
||||||
@ -19,4 +19,6 @@ class DbRace(db.Model):
|
|||||||
name: Mapped[str] = mapped_column(String(64), nullable=False, unique=True)
|
name: Mapped[str] = mapped_column(String(64), nullable=False, unique=True)
|
||||||
number: Mapped[int] = mapped_column(Integer, nullable=False, unique=True)
|
number: Mapped[int] = mapped_column(Integer, nullable=False, unique=True)
|
||||||
date: Mapped[datetime] = mapped_column(DateTime, nullable=False, unique=True)
|
date: Mapped[datetime] = mapped_column(DateTime, nullable=False, unique=True)
|
||||||
pxx: Mapped[int] = mapped_column(Integer, nullable=False) # This is the place to guess
|
pxx: Mapped[int] = mapped_column(Integer, nullable=False) # This is the place to guess
|
||||||
|
quali_date: Mapped[datetime] = mapped_column(DateTime, nullable=False, unique=True)
|
||||||
|
has_sprint: Mapped[bool] = mapped_column(Boolean, nullable=False)
|
||||||
@ -13,7 +13,6 @@ from formula10.database.model.db_season_guess import DbSeasonGuess
|
|||||||
from formula10.database.model.db_user import DbUser
|
from formula10.database.model.db_user import DbUser
|
||||||
from formula10.database.validation import any_is_none, positions_are_contiguous, race_has_started
|
from formula10.database.validation import any_is_none, positions_are_contiguous, race_has_started
|
||||||
from formula10 import ENABLE_TIMING, db
|
from formula10 import ENABLE_TIMING, db
|
||||||
from formula10.domain.model.driver import NONE_DRIVER
|
|
||||||
|
|
||||||
|
|
||||||
def find_or_create_race_guess(user_id: int, race_id: int) -> DbRaceGuess:
|
def find_or_create_race_guess(user_id: int, race_id: int) -> DbRaceGuess:
|
||||||
@ -129,8 +128,8 @@ def find_or_create_race_result(race_id: int) -> DbRaceResult:
|
|||||||
race_result.excluded_driver_ids_json = json.dumps(["9999"])
|
race_result.excluded_driver_ids_json = json.dumps(["9999"])
|
||||||
|
|
||||||
race_result.fastest_lap_id = 9999
|
race_result.fastest_lap_id = 9999
|
||||||
race_result.sprint_dnf_driver_ids_json = json.dumps(["9999"])
|
race_result.sprint_dnf_driver_ids_json = json.dumps([])
|
||||||
race_result.sprint_points_json = json.dumps({"9999": "9999"})
|
race_result.sprint_points_json = json.dumps({})
|
||||||
|
|
||||||
db.session.add(race_result)
|
db.session.add(race_result)
|
||||||
db.session.commit()
|
db.session.commit()
|
||||||
@ -143,21 +142,22 @@ def find_or_create_race_result(race_id: int) -> DbRaceResult:
|
|||||||
return race_result
|
return race_result
|
||||||
|
|
||||||
|
|
||||||
def update_race_result(race_id: int, pxx_driver_ids_list: List[str], first_dnf_driver_ids_list: List[str], dnf_driver_ids_list: List[str], excluded_driver_ids_list: List[str]) -> Response:
|
def update_race_result(race_id: int, pxx_driver_ids_list: List[str], first_dnf_driver_ids_list: List[str], dnf_driver_ids_list: List[str], excluded_driver_ids_list: List[str],
|
||||||
|
fastest_lap_driver_id: int, sprint_pxx_driver_ids_list: List[str], sprint_dnf_driver_ids_list: List[str]) -> Response:
|
||||||
if ENABLE_TIMING and not race_has_started(race_id=race_id):
|
if ENABLE_TIMING and not race_has_started(race_id=race_id):
|
||||||
return error_redirect("No race result can be entered, as the race has not begun!")
|
return error_redirect("No race result can be entered, as the race has not begun!")
|
||||||
|
|
||||||
# Use strings as keys, as these dicts will be serialized to json
|
# Use strings as keys, as these dicts will be serialized to json
|
||||||
pxx_driver_names: Dict[str, str] = {
|
pxx_driver_ids: Dict[str, str] = {
|
||||||
str(position + 1): driver_id for position, driver_id in enumerate(pxx_driver_ids_list)
|
str(position + 1): driver_id for position, driver_id in enumerate(pxx_driver_ids_list)
|
||||||
}
|
}
|
||||||
|
|
||||||
# Not counted drivers have to be at the end
|
# Not counted drivers have to be at the end
|
||||||
excluded_driver_names: Dict[str, str] = {
|
excluded_driver_ids: Dict[str, str] = {
|
||||||
str(position + 1): driver_id for position, driver_id in enumerate(pxx_driver_ids_list)
|
str(position + 1): driver_id for position, driver_id in enumerate(pxx_driver_ids_list)
|
||||||
if driver_id in excluded_driver_ids_list
|
if driver_id in excluded_driver_ids_list
|
||||||
}
|
}
|
||||||
if len(excluded_driver_names) > 0 and (not "20" in excluded_driver_names or not positions_are_contiguous(list(excluded_driver_names.keys()))):
|
if len(excluded_driver_ids) > 0 and (not "20" in excluded_driver_ids or not positions_are_contiguous(list(excluded_driver_ids.keys()))):
|
||||||
return error_redirect("Race result was not saved, as excluded drivers must be contiguous and at the end of the field!")
|
return error_redirect("Race result was not saved, as excluded drivers must be contiguous and at the end of the field!")
|
||||||
|
|
||||||
# First DNF drivers have to be contained in DNF drivers
|
# First DNF drivers have to be contained in DNF drivers
|
||||||
@ -170,15 +170,19 @@ def update_race_result(race_id: int, pxx_driver_ids_list: List[str], first_dnf_d
|
|||||||
return error_redirect("Race result was not saved, as there cannot be DNFs without (an) initial DNF(s)!")
|
return error_redirect("Race result was not saved, as there cannot be DNFs without (an) initial DNF(s)!")
|
||||||
|
|
||||||
race_result: DbRaceResult = find_or_create_race_result(race_id)
|
race_result: DbRaceResult = find_or_create_race_result(race_id)
|
||||||
race_result.pxx_driver_ids_json = json.dumps(pxx_driver_names)
|
race_result.pxx_driver_ids_json = json.dumps(pxx_driver_ids)
|
||||||
race_result.first_dnf_driver_ids_json = json.dumps(first_dnf_driver_ids_list)
|
race_result.first_dnf_driver_ids_json = json.dumps(first_dnf_driver_ids_list)
|
||||||
race_result.dnf_driver_ids_json = json.dumps(dnf_driver_ids_list)
|
race_result.dnf_driver_ids_json = json.dumps(dnf_driver_ids_list)
|
||||||
race_result.excluded_driver_ids_json = json.dumps(excluded_driver_ids_list)
|
race_result.excluded_driver_ids_json = json.dumps(excluded_driver_ids_list)
|
||||||
|
|
||||||
# @todo Dummy values
|
# Extra stats for points calculation
|
||||||
race_result.fastest_lap_id = NONE_DRIVER.id
|
sprint_pxx_driver_ids: Dict[str, str] = {
|
||||||
race_result.sprint_dnf_driver_ids_json = json.dumps([NONE_DRIVER.id])
|
str(position + 1): driver_id for position, driver_id in enumerate(sprint_pxx_driver_ids_list)
|
||||||
race_result.sprint_points_json = json.dumps({NONE_DRIVER.id: 0})
|
}
|
||||||
|
|
||||||
|
race_result.fastest_lap_id = fastest_lap_driver_id
|
||||||
|
race_result.sprint_dnf_driver_ids_json = json.dumps(sprint_dnf_driver_ids_list)
|
||||||
|
race_result.sprint_points_json = json.dumps(sprint_pxx_driver_ids)
|
||||||
|
|
||||||
db.session.commit()
|
db.session.commit()
|
||||||
|
|
||||||
|
|||||||
@ -13,6 +13,8 @@ class Race():
|
|||||||
race.number = db_race.number
|
race.number = db_race.number
|
||||||
race.date = db_race.date
|
race.date = db_race.date
|
||||||
race.place_to_guess = db_race.pxx
|
race.place_to_guess = db_race.pxx
|
||||||
|
race.quali_date = db_race.quali_date
|
||||||
|
race.has_sprint = db_race.has_sprint
|
||||||
return race
|
return race
|
||||||
|
|
||||||
def to_db_race(self) -> DbRace:
|
def to_db_race(self) -> DbRace:
|
||||||
@ -21,6 +23,8 @@ class Race():
|
|||||||
db_race.number = self.number
|
db_race.number = self.number
|
||||||
db_race.date = self.date
|
db_race.date = self.date
|
||||||
db_race.pxx = self.place_to_guess
|
db_race.pxx = self.place_to_guess
|
||||||
|
db_race.quali_date = self.date
|
||||||
|
db_race.has_sprint = self.has_sprint
|
||||||
return db_race
|
return db_race
|
||||||
|
|
||||||
def __eq__(self, __value: object) -> bool:
|
def __eq__(self, __value: object) -> bool:
|
||||||
@ -37,6 +41,8 @@ class Race():
|
|||||||
number: int
|
number: int
|
||||||
date: datetime
|
date: datetime
|
||||||
place_to_guess: int
|
place_to_guess: int
|
||||||
|
quali_date: datetime
|
||||||
|
has_sprint: bool
|
||||||
|
|
||||||
@property
|
@property
|
||||||
def name_sanitized(self) -> str:
|
def name_sanitized(self) -> str:
|
||||||
|
|||||||
@ -174,6 +174,11 @@ class RaceResult:
|
|||||||
self.standing[str(position)] for position in range(1, 21)
|
self.standing[str(position)] for position in range(1, 21)
|
||||||
]
|
]
|
||||||
|
|
||||||
|
def ordered_sprint_standing_list(self) -> List[Driver]:
|
||||||
|
return [
|
||||||
|
self.sprint_standing[str(position)] for position in range(1, 21)
|
||||||
|
]
|
||||||
|
|
||||||
def initial_dnf_string(self) -> str:
|
def initial_dnf_string(self) -> str:
|
||||||
if len(self.initial_dnf) == 0:
|
if len(self.initial_dnf) == 0:
|
||||||
return NONE_DRIVER.name
|
return NONE_DRIVER.name
|
||||||
|
|||||||
@ -11,6 +11,8 @@ from formula10.domain.model.season_guess_result import SeasonGuessResult
|
|||||||
from formula10.domain.model.team import Team
|
from formula10.domain.model.team import Team
|
||||||
from formula10.domain.model.user import User
|
from formula10.domain.model.user import User
|
||||||
|
|
||||||
|
# Guess points
|
||||||
|
|
||||||
RACE_GUESS_OFFSET_POINTS: Dict[int, int] = {
|
RACE_GUESS_OFFSET_POINTS: Dict[int, int] = {
|
||||||
3: 1,
|
3: 1,
|
||||||
2: 3,
|
2: 3,
|
||||||
@ -18,7 +20,6 @@ RACE_GUESS_OFFSET_POINTS: Dict[int, int] = {
|
|||||||
0: 10
|
0: 10
|
||||||
}
|
}
|
||||||
RACE_GUESS_DNF_POINTS: int = 10
|
RACE_GUESS_DNF_POINTS: int = 10
|
||||||
|
|
||||||
SEASON_GUESS_HOT_TAKE_POINTS: int = 10
|
SEASON_GUESS_HOT_TAKE_POINTS: int = 10
|
||||||
SEASON_GUESS_P2_POINTS: int = 10
|
SEASON_GUESS_P2_POINTS: int = 10
|
||||||
SEASON_GUESS_OVERTAKES_POINTS: int = 10
|
SEASON_GUESS_OVERTAKES_POINTS: int = 10
|
||||||
@ -30,6 +31,8 @@ SEASON_GUESS_TEAMWINNER_FALSE_POINTS: int = -3
|
|||||||
SEASON_GUESS_PODIUMS_CORRECT_POINTS: int = 3
|
SEASON_GUESS_PODIUMS_CORRECT_POINTS: int = 3
|
||||||
SEASON_GUESS_PODIUMS_FALSE_POINTS: int = -2
|
SEASON_GUESS_PODIUMS_FALSE_POINTS: int = -2
|
||||||
|
|
||||||
|
# Driver points
|
||||||
|
|
||||||
DRIVER_RACE_POINTS: Dict[int, int] = {
|
DRIVER_RACE_POINTS: Dict[int, int] = {
|
||||||
1: 25,
|
1: 25,
|
||||||
2: 18,
|
2: 18,
|
||||||
@ -42,6 +45,19 @@ DRIVER_RACE_POINTS: Dict[int, int] = {
|
|||||||
9: 2,
|
9: 2,
|
||||||
10: 1
|
10: 1
|
||||||
}
|
}
|
||||||
|
DRIVER_SPRINT_POINTS: Dict[int, int] = {
|
||||||
|
1: 8,
|
||||||
|
2: 7,
|
||||||
|
3: 6,
|
||||||
|
4: 5,
|
||||||
|
5: 4,
|
||||||
|
6: 3,
|
||||||
|
7: 2,
|
||||||
|
8: 1
|
||||||
|
}
|
||||||
|
DRIVER_FASTEST_LAP_POINTS: int = 1
|
||||||
|
|
||||||
|
# Last season results
|
||||||
|
|
||||||
WDC_STANDING_2023: Dict[str, int] = {
|
WDC_STANDING_2023: Dict[str, int] = {
|
||||||
"Max Verstappen": 1,
|
"Max Verstappen": 1,
|
||||||
@ -65,7 +81,6 @@ WDC_STANDING_2023: Dict[str, int] = {
|
|||||||
"Kevin Magnussen": 19,
|
"Kevin Magnussen": 19,
|
||||||
"Logan Sargeant": 21
|
"Logan Sargeant": 21
|
||||||
}
|
}
|
||||||
|
|
||||||
WCC_STANDING_2023: Dict[str, int] = {
|
WCC_STANDING_2023: Dict[str, int] = {
|
||||||
"Red Bull": 1,
|
"Red Bull": 1,
|
||||||
"Mercedes": 2,
|
"Mercedes": 2,
|
||||||
@ -133,7 +148,6 @@ class PointsModel(Model):
|
|||||||
|
|
||||||
return self._points_per_step
|
return self._points_per_step
|
||||||
|
|
||||||
# @todo Doesn't include fastest lap + sprint points
|
|
||||||
def driver_points_per_step(self) -> Dict[str, List[int]]:
|
def driver_points_per_step(self) -> Dict[str, List[int]]:
|
||||||
"""
|
"""
|
||||||
Returns a dictionary of lists, containing points per race for each driver.
|
Returns a dictionary of lists, containing points per race for each driver.
|
||||||
@ -144,15 +158,19 @@ class PointsModel(Model):
|
|||||||
self._driver_points_per_step[driver.name] = [0] * (len(self.all_races()) + 1) # Start at index 1, like the race numbers
|
self._driver_points_per_step[driver.name] = [0] * (len(self.all_races()) + 1) # Start at index 1, like the race numbers
|
||||||
|
|
||||||
for race_result in self.all_race_results():
|
for race_result in self.all_race_results():
|
||||||
for position, driver in race_result.standing.items():
|
race_number: int = race_result.race.number
|
||||||
driver_name: str = driver.name
|
|
||||||
race_number: int = race_result.race.number
|
|
||||||
|
|
||||||
self._driver_points_per_step[driver_name][race_number] = DRIVER_RACE_POINTS[int(position)] if int(position) in DRIVER_RACE_POINTS else 0
|
for position, driver in race_result.standing.items():
|
||||||
|
self._driver_points_per_step[driver.name][race_number] = DRIVER_RACE_POINTS[int(position)] if int(position) in DRIVER_RACE_POINTS else 0
|
||||||
|
self._driver_points_per_step[driver.name][race_number] += DRIVER_FASTEST_LAP_POINTS if race_result.fastest_lap_driver == driver else 0
|
||||||
|
|
||||||
|
for position, driver in race_result.sprint_standing.items():
|
||||||
|
driver_name: str = driver.name
|
||||||
|
|
||||||
|
self._driver_points_per_step[driver_name][race_number] += DRIVER_SPRINT_POINTS[int(position)] if int(position) in DRIVER_SPRINT_POINTS else 0
|
||||||
|
|
||||||
return self._driver_points_per_step
|
return self._driver_points_per_step
|
||||||
|
|
||||||
# @todo Doesn't include fastest lap + sprint points
|
|
||||||
def team_points_per_step(self) -> Dict[str, List[int]]:
|
def team_points_per_step(self) -> Dict[str, List[int]]:
|
||||||
"""
|
"""
|
||||||
Returns a dictionary of lists, containing points per race for each team.
|
Returns a dictionary of lists, containing points per race for each team.
|
||||||
@ -163,15 +181,14 @@ class PointsModel(Model):
|
|||||||
self._team_points_per_step[team.name] = [0] * (len(self.all_races()) + 1) # Start at index 1, like the race numbers
|
self._team_points_per_step[team.name] = [0] * (len(self.all_races()) + 1) # Start at index 1, like the race numbers
|
||||||
|
|
||||||
for race_result in self.all_race_results():
|
for race_result in self.all_race_results():
|
||||||
for position, driver in race_result.standing.items():
|
for driver in race_result.standing.values():
|
||||||
team_name: str = driver.team.name
|
team_name: str = driver.team.name
|
||||||
race_number: int = race_result.race.number
|
race_number: int = race_result.race.number
|
||||||
|
|
||||||
self._team_points_per_step[team_name][race_number] += DRIVER_RACE_POINTS[int(position)] if int(position) in DRIVER_RACE_POINTS else 0
|
self._team_points_per_step[team_name][race_number] += self.driver_points_per_step()[driver.name][race_number]
|
||||||
|
|
||||||
return self._team_points_per_step
|
return self._team_points_per_step
|
||||||
|
|
||||||
# @todo Doesn't include sprint dnfs
|
|
||||||
def dnfs(self) -> Dict[str, int]:
|
def dnfs(self) -> Dict[str, int]:
|
||||||
if self._dnfs is None:
|
if self._dnfs is None:
|
||||||
self._dnfs = dict()
|
self._dnfs = dict()
|
||||||
@ -183,6 +200,9 @@ class PointsModel(Model):
|
|||||||
for driver in race_result.all_dnfs:
|
for driver in race_result.all_dnfs:
|
||||||
self._dnfs[driver.name] += 1
|
self._dnfs[driver.name] += 1
|
||||||
|
|
||||||
|
for driver in race_result.sprint_dnfs:
|
||||||
|
self._dnfs[driver.name] += 1
|
||||||
|
|
||||||
return self._dnfs
|
return self._dnfs
|
||||||
|
|
||||||
#
|
#
|
||||||
|
|||||||
@ -69,6 +69,14 @@ class TemplateModel(Model):
|
|||||||
def current_race(self) -> Race | None:
|
def current_race(self) -> Race | None:
|
||||||
return self.first_race_without_result()
|
return self.first_race_without_result()
|
||||||
|
|
||||||
|
def active_result_race_or_current_race(self) -> Race:
|
||||||
|
if self.active_result is not None:
|
||||||
|
return self.active_result.race
|
||||||
|
elif self.current_race is not None:
|
||||||
|
return self.current_race
|
||||||
|
else:
|
||||||
|
return self.all_races()[0]
|
||||||
|
|
||||||
def active_result_race_name_or_current_race_name(self) -> str:
|
def active_result_race_name_or_current_race_name(self) -> str:
|
||||||
if self.active_result is not None:
|
if self.active_result is not None:
|
||||||
return self.active_result.race.name
|
return self.active_result.race.name
|
||||||
@ -88,6 +96,9 @@ class TemplateModel(Model):
|
|||||||
def all_drivers_or_active_result_standing_drivers(self) -> List[Driver]:
|
def all_drivers_or_active_result_standing_drivers(self) -> List[Driver]:
|
||||||
return self.active_result.ordered_standing_list() if self.active_result is not None else self.all_drivers(include_none=False)
|
return self.active_result.ordered_standing_list() if self.active_result is not None else self.all_drivers(include_none=False)
|
||||||
|
|
||||||
|
def all_drivers_or_active_result_sprint_standing_drivers(self) -> List[Driver]:
|
||||||
|
return self.active_result.ordered_sprint_standing_list() if self.active_result is not None else self.all_drivers(include_none=False)
|
||||||
|
|
||||||
def drivers_for_wdc_gained(self) -> List[Driver]:
|
def drivers_for_wdc_gained(self) -> List[Driver]:
|
||||||
predicate: Callable[[Driver], bool] = lambda driver: driver.abbr not in self._wdc_gained_excluded_abbrs
|
predicate: Callable[[Driver], bool] = lambda driver: driver.abbr not in self._wdc_gained_excluded_abbrs
|
||||||
return find_multiple_strict(predicate, self.all_drivers(include_none=False))
|
return find_multiple_strict(predicate, self.all_drivers(include_none=False))
|
||||||
|
|||||||
@ -24,4 +24,4 @@
|
|||||||
grid-row-gap: 0;
|
grid-row-gap: 0;
|
||||||
grid-column-gap: 8px;
|
grid-column-gap: 8px;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -42,90 +42,161 @@
|
|||||||
|
|
||||||
{% block body %}
|
{% block body %}
|
||||||
|
|
||||||
<div class="grid card-grid">
|
{% set race_result_open=model.race_result_open(model.active_result_race_name_or_current_race_name()) %}
|
||||||
|
{% if race_result_open == true %}
|
||||||
|
{% set action_save_href = "/result-enter/" ~ model.active_result_race_name_or_current_race_name_sanitized() %}
|
||||||
|
{% else %}
|
||||||
|
{% set action_save_href = "" %}
|
||||||
|
{% endif %}
|
||||||
|
|
||||||
<div class="card shadow-sm mb-2" style="max-width: 450px;">
|
<form class="grid card-grid" action="{{ action_save_href }}" method="post">
|
||||||
|
|
||||||
|
{# Race result #}
|
||||||
|
<div class="card shadow-sm mb-2 w-100">
|
||||||
<div class="card-header">
|
<div class="card-header">
|
||||||
{{ model.active_result_race_name_or_current_race_name() }}
|
{{ model.active_result_race_name_or_current_race_name() }}
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="card-body">
|
<div class="card-body">
|
||||||
<div class="d-inline-block overflow-x-scroll w-100">
|
<div class="d-inline-block overflow-x-scroll w-100">
|
||||||
<div style="width: 410px;">
|
<div style="width: 460px;">
|
||||||
{% set race_result_open=model.race_result_open(model.active_result_race_name_or_current_race_name()) %}
|
|
||||||
{% if race_result_open == true %}
|
{# Place numbers #}
|
||||||
{% set action_save_href = "/result-enter/" ~ model.active_result_race_name_or_current_race_name_sanitized() %}
|
<ul class="list-group list-group-flush d-inline-block">
|
||||||
{% else %}
|
{% for driver in model.all_drivers_or_active_result_standing_drivers() %}
|
||||||
{% set action_save_href = "" %}
|
<li class="list-group-item p-1"><span id="place_number"
|
||||||
{% endif %}
|
class="fw-bold">P{{ "%02d" % loop.index }}</span>:
|
||||||
|
</li>
|
||||||
|
{% endfor %}
|
||||||
|
</ul>
|
||||||
|
|
||||||
|
{# 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() %}
|
||||||
|
<li class="list-group-item {% if race_result_open == true %}column{% endif %} p-1"
|
||||||
|
{% if race_result_open == true %}draggable="true"{% endif %}>
|
||||||
|
{{ driver.name }}
|
||||||
|
|
||||||
|
<div class="d-inline-block float-end" style="margin-left: 30px;">
|
||||||
|
{# Fastest lap #}
|
||||||
|
<div class="form-check form-check-reverse d-inline-block">
|
||||||
|
<input type="radio" class="form-check-input"
|
||||||
|
value="{{ driver.id }}"
|
||||||
|
id="fastest-lap-{{ driver.id }}" name="fastest-lap"
|
||||||
|
{% if (model.active_result is not none) and (driver.id == model.active_result.fastest_lap_driver.id) %}checked{% endif %}
|
||||||
|
{% if race_result_open == false %}disabled="disabled"{% endif %}>
|
||||||
|
<label for="fastest-lap-{{ driver.id }}"
|
||||||
|
class="form-check-label text-muted" data-bs-toggle="tooltip"
|
||||||
|
title="Fastest lap">Lap</label>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
{# Driver DNFed at first #}
|
||||||
|
<div class="form-check form-check-reverse d-inline-block"
|
||||||
|
style="margin-left: 2px;">
|
||||||
|
<input type="checkbox" class="form-check-input"
|
||||||
|
value="{{ driver.id }}"
|
||||||
|
id="first-dnf-{{ driver.id }}" name="first-dnf-drivers"
|
||||||
|
{% if (model.active_result is not none) and (driver in model.active_result.initial_dnf) %}checked{% endif %}
|
||||||
|
{% if race_result_open == false %}disabled="disabled"{% endif %}>
|
||||||
|
<label for="first-dnf-{{ driver.id }}"
|
||||||
|
class="form-check-label text-muted">1. DNF</label>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
{# Driver DNFed #}
|
||||||
|
<div class="form-check form-check-reverse d-inline-block"
|
||||||
|
style="margin-left: 2px;">
|
||||||
|
<input type="checkbox" class="form-check-input"
|
||||||
|
value="{{ driver.id }}"
|
||||||
|
id="dnf-{{ driver.id }}" name="dnf-drivers"
|
||||||
|
{% if (model.active_result is not none) and (driver in model.active_result.all_dnfs) %}checked{% endif %}
|
||||||
|
{% if race_result_open == false %}disabled="disabled"{% endif %}>
|
||||||
|
<label for="dnf-{{ driver.id }}"
|
||||||
|
class="form-check-label text-muted">DNF</label>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
{# Driver Excluded #}
|
||||||
|
<div class="form-check form-check-reverse d-inline-block"
|
||||||
|
style="margin-left: 2px;">
|
||||||
|
<input type="checkbox" class="form-check-input"
|
||||||
|
value="{{ driver.id }}"
|
||||||
|
id="exclude-{{ driver.id }}" name="excluded-drivers"
|
||||||
|
{% if (model.active_result is not none) and (driver in model.active_result.standing_exclusions) %}checked{% endif %}
|
||||||
|
{% if race_result_open == false %}disabled="disabled"{% endif %}>
|
||||||
|
<label for="exclude-{{ driver.id }}"
|
||||||
|
class="form-check-label text-muted" data-bs-toggle="tooltip"
|
||||||
|
title="Driver is not counted for standing">NC</label>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
{# Standing order #}
|
||||||
|
<input type="hidden" name="pxx-drivers" value="{{ driver.id }}">
|
||||||
|
</li>
|
||||||
|
{% endfor %}
|
||||||
|
</ul>
|
||||||
|
|
||||||
|
<input type="submit" class="btn btn-danger mt-2 w-100" value="Save"
|
||||||
|
{% if race_result_open == false %}disabled="disabled"{% endif %}>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
{# Sprint result #}
|
||||||
|
{% if model.active_result_race_or_current_race().has_sprint == true %}
|
||||||
|
<div class="card shadow-sm mb-2 w-100">
|
||||||
|
<div class="card-header">
|
||||||
|
Sprint
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="card-body">
|
||||||
|
<div class="d-inline-block overflow-x-scroll w-100">
|
||||||
|
<div style="width: 275px;">
|
||||||
|
|
||||||
<form action="{{ action_save_href }}" method="post">
|
|
||||||
{# Place numbers #}
|
{# Place numbers #}
|
||||||
<ul class="list-group list-group-flush d-inline-block">
|
<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_drivers_or_active_result_sprint_standing_drivers() %}
|
||||||
<li class="list-group-item p-1"><span id="place_number"
|
<li class="list-group-item p-1"><span id="place_number"
|
||||||
class="fw-bold">P{{ "%02d" % loop.index }}</span>:
|
class="fw-bold">P{{ "%02d" % loop.index }}</span>:
|
||||||
</li>
|
</li>
|
||||||
{% endfor %}
|
{% endfor %}
|
||||||
</ul>
|
</ul>
|
||||||
|
|
||||||
{# Drag and drop #}
|
{# 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">
|
<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_drivers_or_active_result_standing_drivers() %}
|
|
||||||
<li class="list-group-item {% if race_result_open == true %}column{% endif %} p-1"
|
<li class="list-group-item {% if race_result_open == true %}column{% endif %} p-1"
|
||||||
{% if race_result_open == true %}draggable="true"{% endif %}>
|
{% if race_result_open == true %}draggable="true"{% endif %}>
|
||||||
{{ driver.name }}
|
{{ driver.name }}
|
||||||
|
|
||||||
<div class="d-inline-block float-end" style="margin-left: 30px;">
|
<div class="d-inline-block float-end" style="margin-left: 30px;">
|
||||||
{# Driver DNFed at first #}
|
|
||||||
<div class="form-check form-check-reverse d-inline-block">
|
|
||||||
<input type="checkbox" class="form-check-input"
|
|
||||||
value="{{ driver.id }}"
|
|
||||||
id="first-dnf-{{ driver.id }}" name="first-dnf-drivers"
|
|
||||||
{% if (model.active_result is not none) and (driver in model.active_result.initial_dnf) %}checked{% endif %}
|
|
||||||
{% if race_result_open == false %}disabled="disabled"{% endif %}>
|
|
||||||
<label for="first-dnf-{{ driver.id }}"
|
|
||||||
class="form-check-label text-muted">1. DNF</label>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
{# Driver DNFed #}
|
{# Driver DNFed #}
|
||||||
<div class="form-check form-check-reverse d-inline-block mx-2">
|
<div class="form-check form-check-reverse d-inline-block"
|
||||||
|
style="margin-left: 2px;">
|
||||||
<input type="checkbox" class="form-check-input"
|
<input type="checkbox" class="form-check-input"
|
||||||
value="{{ driver.id }}"
|
value="{{ driver.id }}"
|
||||||
id="dnf-{{ driver.id }}" name="dnf-drivers"
|
id="sprint-dnf-{{ driver.id }}" name="sprint-dnf-drivers"
|
||||||
{% if (model.active_result is not none) and (driver in model.active_result.all_dnfs) %}checked{% endif %}
|
{% if (model.active_result is not none) and (driver in model.active_result.sprint_dnfs) %}checked{% endif %}
|
||||||
{% if race_result_open == false %}disabled="disabled"{% endif %}>
|
{% if race_result_open == false %}disabled="disabled"{% endif %}>
|
||||||
<label for="dnf-{{ driver.id }}"
|
<label for="sprint-dnf-{{ driver.id }}"
|
||||||
class="form-check-label text-muted">DNF</label>
|
class="form-check-label text-muted">DNF</label>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
{# Driver Excluded #}
|
|
||||||
<div class="form-check form-check-reverse d-inline-block">
|
|
||||||
<input type="checkbox" class="form-check-input"
|
|
||||||
value="{{ driver.id }}"
|
|
||||||
id="exclude-{{ driver.id }}" name="excluded-drivers"
|
|
||||||
{% if (model.active_result is not none) and (driver in model.active_result.standing_exclusions) %}checked{% endif %}
|
|
||||||
{% if race_result_open == false %}disabled="disabled"{% endif %}>
|
|
||||||
<label for="exclude-{{ driver.id }}"
|
|
||||||
class="form-check-label text-muted" data-bs-toggle="tooltip"
|
|
||||||
title="Driver is not counted for standing">NC</label>
|
|
||||||
</div>
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
{# Standing order #}
|
{# Standing order #}
|
||||||
<input type="hidden" name="pxx-drivers" value="{{ driver.id }}">
|
<input type="hidden" name="sprint-pxx-drivers" value="{{ driver.id }}">
|
||||||
</li>
|
</li>
|
||||||
{% endfor %}
|
{% endfor %}
|
||||||
</ul>
|
</ul>
|
||||||
|
|
||||||
<input type="submit" class="btn btn-danger mt-2 w-100" value="Save"
|
|
||||||
{% if race_result_open == false %}disabled="disabled"{% endif %}>
|
</div>
|
||||||
</form>
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
{% endif %}
|
||||||
</div>
|
|
||||||
|
</form>
|
||||||
|
|
||||||
{% endblock body %}
|
{% endblock body %}
|
||||||
@ -18,7 +18,6 @@
|
|||||||
<div class="card-body">
|
<div class="card-body">
|
||||||
Picks that match the current standings are marked in green, except for the hot-take and overtake picks, as
|
Picks that match the current standings are marked in green, except for the hot-take and overtake picks, as
|
||||||
those are not evaluated automatically.<br>
|
those are not evaluated automatically.<br>
|
||||||
Points from sprints and fastest laps are not tracked currently.
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|||||||
@ -6,16 +6,6 @@
|
|||||||
|
|
||||||
{% block body %}
|
{% block body %}
|
||||||
|
|
||||||
<div class="card shadow-sm mb-2">
|
|
||||||
<div class="card-header">
|
|
||||||
Note
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="card-body">
|
|
||||||
Points from sprints and fastest laps are not tracked currently.
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="grid card-grid-2">
|
<div class="grid card-grid-2">
|
||||||
|
|
||||||
<div class="card shadow-sm mb-2">
|
<div class="card shadow-sm mb-2">
|
||||||
|
|||||||
Reference in New Issue
Block a user