Compare commits
127 Commits
516fa107e5
...
openf1
| Author | SHA1 | Date | |
|---|---|---|---|
| 4b3f95764c | |||
| 4fc13471f5 | |||
| 8905673d6d | |||
| 8b2920f886 | |||
| 73273bc5cd | |||
| d3097038a5 | |||
| 96cb8ca891 | |||
| 1ad558171d | |||
| 873df8bd8e | |||
| b250c47cb3 | |||
| 6ed5b914e4 | |||
| feb6d27e24 | |||
| 0d598e75a2 | |||
| a3d234a754 | |||
| 8fcb8c5704 | |||
| 20d177192f | |||
| 27e0231a25 | |||
| 325f753d31 | |||
| b4794ca42f | |||
| 481492868b | |||
| 64d37acc23 | |||
| c2c71a32e8 | |||
| e7d2e960ad | |||
| 1bd174e73f | |||
| 0ea6568082 | |||
| 09203d9390 | |||
| 5dcebab545 | |||
| dfb9360125 | |||
| a0051aacc3 | |||
| d3ee08df36 | |||
| 0a94222cb2 | |||
| 162423ec84 | |||
| fcc29d2372 | |||
| 131965e61f | |||
| d5d128379d | |||
| 49939a38b4 | |||
| f1090f205b | |||
| efcdf5412b | |||
| e0e6ec6bd5 | |||
| abea8aa0c8 | |||
| cf0dc88284 | |||
| 70fae278a8 | |||
| 262bcc8d5e | |||
| 44549f019d | |||
| dc9dc3d092 | |||
| 16be73c1c1 | |||
| 1f4489b3aa | |||
| ab9440cb4a | |||
| 1e4c9a1ad6 | |||
| 457a80e58e | |||
| 005b852836 | |||
| 25b945cb62 | |||
| 86cfa5f649 | |||
| 97d67d49ce | |||
| 2a8c17633e | |||
| 3949ad8f04 | |||
| bf9c25e537 | |||
| 2a0b3bc3f3 | |||
| dbbbd5ccc6 | |||
| ba9c72f71d | |||
| db78d93160 | |||
| a852690f0b | |||
| 594653e3bf | |||
| 3d27099bbb | |||
| 991a1a177e | |||
| a9b1bc4403 | |||
| 7d10c8d4c5 | |||
| e36c4f2b18 | |||
| 45d7c50e66 | |||
| c37b3b882b | |||
| 06f0eba1ea | |||
| d5f2766e7a | |||
| 81a886965f | |||
| a7f90a0a0d | |||
| 10a79dfae3 | |||
| a91e702b13 | |||
| 674f209f5d | |||
| ecb90a6b48 | |||
| a371e5b304 | |||
| 686c7fe945 | |||
| 3704192730 | |||
| fc8a890511 | |||
| 0f15369685 | |||
| c91d690345 | |||
| 0947de5b4c | |||
| 7985b9604a | |||
| 2d912bdc73 | |||
| ea1cf7ec59 | |||
| 13103cc056 | |||
| b1d05cf7c8 | |||
| b6f7cd85cb | |||
| 9b0379a889 | |||
| 218ec19bf9 | |||
| 7d09e00d60 | |||
| 412b5edf20 | |||
| d6e4480d6d | |||
| cfa5f19394 | |||
| 861f4484b2 | |||
| 455637ca46 | |||
| 7f82797066 | |||
| ce28566d8a | |||
| 2c1eec552b | |||
| a5a57e16fa | |||
| d0c7ba242c | |||
| 595b49c2b5 | |||
| a99b9ff005 | |||
| e9c916305e | |||
| 1c126796a9 | |||
| 26ad2c6881 | |||
| ddca2748b3 | |||
| b8316cc236 | |||
| adf6d6e99a | |||
| ea34413b3c | |||
| ab8def6b4f | |||
| b628682f58 | |||
| af8ace15d0 | |||
| 883f17ba9a | |||
| 7ea5d945c9 | |||
| d56477f2c6 | |||
| d2ab905185 | |||
| 799bb0c796 | |||
| 240c9000f2 | |||
| 7dd7b2c98e | |||
| 15065498be | |||
| e498dcefd9 | |||
| 15f4a7a1ef | |||
| f05d227e3e |
28
.gitea/workflows/docker.yaml
Normal file
28
.gitea/workflows/docker.yaml
Normal file
@ -0,0 +1,28 @@
|
||||
name: Build Formula10 Docker Image
|
||||
|
||||
on:
|
||||
push:
|
||||
# branches: [main]
|
||||
paths:
|
||||
- ".gitea/workflows/**"
|
||||
- "Dockerfile"
|
||||
- "requirements.txt"
|
||||
- "formula10/**"
|
||||
|
||||
|
||||
jobs:
|
||||
build-docker:
|
||||
runs-on: ubuntu-22.04
|
||||
steps:
|
||||
- name: Checkout repository
|
||||
uses: actions/checkout@v4
|
||||
- name: Login to container registry
|
||||
uses: docker/login-action@v3
|
||||
with:
|
||||
registry: gitea.vps.chriphost.de
|
||||
username: ${{ secrets.CONTAINER_REGISTRY_USER }}
|
||||
password: ${{ secrets.CONTAINER_REGISTRY_TOKEN }}
|
||||
- name: Build Docker image
|
||||
run: docker build . --file Dockerfile --tag gitea.vps.chriphost.de/christoph/formula10:latest
|
||||
- name: Push Docker image
|
||||
run: docker push gitea.vps.chriphost.de/christoph/formula10:latest
|
||||
8
.gitignore
vendored
8
.gitignore
vendored
@ -1,6 +1,8 @@
|
||||
.direnv
|
||||
.vscode
|
||||
__pycache__
|
||||
instance/formula10.db
|
||||
.idea
|
||||
dynamic_data
|
||||
__pycache__
|
||||
|
||||
instance
|
||||
data/dynamic_export
|
||||
data/dynamic_export
|
||||
|
||||
10
Dockerfile
Normal file
10
Dockerfile
Normal file
@ -0,0 +1,10 @@
|
||||
# syntax=docker/dockerfile:1
|
||||
|
||||
FROM public.ecr.aws/docker/library/python:3.11.8-slim-bookworm
|
||||
RUN apt-get update -y
|
||||
WORKDIR /app
|
||||
COPY requirements.txt requirements.txt
|
||||
RUN pip3 install -r requirements.txt
|
||||
COPY . .
|
||||
EXPOSE 5000
|
||||
CMD ["python3", "-u", "-m", "flask", "--app", "formula10", "run", "--host", "0.0.0.0"]
|
||||
@ -1,98 +0,0 @@
|
||||
import csv
|
||||
import os.path
|
||||
|
||||
from model import *
|
||||
|
||||
|
||||
def load_csv(filename):
|
||||
if not os.path.exists(filename):
|
||||
print(f"Could not load data from file {filename}, as it doesn't exist!")
|
||||
return []
|
||||
|
||||
with open(filename, "r", newline="") as file:
|
||||
reader = csv.reader(file, delimiter=",")
|
||||
next(reader, None) # skip header
|
||||
return list(reader)
|
||||
|
||||
|
||||
def write_csv(filename, objects):
|
||||
if len(objects) == 0:
|
||||
print(f"Could not write objects to file {filename}, as no objects were given!")
|
||||
return
|
||||
|
||||
with open(filename, "w", newline="") as file:
|
||||
writer = csv.writer(file, delimiter=",")
|
||||
writer.writerow(objects[0].__csv_header__)
|
||||
for obj in objects:
|
||||
writer.writerow(obj.to_csv())
|
||||
|
||||
|
||||
# Reload static database data, this has to be called from the app context
|
||||
def reload_static_data(db):
|
||||
print("Initializing Database with Static Values...")
|
||||
# Create it (if it doesn't exist!)
|
||||
db.create_all()
|
||||
|
||||
# Clear static data
|
||||
Team.query.delete()
|
||||
Driver.query.delete()
|
||||
Race.query.delete()
|
||||
User.query.delete()
|
||||
|
||||
# Reload static data
|
||||
for row in load_csv("static_data/teams.csv"):
|
||||
db.session.add(Team().from_csv(row))
|
||||
for row in load_csv("static_data/drivers.csv"):
|
||||
db.session.add(Driver().from_csv(row))
|
||||
for row in load_csv("static_data/races.csv"):
|
||||
db.session.add(Race().from_csv(row))
|
||||
for row in load_csv("static_data/users.csv"):
|
||||
db.session.add(User().from_csv(row))
|
||||
|
||||
db.session.commit()
|
||||
|
||||
|
||||
def reload_dynamic_data(db):
|
||||
print("Initializing Database with Dynamic Values...")
|
||||
|
||||
# Clear dynamic data
|
||||
User.query.delete()
|
||||
RaceResult.query.delete()
|
||||
RaceGuess.query.delete()
|
||||
TeamWinners.query.delete()
|
||||
PodiumDrivers.query.delete()
|
||||
SeasonGuess.query.delete()
|
||||
|
||||
# Reload dynamic data
|
||||
for row in load_csv("dynamic_data/users.csv"):
|
||||
db.session.add(User().from_csv(row))
|
||||
for row in load_csv("dynamic_data/raceresults.csv"):
|
||||
db.session.add(RaceResult().from_csv(row))
|
||||
for row in load_csv("dynamic_data/raceguesses.csv"):
|
||||
db.session.add(RaceGuess().from_csv(row))
|
||||
for row in load_csv("dynamic_data/teamwinners.csv"):
|
||||
db.session.add(TeamWinners().from_csv(row))
|
||||
for row in load_csv("dynamic_data/podiumdrivers.csv"):
|
||||
db.session.add(PodiumDrivers().from_csv(row))
|
||||
for row in load_csv("dynamic_data/seasonguesses.csv"):
|
||||
db.session.add(SeasonGuess().from_csv(row))
|
||||
|
||||
db.session.commit()
|
||||
|
||||
|
||||
def export_dynamic_data():
|
||||
print("Exporting Userdata...")
|
||||
|
||||
users = User.query.all()
|
||||
raceresults = RaceResult.query.all()
|
||||
raceguesses = RaceGuess.query.all()
|
||||
teamwinners = TeamWinners.query.all()
|
||||
podiumdrivers = PodiumDrivers.query.all()
|
||||
seasonguesses = SeasonGuess.query.all()
|
||||
|
||||
write_csv("dynamic_data/users.csv", users)
|
||||
write_csv("dynamic_data/raceresults.csv", raceresults)
|
||||
write_csv("dynamic_data/raceguesses.csv", raceguesses)
|
||||
write_csv("dynamic_data/teamwinners.csv", teamwinners)
|
||||
write_csv("dynamic_data/podiumdrivers.csv", podiumdrivers)
|
||||
write_csv("dynamic_data/seasonguesses.csv", seasonguesses)
|
||||
@ -23,7 +23,9 @@
|
||||
flask
|
||||
flask-sqlalchemy
|
||||
sqlalchemy
|
||||
requests
|
||||
|
||||
pytest
|
||||
]);
|
||||
in {
|
||||
devShell = pkgs.devshell.mkShell {
|
||||
|
||||
254
formula10.py
254
formula10.py
@ -1,254 +0,0 @@
|
||||
from typing import List
|
||||
|
||||
from flask import Flask, render_template, request, redirect
|
||||
from flask_sqlalchemy import SQLAlchemy
|
||||
from model import *
|
||||
from database_utils import reload_static_data, reload_dynamic_data, export_dynamic_data
|
||||
|
||||
app = Flask(__name__)
|
||||
|
||||
app.config['SQLALCHEMY_DATABASE_URI'] = "sqlite:///formula10.db"
|
||||
app.config['SQLALCHEMY_TRACK_MODIFICATIONS'] = False
|
||||
|
||||
db.init_app(app)
|
||||
|
||||
|
||||
# TODO
|
||||
# - Sortable list to enter full race results (need 7 positions to calculate points),
|
||||
# don't enter race result on guess page
|
||||
# - Move guessed place to leftmost column and display actual finishing position of driver instead
|
||||
# - Choose "place to guess" late before the race?
|
||||
# - Already show coming race in table, to give better feedback once a user has locked in a guess
|
||||
# - Set fixed sizes for left- and rightmost column in races table
|
||||
# - Fix the weird sizing everywhere when selecting only a single user...
|
||||
# - Replace ALL absolute pixel values inside the templates
|
||||
|
||||
|
||||
@app.route("/")
|
||||
def index():
|
||||
return redirect("/race")
|
||||
|
||||
|
||||
@app.route("/saveall")
|
||||
def savedynamic():
|
||||
export_dynamic_data()
|
||||
return redirect("/")
|
||||
|
||||
|
||||
@app.route("/loadall")
|
||||
def load():
|
||||
reload_static_data(db)
|
||||
reload_dynamic_data(db)
|
||||
return redirect("/")
|
||||
|
||||
|
||||
@app.route("/loadstatic")
|
||||
def reloadstatic():
|
||||
reload_static_data(db)
|
||||
return redirect("/")
|
||||
|
||||
|
||||
@app.route("/loaddynamic")
|
||||
def reloaddynamic():
|
||||
reload_dynamic_data(db)
|
||||
return redirect("/")
|
||||
|
||||
|
||||
@app.route("/race")
|
||||
def guessraceresult():
|
||||
return redirect("/race/Everyone")
|
||||
|
||||
|
||||
@app.route("/race/<username>")
|
||||
def guessuserraceresults(username):
|
||||
users: List[User] = User.query.all()
|
||||
raceresults: List[RaceResult] = RaceResult.query.all()[::-1]
|
||||
drivers: List[Driver] = Driver.query.all()
|
||||
|
||||
# Select User
|
||||
chosenusers = users
|
||||
if username != "Everyone":
|
||||
chosenusers = [user for user in users if user.name == username]
|
||||
|
||||
pastguesses = dict() # The guesses for which raceresults exist
|
||||
nextguesses = dict() # The guesses that are still open for modification
|
||||
raceresult: RaceResult
|
||||
for raceresult in raceresults:
|
||||
pastguesses[raceresult.race_id] = dict()
|
||||
guess: RaceGuess
|
||||
for guess in RaceGuess.query.all():
|
||||
if guess.race_id in pastguesses:
|
||||
pastguesses[guess.race_id][guess.user_id] = guess
|
||||
else:
|
||||
nextguesses[guess.user_id] = guess
|
||||
|
||||
# TODO: Getting by ID might be stupid, get by date instead?
|
||||
nextid = raceresults[0].race_id + 1 if len(raceresults) > 0 else 1
|
||||
nextrace: Race = Race.query.filter_by(id=nextid).first()
|
||||
|
||||
return render_template("race.jinja",
|
||||
users=users,
|
||||
drivers=drivers,
|
||||
raceresults=raceresults,
|
||||
pastguesses=pastguesses,
|
||||
currentselection=nextguesses,
|
||||
nextrace=nextrace,
|
||||
chosenusername=username,
|
||||
chosenusers=chosenusers)
|
||||
|
||||
|
||||
@app.route("/guessrace/<raceid>/<username>", methods=["POST"])
|
||||
def guessrace(raceid, username):
|
||||
pxx = request.form.get("pxxselect")
|
||||
dnf = request.form.get("dnfselect")
|
||||
|
||||
if pxx is None or dnf is None:
|
||||
return redirect("/race")
|
||||
|
||||
if RaceResult.query.filter_by(race_id=raceid).first() is not None:
|
||||
print("Error: Can't guess race result if the race result is already known!")
|
||||
return redirect("/race")
|
||||
|
||||
raceguess: RaceGuess | None = RaceGuess.query.filter_by(user_id=username, race_id=raceid).first()
|
||||
|
||||
if raceguess is None:
|
||||
raceguess = RaceGuess()
|
||||
raceguess.user_id = username
|
||||
raceguess.race_id = raceid
|
||||
db.session.add(raceguess)
|
||||
|
||||
raceguess.pxx_id = pxx
|
||||
raceguess.dnf_id = dnf
|
||||
db.session.commit()
|
||||
|
||||
return redirect("/race")
|
||||
|
||||
|
||||
@app.route("/enterresult/<raceid>", methods=["POST"])
|
||||
def enterresult(raceid):
|
||||
pxx = request.form.get("pxxselect")
|
||||
dnf = request.form.get("dnfselect")
|
||||
|
||||
if pxx is None or dnf is None:
|
||||
return redirect("/race")
|
||||
|
||||
raceresult: RaceResult | None = RaceResult.query.filter_by(race_id=raceid).first()
|
||||
|
||||
if raceresult is not None:
|
||||
print("RaceResult already exists!")
|
||||
return redirect("/race")
|
||||
|
||||
raceresult = RaceResult()
|
||||
raceresult.race_id = raceid
|
||||
raceresult.pxx_id = pxx
|
||||
raceresult.dnf_id = dnf
|
||||
db.session.add(raceresult)
|
||||
db.session.commit()
|
||||
|
||||
return redirect("/race")
|
||||
|
||||
|
||||
@app.route("/season")
|
||||
def guessseasonresults():
|
||||
return redirect("/season/Everyone")
|
||||
|
||||
|
||||
@app.route("/season/<username>")
|
||||
def guessuserseasonresults(username):
|
||||
users: List[User] = User.query.all()
|
||||
teams: List[Team] = Team.query.all()
|
||||
drivers: List[Driver] = Driver.query.all()
|
||||
|
||||
# Remove NONE driver
|
||||
drivers = [driver for driver in drivers if driver.name != "NONE"]
|
||||
# Select User
|
||||
chosenusers = users
|
||||
if username != "Everyone":
|
||||
chosenusers = [user for user in users if user.name == username]
|
||||
|
||||
seasonguesses = dict()
|
||||
guess: SeasonGuess
|
||||
for guess in SeasonGuess.query.all():
|
||||
seasonguesses[guess.user_id] = guess
|
||||
|
||||
driverpairs = dict()
|
||||
team: Team
|
||||
for team in teams:
|
||||
driverpairs[team.name] = []
|
||||
driver: Driver
|
||||
for driver in drivers:
|
||||
driverpairs[driver.team.name] += [driver]
|
||||
|
||||
return render_template("season.jinja",
|
||||
users=users,
|
||||
teams=teams,
|
||||
drivers=drivers,
|
||||
driverpairs=driverpairs,
|
||||
currentselection=seasonguesses,
|
||||
chosenusername=username,
|
||||
chosenusers=chosenusers)
|
||||
|
||||
|
||||
@app.route("/guessseason/<username>", methods=["POST"])
|
||||
def guessseason(username):
|
||||
guesses = [
|
||||
request.form.get("hottakeselect"),
|
||||
request.form.get("p2select"),
|
||||
request.form.get("overtakeselect"),
|
||||
request.form.get("dnfselect"),
|
||||
request.form.get("gainedselect"),
|
||||
request.form.get("lostselect")
|
||||
]
|
||||
teamwinnerguesses = [
|
||||
request.form.get(f"teamwinner-{team.name}") for team in Team.query.all()
|
||||
]
|
||||
podiumdriverguesses = request.form.getlist("podiumdrivers")
|
||||
|
||||
if any(guess is None for guess in guesses + teamwinnerguesses):
|
||||
print("Error: /guessseason could not obtain request data!")
|
||||
return redirect("/season")
|
||||
|
||||
seasonguess: SeasonGuess | None = SeasonGuess.query.filter_by(user_id=username).first()
|
||||
teamwinners: TeamWinners | None = seasonguess.team_winners if seasonguess is not None else None
|
||||
podiumdrivers: PodiumDrivers | None = seasonguess.podium_drivers if seasonguess is not None else None
|
||||
|
||||
if teamwinners is None:
|
||||
teamwinners = TeamWinners()
|
||||
db.session.add(teamwinners)
|
||||
|
||||
teamwinners.winner_ids = teamwinnerguesses
|
||||
teamwinners.user_id = username
|
||||
db.session.commit()
|
||||
|
||||
if podiumdrivers is None:
|
||||
podiumdrivers = PodiumDrivers()
|
||||
db.session.add(podiumdrivers)
|
||||
|
||||
podiumdrivers.podium_ids = podiumdriverguesses
|
||||
podiumdrivers.user_id = username
|
||||
db.session.commit()
|
||||
|
||||
# Refresh teamwinners + podiumdrivers to obtain IDs
|
||||
teamwinners = TeamWinners.query.filter_by(user_id=username).first()
|
||||
podiumdrivers = PodiumDrivers.query.filter_by(user_id=username).first()
|
||||
|
||||
if seasonguess is None:
|
||||
seasonguess = SeasonGuess()
|
||||
seasonguess.user_id = username
|
||||
db.session.add(seasonguess)
|
||||
|
||||
seasonguess.hot_take = guesses[0]
|
||||
seasonguess.p2_constructor_id = guesses[1]
|
||||
seasonguess.most_overtakes_id = guesses[2]
|
||||
seasonguess.most_dnfs_id = guesses[3]
|
||||
seasonguess.most_gained_id = guesses[4]
|
||||
seasonguess.most_lost_id = guesses[5]
|
||||
seasonguess.team_winners_id = teamwinners.id
|
||||
seasonguess.podium_drivers_id = podiumdrivers.id
|
||||
db.session.commit()
|
||||
|
||||
return redirect("/season")
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
app.run(debug=True)
|
||||
31
formula10/__init__.py
Normal file
31
formula10/__init__.py
Normal file
@ -0,0 +1,31 @@
|
||||
import os
|
||||
from flask import Flask
|
||||
from flask_sqlalchemy import SQLAlchemy
|
||||
|
||||
# Load local ENV variables (can be set when calling the executable)
|
||||
ENABLE_TIMING: bool = False if os.getenv("DISABLE_TIMING") == "True" else True
|
||||
print("Running Formula10 with:")
|
||||
if not ENABLE_TIMING:
|
||||
print("- Disabled timing constraints")
|
||||
|
||||
app: Flask = Flask(__name__)
|
||||
app.config['SQLALCHEMY_DATABASE_URI'] = "sqlite:///formula10.db"
|
||||
app.config['SQLALCHEMY_TRACK_MODIFICATIONS'] = False
|
||||
|
||||
# Session cookie is used to propagate message to error page
|
||||
app.config['SESSION_TYPE'] = 'memcached'
|
||||
app.config['SECRET_KEY'] = 'ich stinke nach maggi'
|
||||
|
||||
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 imported after "app" is declared
|
||||
import formula10.controller.race_controller # type: ignore
|
||||
import formula10.controller.season_controller
|
||||
import formula10.controller.leaderboard_controller
|
||||
import formula10.controller.statistics_controller
|
||||
import formula10.controller.rules_controller
|
||||
import formula10.controller.admin_controller
|
||||
import formula10.controller.error_controller
|
||||
0
formula10/controller/__init__.py
Normal file
0
formula10/controller/__init__.py
Normal file
53
formula10/controller/admin_controller.py
Normal file
53
formula10/controller/admin_controller.py
Normal file
@ -0,0 +1,53 @@
|
||||
from flask import render_template, request
|
||||
from werkzeug import Response
|
||||
|
||||
from formula10.database.update_queries import update_user
|
||||
from formula10.domain.template_model import TemplateModel
|
||||
from formula10 import app
|
||||
|
||||
|
||||
# @app.route("/result")
|
||||
# def result_root() -> Response:
|
||||
# return redirect("/result/Current")
|
||||
|
||||
|
||||
# @app.route("/result/<race_name>")
|
||||
# def result_active_race(race_name: str) -> str:
|
||||
# race_name = unquote(race_name)
|
||||
# model = TemplateModel(active_user_name=None,
|
||||
# active_result_race_name=race_name)
|
||||
|
||||
# return render_template("result.jinja", model=model)
|
||||
|
||||
|
||||
# @app.route("/result-enter/<race_name>", methods=["POST"])
|
||||
# def result_enter_post(race_name: str) -> Response:
|
||||
# race_name = unquote(race_name)
|
||||
# pxxs: List[str] = request.form.getlist("pxx-drivers")
|
||||
# first_dnfs: List[str] = request.form.getlist("first-dnf-drivers")
|
||||
# dnfs: List[str] = request.form.getlist("dnf-drivers")
|
||||
# excluded: List[str] = request.form.getlist("excluded-drivers")
|
||||
|
||||
# # @todo Ugly
|
||||
# race_id: int = Model().race_by(race_name=race_name).id
|
||||
# return update_race_result(race_id, pxxs, first_dnfs, dnfs, excluded)
|
||||
|
||||
|
||||
@app.route("/user")
|
||||
def user_root() -> str:
|
||||
model = TemplateModel(active_user_name=None,
|
||||
active_result_race_name=None)
|
||||
|
||||
return render_template("users.jinja", model=model)
|
||||
|
||||
|
||||
@app.route("/user-add", methods=["POST"])
|
||||
def user_add_post() -> Response:
|
||||
username: str | None = request.form.get("select-add-user")
|
||||
return update_user(username, add=True)
|
||||
|
||||
|
||||
@app.route("/user-delete", methods=["POST"])
|
||||
def user_delete_post() -> Response:
|
||||
username: str | None = request.form.get("select-delete-user")
|
||||
return update_user(username, delete=True)
|
||||
17
formula10/controller/error_controller.py
Normal file
17
formula10/controller/error_controller.py
Normal file
@ -0,0 +1,17 @@
|
||||
from typing import cast
|
||||
from flask import redirect, render_template, session
|
||||
from werkzeug import Response
|
||||
|
||||
from formula10.domain.template_model import TemplateModel
|
||||
from formula10 import app
|
||||
|
||||
def error_redirect(error_message: str) -> Response:
|
||||
session["error_message"] = error_message
|
||||
return redirect(f"/error")
|
||||
|
||||
@app.route("/error")
|
||||
def error_root() -> str:
|
||||
model = TemplateModel(active_user_name=None, active_result_race_name=None)
|
||||
message: str = cast(str, session["error_message"])
|
||||
|
||||
return render_template("error.jinja", model=model, error_message=message)
|
||||
11
formula10/controller/leaderboard_controller.py
Normal file
11
formula10/controller/leaderboard_controller.py
Normal file
@ -0,0 +1,11 @@
|
||||
from flask import render_template
|
||||
from formula10 import app
|
||||
from formula10.domain.points_model import PointsModel
|
||||
from formula10.domain.template_model import TemplateModel
|
||||
|
||||
@app.route("/graphs")
|
||||
def graphs_root() -> str:
|
||||
model = TemplateModel(active_user_name=None, active_result_race_name=None)
|
||||
points = PointsModel()
|
||||
|
||||
return render_template("leaderboard.jinja", model=model, points=points)
|
||||
54
formula10/controller/race_controller.py
Normal file
54
formula10/controller/race_controller.py
Normal file
@ -0,0 +1,54 @@
|
||||
from urllib.parse import unquote
|
||||
from flask import redirect, render_template, request
|
||||
from werkzeug import Response
|
||||
|
||||
from formula10.database.update_queries import delete_race_guess, update_race_guess
|
||||
from formula10.domain.domain_model import Model
|
||||
from formula10.domain.points_model import PointsModel
|
||||
from formula10.domain.template_model import TemplateModel
|
||||
from formula10 import app
|
||||
|
||||
|
||||
@app.route("/")
|
||||
def root() -> Response:
|
||||
return redirect("/race/Everyone")
|
||||
|
||||
|
||||
@app.route("/race")
|
||||
def race_root() -> Response:
|
||||
return redirect("/race/Everyone")
|
||||
|
||||
|
||||
@app.route("/race/<user_name>")
|
||||
def race_active_user(user_name: str) -> str:
|
||||
user_name = unquote(user_name)
|
||||
model = TemplateModel(active_user_name=user_name,
|
||||
active_result_race_name=None)
|
||||
points = PointsModel()
|
||||
|
||||
return render_template("race.jinja", model=model, points=points)
|
||||
|
||||
|
||||
@app.route("/race-guess/<race_name>/<user_name>", methods=["POST"])
|
||||
def race_guess_post(race_name: str, user_name: str) -> Response:
|
||||
race_name = unquote(race_name)
|
||||
user_name = unquote(user_name)
|
||||
|
||||
pxx: str | None = request.form.get("pxxselect")
|
||||
dnf: str | None = request.form.get("dnfselect")
|
||||
|
||||
race_id: int = Model().race_by(race_name=race_name).id
|
||||
user_id: int = Model().user_by(user_name=user_name).id
|
||||
return update_race_guess(race_id, user_id,
|
||||
int(pxx) if pxx is not None else None,
|
||||
int(dnf) if dnf is not None else None)
|
||||
|
||||
|
||||
@app.route("/race-guess-delete/<race_name>/<user_name>", methods=["POST"])
|
||||
def race_guess_delete_post(race_name: str, user_name: str) -> Response:
|
||||
race_name = unquote(race_name)
|
||||
user_name = unquote(user_name)
|
||||
|
||||
race_id: int = Model().race_by(race_name=race_name).id
|
||||
user_id: int = Model().user_by(user_name=user_name).id
|
||||
return delete_race_guess(race_id, user_id)
|
||||
10
formula10/controller/rules_controller.py
Normal file
10
formula10/controller/rules_controller.py
Normal file
@ -0,0 +1,10 @@
|
||||
from flask import render_template
|
||||
|
||||
from formula10 import app
|
||||
from formula10.domain.template_model import TemplateModel
|
||||
|
||||
@app.route("/rules")
|
||||
def rules_root() -> str:
|
||||
model = TemplateModel(active_user_name=None, active_result_race_name=None)
|
||||
|
||||
return render_template("rules.jinja", model=model)
|
||||
48
formula10/controller/season_controller.py
Normal file
48
formula10/controller/season_controller.py
Normal file
@ -0,0 +1,48 @@
|
||||
from typing import List
|
||||
from urllib.parse import unquote
|
||||
from flask import redirect, render_template, request
|
||||
from werkzeug import Response
|
||||
|
||||
from formula10.database.model.db_team import DbTeam
|
||||
from formula10.database.update_queries import update_season_guess
|
||||
from formula10.domain.domain_model import Model
|
||||
from formula10.domain.model.team import NONE_TEAM
|
||||
from formula10.domain.points_model import PointsModel
|
||||
from formula10.domain.template_model import TemplateModel
|
||||
from formula10 import app, db
|
||||
|
||||
|
||||
@app.route("/season")
|
||||
def season_root() -> Response:
|
||||
return redirect("/season/Everyone")
|
||||
|
||||
|
||||
@app.route("/season/<user_name>")
|
||||
def season_active_user(user_name: str) -> str:
|
||||
user_name = unquote(user_name)
|
||||
model = TemplateModel(active_user_name=user_name,
|
||||
active_result_race_name=None)
|
||||
points = PointsModel()
|
||||
|
||||
return render_template("season.jinja", model=model, points=points)
|
||||
|
||||
|
||||
@app.route("/season-guess/<user_name>", methods=["POST"])
|
||||
def season_guess_post(user_name: str) -> Response:
|
||||
user_name = unquote(user_name)
|
||||
guesses: List[str | None] = [
|
||||
request.form.get("hottakeselect"),
|
||||
request.form.get("p2select"),
|
||||
request.form.get("overtakeselect"),
|
||||
request.form.get("dnfselect"),
|
||||
request.form.get("gainedselect"),
|
||||
request.form.get("lostselect")
|
||||
]
|
||||
# TODO: This is pretty ugly, to do queries in the controller
|
||||
team_winner_guesses: List[str | None] = [
|
||||
request.form.get(f"teamwinner-{team.id}") for team in db.session.query(DbTeam).all() if team.id != NONE_TEAM.id
|
||||
]
|
||||
podium_driver_guesses: List[str] = request.form.getlist("podiumdrivers")
|
||||
|
||||
user_id: int = Model().user_by(user_name=user_name).id
|
||||
return update_season_guess(user_id, guesses, team_winner_guesses, podium_driver_guesses)
|
||||
12
formula10/controller/statistics_controller.py
Normal file
12
formula10/controller/statistics_controller.py
Normal file
@ -0,0 +1,12 @@
|
||||
|
||||
from flask import render_template
|
||||
from formula10 import app
|
||||
from formula10.domain.points_model import PointsModel
|
||||
from formula10.domain.template_model import TemplateModel
|
||||
|
||||
@app.route("/stats")
|
||||
def stats_root() -> str:
|
||||
model = TemplateModel(active_user_name=None, active_result_race_name=None)
|
||||
points = PointsModel()
|
||||
|
||||
return render_template("statistics.jinja", model=model, points=points)
|
||||
0
formula10/database/__init__.py
Normal file
0
formula10/database/__init__.py
Normal file
23
formula10/database/common_queries.py
Normal file
23
formula10/database/common_queries.py
Normal file
@ -0,0 +1,23 @@
|
||||
from formula10.database.model.db_driver import DbDriver
|
||||
from formula10.database.model.db_race_result import DbRaceResult
|
||||
from formula10.database.model.db_user import DbUser
|
||||
from formula10 import db
|
||||
|
||||
def race_has_result(race_id: int) -> bool:
|
||||
return db.session.query(DbRaceResult).filter_by(race_id=race_id).first() is not None
|
||||
|
||||
|
||||
def user_exists_and_enabled(user_name: str) -> bool:
|
||||
return db.session.query(DbUser).filter_by(name=user_name, enabled=True).first() is not None
|
||||
|
||||
|
||||
def user_exists_and_disabled(user_name: str) -> bool:
|
||||
return db.session.query(DbUser).filter_by(name=user_name, enabled=False).first() is not None
|
||||
|
||||
|
||||
def find_single_driver_strict(driver_id: int) -> DbDriver:
|
||||
db_driver: DbDriver | None = db.session.query(DbDriver).filter_by(id=driver_id).first()
|
||||
if db_driver is None:
|
||||
raise Exception(f"Could not find driver with id {driver_id} in database")
|
||||
|
||||
return db_driver
|
||||
0
formula10/database/model/__init__.py
Normal file
0
formula10/database/model/__init__.py
Normal file
25
formula10/database/model/db_driver.py
Normal file
25
formula10/database/model/db_driver.py
Normal file
@ -0,0 +1,25 @@
|
||||
from sqlalchemy import Integer, String, ForeignKey
|
||||
from sqlalchemy.orm import mapped_column, Mapped, relationship
|
||||
|
||||
from formula10.database.model.db_team import DbTeam
|
||||
from formula10 import db
|
||||
|
||||
|
||||
class DbDriver(db.Model):
|
||||
"""
|
||||
A F1 driver.
|
||||
It stores the corresponding team + name abbreviation.
|
||||
"""
|
||||
__tablename__ = "driver"
|
||||
|
||||
def __init__(self, *, id: int):
|
||||
self.id = id # Primary key
|
||||
|
||||
id: Mapped[int] = mapped_column(Integer, primary_key=True, autoincrement=False)
|
||||
name: Mapped[str] = mapped_column(String(32), nullable=False, unique=True)
|
||||
abbr: Mapped[str] = mapped_column(String(4), nullable=False, unique=True)
|
||||
team_id: Mapped[str] = mapped_column(ForeignKey("team.id"), nullable=False)
|
||||
country_code: Mapped[str] = mapped_column(String(2), nullable=False) # alpha-2 code
|
||||
|
||||
# Relationships
|
||||
team: Mapped[DbTeam] = relationship("DbTeam", foreign_keys=[team_id])
|
||||
22
formula10/database/model/db_race.py
Normal file
22
formula10/database/model/db_race.py
Normal file
@ -0,0 +1,22 @@
|
||||
from datetime import datetime
|
||||
from sqlalchemy import DateTime, Integer, String
|
||||
from sqlalchemy.orm import Mapped, mapped_column
|
||||
|
||||
from formula10 import db
|
||||
|
||||
|
||||
class DbRace(db.Model):
|
||||
"""
|
||||
A single race at a certain date and GrandPrix in the calendar.
|
||||
It stores the place to guess for this race.
|
||||
"""
|
||||
__tablename__ = "race"
|
||||
|
||||
def __init__(self, *, id: int):
|
||||
self.id = id # Primary key
|
||||
|
||||
id: Mapped[int] = mapped_column(Integer, primary_key=True, autoincrement=False)
|
||||
name: Mapped[str] = mapped_column(String(64), nullable=False, unique=True)
|
||||
number: Mapped[int] = mapped_column(Integer, 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
|
||||
30
formula10/database/model/db_race_guess.py
Normal file
30
formula10/database/model/db_race_guess.py
Normal file
@ -0,0 +1,30 @@
|
||||
from sqlalchemy import ForeignKey
|
||||
from sqlalchemy.orm import Mapped, mapped_column, relationship
|
||||
|
||||
from formula10.database.model.db_user import DbUser
|
||||
from formula10.database.model.db_race import DbRace
|
||||
from formula10.database.model.db_driver import DbDriver
|
||||
from formula10 import db
|
||||
|
||||
|
||||
class DbRaceGuess(db.Model):
|
||||
"""
|
||||
A guess a user made for a race.
|
||||
It stores the corresponding race and the guessed drivers for PXX and DNF.
|
||||
"""
|
||||
__tablename__ = "raceguess"
|
||||
|
||||
def __init__(self, *, user_id: int, race_id: int):
|
||||
self.user_id = user_id # Primary key
|
||||
self.race_id = race_id # Primary key
|
||||
|
||||
user_id: Mapped[int] = mapped_column(ForeignKey("user.id"), primary_key=True)
|
||||
race_id: Mapped[int] = mapped_column(ForeignKey("race.id"), primary_key=True)
|
||||
pxx_driver_id: Mapped[int] = mapped_column(ForeignKey("driver.id"), nullable=False)
|
||||
dnf_driver_id: Mapped[int] = mapped_column(ForeignKey("driver.id"), nullable=False)
|
||||
|
||||
# Relationships
|
||||
user: Mapped[DbUser] = relationship("DbUser", foreign_keys=[user_id])
|
||||
race: Mapped[DbRace] = relationship("DbRace", foreign_keys=[race_id])
|
||||
pxx: Mapped[DbDriver] = relationship("DbDriver", foreign_keys=[pxx_driver_id])
|
||||
dnf: Mapped[DbDriver] = relationship("DbDriver", foreign_keys=[dnf_driver_id])
|
||||
30
formula10/database/model/db_race_result.py
Normal file
30
formula10/database/model/db_race_result.py
Normal file
@ -0,0 +1,30 @@
|
||||
from sqlalchemy import ForeignKey, String
|
||||
from sqlalchemy.orm import Mapped, mapped_column, relationship
|
||||
from formula10.database.model.db_driver import DbDriver
|
||||
|
||||
from formula10.database.model.db_race import DbRace
|
||||
from formula10 import db
|
||||
|
||||
class DbRaceResult(db.Model):
|
||||
"""
|
||||
The result of a past race.
|
||||
It stores the corresponding race and dictionaries of place-/dnf-order and a list of drivers that are excluded from the standings for this race.
|
||||
"""
|
||||
__tablename__ = "raceresult"
|
||||
|
||||
def __init__(self, *, race_id: int):
|
||||
self.race_id = race_id # Primary key
|
||||
|
||||
race_id: Mapped[int] = mapped_column(ForeignKey("race.id"), primary_key=True)
|
||||
pxx_driver_ids_json: Mapped[str] = mapped_column(String(1024), nullable=False)
|
||||
first_dnf_driver_ids_json: Mapped[str] = mapped_column(String(1024), nullable=False)
|
||||
dnf_driver_ids_json: Mapped[str] = mapped_column(String(1024), nullable=False)
|
||||
excluded_driver_ids_json: Mapped[str] = mapped_column(String(1024), nullable=False)
|
||||
|
||||
fastest_lap_id: Mapped[int] = mapped_column(ForeignKey("driver.id"), nullable=False)
|
||||
sprint_dnf_driver_ids_json: Mapped[str] = mapped_column(String(1024), nullable=False)
|
||||
sprint_points_json: Mapped[str] = mapped_column(String(1024), nullable=False)
|
||||
|
||||
# Relationships
|
||||
race: Mapped[DbRace] = relationship("DbRace", foreign_keys=[race_id])
|
||||
fastest_lap_driver: Mapped[DbDriver] = relationship("DbDriver", foreign_keys=[fastest_lap_id])
|
||||
34
formula10/database/model/db_season_guess.py
Normal file
34
formula10/database/model/db_season_guess.py
Normal file
@ -0,0 +1,34 @@
|
||||
from sqlalchemy import ForeignKey, String
|
||||
from sqlalchemy.orm import Mapped, mapped_column, relationship
|
||||
|
||||
from formula10.database.model.db_driver import DbDriver
|
||||
from formula10.database.model.db_team import DbTeam
|
||||
from formula10.database.model.db_user import DbUser
|
||||
from formula10 import db
|
||||
|
||||
class DbSeasonGuess(db.Model):
|
||||
"""
|
||||
A collection of bonus guesses for the entire season.
|
||||
"""
|
||||
__tablename__ = "seasonguess"
|
||||
|
||||
def __init__(self, *, user_id: int):
|
||||
self.user_id = user_id # Primary key
|
||||
|
||||
user_id: Mapped[int] = mapped_column(ForeignKey("user.id"), primary_key=True)
|
||||
hot_take: Mapped[str | None] = mapped_column(String(512), nullable=True)
|
||||
p2_team_id: Mapped[int | None] = mapped_column(ForeignKey("team.id"), nullable=True)
|
||||
overtake_driver_id: Mapped[int | None] = mapped_column(ForeignKey("driver.id"), nullable=True)
|
||||
dnf_driver_id: Mapped[int | None] = mapped_column(ForeignKey("driver.id"), nullable=True)
|
||||
gained_driver_id: Mapped[int | None] = mapped_column(ForeignKey("driver.id"), nullable=True)
|
||||
lost_driver_id: Mapped[int | None] = mapped_column(ForeignKey("driver.id"), nullable=True)
|
||||
team_winners_driver_ids_json: Mapped[str] = mapped_column(String(1024))
|
||||
podium_drivers_driver_ids_json: Mapped[str] = mapped_column(String(1024))
|
||||
|
||||
# Relationships
|
||||
user: Mapped[DbUser] = relationship("DbUser", foreign_keys=[user_id])
|
||||
p2_team: Mapped[DbTeam | None] = relationship("DbTeam", foreign_keys=[p2_team_id])
|
||||
overtake_driver: Mapped[DbDriver | None] = relationship("DbDriver", foreign_keys=[overtake_driver_id])
|
||||
dnf_driver: Mapped[DbDriver | None] = relationship("DbDriver", foreign_keys=[dnf_driver_id])
|
||||
gained_driver: Mapped[DbDriver | None] = relationship("DbDriver", foreign_keys=[gained_driver_id])
|
||||
lost_driver: Mapped[DbDriver | None] = relationship("DbDriver", foreign_keys=[lost_driver_id])
|
||||
22
formula10/database/model/db_season_guess_result.py
Normal file
22
formula10/database/model/db_season_guess_result.py
Normal file
@ -0,0 +1,22 @@
|
||||
from sqlalchemy import Boolean, ForeignKey
|
||||
from sqlalchemy.orm import Mapped, mapped_column, relationship
|
||||
|
||||
from formula10 import db
|
||||
from formula10.database.model.db_user import DbUser
|
||||
|
||||
class DbSeasonGuessResult(db.Model):
|
||||
"""
|
||||
Manually entered results for the season bonus guesses.
|
||||
"""
|
||||
|
||||
__tablename__ = "seasonguessresult"
|
||||
|
||||
def __init__(self, *, user_id: int):
|
||||
self.user_id = user_id # Primary key
|
||||
|
||||
user_id: Mapped[int] = mapped_column(ForeignKey("user.id"), primary_key=True)
|
||||
hot_take_correct: Mapped[bool] = mapped_column(Boolean, nullable=False)
|
||||
overtakes_correct: Mapped[bool] = mapped_column(Boolean, nullable=False)
|
||||
|
||||
# Relationships
|
||||
user: Mapped[DbUser] = relationship("DbUser", foreign_keys=[user_id])
|
||||
17
formula10/database/model/db_team.py
Normal file
17
formula10/database/model/db_team.py
Normal file
@ -0,0 +1,17 @@
|
||||
from sqlalchemy import Integer, String
|
||||
from sqlalchemy.orm import Mapped, mapped_column
|
||||
|
||||
from formula10 import db
|
||||
|
||||
|
||||
class DbTeam(db.Model):
|
||||
"""
|
||||
A constructor/team (name only).
|
||||
"""
|
||||
__tablename__ = "team"
|
||||
|
||||
def __init__(self, *, id: int):
|
||||
self.id = id # Primary key
|
||||
|
||||
id: Mapped[int] = mapped_column(Integer, primary_key=True, autoincrement=False)
|
||||
name: Mapped[str] = mapped_column(String(32), nullable=False, unique=True)
|
||||
19
formula10/database/model/db_user.py
Normal file
19
formula10/database/model/db_user.py
Normal file
@ -0,0 +1,19 @@
|
||||
from sqlalchemy import Boolean, Integer, String
|
||||
from sqlalchemy.orm import Mapped, mapped_column
|
||||
|
||||
from formula10 import db
|
||||
|
||||
|
||||
class DbUser(db.Model):
|
||||
"""
|
||||
A user that can guess races (name only).
|
||||
"""
|
||||
__tablename__ = "user"
|
||||
|
||||
def __init__(self, *, id: int | None):
|
||||
if id is not None:
|
||||
self.id = id # Primary key
|
||||
|
||||
id: Mapped[int] = mapped_column(Integer, primary_key=True, autoincrement=True)
|
||||
name: Mapped[str] = mapped_column(String(32), nullable=False, unique=True)
|
||||
enabled: Mapped[bool] = mapped_column(Boolean, nullable=False)
|
||||
0
formula10/database/open_f1_fetcher.py
Normal file
0
formula10/database/open_f1_fetcher.py
Normal file
239
formula10/database/update_queries.py
Normal file
239
formula10/database/update_queries.py
Normal file
@ -0,0 +1,239 @@
|
||||
import json
|
||||
from typing import List, cast
|
||||
from flask import redirect
|
||||
from werkzeug import Response
|
||||
from formula10.controller.error_controller import error_redirect
|
||||
|
||||
from formula10.database.common_queries import race_has_result, user_exists_and_disabled, user_exists_and_enabled
|
||||
from formula10.database.model.db_race_guess import DbRaceGuess
|
||||
from formula10.database.model.db_season_guess import DbSeasonGuess
|
||||
from formula10.database.model.db_user import DbUser
|
||||
from formula10.database.validation import any_is_none, race_has_started
|
||||
from formula10 import ENABLE_TIMING, db
|
||||
|
||||
|
||||
def find_or_create_race_guess(user_id: int, race_id: int) -> DbRaceGuess:
|
||||
# There can be a single RaceGuess at most, since (user_name, race_name) is the composite primary key
|
||||
race_guess: DbRaceGuess | None = db.session.query(DbRaceGuess).filter_by(user_id=user_id, race_id=race_id).first()
|
||||
if race_guess is not None:
|
||||
return race_guess
|
||||
|
||||
# Insert a new RaceGuess
|
||||
race_guess = DbRaceGuess(user_id=user_id, race_id=race_id)
|
||||
race_guess.pxx_driver_id = 9999
|
||||
race_guess.dnf_driver_id = 9999
|
||||
db.session.add(race_guess)
|
||||
db.session.commit()
|
||||
|
||||
# Double check if database insertion worked and obtain any values set by the database
|
||||
race_guess = db.session.query(DbRaceGuess).filter_by(user_id=user_id, race_id=race_id).first()
|
||||
if race_guess is None:
|
||||
raise Exception("Failed adding RaceGuess to the database")
|
||||
|
||||
return race_guess
|
||||
|
||||
|
||||
def update_race_guess(race_id: int, user_id: int, pxx_select_id: int | None, dnf_select_id: int | None) -> Response:
|
||||
if any_is_none(pxx_select_id, dnf_select_id):
|
||||
return error_redirect(f"Picks for race \"{race_id}\" were not saved, because you did not fill all the fields.")
|
||||
|
||||
if ENABLE_TIMING and race_has_started(race_id=race_id):
|
||||
return error_redirect(f"No picks for race \"{race_id}\" can be entered, as this race has already started.")
|
||||
|
||||
if race_has_result(race_id):
|
||||
return error_redirect(f"No picks for race \"{race_id}\" can be entered, as this race has already finished.")
|
||||
|
||||
pxx_driver_id: int = cast(int, pxx_select_id)
|
||||
dnf_driver_id: int = cast(int, dnf_select_id)
|
||||
|
||||
race_guess: DbRaceGuess = find_or_create_race_guess(user_id, race_id)
|
||||
race_guess.pxx_driver_id = pxx_driver_id
|
||||
race_guess.dnf_driver_id = dnf_driver_id
|
||||
|
||||
db.session.commit()
|
||||
|
||||
return redirect("/race/Everyone")
|
||||
|
||||
|
||||
def delete_race_guess(race_id: int, user_id: int) -> Response:
|
||||
# Don't change guesses that are already over
|
||||
if ENABLE_TIMING and race_has_started(race_id=race_id):
|
||||
return error_redirect(f"No picks for race with id \"{race_id}\" can be deleted, as this race has already started.")
|
||||
|
||||
if race_has_result(race_id):
|
||||
return error_redirect(f"No picks for race \"{race_id}\" can be deleted, as this race has already finished.")
|
||||
|
||||
# Does not throw if row doesn't exist
|
||||
db.session.query(DbRaceGuess).filter_by(race_id=race_id, user_id=user_id).delete()
|
||||
db.session.commit()
|
||||
|
||||
return redirect("/race/Everyone")
|
||||
|
||||
|
||||
def find_or_create_season_guess(user_id: int) -> DbSeasonGuess:
|
||||
# There can be a single SeasonGuess at most, since user_name is the primary key
|
||||
season_guess: DbSeasonGuess | None = db.session.query(DbSeasonGuess).filter_by(user_id=user_id).first()
|
||||
if season_guess is not None:
|
||||
return season_guess
|
||||
|
||||
# Insert a new SeasonGuess
|
||||
season_guess = DbSeasonGuess(user_id=user_id)
|
||||
season_guess.team_winners_driver_ids_json=json.dumps(["9999"])
|
||||
season_guess.podium_drivers_driver_ids_json=json.dumps(["9999"])
|
||||
db.session.add(season_guess)
|
||||
db.session.commit()
|
||||
|
||||
# Double check if database insertion worked and obtain any values set by the database
|
||||
season_guess = db.session.query(DbSeasonGuess).filter_by(user_id=user_id).first()
|
||||
if season_guess is None:
|
||||
raise Exception("Failed adding SeasonGuess to the database")
|
||||
|
||||
return season_guess
|
||||
|
||||
|
||||
def update_season_guess(user_id: int, guesses: List[str | None], team_winner_guesses: List[str | None], podium_driver_guesses: List[str]) -> Response:
|
||||
# Pylance marks type errors here, but those are intended. Columns are marked nullable.
|
||||
|
||||
if ENABLE_TIMING and race_has_started(race_id=1):
|
||||
return error_redirect("No season picks can be entered, as the season has already begun!")
|
||||
|
||||
season_guess: DbSeasonGuess = find_or_create_season_guess(user_id)
|
||||
season_guess.hot_take = guesses[0] # type: ignore
|
||||
season_guess.p2_team_id = guesses[1] # type: ignore
|
||||
season_guess.overtake_driver_id = guesses[2] # type: ignore
|
||||
season_guess.dnf_driver_id = guesses[3] # type: ignore
|
||||
season_guess.gained_driver_id = guesses[4] # type: ignore
|
||||
season_guess.lost_driver_id = guesses[5] # type: ignore
|
||||
season_guess.team_winners_driver_ids_json = json.dumps(team_winner_guesses)
|
||||
season_guess.podium_drivers_driver_ids_json = json.dumps(podium_driver_guesses)
|
||||
|
||||
db.session.commit()
|
||||
|
||||
return redirect(f"/season/Everyone")
|
||||
|
||||
|
||||
# def find_or_create_race_result(race_id: int) -> DbRaceResult:
|
||||
# # There can be a single RaceResult at most, since race_name is the primary key
|
||||
# race_result: DbRaceResult | None = db.session.query(DbRaceResult).filter_by(race_id=race_id).first()
|
||||
# if race_result is not None:
|
||||
# return race_result
|
||||
|
||||
# race_result = DbRaceResult(race_id=race_id)
|
||||
# race_result.pxx_driver_ids_json = json.dumps(["9999"])
|
||||
# race_result.first_dnf_driver_ids_json = json.dumps(["9999"])
|
||||
# race_result.dnf_driver_ids_json = json.dumps(["9999"])
|
||||
# race_result.excluded_driver_ids_json = json.dumps(["9999"])
|
||||
|
||||
# race_result.fastest_lap_id = 9999
|
||||
# race_result.sprint_dnf_driver_ids_json = json.dumps(["9999"])
|
||||
# race_result.sprint_points_json = json.dumps({"9999": "9999"})
|
||||
|
||||
# db.session.add(race_result)
|
||||
# db.session.commit()
|
||||
|
||||
# # Double check if database insertion worked and obtain any values set by the database
|
||||
# race_result = db.session.query(DbRaceResult).filter_by(race_id=race_id).first()
|
||||
# if race_result is None:
|
||||
# raise Exception("Failed adding RaceResult to the database")
|
||||
|
||||
# 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:
|
||||
# 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!")
|
||||
|
||||
# # Use strings as keys, as these dicts will be serialized to json
|
||||
# pxx_driver_names: Dict[str, str] = {
|
||||
# str(position + 1): driver_id for position, driver_id in enumerate(pxx_driver_ids_list)
|
||||
# }
|
||||
|
||||
# # Not counted drivers have to be at the end
|
||||
# excluded_driver_names: Dict[str, str] = {
|
||||
# str(position + 1): driver_id for position, driver_id in enumerate(pxx_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()))):
|
||||
# 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
|
||||
# for driver_id in first_dnf_driver_ids_list:
|
||||
# if driver_id not in dnf_driver_ids_list:
|
||||
# dnf_driver_ids_list.append(driver_id)
|
||||
|
||||
# # There can't be dnfs but no initial dnfs
|
||||
# if len(dnf_driver_ids_list) > 0 and len(first_dnf_driver_ids_list) == 0:
|
||||
# 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.pxx_driver_ids_json = json.dumps(pxx_driver_names)
|
||||
# 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.excluded_driver_ids_json = json.dumps(excluded_driver_ids_list)
|
||||
|
||||
# # @todo Dummy values
|
||||
# race_result.fastest_lap_id = NONE_DRIVER.id
|
||||
# race_result.sprint_dnf_driver_ids_json = json.dumps([NONE_DRIVER.id])
|
||||
# race_result.sprint_points_json = json.dumps({NONE_DRIVER.id: 0})
|
||||
|
||||
# db.session.commit()
|
||||
|
||||
# race: DbRace | None = db.session.query(DbRace).filter_by(id=race_id).first()
|
||||
# if race is None:
|
||||
# raise Exception(f"Could not find DbRace with id {race_id}")
|
||||
|
||||
# return redirect(f"/result/{quote(race.name)}")
|
||||
|
||||
|
||||
def update_user(user_name: str | None, add: bool = False, delete: bool = False) -> Response:
|
||||
if user_name is None:
|
||||
return error_redirect("Invalid request: Cannot add/delete user because it is \"None\"!")
|
||||
|
||||
if not add and not delete:
|
||||
return error_redirect("Invalid request: Can either add or delete user!")
|
||||
|
||||
if add and delete:
|
||||
return error_redirect("Invalid request: Can either add or delete user!")
|
||||
|
||||
if add:
|
||||
if len(user_name) < 3:
|
||||
return error_redirect(f"User \"{user_name}\" was not added, because the username must contain at least 3 characters!")
|
||||
|
||||
if user_exists_and_enabled(user_name):
|
||||
return error_redirect(f"User \"{user_name}\" was not added, because it already exists!")
|
||||
|
||||
elif user_exists_and_disabled(user_name):
|
||||
disabled_user: DbUser | None = db.session.query(DbUser).filter_by(name=user_name, enabled=False).first()
|
||||
if disabled_user is None:
|
||||
raise Exception("update_user couldn't reenable user")
|
||||
|
||||
disabled_user.enabled = True
|
||||
|
||||
else:
|
||||
user: DbUser = DbUser(id=None)
|
||||
user.name = user_name
|
||||
user.enabled = True
|
||||
db.session.add(user)
|
||||
|
||||
db.session.commit()
|
||||
|
||||
return redirect("/user")
|
||||
|
||||
if delete:
|
||||
if user_exists_and_disabled(user_name):
|
||||
return error_redirect(f"User \"{user_name}\" was not deleted, because it does not exist!")
|
||||
|
||||
elif user_exists_and_enabled(user_name):
|
||||
enabled_user: DbUser | None = db.session.query(DbUser).filter_by(name=user_name, enabled=True).first()
|
||||
if enabled_user is None:
|
||||
raise Exception("update_user couldn't disable user")
|
||||
|
||||
enabled_user.enabled = False
|
||||
db.session.commit()
|
||||
|
||||
else:
|
||||
return error_redirect(f"User \"{user_name}\" was not deleted, because it does not exist!")
|
||||
|
||||
return redirect("/user")
|
||||
|
||||
raise Exception("update_user received illegal combination of arguments")
|
||||
102
formula10/database/validation.py
Normal file
102
formula10/database/validation.py
Normal file
@ -0,0 +1,102 @@
|
||||
from datetime import datetime
|
||||
from typing import Any, Callable, Iterable, List, TypeVar, overload
|
||||
|
||||
from formula10.database.model.db_race import DbRace
|
||||
from formula10 import db
|
||||
from formula10.domain.model.race import Race
|
||||
|
||||
_T = TypeVar("_T")
|
||||
|
||||
|
||||
def any_is_none(*args: Any) -> bool:
|
||||
for arg in args:
|
||||
if arg is None:
|
||||
return True
|
||||
|
||||
return False
|
||||
|
||||
|
||||
def positions_are_contiguous(positions: List[str]) -> bool:
|
||||
if len(positions) == 0:
|
||||
return True
|
||||
|
||||
positions_unique = set(positions) # Remove duplicates
|
||||
positions_sorted: List[int] = sorted([int(position) for position in positions_unique])
|
||||
|
||||
# [2, 3, 4, 5]: 2 + 3 == 5
|
||||
return positions_sorted[0] + len(positions_sorted) - 1 == positions_sorted[-1]
|
||||
|
||||
@overload
|
||||
def race_has_started(*, race: Race) -> bool:
|
||||
return race_has_started(race=race)
|
||||
|
||||
@overload
|
||||
def race_has_started(*, race_id: int) -> bool:
|
||||
return race_has_started(race_id=race_id)
|
||||
|
||||
def race_has_started(*, race: Race | None = None, race_id: int | None = None) -> bool:
|
||||
if race is None and race_id is not None:
|
||||
_race: DbRace | None = db.session.query(DbRace).filter_by(id=race_id).first()
|
||||
|
||||
if _race is None:
|
||||
raise Exception(f"Couldn't obtain race with id {race_id} to check date")
|
||||
|
||||
return datetime.now() > _race.date
|
||||
|
||||
if race is not None and race_id is None:
|
||||
return datetime.now() > race.date
|
||||
|
||||
raise Exception("race_has_started received illegal arguments")
|
||||
|
||||
|
||||
def find_first_else_none(predicate: Callable[[_T], bool], iterable: Iterable[_T]) -> _T | None:
|
||||
"""
|
||||
Finds the first element in a sequence matching a predicate.
|
||||
Returns None if no element is found.
|
||||
"""
|
||||
return next(filter(predicate, iterable), None)
|
||||
|
||||
|
||||
def find_multiple(predicate: Callable[[_T], bool], iterable: Iterable[_T]) -> List[_T]:
|
||||
filtered = list(filter(predicate, iterable))
|
||||
|
||||
return filtered
|
||||
|
||||
|
||||
def find_multiple_strict(predicate: Callable[[_T], bool], iterable: Iterable[_T], count: int = 0) -> List[_T]:
|
||||
"""
|
||||
Finds <count> elements in a sequence matching a predicate (finds all if <count> is 0).
|
||||
Throws exception if more/fewer elements were found than specified.
|
||||
"""
|
||||
filtered = list(filter(predicate, iterable))
|
||||
|
||||
if count != 0 and len(filtered) != count:
|
||||
raise Exception(f"find_multiple found {len(filtered)} matching elements but expected {count}")
|
||||
|
||||
return filtered
|
||||
|
||||
|
||||
def find_single_strict(predicate: Callable[[_T], bool], iterable: Iterable[_T]) -> _T:
|
||||
"""
|
||||
Find a single element in a sequence matching a predicate.
|
||||
Throws exception if more/less than a single element is found.
|
||||
"""
|
||||
filtered = list(filter(predicate, iterable))
|
||||
|
||||
if len(filtered) != 1:
|
||||
raise Exception(f"find_single found {len(filtered)} matching elements but expected 1")
|
||||
|
||||
return filtered[0]
|
||||
|
||||
|
||||
def find_single_or_none_strict(predicate: Callable[[_T], bool], iterable: Iterable[_T]) -> _T | None:
|
||||
"""
|
||||
Find a single element in a sequence matching a predicate if it exists.
|
||||
Only throws exception if more than a single element is found.
|
||||
"""
|
||||
filtered = list(filter(predicate, iterable))
|
||||
|
||||
if len(filtered) > 1:
|
||||
raise Exception(f"find_single_or_none found {len(list(filtered))} matching elements but expected 0 or 1")
|
||||
|
||||
return filtered[0] if len(filtered) == 1 else None
|
||||
0
formula10/domain/__init__.py
Normal file
0
formula10/domain/__init__.py
Normal file
335
formula10/domain/domain_model.py
Normal file
335
formula10/domain/domain_model.py
Normal file
@ -0,0 +1,335 @@
|
||||
from typing import Callable, Dict, List, overload
|
||||
from sqlalchemy import desc
|
||||
|
||||
from formula10.database.model.db_driver import DbDriver
|
||||
from formula10.database.model.db_race import DbRace
|
||||
from formula10.database.model.db_race_guess import DbRaceGuess
|
||||
from formula10.database.model.db_race_result import DbRaceResult
|
||||
from formula10.database.model.db_season_guess import DbSeasonGuess
|
||||
from formula10.database.model.db_season_guess_result import DbSeasonGuessResult
|
||||
from formula10.database.model.db_team import DbTeam
|
||||
from formula10.database.model.db_user import DbUser
|
||||
from formula10.database.validation import find_multiple_strict, find_single_or_none_strict, find_single_strict
|
||||
from formula10.domain.model.driver import NONE_DRIVER, Driver
|
||||
from formula10.domain.model.race import Race
|
||||
from formula10.domain.model.race_guess import RaceGuess
|
||||
from formula10.domain.model.race_result import RaceResult
|
||||
from formula10.domain.model.season_guess import SeasonGuess
|
||||
from formula10.domain.model.season_guess_result import SeasonGuessResult
|
||||
from formula10.domain.model.team import NONE_TEAM, Team
|
||||
from formula10.domain.model.user import User
|
||||
from formula10 import db
|
||||
|
||||
|
||||
class Model():
|
||||
_all_users: List[User] | None = None
|
||||
_all_race_results: List[RaceResult] | None = None
|
||||
_all_race_guesses: List[RaceGuess] | None = None
|
||||
_all_season_guesses: List[SeasonGuess] | None = None
|
||||
_all_season_guess_results: List[SeasonGuessResult] | None = None
|
||||
_all_races: List[Race] | None = None
|
||||
_all_drivers: List[Driver] | None = None
|
||||
_all_teams: List[Team] | None = None
|
||||
|
||||
def all_users(self) -> List[User]:
|
||||
"""
|
||||
Returns a list of all enabled users.
|
||||
"""
|
||||
if self._all_users is None:
|
||||
self._all_users = [
|
||||
User.from_db_user(db_user)
|
||||
for db_user in db.session.query(DbUser).filter_by(enabled=True).all()
|
||||
]
|
||||
|
||||
return self._all_users
|
||||
|
||||
def all_race_results(self) -> List[RaceResult]:
|
||||
"""
|
||||
Returns a list of all race results, in descending order (most recent first).
|
||||
"""
|
||||
if self._all_race_results is None:
|
||||
self._all_race_results = [
|
||||
RaceResult.from_db_race_result(db_race_result)
|
||||
for db_race_result in db.session.query(DbRaceResult).join(DbRaceResult.race).order_by(desc(DbRace.number)).all()
|
||||
]
|
||||
|
||||
return self._all_race_results
|
||||
|
||||
def all_race_guesses(self) -> List[RaceGuess]:
|
||||
"""
|
||||
Returns a list of all race guesses (of enabled users).
|
||||
"""
|
||||
if self._all_race_guesses is None:
|
||||
self._all_race_guesses = [
|
||||
RaceGuess.from_db_race_guess(db_race_guess)
|
||||
for db_race_guess in db.session.query(DbRaceGuess).join(DbRaceGuess.user).filter_by(enabled=True).all() # Ignore disabled users
|
||||
]
|
||||
|
||||
return self._all_race_guesses
|
||||
|
||||
def all_season_guesses(self) -> List[SeasonGuess]:
|
||||
"""
|
||||
Returns a list of all season guesses (of enabled users).
|
||||
"""
|
||||
if self._all_season_guesses is None:
|
||||
self._all_season_guesses = [
|
||||
SeasonGuess.from_db_season_guess(db_season_guess)
|
||||
for db_season_guess in db.session.query(DbSeasonGuess).join(DbSeasonGuess.user).filter_by(enabled=True).all() # Ignore disabled users
|
||||
]
|
||||
|
||||
return self._all_season_guesses
|
||||
|
||||
def all_season_guess_results(self) -> List[SeasonGuessResult]:
|
||||
if self._all_season_guess_results is None:
|
||||
self._all_season_guess_results = [
|
||||
SeasonGuessResult.from_db_season_guess_result(db_season_guess_result)
|
||||
for db_season_guess_result in db.session.query(DbSeasonGuessResult).join(DbSeasonGuessResult.user).filter_by(enabled=True).all() # Ignore disabled users
|
||||
]
|
||||
|
||||
return self._all_season_guess_results
|
||||
|
||||
def all_races(self) -> List[Race]:
|
||||
"""
|
||||
Returns a list of all races, in descending order (last race first).
|
||||
"""
|
||||
if self._all_races is None:
|
||||
self._all_races = [
|
||||
Race.from_db_race(db_race)
|
||||
for db_race in db.session.query(DbRace).order_by(desc(DbRace.number)).all()
|
||||
]
|
||||
|
||||
return self._all_races
|
||||
|
||||
def all_drivers(self, *, include_none: bool) -> List[Driver]:
|
||||
"""
|
||||
Returns a list of all drivers.
|
||||
"""
|
||||
if self._all_drivers is None:
|
||||
self._all_drivers = [
|
||||
Driver.from_db_driver(db_driver)
|
||||
for db_driver in db.session.query(DbDriver).all()
|
||||
]
|
||||
|
||||
if include_none:
|
||||
return self._all_drivers
|
||||
else:
|
||||
predicate: Callable[[Driver], bool] = lambda driver: driver != NONE_DRIVER
|
||||
return find_multiple_strict(predicate, self._all_drivers)
|
||||
|
||||
def all_teams(self, *, include_none: bool) -> List[Team]:
|
||||
"""
|
||||
Returns a list of all teams.
|
||||
"""
|
||||
if self._all_teams is None:
|
||||
self._all_teams = [
|
||||
Team.from_db_team(db_team)
|
||||
for db_team in db.session.query(DbTeam).all()
|
||||
]
|
||||
|
||||
if include_none:
|
||||
return self._all_teams
|
||||
else:
|
||||
predicate: Callable[[Team], bool] = lambda team: team != NONE_TEAM
|
||||
return find_multiple_strict(predicate, self._all_teams)
|
||||
|
||||
#
|
||||
# User queries
|
||||
#
|
||||
|
||||
@overload
|
||||
def user_by(self, *, user_name: str) -> User:
|
||||
"""
|
||||
Tries to obtain the user object for a specific username.
|
||||
"""
|
||||
return self.user_by(user_name=user_name)
|
||||
|
||||
@overload
|
||||
def user_by(self, *, user_name: str, ignore: List[str]) -> User | None:
|
||||
"""
|
||||
Tries to obtain the user object for a specific username, but ignores certain usernames.
|
||||
"""
|
||||
return self.user_by(user_name=user_name, ignore=ignore)
|
||||
|
||||
def user_by(self, *, user_name: str, ignore: List[str] | None = None) -> User | None:
|
||||
if ignore is None:
|
||||
ignore = []
|
||||
|
||||
if len(ignore) > 0 and user_name in ignore:
|
||||
return None
|
||||
|
||||
predicate: Callable[[User], bool] = lambda user: user.name == user_name
|
||||
return find_single_strict(predicate, self.all_users())
|
||||
|
||||
#
|
||||
# Race result queries
|
||||
#
|
||||
|
||||
def race_result_by(self, *, race_name: str) -> RaceResult | None:
|
||||
"""
|
||||
Tries to obtain the race result corresponding to a race name.
|
||||
"""
|
||||
predicate: Callable[[RaceResult], bool] = lambda result: result.race.name == race_name
|
||||
return find_single_or_none_strict(predicate, self.all_race_results())
|
||||
|
||||
#
|
||||
# Race guess queries
|
||||
#
|
||||
|
||||
@overload
|
||||
def race_guesses_by(self, *, user_name: str) -> List[RaceGuess]:
|
||||
"""
|
||||
Returns a list of all race guesses made by a specific user.
|
||||
"""
|
||||
return self.race_guesses_by(user_name=user_name)
|
||||
|
||||
@overload
|
||||
def race_guesses_by(self, *, race_name: str) -> List[RaceGuess]:
|
||||
"""
|
||||
Returns a list of all race guesses made for a specific race.
|
||||
"""
|
||||
return self.race_guesses_by(race_name=race_name)
|
||||
|
||||
@overload
|
||||
def race_guesses_by(self, *, user_name: str, race_name: str) -> RaceGuess | None:
|
||||
"""
|
||||
Returns a single race guess by a specific user for a specific race, or None, if this guess doesn't exist.
|
||||
"""
|
||||
return self.race_guesses_by(user_name=user_name, race_name=race_name)
|
||||
|
||||
@overload
|
||||
def race_guesses_by(self) -> Dict[str, Dict[str, RaceGuess]]:
|
||||
"""
|
||||
Returns a dictionary that maps race-ids to user-id - guess dictionaries.
|
||||
"""
|
||||
return self.race_guesses_by()
|
||||
|
||||
def race_guesses_by(self, *, user_name: str | None = None, race_name: str | None = None) -> RaceGuess | List[RaceGuess] | Dict[str, Dict[str, RaceGuess]] | None:
|
||||
# List of all guesses by a single user
|
||||
if user_name is not None and race_name is None:
|
||||
predicate: Callable[[RaceGuess], bool] = lambda guess: guess.user.name == user_name
|
||||
return find_multiple_strict(predicate, self.all_race_guesses())
|
||||
|
||||
# List of all guesses for a single race
|
||||
if user_name is None and race_name is not None:
|
||||
predicate: Callable[[RaceGuess], bool] = lambda guess: guess.race.name == race_name
|
||||
return find_multiple_strict(predicate, self.all_race_guesses())
|
||||
|
||||
# Guess for a single race by a single user
|
||||
if user_name is not None and race_name is not None:
|
||||
predicate: Callable[[RaceGuess], bool] = lambda guess: guess.user.name == user_name and guess.race.name == race_name
|
||||
return find_single_or_none_strict(predicate, self.all_race_guesses())
|
||||
|
||||
# Dict with all guesses
|
||||
if user_name is None and race_name is None:
|
||||
guesses_by: Dict[str, Dict[str, RaceGuess]] = dict()
|
||||
guess: RaceGuess
|
||||
|
||||
for guess in self.all_race_guesses():
|
||||
if guess.race.name not in guesses_by:
|
||||
guesses_by[guess.race.name] = dict()
|
||||
|
||||
guesses_by[guess.race.name][guess.user.name] = guess
|
||||
|
||||
return guesses_by
|
||||
|
||||
raise Exception("race_guesses_by encountered illegal combination of arguments")
|
||||
|
||||
#
|
||||
# Season guess queries
|
||||
#
|
||||
|
||||
@overload
|
||||
def season_guesses_by(self, *, user_name: str) -> SeasonGuess | None:
|
||||
"""
|
||||
Returns the season guess made by a specific user.
|
||||
"""
|
||||
return self.season_guesses_by(user_name=user_name)
|
||||
|
||||
@overload
|
||||
def season_guesses_by(self) -> Dict[str, SeasonGuess]:
|
||||
"""
|
||||
Returns a dictionary of season guesses mapped to usernames.
|
||||
"""
|
||||
return self.season_guesses_by()
|
||||
|
||||
def season_guesses_by(self, *, user_name: str | None = None) -> SeasonGuess | Dict[str, SeasonGuess] | None:
|
||||
if user_name is not None:
|
||||
predicate: Callable[[SeasonGuess], bool] = lambda guess: guess.user.name == user_name
|
||||
return find_single_or_none_strict(predicate, self.all_season_guesses())
|
||||
|
||||
if user_name is None:
|
||||
guesses_by: Dict[str, SeasonGuess] = dict()
|
||||
guess: SeasonGuess
|
||||
|
||||
for guess in self.all_season_guesses():
|
||||
guesses_by[guess.user.name] = guess
|
||||
|
||||
return guesses_by
|
||||
|
||||
raise Exception("season_guesses_by encountered illegal combination of arguments")
|
||||
|
||||
#
|
||||
# Season guess result queries
|
||||
#
|
||||
|
||||
def season_guess_result_by(self, *, user_name: str) -> SeasonGuessResult | None:
|
||||
predicate: Callable[[SeasonGuessResult], bool] = lambda guess: guess.user.name == user_name
|
||||
return find_single_or_none_strict(predicate, self.all_season_guess_results())
|
||||
|
||||
#
|
||||
# Team queries
|
||||
#
|
||||
|
||||
def none_team(self) -> Team:
|
||||
return NONE_TEAM
|
||||
|
||||
#
|
||||
# Driver queries
|
||||
#
|
||||
|
||||
def none_driver(self) -> Driver:
|
||||
return NONE_DRIVER
|
||||
|
||||
@overload
|
||||
def drivers_by(self, *, team_name: str) -> List[Driver]:
|
||||
"""
|
||||
Returns a list of all drivers driving for a certain team.
|
||||
"""
|
||||
return self.drivers_by(team_name=team_name)
|
||||
|
||||
@overload
|
||||
def drivers_by(self) -> Dict[str, List[Driver]]:
|
||||
"""
|
||||
Returns a dictionary of drivers mapped to team names.
|
||||
"""
|
||||
return self.drivers_by()
|
||||
|
||||
def drivers_by(self, *, team_name: str | None = None) -> List[Driver] | Dict[str, List[Driver]]:
|
||||
if team_name is not None:
|
||||
predicate: Callable[[Driver], bool] = lambda driver: driver.team.name == team_name
|
||||
return find_multiple_strict(predicate, self.all_drivers(include_none=False), 2)
|
||||
|
||||
if team_name is None:
|
||||
drivers_by: Dict[str, List[Driver]] = dict()
|
||||
driver: Driver
|
||||
team: Team
|
||||
|
||||
for team in self.all_teams(include_none=False):
|
||||
drivers_by[team.name] = []
|
||||
for driver in self.all_drivers(include_none=False):
|
||||
drivers_by[driver.team.name] += [driver]
|
||||
|
||||
return drivers_by
|
||||
|
||||
raise Exception("drivers_by encountered illegal combination of arguments")
|
||||
|
||||
#
|
||||
# Race queries
|
||||
#
|
||||
|
||||
def race_by(self, *, race_name: str) -> Race:
|
||||
for race in self.all_races():
|
||||
if race.name == race_name:
|
||||
return race
|
||||
|
||||
raise Exception(f"Couldn't find race {race_name}")
|
||||
0
formula10/domain/model/__init__.py
Normal file
0
formula10/domain/model/__init__.py
Normal file
51
formula10/domain/model/driver.py
Normal file
51
formula10/domain/model/driver.py
Normal file
@ -0,0 +1,51 @@
|
||||
from urllib.parse import quote
|
||||
|
||||
from formula10.database.model.db_driver import DbDriver
|
||||
from formula10.domain.model.team import NONE_TEAM, Team
|
||||
|
||||
|
||||
class Driver():
|
||||
@classmethod
|
||||
def from_db_driver(cls, db_driver: DbDriver):
|
||||
driver: Driver = cls()
|
||||
driver.id = db_driver.id
|
||||
driver.name = db_driver.name
|
||||
driver.abbr = db_driver.abbr
|
||||
driver.country = db_driver.country_code
|
||||
driver.team = Team.from_db_team(db_driver.team)
|
||||
return driver
|
||||
|
||||
def to_db_driver(self) -> DbDriver:
|
||||
db_driver: DbDriver = DbDriver(id=self.id)
|
||||
db_driver.name = self.name
|
||||
db_driver.abbr = self.abbr
|
||||
db_driver.country_code = self.country
|
||||
db_driver.team_id = self.team.name
|
||||
return db_driver
|
||||
|
||||
def __eq__(self, __value: object) -> bool:
|
||||
if isinstance(__value, Driver):
|
||||
return self.id == __value.id
|
||||
|
||||
return NotImplemented
|
||||
|
||||
def __hash__(self) -> int:
|
||||
return hash(self.id)
|
||||
|
||||
id: int
|
||||
name: str
|
||||
abbr: str
|
||||
country: str
|
||||
team: Team
|
||||
|
||||
@property
|
||||
def name_sanitized(self) -> str:
|
||||
return quote(self.name)
|
||||
|
||||
|
||||
NONE_DRIVER: Driver = Driver()
|
||||
NONE_DRIVER.id = 0
|
||||
NONE_DRIVER.name = "None"
|
||||
NONE_DRIVER.abbr = "None"
|
||||
NONE_DRIVER.country = "NO"
|
||||
NONE_DRIVER.team = NONE_TEAM
|
||||
43
formula10/domain/model/race.py
Normal file
43
formula10/domain/model/race.py
Normal file
@ -0,0 +1,43 @@
|
||||
from datetime import datetime
|
||||
from urllib.parse import quote
|
||||
|
||||
from formula10.database.model.db_race import DbRace
|
||||
|
||||
|
||||
class Race():
|
||||
@classmethod
|
||||
def from_db_race(cls, db_race: DbRace):
|
||||
race: Race = cls()
|
||||
race.id = db_race.id
|
||||
race.name = db_race.name
|
||||
race.number = db_race.number
|
||||
race.date = db_race.date
|
||||
race.place_to_guess = db_race.pxx
|
||||
return race
|
||||
|
||||
def to_db_race(self) -> DbRace:
|
||||
db_race: DbRace = DbRace(id=self.id)
|
||||
db_race.name = self.name
|
||||
db_race.number = self.number
|
||||
db_race.date = self.date
|
||||
db_race.pxx = self.place_to_guess
|
||||
return db_race
|
||||
|
||||
def __eq__(self, __value: object) -> bool:
|
||||
if isinstance(__value, Race):
|
||||
return self.id == __value.id
|
||||
|
||||
return NotImplemented
|
||||
|
||||
def __hash__(self) -> int:
|
||||
return hash(self.id)
|
||||
|
||||
id: int
|
||||
name: str
|
||||
number: int
|
||||
date: datetime
|
||||
place_to_guess: int
|
||||
|
||||
@property
|
||||
def name_sanitized(self) -> str:
|
||||
return quote(self.name)
|
||||
35
formula10/domain/model/race_guess.py
Normal file
35
formula10/domain/model/race_guess.py
Normal file
@ -0,0 +1,35 @@
|
||||
from formula10.database.model.db_race_guess import DbRaceGuess
|
||||
from formula10.domain.model.driver import Driver
|
||||
from formula10.domain.model.race import Race
|
||||
from formula10.domain.model.user import User
|
||||
|
||||
|
||||
class RaceGuess():
|
||||
@classmethod
|
||||
def from_db_race_guess(cls, db_race_guess: DbRaceGuess):
|
||||
race_guess: RaceGuess = cls()
|
||||
race_guess.user = User.from_db_user(db_race_guess.user)
|
||||
race_guess.race = Race.from_db_race(db_race_guess.race)
|
||||
race_guess.pxx_guess = Driver.from_db_driver(db_race_guess.pxx)
|
||||
race_guess.dnf_guess = Driver.from_db_driver(db_race_guess.dnf)
|
||||
return race_guess
|
||||
|
||||
def to_db_race_guess(self) -> DbRaceGuess:
|
||||
db_race_guess: DbRaceGuess = DbRaceGuess(user_id=self.user.id, race_id=self.race.id)
|
||||
db_race_guess.pxx_driver_id = self.pxx_guess.id
|
||||
db_race_guess.dnf_driver_id = self.dnf_guess.id
|
||||
return db_race_guess
|
||||
|
||||
def __eq__(self, __value: object) -> bool:
|
||||
if isinstance(__value, RaceGuess):
|
||||
return self.user == __value.user and self.race == __value.race
|
||||
|
||||
return NotImplemented
|
||||
|
||||
def __hash__(self) -> int:
|
||||
return hash((self.user, self.race))
|
||||
|
||||
user: User
|
||||
race: Race
|
||||
pxx_guess: Driver
|
||||
dnf_guess: Driver
|
||||
185
formula10/domain/model/race_result.py
Normal file
185
formula10/domain/model/race_result.py
Normal file
@ -0,0 +1,185 @@
|
||||
import json
|
||||
from typing import Dict, List
|
||||
|
||||
from formula10.database.common_queries import find_single_driver_strict
|
||||
from formula10.database.model.db_race_result import DbRaceResult
|
||||
from formula10.domain.model.driver import NONE_DRIVER, Driver
|
||||
from formula10.domain.model.race import Race
|
||||
|
||||
|
||||
class RaceResult:
|
||||
@classmethod
|
||||
def from_db_race_result(cls, db_race_result: DbRaceResult):
|
||||
race_result: RaceResult = cls()
|
||||
race_result.race = Race.from_db_race(db_race_result.race)
|
||||
race_result.fastest_lap_driver = Driver.from_db_driver(db_race_result.fastest_lap_driver)
|
||||
|
||||
# Deserialize from json
|
||||
standing: Dict[str, str] = json.loads(db_race_result.pxx_driver_ids_json)
|
||||
initial_dnf: List[str] = json.loads(db_race_result.first_dnf_driver_ids_json)
|
||||
all_dnfs: List[str] = json.loads(db_race_result.dnf_driver_ids_json)
|
||||
standing_exclusions: List[str] = json.loads(db_race_result.excluded_driver_ids_json)
|
||||
sprint_dnfs: List[str] = json.loads(db_race_result.sprint_dnf_driver_ids_json)
|
||||
sprint_standing: Dict[str, str] = json.loads(db_race_result.sprint_points_json)
|
||||
|
||||
# Populate relationships
|
||||
race_result.standing = {
|
||||
position: Driver.from_db_driver(find_single_driver_strict(int(driver_id)))
|
||||
for position, driver_id in standing.items()
|
||||
}
|
||||
race_result.initial_dnf = [
|
||||
Driver.from_db_driver(find_single_driver_strict(int(driver_id)))
|
||||
for driver_id in initial_dnf
|
||||
]
|
||||
race_result.all_dnfs = [
|
||||
Driver.from_db_driver(find_single_driver_strict(int(driver_id)))
|
||||
for driver_id in all_dnfs
|
||||
]
|
||||
race_result.standing_exclusions = [
|
||||
Driver.from_db_driver(find_single_driver_strict(int(driver_id)))
|
||||
for driver_id in standing_exclusions
|
||||
]
|
||||
race_result.sprint_dnfs = [
|
||||
Driver.from_db_driver(find_single_driver_strict(int(driver_id)))
|
||||
for driver_id in sprint_dnfs
|
||||
]
|
||||
race_result.sprint_standing = {
|
||||
position: Driver.from_db_driver(find_single_driver_strict(int(driver_id)))
|
||||
for position, driver_id in sprint_standing.items()
|
||||
}
|
||||
|
||||
return race_result
|
||||
|
||||
def to_db_race_result(self) -> DbRaceResult:
|
||||
# "Unpopulate" relationships, remove none driver
|
||||
standing: Dict[str, str] = {
|
||||
position: driver.name for position, driver in self.standing.items()
|
||||
}
|
||||
initial_dnf: List[str] = [
|
||||
str(driver.id) for driver in self.initial_dnf if driver
|
||||
]
|
||||
all_dnfs: List[str] = [
|
||||
str(driver.id) for driver in self.all_dnfs if driver
|
||||
]
|
||||
standing_exclusions: List[str] = [
|
||||
str(driver.id) for driver in self.standing_exclusions if driver
|
||||
]
|
||||
sprint_dnfs: List[str] = [
|
||||
str(driver.id) for driver in self.sprint_dnfs if driver
|
||||
]
|
||||
sprint_standing: Dict[str, str] = {
|
||||
position: driver.name for position, driver in self.sprint_standing.items()
|
||||
}
|
||||
|
||||
# Serialize to json
|
||||
db_race_result: DbRaceResult = DbRaceResult(race_id=self.race.id)
|
||||
db_race_result.pxx_driver_ids_json = json.dumps(standing)
|
||||
db_race_result.first_dnf_driver_ids_json = json.dumps(initial_dnf)
|
||||
db_race_result.dnf_driver_ids_json = json.dumps(all_dnfs)
|
||||
db_race_result.excluded_driver_ids_json = json.dumps(standing_exclusions)
|
||||
db_race_result.fastest_lap_id = self.fastest_lap_driver.id
|
||||
db_race_result.sprint_dnf_driver_ids_json = json.dumps(sprint_dnfs)
|
||||
db_race_result.sprint_points_json = json.dumps(sprint_standing)
|
||||
|
||||
return db_race_result
|
||||
|
||||
def __eq__(self, __value: object) -> bool:
|
||||
if isinstance(__value, RaceResult):
|
||||
return self.race == __value.race
|
||||
|
||||
return NotImplemented
|
||||
|
||||
def __hash__(self) -> int:
|
||||
return hash(self.race)
|
||||
|
||||
race: Race
|
||||
standing: Dict[str, Driver] # Always contains all 20 drivers, even if DNF'ed or excluded
|
||||
initial_dnf: List[Driver] # initial_dnf is empty if no-one DNF'ed
|
||||
all_dnfs: List[Driver]
|
||||
standing_exclusions: List[Driver]
|
||||
|
||||
fastest_lap_driver: Driver
|
||||
sprint_dnfs: List[Driver]
|
||||
sprint_standing: Dict[str, Driver]
|
||||
|
||||
def offset_from_place_to_guess(self, offset: int, respect_nc:bool = True) -> Driver:
|
||||
position: str = str(self.race.place_to_guess + offset)
|
||||
|
||||
if position not in self.standing:
|
||||
raise Exception(f"Position {position} not found in RaceResult.standing")
|
||||
|
||||
if self.standing[position] in self.standing_exclusions and respect_nc:
|
||||
return NONE_DRIVER
|
||||
|
||||
return self.standing[position]
|
||||
|
||||
def driver_standing_position(self, driver: Driver) -> int | None:
|
||||
if driver == NONE_DRIVER:
|
||||
return None
|
||||
|
||||
for position, _driver in self.standing.items():
|
||||
if driver == _driver and driver not in self.standing_exclusions:
|
||||
return int(position)
|
||||
|
||||
return None
|
||||
|
||||
def driver_standing_position_string(self, driver: Driver) -> str:
|
||||
if driver == NONE_DRIVER:
|
||||
return ""
|
||||
|
||||
for position, _driver in self.standing.items():
|
||||
if driver == _driver and driver not in self.standing_exclusions:
|
||||
return f" (P{position})"
|
||||
|
||||
return " (NC)"
|
||||
|
||||
def driver_standing_points_string(self, driver: Driver) -> str:
|
||||
points_strings: Dict[int, str] = {
|
||||
0: "10 Points",
|
||||
1: "6 Points",
|
||||
2: "3 Points",
|
||||
3: "1 Points"
|
||||
}
|
||||
|
||||
if driver == NONE_DRIVER:
|
||||
if self.standing[str(self.race.place_to_guess)] in self.standing_exclusions:
|
||||
return "10 Points"
|
||||
else:
|
||||
return "0 Points"
|
||||
|
||||
for position, _driver in self.standing.items():
|
||||
if driver == _driver and driver not in self.standing_exclusions:
|
||||
position_offset: int = abs(self.race.place_to_guess - int(position))
|
||||
if position_offset in points_strings:
|
||||
return points_strings[position_offset]
|
||||
else:
|
||||
return "0 Points"
|
||||
|
||||
raise Exception(f"Could not get points string for driver {driver.name}")
|
||||
|
||||
def driver_dnf_points_string(self, driver: Driver) -> str:
|
||||
if driver == NONE_DRIVER:
|
||||
if len(self.initial_dnf) == 0:
|
||||
return "10 Points"
|
||||
else:
|
||||
return "0 Points"
|
||||
|
||||
if driver in self.initial_dnf:
|
||||
return "10 Points"
|
||||
else:
|
||||
return "0 Points"
|
||||
|
||||
def ordered_standing_list(self) -> List[Driver]:
|
||||
return [
|
||||
self.standing[str(position)] for position in range(1, 21)
|
||||
]
|
||||
|
||||
def initial_dnf_string(self) -> str:
|
||||
if len(self.initial_dnf) == 0:
|
||||
return NONE_DRIVER.name
|
||||
|
||||
dnf_string: str = ""
|
||||
for driver in self.initial_dnf:
|
||||
dnf_string += f"{driver.abbr} "
|
||||
|
||||
return dnf_string[0:len(dnf_string)-1] # Remove last space
|
||||
81
formula10/domain/model/season_guess.py
Normal file
81
formula10/domain/model/season_guess.py
Normal file
@ -0,0 +1,81 @@
|
||||
import json
|
||||
from typing import List
|
||||
from formula10.database.common_queries import find_single_driver_strict
|
||||
from formula10.database.model.db_season_guess import DbSeasonGuess
|
||||
from formula10.domain.model.driver import Driver
|
||||
from formula10.domain.model.team import Team
|
||||
from formula10.domain.model.user import User
|
||||
|
||||
|
||||
class SeasonGuess():
|
||||
@classmethod
|
||||
def from_db_season_guess(cls, db_season_guess: DbSeasonGuess):
|
||||
season_guess: SeasonGuess = cls()
|
||||
season_guess.user = User.from_db_user(db_season_guess.user)
|
||||
season_guess.hot_take = db_season_guess.hot_take if db_season_guess.hot_take is not None else None
|
||||
season_guess.p2_wcc = Team.from_db_team(db_season_guess.p2_team) if db_season_guess.p2_team is not None else None
|
||||
season_guess.most_overtakes = Driver.from_db_driver(db_season_guess.overtake_driver) if db_season_guess.overtake_driver is not None else None
|
||||
season_guess.most_dnfs = Driver.from_db_driver(db_season_guess.dnf_driver) if db_season_guess.dnf_driver is not None else None
|
||||
season_guess.most_wdc_gained = Driver.from_db_driver(db_season_guess.gained_driver) if db_season_guess.gained_driver is not None else None
|
||||
season_guess.most_wdc_lost = Driver.from_db_driver(db_season_guess.lost_driver) if db_season_guess.lost_driver is not None else None
|
||||
|
||||
# Deserialize from json
|
||||
team_winners: List[str | None] = json.loads(db_season_guess.team_winners_driver_ids_json)
|
||||
podiums: List[str] = json.loads(db_season_guess.podium_drivers_driver_ids_json)
|
||||
|
||||
# Populate relationships
|
||||
season_guess.team_winners = [
|
||||
Driver.from_db_driver(find_single_driver_strict(int(driver_id))) if driver_id is not None else None
|
||||
for driver_id in team_winners
|
||||
]
|
||||
season_guess.podiums = [
|
||||
Driver.from_db_driver(find_single_driver_strict(int(driver_id)))
|
||||
for driver_id in podiums
|
||||
]
|
||||
|
||||
return season_guess
|
||||
|
||||
def to_db_season_guess(self):
|
||||
# "Unpopulate" relationships
|
||||
team_winners: List[str | None] = [
|
||||
driver.name if driver is not None else None
|
||||
for driver in self.team_winners
|
||||
]
|
||||
podiums: List[str] = [
|
||||
driver.name for driver in self.podiums
|
||||
]
|
||||
|
||||
# Serialize to json
|
||||
db_season_guess: DbSeasonGuess = DbSeasonGuess(user_id=self.user.id)
|
||||
db_season_guess.hot_take = self.hot_take
|
||||
db_season_guess.p2_team_id = self.p2_wcc.id if self.p2_wcc is not None else None
|
||||
db_season_guess.overtake_driver_id = self.most_overtakes.id if self.most_overtakes is not None else None
|
||||
db_season_guess.dnf_driver_id = self.most_dnfs.id if self.most_dnfs is not None else None
|
||||
db_season_guess.gained_driver_id = self.most_wdc_gained.id if self.most_wdc_gained is not None else None
|
||||
db_season_guess.lost_driver_id = self.most_wdc_lost.id if self.most_wdc_lost is not None else None
|
||||
db_season_guess.team_winners_driver_ids_json=json.dumps(team_winners)
|
||||
db_season_guess.podium_drivers_driver_ids_json=json.dumps(podiums)
|
||||
|
||||
return db_season_guess
|
||||
|
||||
def __eq__(self, __value: object) -> bool:
|
||||
if isinstance(__value, SeasonGuess):
|
||||
return self.user == __value.user
|
||||
|
||||
return NotImplemented
|
||||
|
||||
def __hash__(self) -> int:
|
||||
return hash(self.user)
|
||||
|
||||
user: User
|
||||
hot_take: str | None
|
||||
p2_wcc: Team | None
|
||||
most_overtakes: Driver | None
|
||||
most_dnfs: Driver | None
|
||||
most_wdc_gained: Driver | None
|
||||
most_wdc_lost: Driver | None
|
||||
team_winners: List[Driver | None]
|
||||
podiums: List[Driver]
|
||||
|
||||
def hot_take_string(self) -> str:
|
||||
return self.hot_take if self.hot_take is not None else ""
|
||||
32
formula10/domain/model/season_guess_result.py
Normal file
32
formula10/domain/model/season_guess_result.py
Normal file
@ -0,0 +1,32 @@
|
||||
from formula10.database.model.db_season_guess_result import DbSeasonGuessResult
|
||||
from formula10.domain.model.user import User
|
||||
|
||||
|
||||
class SeasonGuessResult():
|
||||
@classmethod
|
||||
def from_db_season_guess_result(cls, db_season_guess_result: DbSeasonGuessResult):
|
||||
season_guess_result: SeasonGuessResult = cls()
|
||||
season_guess_result.user = User.from_db_user(db_season_guess_result.user)
|
||||
season_guess_result.hot_take_correct = db_season_guess_result.hot_take_correct
|
||||
season_guess_result.overtakes_correct = db_season_guess_result.overtakes_correct
|
||||
|
||||
return season_guess_result
|
||||
|
||||
def to_db_season_guess_result(self) -> DbSeasonGuessResult:
|
||||
db_season_guess_result: DbSeasonGuessResult = DbSeasonGuessResult(user_id=self.user.id)
|
||||
db_season_guess_result.hot_take_correct = self.hot_take_correct
|
||||
db_season_guess_result.overtakes_correct = self.overtakes_correct
|
||||
return db_season_guess_result
|
||||
|
||||
def __eq__(self, __value: object) -> bool:
|
||||
if isinstance(__value, SeasonGuessResult):
|
||||
return self.user == __value.user
|
||||
|
||||
return NotImplemented
|
||||
|
||||
def __hash__(self) -> int:
|
||||
return hash(self.user)
|
||||
|
||||
user: User
|
||||
hot_take_correct: bool
|
||||
overtakes_correct: bool
|
||||
37
formula10/domain/model/team.py
Normal file
37
formula10/domain/model/team.py
Normal file
@ -0,0 +1,37 @@
|
||||
from urllib.parse import quote
|
||||
|
||||
from formula10.database.model.db_team import DbTeam
|
||||
|
||||
|
||||
class Team():
|
||||
@classmethod
|
||||
def from_db_team(cls, db_team: DbTeam):
|
||||
team: Team = cls()
|
||||
team.id = db_team.id
|
||||
team.name = db_team.name
|
||||
return team
|
||||
|
||||
def to_db_team(self) -> DbTeam:
|
||||
db_team: DbTeam = DbTeam(id=self.id)
|
||||
db_team.name = self.name
|
||||
return db_team
|
||||
|
||||
def __eq__(self, __value: object) -> bool:
|
||||
if isinstance(__value, Team):
|
||||
return self.id == __value.id
|
||||
|
||||
return NotImplemented
|
||||
|
||||
def __hash__(self) -> int:
|
||||
return hash(self.id)
|
||||
|
||||
id: int
|
||||
name: str
|
||||
|
||||
@property
|
||||
def name_sanitized(self) -> str:
|
||||
return quote(self.name)
|
||||
|
||||
NONE_TEAM: Team = Team()
|
||||
NONE_TEAM.id = 0
|
||||
NONE_TEAM.name = "None"
|
||||
36
formula10/domain/model/user.py
Normal file
36
formula10/domain/model/user.py
Normal file
@ -0,0 +1,36 @@
|
||||
from urllib.parse import quote
|
||||
|
||||
from formula10.database.model.db_user import DbUser
|
||||
|
||||
|
||||
class User():
|
||||
@classmethod
|
||||
def from_db_user(cls, db_user: DbUser):
|
||||
user: User = cls()
|
||||
user.id = db_user.id
|
||||
user.name = db_user.name
|
||||
user.enabled = db_user.enabled
|
||||
return user
|
||||
|
||||
def to_db_user(self) -> DbUser:
|
||||
db_user: DbUser = DbUser(id=self.id)
|
||||
db_user.name = self.name
|
||||
db_user.enabled = self.enabled
|
||||
return db_user
|
||||
|
||||
def __eq__(self, __value: object) -> bool:
|
||||
if isinstance(__value, User):
|
||||
return self.id == __value.id
|
||||
|
||||
return NotImplemented
|
||||
|
||||
def __hash__(self) -> int:
|
||||
return hash(self.id)
|
||||
|
||||
id: int
|
||||
name: str
|
||||
enabled: bool
|
||||
|
||||
@property
|
||||
def name_sanitized(self) -> str:
|
||||
return quote(self.name)
|
||||
624
formula10/domain/points_model.py
Normal file
624
formula10/domain/points_model.py
Normal file
@ -0,0 +1,624 @@
|
||||
import json
|
||||
from typing import Any, Callable, Dict, List, overload
|
||||
import numpy as np
|
||||
|
||||
from formula10.domain.domain_model import Model
|
||||
from formula10.domain.model.driver import NONE_DRIVER, Driver
|
||||
from formula10.domain.model.race_guess import RaceGuess
|
||||
from formula10.domain.model.race_result import RaceResult
|
||||
from formula10.domain.model.season_guess import SeasonGuess
|
||||
from formula10.domain.model.season_guess_result import SeasonGuessResult
|
||||
from formula10.domain.model.team import Team
|
||||
from formula10.domain.model.user import User
|
||||
|
||||
RACE_GUESS_OFFSET_POINTS: Dict[int, int] = {
|
||||
3: 1,
|
||||
2: 3,
|
||||
1: 6,
|
||||
0: 10
|
||||
}
|
||||
RACE_GUESS_DNF_POINTS: int = 10
|
||||
|
||||
SEASON_GUESS_HOT_TAKE_POINTS: int = 10
|
||||
SEASON_GUESS_P2_POINTS: int = 10
|
||||
SEASON_GUESS_OVERTAKES_POINTS: int = 10
|
||||
SEASON_GUESS_DNF_POINTS: int = 10
|
||||
SEASON_GUESS_GAINED_POINTS: int = 10
|
||||
SEASON_GUESS_LOST_POINTS: int = 10
|
||||
SEASON_GUESS_TEAMWINNER_CORRECT_POINTS: int = 3
|
||||
SEASON_GUESS_TEAMWINNER_FALSE_POINTS: int = -3
|
||||
SEASON_GUESS_PODIUMS_CORRECT_POINTS: int = 3
|
||||
SEASON_GUESS_PODIUMS_FALSE_POINTS: int = -2
|
||||
|
||||
DRIVER_RACE_POINTS: Dict[int, int] = {
|
||||
1: 25,
|
||||
2: 18,
|
||||
3: 15,
|
||||
4: 12,
|
||||
5: 10,
|
||||
6: 8,
|
||||
7: 6,
|
||||
8: 4,
|
||||
9: 2,
|
||||
10: 1
|
||||
}
|
||||
|
||||
WDC_STANDING_2023: Dict[str, int] = {
|
||||
"Max Verstappen": 1,
|
||||
"Sergio Perez": 2,
|
||||
"Lewis Hamilton": 3,
|
||||
"Fernando Alonso": 4,
|
||||
"Charles Leclerc": 5,
|
||||
"Lando Norris": 6,
|
||||
"Carlos Sainz": 7,
|
||||
"George Russell": 8,
|
||||
"Oscar Piastri": 9,
|
||||
"Lance Stroll": 10,
|
||||
"Pierre Gasly": 11,
|
||||
"Esteban Ocon": 12,
|
||||
"Alexander Albon": 13,
|
||||
"Yuki Tsunoda": 14,
|
||||
"Valtteri Bottas": 15,
|
||||
"Nico Hulkenberg": 16,
|
||||
"Daniel Ricciardo": 17,
|
||||
"Zhou Guanyu": 18,
|
||||
"Kevin Magnussen": 19,
|
||||
"Logan Sargeant": 21
|
||||
}
|
||||
|
||||
WCC_STANDING_2023: Dict[str, int] = {
|
||||
"Red Bull": 1,
|
||||
"Mercedes": 2,
|
||||
"Ferrari": 3,
|
||||
"McLaren": 4,
|
||||
"Aston Martin": 5,
|
||||
"Alpine": 6,
|
||||
"Williams": 7,
|
||||
"VCARB": 8,
|
||||
"Sauber": 9,
|
||||
"Haas": 10
|
||||
}
|
||||
|
||||
def standing_points(race_guess: RaceGuess, race_result: RaceResult) -> int:
|
||||
guessed_driver_position: int | None = race_result.driver_standing_position(driver=race_guess.pxx_guess)
|
||||
if guessed_driver_position is None:
|
||||
return 0
|
||||
|
||||
position_offset: int = abs(guessed_driver_position - race_guess.race.place_to_guess)
|
||||
if position_offset not in RACE_GUESS_OFFSET_POINTS:
|
||||
return 0
|
||||
|
||||
return RACE_GUESS_OFFSET_POINTS[position_offset]
|
||||
|
||||
def dnf_points(race_guess: RaceGuess, race_result: RaceResult) -> int:
|
||||
if race_guess.dnf_guess in race_result.initial_dnf:
|
||||
return RACE_GUESS_DNF_POINTS
|
||||
|
||||
if race_guess.dnf_guess == NONE_DRIVER and len(race_result.initial_dnf) == 0:
|
||||
return RACE_GUESS_DNF_POINTS
|
||||
|
||||
return 0
|
||||
|
||||
class PointsModel(Model):
|
||||
"""
|
||||
This class bundles all data + functionality required to do points calculations.
|
||||
"""
|
||||
|
||||
_points_per_step: Dict[str, List[int]] | None = None
|
||||
_driver_points_per_step: Dict[str, List[int]] | None = None
|
||||
_team_points_per_step: Dict[str, List[int]] | None = None
|
||||
_dnfs: Dict[str, int] | None = None
|
||||
|
||||
def __init__(self):
|
||||
Model.__init__(self)
|
||||
|
||||
def points_per_step(self) -> Dict[str, List[int]]:
|
||||
"""
|
||||
Returns a dictionary of lists, containing points per race for each user.
|
||||
"""
|
||||
if self._points_per_step is None:
|
||||
self._points_per_step = dict()
|
||||
for user in self.all_users():
|
||||
self._points_per_step[user.name] = [0] * (len(self.all_races()) + 1) # Start at index 1, like the race numbers
|
||||
|
||||
for race_guess in self.all_race_guesses():
|
||||
user_name: str = race_guess.user.name
|
||||
race_number: int = race_guess.race.number
|
||||
race_result: RaceResult | None = self.race_result_by(race_name=race_guess.race.name)
|
||||
|
||||
if race_result is None:
|
||||
continue
|
||||
|
||||
self._points_per_step[user_name][race_number] = standing_points(race_guess, race_result) + dnf_points(race_guess, race_result)
|
||||
|
||||
return self._points_per_step
|
||||
|
||||
# @todo Doesn't include fastest lap + sprint points
|
||||
def driver_points_per_step(self) -> Dict[str, List[int]]:
|
||||
"""
|
||||
Returns a dictionary of lists, containing points per race for each driver.
|
||||
"""
|
||||
if self._driver_points_per_step is None:
|
||||
self._driver_points_per_step = dict()
|
||||
for driver in self.all_drivers(include_none=False):
|
||||
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 position, driver in race_result.standing.items():
|
||||
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
|
||||
|
||||
return self._driver_points_per_step
|
||||
|
||||
# @todo Doesn't include fastest lap + sprint points
|
||||
def team_points_per_step(self) -> Dict[str, List[int]]:
|
||||
"""
|
||||
Returns a dictionary of lists, containing points per race for each team.
|
||||
"""
|
||||
if self._team_points_per_step is None:
|
||||
self._team_points_per_step = dict()
|
||||
for team in self.all_teams(include_none=False):
|
||||
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 position, driver in race_result.standing.items():
|
||||
team_name: str = driver.team.name
|
||||
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
|
||||
|
||||
return self._team_points_per_step
|
||||
|
||||
# @todo Doesn't include sprint dnfs
|
||||
def dnfs(self) -> Dict[str, int]:
|
||||
if self._dnfs is None:
|
||||
self._dnfs = dict()
|
||||
|
||||
for driver in self.all_drivers(include_none=False):
|
||||
self._dnfs[driver.name] = 0
|
||||
|
||||
for race_result in self.all_race_results():
|
||||
for driver in race_result.all_dnfs:
|
||||
self._dnfs[driver.name] += 1
|
||||
|
||||
return self._dnfs
|
||||
|
||||
#
|
||||
# Driver stats
|
||||
#
|
||||
|
||||
def driver_points_per_step_cumulative(self) -> Dict[str, List[int]]:
|
||||
"""
|
||||
Returns a dictionary of lists, containing cumulative points per race for each driver.
|
||||
"""
|
||||
points_per_step_cumulative: Dict[str, List[int]] = dict()
|
||||
for driver_name, points in self.driver_points_per_step().items():
|
||||
points_per_step_cumulative[driver_name] = np.cumsum(points).tolist()
|
||||
|
||||
return points_per_step_cumulative
|
||||
|
||||
@overload
|
||||
def driver_points_by(self, *, driver_name: str) -> List[int]:
|
||||
"""
|
||||
Returns a list of points per race for a specific driver.
|
||||
"""
|
||||
return self.driver_points_by(driver_name=driver_name)
|
||||
|
||||
@overload
|
||||
def driver_points_by(self, *, race_name: str) -> Dict[str, int]:
|
||||
"""
|
||||
Returns a dictionary of points per driver for a specific race.
|
||||
"""
|
||||
return self.driver_points_by(race_name=race_name)
|
||||
|
||||
@overload
|
||||
def driver_points_by(self, *, driver_name: str, race_name: str) -> int:
|
||||
"""
|
||||
Returns the points for a specific race for a specific driver.
|
||||
"""
|
||||
return self.driver_points_by(driver_name=driver_name, race_name=race_name)
|
||||
|
||||
def driver_points_by(self, *, driver_name: str | None = None, race_name: str | None = None) -> List[int] | Dict[str, int] | int:
|
||||
if driver_name is not None and race_name is None:
|
||||
return self.driver_points_per_step()[driver_name]
|
||||
|
||||
if driver_name is None and race_name is not None:
|
||||
race_number: int = self.race_by(race_name=race_name).number
|
||||
points_by_race: Dict[str, int] = dict()
|
||||
|
||||
for _driver_name, points in self.driver_points_per_step().items():
|
||||
points_by_race[_driver_name] = points[race_number]
|
||||
|
||||
return points_by_race
|
||||
|
||||
if driver_name is not None and race_name is not None:
|
||||
race_number: int = self.race_by(race_name=race_name).number
|
||||
|
||||
return self.driver_points_per_step()[driver_name][race_number]
|
||||
|
||||
raise Exception("driver_points_by received an illegal combination of arguments")
|
||||
|
||||
def total_driver_points_by(self, driver_name: str) -> int:
|
||||
return sum(self.driver_points_by(driver_name=driver_name))
|
||||
|
||||
def drivers_sorted_by_points(self) -> List[Driver]:
|
||||
comparator: Callable[[Driver], int] = lambda driver: self.total_driver_points_by(driver.name)
|
||||
return sorted(self.all_drivers(include_none=False), key=comparator, reverse=True)
|
||||
|
||||
def wdc_standing_by_position(self) -> Dict[int, List[str]]:
|
||||
standing: Dict[int, List[str]] = dict()
|
||||
|
||||
for position in range(1, len(self.all_drivers(include_none=False)) + 1):
|
||||
standing[position] = list()
|
||||
|
||||
position: int = 1
|
||||
last_points: int = 0
|
||||
|
||||
for driver in self.drivers_sorted_by_points():
|
||||
points: int = self.total_driver_points_by(driver.name)
|
||||
if points < last_points:
|
||||
position += 1
|
||||
|
||||
standing[position].append(driver.name)
|
||||
last_points = points
|
||||
|
||||
return standing
|
||||
|
||||
def wdc_standing_by_driver(self) -> Dict[str, int]:
|
||||
standing: Dict[str, int] = dict()
|
||||
|
||||
position: int = 1
|
||||
last_points: int = 0
|
||||
|
||||
for driver in self.drivers_sorted_by_points():
|
||||
points: int = self.total_driver_points_by(driver.name)
|
||||
if points < last_points:
|
||||
position += 1
|
||||
|
||||
standing[driver.name] = position
|
||||
last_points = points
|
||||
|
||||
return standing
|
||||
|
||||
def wdc_diff_2023_by(self, driver_name: str) -> int:
|
||||
return WDC_STANDING_2023[driver_name] - self.wdc_standing_by_driver()[driver_name]
|
||||
|
||||
def most_dnf_names(self) -> List[str]:
|
||||
dnf_names: List[str] = list()
|
||||
most_dnfs: int = 0
|
||||
|
||||
for dnfs in self.dnfs().values():
|
||||
if dnfs > most_dnfs:
|
||||
most_dnfs = dnfs
|
||||
|
||||
for driver_name, dnfs in self.dnfs().items():
|
||||
if dnfs == most_dnfs:
|
||||
dnf_names.append(driver_name)
|
||||
|
||||
return dnf_names
|
||||
|
||||
def most_gained_names(self) -> List[str]:
|
||||
most_gained_names: List[str] = list()
|
||||
most_gained: int = 0
|
||||
|
||||
for driver in self.all_drivers(include_none=False):
|
||||
gained: int = self.wdc_diff_2023_by(driver.name)
|
||||
|
||||
if gained > most_gained:
|
||||
most_gained = gained
|
||||
|
||||
for driver in self.all_drivers(include_none=False):
|
||||
gained: int = self.wdc_diff_2023_by(driver.name)
|
||||
|
||||
if gained == most_gained:
|
||||
most_gained_names.append(driver.name)
|
||||
|
||||
return most_gained_names
|
||||
|
||||
def most_lost_names(self) -> List[str]:
|
||||
most_lost_names: List[str] = list()
|
||||
most_lost: int = 100
|
||||
|
||||
for driver in self.all_drivers(include_none=False):
|
||||
lost: int = self.wdc_diff_2023_by(driver.name)
|
||||
|
||||
if lost < most_lost:
|
||||
most_lost = lost
|
||||
|
||||
for driver in self.all_drivers(include_none=False):
|
||||
lost: int = self.wdc_diff_2023_by(driver.name)
|
||||
|
||||
if lost == most_lost:
|
||||
most_lost_names.append(driver.name)
|
||||
|
||||
return most_lost_names
|
||||
|
||||
#
|
||||
# Team points
|
||||
#
|
||||
|
||||
def team_points_per_step_cumulative(self) -> Dict[str, List[int]]:
|
||||
"""
|
||||
Returns a dictionary of lists, containing cumulative points per race for each team.
|
||||
"""
|
||||
points_per_step_cumulative: Dict[str, List[int]] = dict()
|
||||
for team_name, points in self.team_points_per_step().items():
|
||||
points_per_step_cumulative[team_name] = np.cumsum(points).tolist()
|
||||
|
||||
return points_per_step_cumulative
|
||||
|
||||
def total_team_points_by(self, team_name: str) -> int:
|
||||
teammates: List[Driver] = self.drivers_by(team_name=team_name)
|
||||
return sum(self.driver_points_by(driver_name=teammates[0].name)) + sum(self.driver_points_by(driver_name=teammates[1].name))
|
||||
|
||||
def teams_sorted_by_points(self) -> List[Team]:
|
||||
comparator: Callable[[Team], int] = lambda team: self.total_team_points_by(team.name)
|
||||
return sorted(self.all_teams(include_none=False), key=comparator, reverse=True)
|
||||
|
||||
def wcc_standing_by_position(self) -> Dict[int, List[str]]:
|
||||
standing: Dict[int, List[str]] = dict()
|
||||
|
||||
for position in range (1, len(self.all_teams(include_none=False)) + 1):
|
||||
standing[position] = list()
|
||||
|
||||
position: int = 1
|
||||
last_points: int = 0
|
||||
|
||||
for team in self.teams_sorted_by_points():
|
||||
points: int = self.total_team_points_by(team.name)
|
||||
if points < last_points:
|
||||
position += 1
|
||||
|
||||
standing[position].append(team.name)
|
||||
last_points = points
|
||||
|
||||
return standing
|
||||
|
||||
def wcc_standing_by_team(self) -> Dict[str, int]:
|
||||
standing: Dict[str, int] = dict()
|
||||
|
||||
position: int = 1
|
||||
last_points: int = 0
|
||||
|
||||
for team in self.teams_sorted_by_points():
|
||||
points: int = self.total_team_points_by(team.name)
|
||||
if points < last_points:
|
||||
position += 1
|
||||
|
||||
standing[team.name] = position
|
||||
last_points = points
|
||||
|
||||
return standing
|
||||
|
||||
def wcc_diff_2023_by(self, team_name: str) -> int:
|
||||
return WCC_STANDING_2023[team_name] - self.wcc_standing_by_team()[team_name]
|
||||
|
||||
#
|
||||
# User stats
|
||||
#
|
||||
|
||||
def points_per_step_cumulative(self) -> Dict[str, List[int]]:
|
||||
"""
|
||||
Returns a dictionary of lists, containing cumulative points per race for each user.
|
||||
"""
|
||||
points_per_step_cumulative: Dict[str, List[int]] = dict()
|
||||
for user_name, points in self.points_per_step().items():
|
||||
points_per_step_cumulative[user_name] = np.cumsum(points).tolist()
|
||||
|
||||
return points_per_step_cumulative
|
||||
|
||||
@overload
|
||||
def points_by(self, *, user_name: str) -> List[int]:
|
||||
"""
|
||||
Returns a list of points per race for a specific user.
|
||||
"""
|
||||
return self.points_by(user_name=user_name)
|
||||
|
||||
@overload
|
||||
def points_by(self, *, race_name: str) -> Dict[str, int]:
|
||||
"""
|
||||
Returns a dictionary of points per user for a specific race.
|
||||
"""
|
||||
return self.points_by(race_name=race_name)
|
||||
|
||||
@overload
|
||||
def points_by(self, *, user_name: str, race_name: str) -> int:
|
||||
"""
|
||||
Returns the points for a specific race for a specific user.
|
||||
"""
|
||||
return self.points_by(user_name=user_name, race_name=race_name)
|
||||
|
||||
def points_by(self, *, user_name: str | None = None, race_name: str | None = None) -> List[int] | Dict[str, int] | int:
|
||||
if user_name is not None and race_name is None:
|
||||
return self.points_per_step()[user_name]
|
||||
|
||||
if user_name is None and race_name is not None:
|
||||
race_number: int = self.race_by(race_name=race_name).number
|
||||
points_by_race: Dict[str, int] = dict()
|
||||
|
||||
for _user_name, points in self.points_per_step().items():
|
||||
points_by_race[_user_name] = points[race_number]
|
||||
|
||||
return points_by_race
|
||||
|
||||
if user_name is not None and race_name is not None:
|
||||
race_number: int = self.race_by(race_name=race_name).number
|
||||
|
||||
return self.points_per_step()[user_name][race_number]
|
||||
|
||||
raise Exception("points_by received an illegal combination of arguments")
|
||||
|
||||
def total_points_by(self, user_name: str) -> int:
|
||||
"""
|
||||
Returns the total number of points for a specific user.
|
||||
"""
|
||||
return sum(self.points_by(user_name=user_name))
|
||||
|
||||
def users_sorted_by_points(self) -> List[User]:
|
||||
"""
|
||||
Returns the list of users, sorted by their points from race guesses (in descending order).
|
||||
"""
|
||||
comparator: Callable[[User], int] = lambda user: self.total_points_by(user.name)
|
||||
return sorted(self.all_users(), key=comparator, reverse=True)
|
||||
|
||||
def user_standing(self) -> Dict[str, int]:
|
||||
standing: Dict[str, int] = dict()
|
||||
|
||||
position: int = 1
|
||||
last_points: int = 0
|
||||
for user in self.users_sorted_by_points():
|
||||
if self.total_points_by(user.name) < last_points:
|
||||
position += 1
|
||||
|
||||
standing[user.name] = position
|
||||
|
||||
last_points = self.total_points_by(user.name)
|
||||
|
||||
return standing
|
||||
|
||||
def picks_count(self, user_name: str) -> int:
|
||||
# Treat standing + dnf picks separately
|
||||
return len(self.race_guesses_by(user_name=user_name)) * 2
|
||||
|
||||
def picks_with_points_count(self, user_name: str) -> int:
|
||||
count: int = 0
|
||||
|
||||
for race_guess in self.race_guesses_by(user_name=user_name):
|
||||
race_result: RaceResult | None = self.race_result_by(race_name=race_guess.race.name)
|
||||
if race_result is None:
|
||||
continue
|
||||
|
||||
if standing_points(race_guess, race_result) > 0:
|
||||
count += 1
|
||||
if dnf_points(race_guess, race_result) > 0:
|
||||
count += 1
|
||||
|
||||
return count
|
||||
|
||||
def points_per_pick(self, user_name: str) -> float:
|
||||
if self.picks_count(user_name) == 0:
|
||||
return 0.0
|
||||
|
||||
return self.total_points_by(user_name) / self.picks_count(user_name)
|
||||
|
||||
#
|
||||
# Season guess evaluation
|
||||
#
|
||||
|
||||
def hot_take_correct(self, user_name: str) -> bool:
|
||||
season_guess_result: SeasonGuessResult | None = self.season_guess_result_by(user_name=user_name)
|
||||
|
||||
return season_guess_result.hot_take_correct if season_guess_result is not None else False
|
||||
|
||||
def p2_constructor_correct(self, user_name: str) -> bool:
|
||||
season_guess: SeasonGuess | None = self.season_guesses_by(user_name=user_name)
|
||||
|
||||
if season_guess is None or season_guess.p2_wcc is None:
|
||||
return False
|
||||
|
||||
return season_guess.p2_wcc.name in self.wcc_standing_by_position()[2]
|
||||
|
||||
def overtakes_correct(self, user_name: str) -> bool:
|
||||
season_guess_result: SeasonGuessResult | None = self.season_guess_result_by(user_name=user_name)
|
||||
|
||||
return season_guess_result.overtakes_correct if season_guess_result is not None else False
|
||||
|
||||
def dnfs_correct(self, user_name: str) -> bool:
|
||||
season_guess: SeasonGuess | None = self.season_guesses_by(user_name=user_name)
|
||||
|
||||
if season_guess is None or season_guess.most_dnfs is None:
|
||||
return False
|
||||
|
||||
return season_guess.most_dnfs.name in self.most_dnf_names()
|
||||
|
||||
def most_gained_correct(self, user_name: str) -> bool:
|
||||
season_guess: SeasonGuess | None = self.season_guesses_by(user_name=user_name)
|
||||
|
||||
if season_guess is None or season_guess.most_wdc_gained is None:
|
||||
return False
|
||||
|
||||
return season_guess.most_wdc_gained.name in self.most_gained_names()
|
||||
|
||||
def most_lost_correct(self, user_name: str) -> bool:
|
||||
season_guess: SeasonGuess | None = self.season_guesses_by(user_name=user_name)
|
||||
|
||||
if season_guess is None or season_guess.most_wdc_lost is None:
|
||||
return False
|
||||
|
||||
return season_guess.most_wdc_lost.name in self.most_lost_names()
|
||||
|
||||
def is_team_winner(self, driver: Driver) -> bool:
|
||||
teammates: List[Driver] = self.drivers_by(team_name=driver.team.name)
|
||||
teammate: Driver = teammates[0] if teammates[1] == driver else teammates[1]
|
||||
|
||||
print(f"{driver.name} standing: {self.wdc_standing_by_driver()[driver.name]}, {teammate.name} standing: {self.wdc_standing_by_driver()[teammate.name]}")
|
||||
|
||||
return self.wdc_standing_by_driver()[driver.name] <= self.wdc_standing_by_driver()[teammate.name]
|
||||
|
||||
def has_podium(self, driver: Driver) -> bool:
|
||||
for race_result in self.all_race_results():
|
||||
position: int | None = race_result.driver_standing_position(driver)
|
||||
if position is not None and position <= 3:
|
||||
return True
|
||||
|
||||
return False
|
||||
|
||||
#
|
||||
# Diagram queries
|
||||
#
|
||||
|
||||
def cumulative_points_data(self) -> str:
|
||||
data: Dict[Any, Any] = dict()
|
||||
|
||||
data["labels"] = [0] + [
|
||||
race.name for race in sorted(self.all_races(), key=lambda race: race.number)
|
||||
]
|
||||
|
||||
data["datasets"] = [
|
||||
{
|
||||
"data": self.points_per_step_cumulative()[user.name],
|
||||
"label": user.name,
|
||||
"fill": False
|
||||
}
|
||||
for user in self.all_users()
|
||||
]
|
||||
|
||||
return json.dumps(data)
|
||||
|
||||
def cumulative_driver_points_data(self) -> str:
|
||||
data: Dict[Any, Any] = dict()
|
||||
|
||||
data["labels"] = [0] + [
|
||||
race.name for race in sorted(self.all_races(), key=lambda race: race.number)
|
||||
]
|
||||
|
||||
data["datasets"] = [
|
||||
{
|
||||
"data": self.driver_points_per_step_cumulative()[driver.name],
|
||||
"label": driver.abbr,
|
||||
"fill": False
|
||||
}
|
||||
for driver in self.all_drivers(include_none=False)
|
||||
]
|
||||
|
||||
return json.dumps(data)
|
||||
|
||||
def cumulative_team_points_data(self) -> str:
|
||||
data: Dict[Any, Any] = dict()
|
||||
|
||||
data["labels"] = [0] + [
|
||||
race.name for race in sorted(self.all_races(), key=lambda race: race.number)
|
||||
]
|
||||
|
||||
data["datasets"] = [
|
||||
{
|
||||
"data": self.team_points_per_step_cumulative()[team.name],
|
||||
"label": team.name,
|
||||
"fill": False
|
||||
}
|
||||
for team in self.all_teams(include_none=False)
|
||||
]
|
||||
|
||||
return json.dumps(data)
|
||||
93
formula10/domain/template_model.py
Normal file
93
formula10/domain/template_model.py
Normal file
@ -0,0 +1,93 @@
|
||||
from typing import List, Callable
|
||||
from formula10 import ENABLE_TIMING
|
||||
|
||||
from formula10.domain.domain_model import Model
|
||||
from formula10.domain.model.driver import Driver
|
||||
from formula10.domain.model.race import Race
|
||||
from formula10.domain.model.race_result import RaceResult
|
||||
from formula10.domain.model.user import User
|
||||
from formula10.database.validation import find_first_else_none, find_multiple_strict, find_single_strict, race_has_started
|
||||
|
||||
|
||||
class TemplateModel(Model):
|
||||
"""
|
||||
This class bundles all data + functionality required from inside a template.
|
||||
"""
|
||||
|
||||
active_user: User | None = None
|
||||
active_result: RaceResult | None = None
|
||||
|
||||
# RIC is excluded, since he didn't drive as many races 2023 as the others
|
||||
_wdc_gained_excluded_abbrs: List[str] = ["RIC"]
|
||||
|
||||
def __init__(self, *, active_user_name: str | None, active_result_race_name: str | None):
|
||||
Model.__init__(self)
|
||||
|
||||
if active_user_name is not None:
|
||||
self.active_user = self.user_by(user_name=active_user_name, ignore=["Everyone"])
|
||||
|
||||
if active_result_race_name is not None:
|
||||
self.active_result = self.race_result_by(race_name=active_result_race_name)
|
||||
|
||||
def race_guess_open(self, race: Race) -> bool:
|
||||
return not race_has_started(race=race) if ENABLE_TIMING else True
|
||||
|
||||
def season_guess_open(self) -> bool:
|
||||
return not race_has_started(race_id=1) if ENABLE_TIMING else True
|
||||
|
||||
def race_result_open(self, race_name: str) -> bool:
|
||||
predicate: Callable[[Race], bool] = lambda race: race.name == race_name
|
||||
race: Race = find_single_strict(predicate, self.all_races())
|
||||
return race_has_started(race_id=race.id) if ENABLE_TIMING else True
|
||||
|
||||
def active_user_name_or_everyone(self) -> str:
|
||||
return self.active_user.name if self.active_user is not None else "Everyone"
|
||||
|
||||
def active_user_name_sanitized_or_everyone(self) -> str:
|
||||
return self.active_user.name_sanitized if self.active_user is not None else "Everyone"
|
||||
|
||||
def all_users_or_active_user(self) -> List[User]:
|
||||
if self.active_user is not None:
|
||||
return [self.active_user]
|
||||
|
||||
return self.all_users()
|
||||
|
||||
def first_race_without_result(self) -> Race | None:
|
||||
"""
|
||||
Returns the first race-object with no associated race result.
|
||||
"""
|
||||
results: List[RaceResult] = self.all_race_results()
|
||||
if len(results) == 0:
|
||||
return self.all_races()[-1] # all_races is sorted descending by number
|
||||
|
||||
most_recent_result: RaceResult = results[0]
|
||||
predicate: Callable[[Race], bool] = lambda race: race.number == most_recent_result.race.number + 1
|
||||
|
||||
return find_first_else_none(predicate, self.all_races())
|
||||
|
||||
@property
|
||||
def current_race(self) -> Race | None:
|
||||
return self.first_race_without_result()
|
||||
|
||||
def active_result_race_name_or_current_race_name(self) -> str:
|
||||
if self.active_result is not None:
|
||||
return self.active_result.race.name
|
||||
elif self.current_race is not None:
|
||||
return self.current_race.name
|
||||
else:
|
||||
return self.all_races()[0].name
|
||||
|
||||
def active_result_race_name_or_current_race_name_sanitized(self) -> str:
|
||||
if self.active_result is not None:
|
||||
return self.active_result.race.name_sanitized
|
||||
elif self.current_race is not None:
|
||||
return self.current_race.name_sanitized
|
||||
else:
|
||||
return self.all_races()[0].name_sanitized
|
||||
|
||||
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)
|
||||
|
||||
def drivers_for_wdc_gained(self) -> List[Driver]:
|
||||
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))
|
||||
|
Before Width: | Height: | Size: 1.8 KiB After Width: | Height: | Size: 1.8 KiB |
|
Before Width: | Height: | Size: 1.8 KiB After Width: | Height: | Size: 1.8 KiB |
7
formula10/static/script/bootstrap.bundle.min.js
vendored
Normal file
7
formula10/static/script/bootstrap.bundle.min.js
vendored
Normal file
File diff suppressed because one or more lines are too long
29
formula10/static/script/countdown.js
Normal file
29
formula10/static/script/countdown.js
Normal file
@ -0,0 +1,29 @@
|
||||
// Set the date we're counting down to
|
||||
var raceTime = document.getElementById("race_date").innerHTML
|
||||
var countDownDate = new Date(raceTime).getTime();
|
||||
|
||||
// Update the countdown every 1 second
|
||||
var x = setInterval(function() {
|
||||
|
||||
// Get today's date and time
|
||||
var now = new Date().getTime();
|
||||
|
||||
// Find the distance between now and the countdown date
|
||||
var distance = countDownDate - now;
|
||||
|
||||
// Time calculations for days, hours, minutes and seconds
|
||||
var days = Math.floor(distance / (1000 * 60 * 60 * 24));
|
||||
var hours = Math.floor((distance % (1000 * 60 * 60 * 24)) / (1000 * 60 * 60));
|
||||
var minutes = Math.floor((distance % (1000 * 60 * 60)) / (1000 * 60));
|
||||
var seconds = Math.floor((distance % (1000 * 60)) / 1000);
|
||||
|
||||
// Display the result in the element with id="demo"
|
||||
document.getElementById("race_date_countdown").innerHTML = days + "d " + hours + "h " + minutes + "m " + seconds + "s ";
|
||||
|
||||
// If the countdown is finished, write some text
|
||||
if (distance < 0) {
|
||||
clearInterval(x);
|
||||
document.getElementById("race_date_countdown").innerHTML = "GO GO GO";
|
||||
}
|
||||
|
||||
}, 1000);
|
||||
80
formula10/static/script/draggable.js
Normal file
80
formula10/static/script/draggable.js
Normal file
@ -0,0 +1,80 @@
|
||||
// https://codepen.io/retrofuturistic/pen/DJWYBv
|
||||
|
||||
let dragSrcEl = null;
|
||||
|
||||
function handleDragStart(e) {
|
||||
// Target (this) element is the source node.
|
||||
dragSrcEl = this;
|
||||
|
||||
e.dataTransfer.effectAllowed = 'move';
|
||||
e.dataTransfer.setData('text/html', this.outerHTML);
|
||||
|
||||
this.classList.add('dragElem');
|
||||
}
|
||||
|
||||
function handleDragOver(e) {
|
||||
if (e.preventDefault) {
|
||||
e.preventDefault(); // Necessary. Allows us to drop.
|
||||
}
|
||||
this.classList.add('over');
|
||||
|
||||
e.dataTransfer.dropEffect = 'move'; // See the section on the DataTransfer object.
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
function handleDragEnter(e) {
|
||||
// this / e.target is the current hover target.
|
||||
}
|
||||
|
||||
function handleDragLeave(e) {
|
||||
this.classList.remove('over'); // this / e.target is previous target element.
|
||||
}
|
||||
|
||||
function handleDrop(e) {
|
||||
// this/e.target is current target element.
|
||||
|
||||
if (e.stopPropagation) {
|
||||
e.stopPropagation(); // Stops some browsers from redirecting.
|
||||
}
|
||||
|
||||
// Don't do anything if dropping the same column we're dragging.
|
||||
if (dragSrcEl != this) {
|
||||
// Set the source column's HTML to the HTML of the column we dropped on.
|
||||
// alert(this.outerHTML);
|
||||
// dragSrcEl.innerHTML = this.innerHTML;
|
||||
// this.innerHTML = e.dataTransfer.getData('text/html');
|
||||
|
||||
this.parentNode.removeChild(dragSrcEl);
|
||||
let dropHTML = e.dataTransfer.getData('text/html');
|
||||
this.insertAdjacentHTML('beforebegin', dropHTML);
|
||||
let dropElem = this.previousSibling;
|
||||
|
||||
addDnDHandlers(dropElem);
|
||||
}
|
||||
|
||||
this.classList.remove('over');
|
||||
return false;
|
||||
}
|
||||
|
||||
function handleDragEnd(e) {
|
||||
// this/e.target is the source node.
|
||||
this.classList.remove('over');
|
||||
|
||||
/*[].forEach.call(cols, function (col) {
|
||||
col.classList.remove('over');
|
||||
});*/
|
||||
}
|
||||
|
||||
function addDnDHandlers(elem) {
|
||||
elem.addEventListener('dragstart', handleDragStart, false);
|
||||
elem.addEventListener('dragenter', handleDragEnter, false)
|
||||
elem.addEventListener('dragover', handleDragOver, false);
|
||||
elem.addEventListener('dragleave', handleDragLeave, false);
|
||||
elem.addEventListener('drop', handleDrop, false);
|
||||
elem.addEventListener('dragend', handleDragEnd, false);
|
||||
|
||||
}
|
||||
|
||||
const cols = document.querySelectorAll('#columns .column');
|
||||
[].forEach.call(cols, addDnDHandlers);
|
||||
18
formula10/static/style/diagram.css
Normal file
18
formula10/static/style/diagram.css
Normal file
@ -0,0 +1,18 @@
|
||||
.chart-container {
|
||||
width: 100%;
|
||||
height: 40vh;
|
||||
}
|
||||
|
||||
@media only screen and (max-width: 900px) {
|
||||
.chart-container {
|
||||
width: 100%;
|
||||
height: 50vh;
|
||||
}
|
||||
}
|
||||
|
||||
@media only screen and (orientation: landscape) and (max-width: 900px) {
|
||||
.chart-container {
|
||||
width: 100%;
|
||||
height: 100vh;
|
||||
}
|
||||
}
|
||||
21
formula10/static/style/draggable.css
Normal file
21
formula10/static/style/draggable.css
Normal file
@ -0,0 +1,21 @@
|
||||
/* https://codepen.io/retrofuturistic/pen/DJWYBv */
|
||||
|
||||
[draggable] {
|
||||
-moz-user-select: none;
|
||||
-khtml-user-select: none;
|
||||
-webkit-user-select: none;
|
||||
user-select: none;
|
||||
|
||||
/* Required to make elements draggable in old WebKit */
|
||||
-khtml-user-drag: element;
|
||||
-webkit-user-drag: element;
|
||||
}
|
||||
|
||||
.column {
|
||||
cursor: move;
|
||||
}
|
||||
|
||||
.column.over {
|
||||
//border: 2px dashed #000;
|
||||
border-top: 2px solid blue;
|
||||
}
|
||||
27
formula10/static/style/grid.css
Normal file
27
formula10/static/style/grid.css
Normal file
@ -0,0 +1,27 @@
|
||||
.card-grid {
|
||||
grid-template-columns: repeat(auto-fit, minmax(325px, 1fr));
|
||||
grid-row-gap: 0;
|
||||
grid-column-gap: 8px;
|
||||
}
|
||||
|
||||
@media only screen and (min-width: 470px) {
|
||||
.card-grid {
|
||||
grid-template-columns: repeat(auto-fit, minmax(450px, 1fr));
|
||||
grid-row-gap: 0;
|
||||
grid-column-gap: 8px;
|
||||
}
|
||||
}
|
||||
|
||||
.card-grid-2 {
|
||||
grid-template-columns: repeat(1, minmax(325px, 1fr));
|
||||
grid-row-gap: 0;
|
||||
grid-column-gap: 8px;
|
||||
}
|
||||
|
||||
@media only screen and (min-width: 950px) {
|
||||
.card-grid-2 {
|
||||
grid-template-columns: repeat(2, minmax(450px, 1fr));
|
||||
grid-row-gap: 0;
|
||||
grid-column-gap: 8px;
|
||||
}
|
||||
}
|
||||
238
formula10/templates/base.jinja
Normal file
238
formula10/templates/base.jinja
Normal file
@ -0,0 +1,238 @@
|
||||
<!DOCTYPE html>
|
||||
<html lang="en">
|
||||
|
||||
{# Active user navbar dropdown #}
|
||||
{% macro active_user_dropdown(page) %}
|
||||
{% if model.all_users() | length > 1 %}
|
||||
<div class="dropdown">
|
||||
<button class="btn btn-outline-danger dropdown-toggle" type="button" data-bs-toggle="dropdown"
|
||||
aria-expanded="false">
|
||||
{{ model.active_user_name_or_everyone() }}
|
||||
</button>
|
||||
<ul class="dropdown-menu">
|
||||
<li><a class="dropdown-item" href="/{{ page }}/Everyone">Everyone</a></li>
|
||||
<li>
|
||||
<hr class="dropdown-divider">
|
||||
</li>
|
||||
|
||||
{% for user in model.all_users() %}
|
||||
<li><a class="dropdown-item" href="/{{ page }}/{{ user.name_sanitized }}">{{ user.name }}</a></li>
|
||||
{% endfor %}
|
||||
</ul>
|
||||
</div>
|
||||
{% endif %}
|
||||
{% endmacro %}
|
||||
|
||||
{# Simple driver select for forms #}
|
||||
{% macro driver_select(name, label, include_none, drivers=none, disabled=false, border="") %}
|
||||
<div class="form-floating">
|
||||
<select name="{{ name }}" id="{{ name }}" class="form-select {{ border }}" aria-label="{{ name }}"
|
||||
{% if disabled %}disabled="disabled"{% endif %}>
|
||||
<option value="" selected disabled hidden></option>
|
||||
|
||||
{% if drivers == none %}
|
||||
{% set drivers = model.all_drivers(include_none=include_none) %}
|
||||
{% endif %}
|
||||
|
||||
{% for driver in drivers %}
|
||||
<option value="{{ driver.id }}">{{ driver.abbr }}</option>
|
||||
{% endfor %}
|
||||
</select>
|
||||
<label for="{{ name }}" class="text-primary">{{ label }}</label>
|
||||
</div>
|
||||
{% endmacro %}
|
||||
|
||||
{# Driver select for forms where a value might be preselected #}
|
||||
{% macro driver_select_with_preselect(driver_match, name, label, include_none, drivers=none, disabled=false, border="") %}
|
||||
<div class="form-floating">
|
||||
<select name="{{ name }}" id="{{ name }}" class="form-select {{ border }}" aria-label="{{ name }}"
|
||||
{% if disabled %}disabled="disabled"{% endif %}>
|
||||
{# Use namespace wrapper to persist scope between loop iterations #}
|
||||
{% set user_has_chosen = namespace(driverpre=false) %}
|
||||
|
||||
{% if drivers == none %}
|
||||
{% set drivers = model.all_drivers(include_none=include_none) %}
|
||||
{% endif %}
|
||||
|
||||
{% for driver in drivers %}
|
||||
{% if driver_match == driver %}
|
||||
{% set user_has_chosen.driverpre = true %}
|
||||
<option selected="selected" value="{{ driver.id }}">{{ driver.abbr }}</option>
|
||||
{% else %}
|
||||
<option value="{{ driver.id }}">{{ driver.abbr }}</option>
|
||||
{% endif %}
|
||||
|
||||
{% if (include_none == true) and (driver == model.none_driver()) %}
|
||||
<option disabled="disabled">──────────</option>
|
||||
{% endif %}
|
||||
{% endfor %}
|
||||
|
||||
{# Add an empty default if nothing has been chosen #}
|
||||
{% if user_has_chosen.driverpre == false %}
|
||||
<option value="" selected="selected" disabled="disabled" hidden="hidden"></option>
|
||||
{% endif %}
|
||||
</select>
|
||||
<label for="{{ name }}" class="text-primary">{{ label }}</label>
|
||||
</div>
|
||||
{% endmacro %}
|
||||
|
||||
{# Simple team select for forms #}
|
||||
{% macro team_select(name, label, include_none, teams=none, disabled=false, border="") %}
|
||||
<div class="form-floating">
|
||||
<select name="{{ name }}" id="{{ name }}" class="form-select {{ border }}" aria-label="{{ name }}"
|
||||
{% if disabled %}disabled="disabled"{% endif %}>
|
||||
<option value="" selected disabled hidden></option>
|
||||
|
||||
{% if teams == none %}
|
||||
{% set teams = model.all_teams(include_none=include_none) %}
|
||||
{% endif %}
|
||||
|
||||
{% for team in teams %}
|
||||
<option value="{{ team.id }}">{{ team.name }}</option>
|
||||
{% endfor %}
|
||||
</select>
|
||||
<label for="{{ name }}" class="text-primary">{{ label }}</label>
|
||||
</div>
|
||||
{% endmacro %}
|
||||
|
||||
{# Team select for forms where a value might be preselected #}
|
||||
{% macro team_select_with_preselect(team_match, name, label, include_none, teams=none, disabled=false, border="") %}
|
||||
<div class="form-floating">
|
||||
<select name="{{ name }}" id="{{ name }}" class="form-select {{ border }}" aria-label="{{ name }}"
|
||||
{% if disabled %}disabled="disabled"{% endif %}>
|
||||
{# Use namespace wrapper to persist scope between loop iterations #}
|
||||
{% set user_has_chosen = namespace(teampre=false) %}
|
||||
|
||||
{% if teams == none %}
|
||||
{% set teams = model.all_teams(include_none=include_none) %}
|
||||
{% endif %}
|
||||
|
||||
{% for team in teams %}
|
||||
{% if team_match == team %}
|
||||
{% set user_has_chosen.teampre = true %}
|
||||
<option selected="selected" value="{{ team.id }}">{{ team.name }}</option>
|
||||
{% else %}
|
||||
<option value="{{ team.id }}">{{ team.name }}</option>
|
||||
{% endif %}
|
||||
|
||||
{% if (include_none == true) and (team == model.none_team()) %}
|
||||
<option disabled="disabled">──────────</option>
|
||||
{% endif %}
|
||||
{% endfor %}
|
||||
|
||||
{# Add an empty default if nothing has been chosen #}
|
||||
{% if user_has_chosen.teampre == false %}
|
||||
<option value="" selected="selected" disabled="disabled" hidden="hidden"></option>
|
||||
{% endif %}
|
||||
</select>
|
||||
<label for="{{ name }}" class="text-primary">{{ label }}</label>
|
||||
</div>
|
||||
{% endmacro %}
|
||||
|
||||
{# Easy nav-bar entries. When a page sets the active_page variable, the current entry will be underlined #}
|
||||
{% macro nav_selector(page, text) %}
|
||||
<a class="nav-link text-nowrap" href="{{ page }}">{% if active_page == page %}<u>{% endif %} {{ text }}
|
||||
{# NOTE: active_page should be set at the top of each template #}
|
||||
{% if active_page == page %}</u>{% endif %}</a>
|
||||
{% endmacro %}
|
||||
|
||||
{% macro pxx_guess_colorization(guessed_driver, result) -%}
|
||||
{% if (guessed_driver == result.offset_from_place_to_guess(-3)) and (guessed_driver != model.none_driver()) %}
|
||||
fw-bold
|
||||
{% elif (guessed_driver == result.offset_from_place_to_guess(-2)) and (guessed_driver != model.none_driver()) %}
|
||||
text-danger fw-bold
|
||||
{% elif (guessed_driver == result.offset_from_place_to_guess(-1)) and (guessed_driver != model.none_driver()) %}
|
||||
text-warning fw-bold
|
||||
{% elif (guessed_driver == result.offset_from_place_to_guess( 0)) %}text-success fw-bold
|
||||
{% elif (guessed_driver == result.offset_from_place_to_guess( 1)) and (guessed_driver != model.none_driver()) %}
|
||||
text-warning fw-bold
|
||||
{% elif (guessed_driver == result.offset_from_place_to_guess( 2)) and (guessed_driver != model.none_driver()) %}
|
||||
text-danger fw-bold
|
||||
{% elif (guessed_driver == result.offset_from_place_to_guess( 3)) and (guessed_driver != model.none_driver()) %}
|
||||
fw-bold
|
||||
{% endif %}
|
||||
{%- endmacro %}
|
||||
|
||||
{% macro dnf_guess_colorization(guessed_driver, result) -%}
|
||||
{% if guessed_driver in result.initial_dnf %}text-success fw-bold
|
||||
{% elif (guessed_driver == model.none_driver()) and (result.initial_dnf | length == 0) %}text-success fw-bold
|
||||
{% endif %}
|
||||
{%- endmacro %}
|
||||
|
||||
{# @formatter:off #}
|
||||
{% macro pxx_standing_tooltip_text(result) %}
|
||||
{%- for position in range(-3, 4) %}
|
||||
{%- set driver = result.offset_from_place_to_guess(position, respect_nc=false) %}
|
||||
{{- driver.abbr ~ result.driver_standing_position_string(driver) }}
|
||||
{% endfor %}
|
||||
{%- endmacro %}
|
||||
{# @formatter:on #}
|
||||
|
||||
<head>
|
||||
<meta charset="UTF-8">
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
||||
|
||||
<!-- Title -->
|
||||
<title>{% block title %}{% endblock title %}</title>
|
||||
<link rel="icon" href="../static/image/favicon.svg" sizes="any" type="image/svg+xml">
|
||||
|
||||
<!-- Bootstrap -->
|
||||
<link href="../static/style/bootstrap.css" rel="stylesheet">
|
||||
<script src="../static/script/bootstrap.bundle.js"></script>
|
||||
|
||||
<!-- ChartJS -->
|
||||
<script src="https://cdn.jsdelivr.net/npm/chart.js"></script>
|
||||
|
||||
<!-- Custom -->
|
||||
<link href="../static/style/grid.css" rel="stylesheet">
|
||||
<link href="../static/style/diagram.css" rel="stylesheet">
|
||||
<script defer>
|
||||
{# Initialize Bootstrap Tooltips #}
|
||||
let tooltipTriggerList = document.querySelectorAll("[data-bs-toggle='tooltip']")
|
||||
let tooltipList = [...tooltipTriggerList].map(tooltipTriggerEl => new bootstrap.Tooltip(tooltipTriggerEl))
|
||||
</script>
|
||||
|
||||
{% block head_extra %}{% endblock head_extra %}
|
||||
</head>
|
||||
|
||||
<body>
|
||||
|
||||
<nav class="navbar fixed-top navbar-expand-lg bg-body-tertiary shadow-sm">
|
||||
<div class="container-fluid">
|
||||
<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
|
||||
</a>
|
||||
|
||||
<button type="button" class="navbar-toggler" data-bs-toggle="collapse" data-bs-target="#navbarCollapse">
|
||||
<span class="navbar-toggler-icon"></span>
|
||||
</button>
|
||||
|
||||
<div class="collapse navbar-collapse" id="navbarCollapse">
|
||||
<div class="navbar-nav me-2">
|
||||
{{ nav_selector(page="/race/" ~ model.active_user_name_sanitized_or_everyone(), text="Race Picks") }}
|
||||
{{ nav_selector(page="/season/" ~ model.active_user_name_sanitized_or_everyone(), text="Season Picks") }}
|
||||
{{ nav_selector(page="/graphs", text="Leaderboard") }}
|
||||
{{ nav_selector(page="/stats", text="Statistics") }}
|
||||
{{ nav_selector(page="/rules", text="Rules") }}
|
||||
</div>
|
||||
|
||||
{% block navbar_center %}{% endblock navbar_center %}
|
||||
<div class="flex-grow-1"></div>
|
||||
|
||||
<div class="navbar-nav">
|
||||
{# {{ nav_selector(page="/result", text="Enter Race Result") }} #}
|
||||
{{ nav_selector(page="/user", text="Manage Users") }}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</nav>
|
||||
|
||||
<div class="px-2 pt-2" style="margin-top: 55px !important;">
|
||||
{% block body %}{% endblock body %}
|
||||
</div>
|
||||
|
||||
</body>
|
||||
|
||||
</html>
|
||||
16
formula10/templates/error.jinja
Normal file
16
formula10/templates/error.jinja
Normal file
@ -0,0 +1,16 @@
|
||||
{% extends 'base.jinja' %}
|
||||
|
||||
{% block title %}Formula 10 - Error{% endblock title %}
|
||||
|
||||
{% set active_page = "/error" %}
|
||||
|
||||
{% block body %}
|
||||
<div class="card shadow-sm mb-2">
|
||||
<div class="card-header">
|
||||
<span class="text-danger fw-bold">Error</span>
|
||||
</div>
|
||||
<div class="card-body">
|
||||
{{ error_message }}
|
||||
</div>
|
||||
</div>
|
||||
{% endblock body %}
|
||||
106
formula10/templates/leaderboard.jinja
Normal file
106
formula10/templates/leaderboard.jinja
Normal file
@ -0,0 +1,106 @@
|
||||
{% extends 'base.jinja' %}
|
||||
|
||||
{% block title %}Formula 10 - Leaderboard{% endblock title %}
|
||||
|
||||
{% set active_page = "/graphs" %}
|
||||
|
||||
{% block body %}
|
||||
|
||||
<div class="card shadow-sm mb-2">
|
||||
<div class="card-header">
|
||||
Note
|
||||
</div>
|
||||
|
||||
<div class="card-body">
|
||||
Points only include race picks.
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="card shadow-sm mb-2">
|
||||
<div class="card-header">
|
||||
Leaderboard
|
||||
</div>
|
||||
|
||||
<div class="card-body">
|
||||
<div class="d-inline-block overflow-x-scroll w-100">
|
||||
<table class="table table-bordered table-sm table-responsive">
|
||||
<thead>
|
||||
<tr>
|
||||
<th scope="col" class="text-center" style="min-width: 50px;">Place</th>
|
||||
<th scope="col" class="text-center" style="min-width: 50px;">User</th>
|
||||
<th scope="col" class="text-center" style="min-width: 100px;">Points</th>
|
||||
<th scope="col" class="text-center" style="min-width: 100px;">Total picks</th>
|
||||
<th scope="col" class="text-center" style="min-width: 100px;" data-bs-toggle="tooltip"
|
||||
title="Any points count as correct">Correct picks
|
||||
</th>
|
||||
<th scope="col" class="text-center" style="min-width: 100px;">Points per pick</th>
|
||||
</tr>
|
||||
</thead>
|
||||
|
||||
<tbody>
|
||||
{% for user in points.users_sorted_by_points() %}
|
||||
{% set user_standing = points.user_standing()[user.name] %}
|
||||
<tr class="{% if user_standing == 1 %}table-danger{% endif %}">
|
||||
<td class="text-center text-nowrap">{{ user_standing }}</td>
|
||||
<td class="text-center text-nowrap">{{ user.name }}</td>
|
||||
<td class="text-center text-nowrap">{{ points.total_points_by(user.name) }}</td>
|
||||
<td class="text-center text-nowrap">{{ points.picks_count(user.name) }}</td>
|
||||
<td class="text-center text-nowrap">{{ points.picks_with_points_count(user.name) }}</td>
|
||||
<td class="text-center text-nowrap">{{ "%0.2f" % points.points_per_pick(user.name) }}</td>
|
||||
</tr>
|
||||
{% endfor %}
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="card shadow-sm mb-2">
|
||||
<div class="card-header">
|
||||
History
|
||||
</div>
|
||||
|
||||
<div class="card-body">
|
||||
<div class="chart-container">
|
||||
<canvas id="line-chart"></canvas>
|
||||
</div>
|
||||
|
||||
<script>
|
||||
function cumulative_points(data) {
|
||||
return new Chart(document.getElementById("line-chart"), {
|
||||
type: 'line',
|
||||
data: data,
|
||||
options: {
|
||||
title: {
|
||||
display: true,
|
||||
text: 'History'
|
||||
},
|
||||
{#tension: 0,#}
|
||||
responsive: true,
|
||||
maintainAspectRatio: false,
|
||||
pointRadius: 5,
|
||||
pointHoverRadius: 10,
|
||||
scales: {
|
||||
y: {
|
||||
min: 0,
|
||||
{#max: 100#}
|
||||
}
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
cumulative_points({{ points.cumulative_points_data() | safe }})
|
||||
</script>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
{# <div class="card mt-2">#}
|
||||
{# <div class="card-body">#}
|
||||
{# <h5 class="card-title">Statistics</h5>#}
|
||||
|
||||
{# Various statistics: Driver voted most for DNF #}
|
||||
{# </div>#}
|
||||
{# </div>#}
|
||||
|
||||
{% endblock body %}
|
||||
204
formula10/templates/race.jinja
Normal file
204
formula10/templates/race.jinja
Normal file
@ -0,0 +1,204 @@
|
||||
{% extends 'base.jinja' %}
|
||||
|
||||
{% block title %}Formula 10 - Race{% endblock title %}
|
||||
|
||||
{% set active_page = "/race/" ~ model.active_user_name_sanitized_or_everyone() %}
|
||||
|
||||
{% block head_extra %}
|
||||
<script src="../static/script/countdown.js" defer></script>
|
||||
{% endblock head_extra %}
|
||||
|
||||
{% block navbar_center %}
|
||||
{{ active_user_dropdown(page='race') }}
|
||||
{% endblock navbar_center %}
|
||||
|
||||
{% block body %}
|
||||
|
||||
{# Put table in this div to make right padding work #}
|
||||
<div class="d-inline-block overflow-x-scroll w-100 mb-2">
|
||||
<table class="table table-bordered table-sm table-responsive shadow-sm">
|
||||
|
||||
<thead>
|
||||
<tr>
|
||||
<th scope="col" rowspan="2" class="text-center" style="width: 125px;">Race</th>
|
||||
|
||||
<th scope="col" {% if model.active_user is none %}colspan="{{ model.all_users() | length }}"{% endif %}
|
||||
class="text-center">Call
|
||||
</th>
|
||||
|
||||
<th scope="col" rowspan="2" class="text-center" style="width: 125px;">Result</th>
|
||||
</tr>
|
||||
</thead>
|
||||
|
||||
<tbody>
|
||||
|
||||
{# Users List #}
|
||||
<tr>
|
||||
<td> </td>
|
||||
|
||||
{# Link should only be visible if all users are visible #}
|
||||
{% if model.active_user is not none %}
|
||||
<td class="text-center text-nowrap" style="min-width: 100px;">{{ model.active_user.name }}
|
||||
({{ points.total_points_by(model.active_user.name) }})
|
||||
</td>
|
||||
{% else %}
|
||||
{% for user in model.all_users() %}
|
||||
<td class="text-center text-nowrap" style="min-width: 100px;">
|
||||
<a href="/race/{{ user.name_sanitized }}" class="link-dark">{{ user.name }}
|
||||
({{ points.total_points_by(user.name) }})</a>
|
||||
</td>
|
||||
{% endfor %}
|
||||
{% endif %}
|
||||
|
||||
<td> </td>
|
||||
</tr>
|
||||
|
||||
{# Current Result, only displayed for all users overview and if guess is remaining #}
|
||||
{% if (model.active_user is none) and (model.current_race is not none) %}
|
||||
|
||||
<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><br>
|
||||
<small><span class="fw-bold">Date:</span> {{ model.current_race.date.strftime("%d.%m %H:%M") }}
|
||||
</small>
|
||||
</td>
|
||||
|
||||
{% 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 %}
|
||||
{% else %}
|
||||
<td> </td>
|
||||
{% endif %}
|
||||
|
||||
{# Race countdown #}
|
||||
<span id="race_date" hidden="hidden">{{ model.current_race.date.strftime("%Y-%m-%dT%H:%M") }}</span>
|
||||
<td class="text-center text-nowrap align-middle">
|
||||
<span class="fw-bold">Race starts in:</span><br>
|
||||
<span id="race_date_countdown">00d 00h 00m 00s</span>
|
||||
</td>
|
||||
</tr>
|
||||
{% endif %}
|
||||
|
||||
{# Enter Guess, only displayed for single user focused view and if guess is remaining #}
|
||||
{% if (model.active_user is not none) and (model.current_race is not none) %}
|
||||
<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><br>
|
||||
<small><span class="fw-bold">Date:</span> {{ model.current_race.date.strftime("%d.%m %H:%M") }}
|
||||
</small>
|
||||
</td>
|
||||
|
||||
<td>
|
||||
{% set race_guess_open = model.race_guess_open(model.current_race) %}
|
||||
{% if race_guess_open == 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 #}
|
||||
{{ driver_select_with_preselect(driver_match=user_guess.pxx_guess, name="pxxselect", label="P" ~ model.current_race.place_to_guess ~ ":", include_none=true, disabled=not race_guess_open) }}
|
||||
|
||||
<div class="mt-2"></div>
|
||||
|
||||
{# Driver DNF Select #}
|
||||
{{ driver_select_with_preselect(driver_match=user_guess.dnf_guess, name="dnfselect", label="DNF:", include_none=true, disabled=not race_guess_open) }}
|
||||
|
||||
<input type="submit" class="btn btn-danger mt-2 w-100" value="Save"
|
||||
{% if race_guess_open == false %}disabled="disabled"{% endif %}>
|
||||
</form>
|
||||
|
||||
{# Delete guess #}
|
||||
<form action="{{ action_delete_href }}" method="post">
|
||||
<input type="submit" class="btn btn-dark mt-2 w-100" value="Delete"
|
||||
{% if race_guess_open == false %}disabled="disabled"{% endif %}>
|
||||
</form>
|
||||
</td>
|
||||
|
||||
<td> </td>
|
||||
</tr>
|
||||
{% endif %}
|
||||
|
||||
{# Past Race Results #}
|
||||
{% for past_result in model.all_race_results() %}
|
||||
<tr>
|
||||
<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 %H:%M") }}
|
||||
</small>
|
||||
</td>
|
||||
|
||||
{% 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) }}">
|
||||
<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) }}">
|
||||
<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 %}
|
||||
{% else %}
|
||||
<td> </td>
|
||||
{% endif %}
|
||||
|
||||
{# Actual result #}
|
||||
<td class="text-center text-nowrap">
|
||||
<ul class="list-group list-group-flush">
|
||||
<li class="list-group-item">
|
||||
<span data-bs-toggle="tooltip" title="{{ pxx_standing_tooltip_text(result=past_result) }}">
|
||||
P{{ past_result.race.place_to_guess }}: {{ past_result.offset_from_place_to_guess(0).abbr }}
|
||||
</span>
|
||||
</li>
|
||||
<li class="list-group-item">
|
||||
DNF: {{ past_result.initial_dnf_string() }}</li>
|
||||
</ul>
|
||||
</td>
|
||||
</tr>
|
||||
{% endfor %}
|
||||
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
|
||||
{% endblock body %}
|
||||
131
formula10/templates/result.jinja
Normal file
131
formula10/templates/result.jinja
Normal file
@ -0,0 +1,131 @@
|
||||
{% extends 'base.jinja' %}
|
||||
|
||||
{% block title %}Formula 10 - Race Result{% endblock title %}
|
||||
|
||||
{% set active_page = "/result" %}
|
||||
|
||||
{% block head_extra %}
|
||||
<link href="../static/style/draggable.css" rel="stylesheet">
|
||||
<script src="../static/script/draggable.js" defer></script>
|
||||
{% endblock head_extra %}
|
||||
|
||||
{% block navbar_center %}
|
||||
|
||||
{% if model.all_race_results() | length > 0 %}
|
||||
<div class="dropdown">
|
||||
<button class="btn btn-outline-danger dropdown-toggle" type="button" data-bs-toggle="dropdown"
|
||||
aria-expanded="false">
|
||||
{{ model.active_result_race_name_or_current_race_name() }}
|
||||
</button>
|
||||
<ul class="dropdown-menu">
|
||||
{% if model.current_race is not none %}
|
||||
<li>
|
||||
<a class="dropdown-item"
|
||||
href="/result/{{ model.current_race.name_sanitized }}">{{ model.current_race.name }}</a>
|
||||
</li>
|
||||
<li>
|
||||
<hr class="dropdown-divider">
|
||||
</li>
|
||||
{% endif %}
|
||||
|
||||
{% for result in model.all_race_results() %}
|
||||
<li>
|
||||
<a class="dropdown-item"
|
||||
href="/result/{{ result.race.name_sanitized }}">{{ result.race.name }}</a>
|
||||
</li>
|
||||
{% endfor %}
|
||||
</ul>
|
||||
</div>
|
||||
{% endif %}
|
||||
|
||||
{% endblock navbar_center %}
|
||||
|
||||
{% block body %}
|
||||
|
||||
<div class="grid card-grid">
|
||||
|
||||
<div class="card shadow-sm mb-2" style="max-width: 450px;">
|
||||
<div class="card-header">
|
||||
{{ model.active_result_race_name_or_current_race_name() }}
|
||||
</div>
|
||||
|
||||
<div class="card-body">
|
||||
<div class="d-inline-block overflow-x-scroll w-100">
|
||||
<div style="width: 410px;">
|
||||
{% 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 %}
|
||||
|
||||
<form action="{{ action_save_href }}" method="post">
|
||||
{# Place numbers #}
|
||||
<ul class="list-group list-group-flush d-inline-block">
|
||||
{% for driver in model.all_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>
|
||||
{% endfor %}
|
||||
</ul>
|
||||
|
||||
{# Drag and drop #}
|
||||
<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;">
|
||||
{# 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 #}
|
||||
<div class="form-check form-check-reverse d-inline-block mx-2">
|
||||
<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">
|
||||
<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 %}>
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
{% endblock body %}
|
||||
96
formula10/templates/rules.jinja
Normal file
96
formula10/templates/rules.jinja
Normal file
@ -0,0 +1,96 @@
|
||||
{% extends 'base.jinja' %}
|
||||
|
||||
{% block title %}Formula 10 - Rules{% endblock title %}
|
||||
|
||||
{% set active_page = "/rules" %}
|
||||
|
||||
{% block body %}
|
||||
<div class="card shadow-sm mb-2">
|
||||
<div class="card-header">
|
||||
Format
|
||||
</div>
|
||||
|
||||
<div class="card-body">
|
||||
<p>
|
||||
Das Tippspiel wird dieses Jahr in zwei Teile aufgespalten: Renntips (für jedes Rennen) und Bonustipps
|
||||
(für die ganze Saison).
|
||||
Renntipps müssen bis Rennstart, Bonustipps bis 1. März abgegeben werden.
|
||||
Tipps können entweder selbst eingetragen werden, oder in die Gruppe geschrieben werden, um gültig zu
|
||||
sein.
|
||||
</p>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="card shadow-sm mb-2">
|
||||
<div class="card-header">
|
||||
Renntipps
|
||||
</div>
|
||||
|
||||
<div class="card-body">
|
||||
<p>
|
||||
Jedes Rennen besteht aus zwei Tipps.
|
||||
Einem Platzierungstipp (PX-Tipp) und einem Tipp welcher Fahrer als Erstes das Rennen abbricht
|
||||
(DNF-Tipp).
|
||||
Anders als beim P10-Tipp letztes Jahr wird dieses Mal jedes Rennen eine andere Platzierung getippt.
|
||||
Die zu tippende Platzierung wird auf der Tabellen-Übersichtsseite und im Fahrer-Auswahlmenü angezeigt.
|
||||
</p>
|
||||
|
||||
<p>
|
||||
DNS/DSQ zählt hierbei nicht als DNF, außerdem besteht die Möglichkeit zu tippen, dass kein Fahrer DNF't oder
|
||||
das Rennen auf PX beendet.
|
||||
</p>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="card shadow-sm mb-2">
|
||||
<div class="card-header">
|
||||
Punkte
|
||||
</div>
|
||||
|
||||
<div class="card-body">
|
||||
<p>
|
||||
Für einen korrekten Tipp werden 10 Punkte vergeben.
|
||||
Beim PX-Tipp werden 6 Punkte für einen Platz Abweichung, 3 Punkte für zwei plätze Abweichung und 1 Punkt
|
||||
für 3 Plätze Abweichung vergeben.
|
||||
</p>
|
||||
|
||||
<p>
|
||||
Beim DNF-Tipp werden keine Abweichungspunkte vergeben, ebensowenig wie bei der Auswahl "Keiner" für den
|
||||
PX-Tipp.
|
||||
</p>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="card shadow-sm mb-2">
|
||||
<div class="card-header">
|
||||
Bonustipps
|
||||
</div>
|
||||
|
||||
<div class="card-body">
|
||||
<p>
|
||||
Zusätzlich gibt es dieses Jahr auch Tipps, die sich auf die ganze Saison beziehen und verschieden
|
||||
bepunktet werden.
|
||||
</p>
|
||||
|
||||
<ul class="list-group list-group-numbered">
|
||||
<li class="list-group-item">Welches Team wird P2 in der constructors championship? (10 Punkte für die
|
||||
richtige Antwort / 0 Punkte für eine falsche Antwort)
|
||||
</li>
|
||||
<li class="list-group-item">Welcher Fahrer verbessert am meisten seine Platzierung in der drivers
|
||||
championship im Vergleich zum Vorjahr? (10/0)
|
||||
</li>
|
||||
<li class="list-group-item">Welcher Fahrer verschlechtert am meisten seine Platzierung in der drivers
|
||||
championship im Vergleich zum Vorjahr? (10/0)
|
||||
</li>
|
||||
<li class="list-group-item">Welcher Fahrer hat die meisten DNFs? (10/0)</li>
|
||||
<li class="list-group-item">Welcher Fahrer hat die meisten Überholungen? (10/0)</li>
|
||||
<li class="list-group-item">Nenne alle Fahrer, die mindestens einmal auf dem Podium stehen werden.
|
||||
(3/-2, nicht-gegebene Antworten zählen als falsch)
|
||||
</li>
|
||||
<li class="list-group-item">Nenne für alle Teams den Sieger des teaminternen Duells. (3/-3)</li>
|
||||
<li class="list-group-item">Nenne einen hot-take für die Saison (10/0, "hotness" wird vorher abgesegnet)</li>
|
||||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
{% endblock body %}
|
||||
176
formula10/templates/season.jinja
Normal file
176
formula10/templates/season.jinja
Normal file
@ -0,0 +1,176 @@
|
||||
{% extends 'base.jinja' %}
|
||||
|
||||
{% block title %}Formula 10 - Season{% endblock title %}
|
||||
|
||||
{% set active_page = "/season/" ~ model.active_user_name_sanitized_or_everyone() %}
|
||||
|
||||
{% block navbar_center %}
|
||||
{{ active_user_dropdown(page='season') }}
|
||||
{% endblock navbar_center %}
|
||||
|
||||
{% block body %}
|
||||
|
||||
<div class="card shadow-sm mb-2">
|
||||
<div class="card-header">
|
||||
Note
|
||||
</div>
|
||||
|
||||
<div class="card-body">
|
||||
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>
|
||||
Points from sprints and fastest laps are not tracked currently.
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="grid card-grid">
|
||||
|
||||
{% for user in model.all_users_or_active_user() %}
|
||||
|
||||
<div class="card shadow-sm mb-2">
|
||||
<div class="card-header">
|
||||
{# Link should only be visible if all users are visible #}
|
||||
{% if model.active_user is not none %}
|
||||
{{ user.name }}
|
||||
{% else %}
|
||||
<a href="/season/{{ user.name }}" class="link-dark">{{ user.name }}</a>
|
||||
{% endif %}
|
||||
</div>
|
||||
|
||||
<div class="card-body">
|
||||
|
||||
{% set user_guess = model.season_guesses_by(user_name=user.name) %}
|
||||
|
||||
{% set season_guess_open = model.season_guess_open() %}
|
||||
{% if 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">
|
||||
<textarea
|
||||
class="form-control {% if points.hot_take_correct(user.name) %}border-success{% endif %}"
|
||||
id="hot-take-input-{{ user.name }}" name="hottakeselect"
|
||||
style="height: 150px"
|
||||
{% if season_guess_open == false %}disabled="disabled"{% endif %}>
|
||||
{%- if user_guess is not none -%}{{ user_guess.hot_take_string() }}{%- endif -%}
|
||||
</textarea>
|
||||
|
||||
<label for="hot-take-input-{{ user.name }}" class="text-primary">Hot Take:</label>
|
||||
</div>
|
||||
|
||||
{# P2 Constructor #}
|
||||
<div class="mt-2">
|
||||
{{ team_select_with_preselect(team_match=user_guess.p2_wcc, name="p2select", label="P2 in WCC:",
|
||||
include_none=false, disabled=not season_guess_open,
|
||||
border=("border-success" if points.p2_constructor_correct(user.name) else "")) }}
|
||||
</div>
|
||||
|
||||
{# Most Overtakes + DNFs #}
|
||||
<div class="input-group mt-2">
|
||||
{{ driver_select_with_preselect(driver_match=user_guess.most_overtakes, name="overtakeselect",
|
||||
label="Most overtakes:", include_none=false, disabled=not season_guess_open,
|
||||
border=("border-success" if points.overtakes_correct(user.name) else "")) }}
|
||||
{{ driver_select_with_preselect(driver_match=user_guess.most_dnfs, name="dnfselect", label="Most DNFs:",
|
||||
include_none=false, disabled=not season_guess_open,
|
||||
border=("border-success" if points.dnfs_correct(user.name) else "")) }}
|
||||
</div>
|
||||
|
||||
{# Most Gained + Lost #}
|
||||
<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(),
|
||||
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",
|
||||
label="Most WDC pl. lost:", include_none=false, disabled=not season_guess_open,
|
||||
border=("border-success" if points.most_lost_correct(user.name) else "")) }}
|
||||
</div>
|
||||
|
||||
{# Team-internal Winners #}
|
||||
<h6 class="card-subtitle mt-2" data-bs-toggle="tooltip"
|
||||
title="Which driver will finish the season higher than his teammate?">Teammate battle
|
||||
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] %}
|
||||
|
||||
<div class="g-col-6">
|
||||
<div class="form-check form-check-inline">
|
||||
<input class="form-check-input" type="radio"
|
||||
name="teamwinner-{{ team.id }}"
|
||||
id="teamwinner-{{ team.id }}-1-{{ user.id }}"
|
||||
value="{{ driver_a.id }}"
|
||||
{% if (user_guess is not none) and (driver_a in user_guess.team_winners) %}checked="checked"{% endif %}
|
||||
{% if season_guess_open == false %}disabled="disabled"{% endif %}>
|
||||
<label class="form-check-label {% if (user_guess is not none) and (driver_a in user_guess.team_winners) and points.is_team_winner(driver_a) %}text-success{% endif %}"
|
||||
for="teamwinner-{{ team.id }}-1-{{ user.id }}">{{ driver_a.name }}</label>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="g-col-6">
|
||||
<div class="form-check form-check-inline">
|
||||
<input class="form-check-input" type="radio"
|
||||
name="teamwinner-{{ team.id }}"
|
||||
id="teamwinner-{{ team.id }}-2-{{ user.id }}"
|
||||
value="{{ driver_b.id }}"
|
||||
{% if (user_guess is not none) and (driver_b in user_guess.team_winners) %}checked="checked"{% endif %}
|
||||
{% if season_guess_open == false %}disabled="disabled"{% endif %}>
|
||||
<label class="form-check-label {% if (user_guess is not none) and (driver_b in user_guess.team_winners) and points.is_team_winner(driver_b) %}text-success{% endif %}"
|
||||
for="teamwinner-{{ team.id }}-2-{{ user.id }}">{{ driver_b.name }}</label>
|
||||
</div>
|
||||
</div>
|
||||
{% endfor %}
|
||||
</div>
|
||||
|
||||
{# Drivers with Podiums #}
|
||||
<h6 class="card-subtitle mt-2" data-bs-toggle="tooltip"
|
||||
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] %}
|
||||
|
||||
<div class="g-col-6">
|
||||
<div class="form-check form-check-inline">
|
||||
<input class="form-check-input" type="checkbox"
|
||||
name="podiumdrivers"
|
||||
id="podium-{{ driver_a.id }}-{{ user.id }}"
|
||||
value="{{ driver_a.id }}"
|
||||
{% if (user_guess is not none) and (driver_a in user_guess.podiums) %}checked="checked"{% endif %}
|
||||
{% if season_guess_open == false %}disabled="disabled"{% endif %}>
|
||||
<label class="form-check-label {% if (user_guess is not none) and (driver_a in user_guess.podiums) and points.has_podium(driver_a) %}text-success{% endif %}"
|
||||
for="podium-{{ driver_a.id }}-{{ user.id }}">{{ driver_a.name }}</label>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="g-col-6">
|
||||
<div class="form-check form-check-inline">
|
||||
<input class="form-check-input" type="checkbox"
|
||||
name="podiumdrivers"
|
||||
id="podium-{{ driver_b.id }}-{{ user.id }}"
|
||||
value="{{ driver_b.id }}"
|
||||
{% if (user_guess is not none) and (driver_b in user_guess.podiums) %}checked="checked"{% endif %}
|
||||
{% if season_guess_open == false %}disabled="disabled"{% endif %}>
|
||||
<label class="form-check-label {% if (user_guess is not none) and (driver_b in user_guess.podiums) and points.has_podium(driver_b) %}text-success{% endif %}"
|
||||
for="podium-{{ driver_b.id }}-{{ user.id }}">{{ driver_b.name }}</label>
|
||||
</div>
|
||||
</div>
|
||||
{% endfor %}
|
||||
</div>
|
||||
|
||||
<input type="submit" class="btn btn-danger mt-2 w-100" value="Save"
|
||||
{% if season_guess_open == false %}disabled="disabled"{% endif %}>
|
||||
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
{% endfor %}
|
||||
</div>
|
||||
|
||||
{% endblock body %}
|
||||
171
formula10/templates/statistics.jinja
Normal file
171
formula10/templates/statistics.jinja
Normal file
@ -0,0 +1,171 @@
|
||||
{% extends 'base.jinja' %}
|
||||
|
||||
{% block title %}Formula 10 - Statistics{% endblock title %}
|
||||
|
||||
{% set active_page = "/stats" %}
|
||||
|
||||
{% 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="card shadow-sm mb-2">
|
||||
<div class="card-header">
|
||||
Drivers
|
||||
</div>
|
||||
|
||||
<div class="card-body">
|
||||
<div class="d-inline-block overflow-x-scroll w-100">
|
||||
<table class="table table-bordered table-sm table-responsive">
|
||||
<thead>
|
||||
<tr>
|
||||
<th scope="col" class="text-center" style="min-width: 50px;">Place</th>
|
||||
<th scope="col" class="text-center" style="min-width: 50px;">Driver</th>
|
||||
<th scope="col" class="text-center" style="min-width: 100px;">Points</th>
|
||||
<th scope="col" class="text-center" style="min-width: 100px;">DNFs</th>
|
||||
<th scope="col" class="text-center" style="min-width: 100px;">Place Delta</th>
|
||||
</tr>
|
||||
</thead>
|
||||
|
||||
<tbody>
|
||||
{% for driver in points.drivers_sorted_by_points() %}
|
||||
{% 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>
|
||||
<td class="text-center text-nowrap">{{ driver.name }}</td>
|
||||
<td class="text-center text-nowrap">{{ points.total_driver_points_by(driver.name) }}</td>
|
||||
<td class="text-center text-nowrap">{{ points.dnfs()[driver.name] }}</td>
|
||||
<td class="text-center text-nowrap">{{ "%+d" % points.wdc_diff_2023_by(driver.name) }}</td>
|
||||
</tr>
|
||||
{% endfor %}
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="card shadow-sm mb-2">
|
||||
<div class="card-header">
|
||||
Constructors
|
||||
</div>
|
||||
|
||||
<div class="card-body">
|
||||
<div class="d-inline-block overflow-x-scroll w-100">
|
||||
<table class="table table-bordered table-sm table-responsive">
|
||||
<thead>
|
||||
<tr>
|
||||
<th scope="col" class="text-center" style="min-width: 50px;">Place</th>
|
||||
<th scope="col" class="text-center" style="min-width: 50px;">Team</th>
|
||||
<th scope="col" class="text-center" style="min-width: 100px;">Points</th>
|
||||
<th scope="col" class="text-center" style="min-width: 100px;">Place Delta</th>
|
||||
</tr>
|
||||
</thead>
|
||||
|
||||
<tbody>
|
||||
{% for team in points.teams_sorted_by_points() %}
|
||||
{% set team_standing = points.wcc_standing_by_team()[team.name] %}
|
||||
<tr class="{% if team_standing == 1 %}table-danger{% endif %}">
|
||||
<td class="text-center text-nowrap">{{ team_standing }}</td>
|
||||
<td class="text-center text-nowrap">{{ team.name }}</td>
|
||||
<td class="text-center text-nowrap">{{ points.total_team_points_by(team.name) }}</td>
|
||||
<td class="text-center text-nowrap">{{ points.wcc_diff_2023_by(team.name) }}</td>
|
||||
</tr>
|
||||
{% endfor %}
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="card shadow-sm mb-2">
|
||||
<div class="card-header">
|
||||
Driver history
|
||||
</div>
|
||||
|
||||
<div class="card-body">
|
||||
<div class="chart-container">
|
||||
<canvas id="driver-line-chart"></canvas>
|
||||
</div>
|
||||
|
||||
<script>
|
||||
function cumulative_driver_points(data) {
|
||||
return new Chart(document.getElementById("driver-line-chart"), {
|
||||
type: 'line',
|
||||
data: data,
|
||||
options: {
|
||||
title: {
|
||||
display: true,
|
||||
text: 'History'
|
||||
},
|
||||
{#tension: 0,#}
|
||||
responsive: true,
|
||||
maintainAspectRatio: false,
|
||||
pointRadius: 5,
|
||||
pointHoverRadius: 10,
|
||||
scales: {
|
||||
y: {
|
||||
min: 0,
|
||||
{#max: 100#}
|
||||
}
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
cumulative_driver_points({{ points.cumulative_driver_points_data() | safe }})
|
||||
</script>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="card shadow-sm mb-2">
|
||||
<div class="card-header">
|
||||
Team history
|
||||
</div>
|
||||
|
||||
<div class="card-body">
|
||||
<div class="chart-container">
|
||||
<canvas id="team-line-chart"></canvas>
|
||||
</div>
|
||||
|
||||
<script>
|
||||
function cumulative_team_points(data) {
|
||||
return new Chart(document.getElementById("team-line-chart"), {
|
||||
type: 'line',
|
||||
data: data,
|
||||
options: {
|
||||
title: {
|
||||
display: true,
|
||||
text: 'History'
|
||||
},
|
||||
{#tension: 0,#}
|
||||
responsive: true,
|
||||
maintainAspectRatio: false,
|
||||
pointRadius: 5,
|
||||
pointHoverRadius: 10,
|
||||
scales: {
|
||||
y: {
|
||||
min: 0,
|
||||
{#max: 100#}
|
||||
}
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
cumulative_team_points({{ points.cumulative_team_points_data() | safe }})
|
||||
</script>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
{% endblock body %}
|
||||
75
formula10/templates/users.jinja
Normal file
75
formula10/templates/users.jinja
Normal file
@ -0,0 +1,75 @@
|
||||
{% extends 'base.jinja' %}
|
||||
|
||||
{% block title %}Formula 10 - Users{% endblock title %}
|
||||
|
||||
{% set active_page = "/users" %}
|
||||
|
||||
{% block body %}
|
||||
|
||||
<div class="card shadow-sm mb-2">
|
||||
<div class="card-header">
|
||||
Add user
|
||||
</div>
|
||||
|
||||
<div class="card-body">
|
||||
<form action="/user-add" method="post">
|
||||
<div class="input-group">
|
||||
<div class="form-floating">
|
||||
<input type="text" class="form-control" id="select-add-user" name="select-add-user"
|
||||
placeholder="Username:">
|
||||
<label for="select-add-user">Username:</label>
|
||||
</div>
|
||||
|
||||
<input type="submit" class="form-control btn btn-danger" value="Add" style="max-width: 200px;">
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
{% if model.all_users() | length > 0 %}
|
||||
<div class="card shadow-sm mb-2">
|
||||
<div class="card-header">
|
||||
Registered users
|
||||
</div>
|
||||
|
||||
<div class="card-body">
|
||||
<ul class="list-group list-group-flush">
|
||||
{% for user in model.all_users() %}
|
||||
<li class="list-group-item">{{ user.name }}</li>
|
||||
{% endfor %}
|
||||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="card shadow-sm mb-2">
|
||||
<div class="card-header">
|
||||
Delete user
|
||||
</div>
|
||||
|
||||
<div class="card-body">
|
||||
<form action="/user-delete" method="post">
|
||||
<div class="input-group">
|
||||
<select class="form-control form-select" aria-label="select-delete-user"
|
||||
name="select-delete-user">
|
||||
<option selected="selected" disabled="disabled" hidden="hidden">Select User</option>
|
||||
{% for user in model.all_users() %}
|
||||
<option value="{{ user.name }}">{{ user.name }}</option>
|
||||
{% endfor %}
|
||||
</select>
|
||||
|
||||
<input type="submit" class="form-control btn btn-danger" value="Delete"
|
||||
style="max-width: 200px;">
|
||||
</div>
|
||||
|
||||
<div class="form-text">
|
||||
"Deleting" a user just hides it from the user interface without deleting any inputs, your
|
||||
"pERsoNaL DaTa" is not yours anyway.<br>
|
||||
Re-adding a user with the same name will "restore" it. That doesn't mean you're allowed to
|
||||
remove everyone though.
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
{% endif %}
|
||||
|
||||
{% endblock body %}
|
||||
286
model.py
286
model.py
@ -1,286 +0,0 @@
|
||||
from typing import List
|
||||
|
||||
from flask_sqlalchemy import SQLAlchemy
|
||||
from sqlalchemy import Integer, String, Boolean, DateTime, ForeignKey, PickleType
|
||||
from sqlalchemy.orm import Mapped, mapped_column, relationship
|
||||
from datetime import datetime
|
||||
import json
|
||||
|
||||
db = SQLAlchemy()
|
||||
|
||||
####################################
|
||||
# Static Data (Defined in Backend) #
|
||||
####################################
|
||||
|
||||
|
||||
class Race(db.Model):
|
||||
__tablename__ = "race"
|
||||
|
||||
def from_csv(self, row):
|
||||
self.id = int(row[0])
|
||||
self.grandprix = str(row[1])
|
||||
self.number = int(row[2])
|
||||
self.date = datetime.strptime(row[3], "%Y-%m-%d")
|
||||
self.pxx = int(row[4]) # This is the place that has to be guessed for this race
|
||||
return self
|
||||
|
||||
id: Mapped[int] = mapped_column(Integer, primary_key=True)
|
||||
grandprix: Mapped[str] = mapped_column(String(32))
|
||||
number: Mapped[int] = mapped_column(Integer)
|
||||
date: Mapped[datetime] = mapped_column(DateTime)
|
||||
pxx: Mapped[int] = mapped_column(Integer)
|
||||
|
||||
|
||||
class Team(db.Model):
|
||||
__tablename__ = "team"
|
||||
|
||||
def from_csv(self, row):
|
||||
self.name = str(row[0])
|
||||
return self
|
||||
|
||||
name: Mapped[str] = mapped_column(String(32), primary_key=True)
|
||||
|
||||
|
||||
class Driver(db.Model):
|
||||
__tablename__ = "driver"
|
||||
|
||||
def from_csv(self, row):
|
||||
self.name = str(row[0])
|
||||
self.abbr = str(row[1])
|
||||
self.team_id = str(row[2])
|
||||
self.country_code = str(row[3])
|
||||
return self
|
||||
|
||||
name: Mapped[str] = mapped_column(String(32), primary_key=True)
|
||||
abbr: Mapped[str] = mapped_column(String(3))
|
||||
team_id: Mapped[str] = mapped_column(ForeignKey("team.name"))
|
||||
country_code: Mapped[str] = mapped_column(String(2)) # alpha-2 code
|
||||
|
||||
# Relationships
|
||||
team: Mapped["Team"] = relationship("Team", foreign_keys=[team_id])
|
||||
|
||||
|
||||
######################################
|
||||
# Dynamic Data (Defined in Frontend) #
|
||||
######################################
|
||||
|
||||
|
||||
class User(db.Model):
|
||||
__tablename__ = "user"
|
||||
__csv_header__ = ["name"]
|
||||
|
||||
def from_csv(self, row):
|
||||
self.name = str(row[0])
|
||||
return self
|
||||
|
||||
def to_csv(self):
|
||||
return [
|
||||
self.name
|
||||
]
|
||||
|
||||
name: Mapped[str] = mapped_column(String(32), primary_key=True)
|
||||
|
||||
|
||||
class RaceResult(db.Model):
|
||||
__tablename__ = "raceresult"
|
||||
__csv_header__ = ["id", "race_id", "pxx_id", "dnf_id"]
|
||||
|
||||
def from_csv(self, row):
|
||||
self.id = int(row[0])
|
||||
self.race_id = int(row[1])
|
||||
self.pxx_id = str(row[2])
|
||||
self.dnf_id = str(row[3])
|
||||
return self
|
||||
|
||||
def to_csv(self):
|
||||
return [
|
||||
self.id,
|
||||
self.race_id,
|
||||
self.pxx_id,
|
||||
self.dnf_id
|
||||
]
|
||||
|
||||
id: Mapped[int] = mapped_column(Integer, primary_key=True)
|
||||
race_id: Mapped[int] = mapped_column(ForeignKey("race.id"))
|
||||
pxx_id: Mapped[str] = mapped_column(ForeignKey("driver.name"))
|
||||
dnf_id: Mapped[str] = mapped_column(ForeignKey("driver.name"))
|
||||
|
||||
# Relationships
|
||||
race: Mapped["Race"] = relationship("Race", foreign_keys=[race_id])
|
||||
pxx: Mapped["Driver"] = relationship("Driver", foreign_keys=[pxx_id])
|
||||
dnf: Mapped["Driver"] = relationship("Driver", foreign_keys=[dnf_id])
|
||||
|
||||
|
||||
class RaceGuess(db.Model):
|
||||
__tablename__ = "raceguess"
|
||||
__csv_header__ = ["id", "user_id", "race_id", "pxx_id", "dnf_id"]
|
||||
|
||||
def from_csv(self, row):
|
||||
self.id = int(row[0])
|
||||
self.user_id = str(row[1])
|
||||
self.race_id = int(row[2])
|
||||
self.pxx_id = str(row[3])
|
||||
self.dnf_id = str(row[4])
|
||||
return self
|
||||
|
||||
def to_csv(self):
|
||||
return [
|
||||
self.id,
|
||||
self.user_id,
|
||||
self.race_id,
|
||||
self.pxx_id,
|
||||
self.dnf_id
|
||||
]
|
||||
|
||||
id: Mapped[int] = mapped_column(Integer, primary_key=True)
|
||||
user_id: Mapped[str] = mapped_column(ForeignKey("user.name"))
|
||||
race_id: Mapped[int] = mapped_column(ForeignKey("race.id"))
|
||||
pxx_id: Mapped[str] = mapped_column(ForeignKey("driver.name"))
|
||||
dnf_id: Mapped[str] = mapped_column(ForeignKey("driver.name"))
|
||||
|
||||
# Relationships
|
||||
user: Mapped["User"] = relationship("User", foreign_keys=[user_id])
|
||||
race: Mapped["Race"] = relationship("Race", foreign_keys=[race_id])
|
||||
pxx: Mapped["Driver"] = relationship("Driver", foreign_keys=[pxx_id])
|
||||
dnf: Mapped["Driver"] = relationship("Driver", foreign_keys=[dnf_id])
|
||||
|
||||
|
||||
class TeamWinners(db.Model):
|
||||
__tablename__ = "teamwinners"
|
||||
__csv_header__ = ["id", "user_id", "winner_ids_json"]
|
||||
|
||||
def from_csv(self, row):
|
||||
self.id = int(row[0])
|
||||
self.user_id = str(row[1])
|
||||
self.winner_ids_json = str(row[2])
|
||||
return self
|
||||
|
||||
def to_csv(self):
|
||||
return [
|
||||
self.id,
|
||||
self.user_id,
|
||||
self.winner_ids_json
|
||||
]
|
||||
|
||||
id: Mapped[int] = mapped_column(Integer, primary_key=True)
|
||||
user_id: Mapped[str] = mapped_column(ForeignKey("user.name"))
|
||||
winner_ids_json: Mapped[str] = mapped_column(String(512))
|
||||
|
||||
@property
|
||||
def winner_ids(self) -> List[str]:
|
||||
return json.loads(self.winner_ids_json)
|
||||
|
||||
@winner_ids.setter
|
||||
def winner_ids(self, new_winner_ids: List[str]):
|
||||
self.winner_ids_json = json.dumps(new_winner_ids)
|
||||
|
||||
# Relationships
|
||||
user: Mapped["User"] = relationship("User", foreign_keys=[user_id])
|
||||
_winners = None
|
||||
|
||||
@property
|
||||
def winners(self) -> List[Driver]:
|
||||
if self._winners is None:
|
||||
self._winners = [
|
||||
driver for driver in Driver.query.all() if driver.name in self.winner_ids
|
||||
]
|
||||
|
||||
return self._winners
|
||||
|
||||
|
||||
class PodiumDrivers(db.Model):
|
||||
__tablename__ = "podiumdrivers"
|
||||
__csv_header__ = ["id", "user_id", "podium_ids_json"]
|
||||
|
||||
def from_csv(self, row):
|
||||
self.id = int(row[0])
|
||||
self.user_id = str(row[1])
|
||||
self.podium_ids_json = str(row[2])
|
||||
return self
|
||||
|
||||
def to_csv(self):
|
||||
return [
|
||||
self.id,
|
||||
self.user_id,
|
||||
self.podium_ids_json
|
||||
]
|
||||
|
||||
id: Mapped[int] = mapped_column(Integer, primary_key=True)
|
||||
user_id: Mapped[str] = mapped_column(ForeignKey("user.name"))
|
||||
podium_ids_json: Mapped[str] = mapped_column(String(512))
|
||||
|
||||
@property
|
||||
def podium_ids(self) -> List[str]:
|
||||
return json.loads(self.podium_ids_json)
|
||||
|
||||
@podium_ids.setter
|
||||
def podium_ids(self, new_podium_ids: List[str]):
|
||||
self.podium_ids_json = json.dumps(new_podium_ids)
|
||||
|
||||
# Relationships
|
||||
user: Mapped["User"] = relationship("User", foreign_keys=[user_id])
|
||||
_podiums = None
|
||||
|
||||
@property
|
||||
def podiums(self) -> List[Driver]:
|
||||
if self._podiums is None:
|
||||
self._podiums = [
|
||||
driver for driver in Driver.query.all() if driver.name in self.podium_ids
|
||||
]
|
||||
|
||||
return self._podiums
|
||||
|
||||
|
||||
class SeasonGuess(db.Model):
|
||||
__tablename__ = "seasonguess"
|
||||
__csv_header__ = ["id", "user_id",
|
||||
"hot_take", "p2_constructor_id", "most_overtakes_id", "most_dnfs_id", "most_gained_id",
|
||||
"most_lost_id", "team_winners_id", "podium_drivers_id"]
|
||||
|
||||
def from_csv(self, row):
|
||||
self.id = int(row[0])
|
||||
self.user_id = str(row[1])
|
||||
self.hot_take = str(row[2])
|
||||
self.p2_constructor_id = str(row[3])
|
||||
self.most_overtakes_id = str(row[4])
|
||||
self.most_dnfs_id = str(row[5])
|
||||
self.most_gained_id = str(row[6])
|
||||
self.most_lost_id = str(row[6])
|
||||
self.team_winners_id = int(row[8])
|
||||
self.podium_drivers_id = int(row[9])
|
||||
return self
|
||||
|
||||
def to_csv(self):
|
||||
return [
|
||||
self.id,
|
||||
self.user_id,
|
||||
self.hot_take,
|
||||
self.p2_constructor_id,
|
||||
self.most_overtakes_id,
|
||||
self.most_dnfs_id,
|
||||
self.most_gained_id,
|
||||
self.most_lost_id,
|
||||
self.team_winners_id,
|
||||
self.podium_drivers_id
|
||||
]
|
||||
|
||||
id: Mapped[int] = mapped_column(Integer, primary_key=True)
|
||||
user_id: Mapped[str] = mapped_column(ForeignKey("user.name"))
|
||||
hot_take: Mapped[str] = mapped_column(String(512))
|
||||
p2_constructor_id: Mapped[str] = mapped_column(ForeignKey("team.name"))
|
||||
most_overtakes_id: Mapped[str] = mapped_column(ForeignKey("driver.name"))
|
||||
most_dnfs_id: Mapped[str] = mapped_column(ForeignKey("driver.name"))
|
||||
most_gained_id: Mapped[str] = mapped_column(ForeignKey("driver.name"))
|
||||
most_lost_id: Mapped[str] = mapped_column(ForeignKey("driver.name"))
|
||||
team_winners_id: Mapped[int] = mapped_column(ForeignKey("teamwinners.id"))
|
||||
podium_drivers_id: Mapped[int] = mapped_column(ForeignKey("podiumdrivers.id"))
|
||||
|
||||
# Relationships
|
||||
user: Mapped["User"] = relationship("User", foreign_keys=[user_id])
|
||||
p2_constructor: Mapped["Team"] = relationship("Team", foreign_keys=[p2_constructor_id])
|
||||
most_overtakes: Mapped["Driver"] = relationship("Driver", foreign_keys=[most_overtakes_id])
|
||||
most_dnfs: Mapped["Driver"] = relationship("Driver", foreign_keys=[most_dnfs_id])
|
||||
most_gained: Mapped["Driver"] = relationship("Driver", foreign_keys=[most_gained_id])
|
||||
most_lost: Mapped["Driver"] = relationship("Driver", foreign_keys=[most_lost_id])
|
||||
team_winners: Mapped["TeamWinners"] = relationship("TeamWinners", foreign_keys=[team_winners_id])
|
||||
podium_drivers: Mapped["PodiumDrivers"] = relationship("PodiumDrivers", foreign_keys=[podium_drivers_id])
|
||||
8
requirements.txt
Normal file
8
requirements.txt
Normal file
@ -0,0 +1,8 @@
|
||||
rich
|
||||
numpy
|
||||
|
||||
flask
|
||||
flask-sqlalchemy
|
||||
sqlalchemy
|
||||
|
||||
pytest
|
||||
@ -1,22 +0,0 @@
|
||||
name,abbr,team_id,country_code
|
||||
NONE,NON,NONE,NO
|
||||
Alexander Albon,ALB,Williams,TH
|
||||
Fernando Alonso,ALO,Aston Martin,ES
|
||||
Valteri Bottas,BOT,Stake,FL
|
||||
Pierre Gasly,GAS,Alpine,FR
|
||||
Lewis Hamilton,HAM,Mercedes,UK
|
||||
Nico Hulkenberg,HUL,Haas,DE
|
||||
Charles Leclerc,LEC,Ferrari,MC
|
||||
Kevin Magnussen,MAG,Haas,DK
|
||||
Lando Norris,NOR,McLaren,UK
|
||||
Esteban Ocon,OCO,Alpine,FR
|
||||
Sergio Perez,PER,RedBull,MX
|
||||
Oscar Piastri,PIA,McLaren,AU
|
||||
Daniel Ricciardo,RIC,VCARB,AU
|
||||
George Russel,RUS,Mercedes,UK
|
||||
Carlos Sainz,SAI,Ferrari,ES
|
||||
Logan Sargeant,SAR,Williams,US
|
||||
Lance Stroll,STR,Aston Martin,CA
|
||||
Yuki Tsunoda,TSU,VCARB,JP
|
||||
Max Verstappen,VER,RedBull,NL
|
||||
Zhou Guanyu,ZHO,Stake,CN
|
||||
|
@ -1,24 +0,0 @@
|
||||
id,grandprix,number,date,pxx
|
||||
1,Bahrain,1,2023-03-05,3
|
||||
2,Saudi Arabia,2,2023-03-19,17
|
||||
3,Melbourne,3,2023-04-02,5
|
||||
4,Baku,4,2023-04-30,6
|
||||
5,Miami,5,2023-05-07,15
|
||||
6,Imola,6,2023-05-21,8
|
||||
7,Monaco,7,2023-05-28,9
|
||||
8,Barcelona,8,2023-06-04,13
|
||||
9,Montreal,9,2023-06-18,11
|
||||
10,Spielberg,10,2023-07-02,12
|
||||
11,Silverstone,11,2023-07-09,18
|
||||
12,Budapest,12,2023-07-23,12
|
||||
13,Spa,13,2023-07-30,13
|
||||
14,Zandvoort,14,2023-08-27,3
|
||||
15,Monza,15,2023-09-03,6
|
||||
16,Singapore,16,2023-09-17,10
|
||||
17,Suzuka,17,2023-09-24,11
|
||||
18,Qatar,18,2023-10-08,3
|
||||
19,Austin,19,2023-10-22,11
|
||||
20,Mexico,20,2023-10-29,17
|
||||
21,Brazil,21,2023-11-05,14
|
||||
22,Las Vegas,22,2023-11-18,8
|
||||
23,Abu Dhabi,23,2023-11-26,5
|
||||
|
@ -1,11 +0,0 @@
|
||||
team
|
||||
Alpine
|
||||
Aston Martin
|
||||
Ferrari
|
||||
Haas
|
||||
McLaren
|
||||
Mercedes
|
||||
RedBull
|
||||
Stake
|
||||
VCARB
|
||||
Williams
|
||||
|
@ -1,12 +0,0 @@
|
||||
name
|
||||
Henri
|
||||
Christoph
|
||||
Vinzent
|
||||
Sven
|
||||
Linus
|
||||
Phil
|
||||
Ipp
|
||||
Melissa
|
||||
Julian
|
||||
Käptn
|
||||
Marc
|
||||
|
@ -1,145 +0,0 @@
|
||||
<!DOCTYPE html>
|
||||
<html lang="en">
|
||||
|
||||
{# Easy nav-bar entries. When a page sets the active_page variable, the current entry will be underlined #}
|
||||
{% macro nav_selector(page='', text='') %}
|
||||
<a class="nav-link text-nowrap" href="/{{ page }}">{% if active_page == page %}<u>{% endif %} {{ text }}
|
||||
{% if active_page == page %}</u>{% endif %}</a>
|
||||
{% endmacro %}
|
||||
|
||||
{# Simple driver dropdown. Requires list of drivers. #}
|
||||
{% macro driver_select(name='', label='') %}
|
||||
<div class="form-floating">
|
||||
<select name="{{ name }}" class="form-select" aria-label="{{ name }}">
|
||||
<option value="" selected disabled hidden></option>
|
||||
{% for driver in drivers %}
|
||||
<option value="{{ driver.name }}">{{ driver.abbr }}</option>
|
||||
{% endfor %}
|
||||
</select>
|
||||
<label for="{{ name }}" class="text-primary">{{ label }}</label>
|
||||
</div>
|
||||
{% endmacro %}
|
||||
|
||||
{# Driver dropdown where a value might be preselected. Requires list of drivers. #}
|
||||
{% macro driver_select_with_preselect(match='', name='', label='') %}
|
||||
<div class="form-floating">
|
||||
<select name="{{ name }}" class="form-select" aria-label="{{ name }}">
|
||||
{# Use namespace wrapper to persist scope between loop iterations #}
|
||||
{% set user_has_chosen = namespace(driverpre="false") %}
|
||||
|
||||
{% for driver in drivers %}
|
||||
{% if match == driver.abbr %}
|
||||
{% set user_has_chosen.driverpre = "true" %}
|
||||
<option selected="selected" value="{{ driver.name }}">{{ driver.abbr }}</option>
|
||||
{% else %}
|
||||
<option value="{{ driver.name }}">{{ driver.abbr }}</option>
|
||||
{% endif %}
|
||||
{% endfor %}
|
||||
|
||||
{# Add an empty default if nothing has been chosen #}
|
||||
{% if user_has_chosen.driverpre == "false" %}
|
||||
<option value="" selected="selected" disabled="disabled" hidden="hidden"></option>
|
||||
{% endif %}
|
||||
</select>
|
||||
<label for="{{ name }}" class="text-primary">{{ label }}</label>
|
||||
</div>
|
||||
{% endmacro %}
|
||||
|
||||
{# Simple team dropdown. Requires list of teams. #}
|
||||
{% macro team_select(name='', label='') %}
|
||||
<div class="form-floating">
|
||||
<select name="{{ name }}" class="form-select" aria-label="{{ name }}">
|
||||
<option value="" selected disabled hidden></option>
|
||||
{% for team in teams %}
|
||||
<option value="{{ team.name }}">{{ team.name }}</option>
|
||||
{% endfor %}
|
||||
</select>
|
||||
<label for="{{ name }}" class="text-primary">{{ label }}</label>
|
||||
</div>
|
||||
{% endmacro %}
|
||||
|
||||
{# Team dropdown where a value might be preselected. Requires list of teams. #}
|
||||
{% macro team_select_with_preselect(match='', name='', label='') %}
|
||||
<div class="form-floating">
|
||||
<select name="{{ name }}" class="form-select" aria-label="{{ name }}">
|
||||
{# Use namespace wrapper to persist scope between loop iterations #}
|
||||
{% set user_has_chosen = namespace(teampre="false") %}
|
||||
|
||||
{% for team in teams %}
|
||||
{% if match == team.name %}
|
||||
{% set user_has_chosen.teampre = "true" %}
|
||||
<option selected="selected" value="{{ team.name }}">{{ team.name }}</option>
|
||||
{% else %}
|
||||
<option value="{{ team.name }}">{{ team.name }}</option>
|
||||
{% endif %}
|
||||
{% endfor %}
|
||||
|
||||
{# Add an empty default if nothing has been chosen #}
|
||||
{% if user_has_chosen.teampre == "false" %}
|
||||
<option value="" selected="selected" disabled="disabled" hidden="hidden"></option>
|
||||
{% endif %}
|
||||
</select>
|
||||
<label for="{{ name }}" class="text-primary">{{ label }}</label>
|
||||
</div>
|
||||
{% endmacro %}
|
||||
|
||||
<head>
|
||||
<meta charset="UTF-8">
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
||||
|
||||
<!-- Title -->
|
||||
<title>{% block title %}{% endblock title %}</title>
|
||||
<link rel="icon" href="../static/image/favicon.svg" sizes="any" type="image/svg+xml">
|
||||
|
||||
<!-- Bootstrap -->
|
||||
<link href="../static/style/bootstrap.css" rel="stylesheet">
|
||||
<script src="../static/script/bootstrap.bundle.js"></script>
|
||||
|
||||
{# <script> #}
|
||||
{# {# Initialize Bootstrap Tooltips #} #}
|
||||
{# console.log("Initializing Tooltips...") #}
|
||||
{# const tooltipTriggerList = document.querySelectorAll('[data-bs-toggle="tooltip"]') #}
|
||||
{# const tooltipList = [...tooltipTriggerList].map(tooltipTriggerEl => new bootstrap.Tooltip(tooltipTriggerEl)) #}
|
||||
{# </script> #}
|
||||
</head>
|
||||
|
||||
<body>
|
||||
|
||||
<nav class="navbar fixed-top navbar-expand-lg bg-body-tertiary">
|
||||
<div class="container-fluid">
|
||||
<a class="navbar-brand" href="/">
|
||||
<img src="../static/image/f1_logo.svg" alt="Logo" width="120" height="30"
|
||||
class="d-inline-block align-text-top">
|
||||
Formula <i>10</i>
|
||||
</a>
|
||||
|
||||
<button type="button" class="navbar-toggler" data-bs-toggle="collapse" data-bs-target="#navbarCollapse">
|
||||
<span class="navbar-toggler-icon"></span>
|
||||
</button>
|
||||
|
||||
<div class="collapse navbar-collapse" id="navbarCollapse">
|
||||
<div class="navbar-nav me-2">
|
||||
{{ nav_selector("race", "Guess Race") }}
|
||||
{{ nav_selector("season", "Guess Season") }}
|
||||
{{ nav_selector("graphs", "Statistics") }}
|
||||
{{ nav_selector("rules", "Rules") }}
|
||||
</div>
|
||||
|
||||
{% block navbar_center %}{% endblock navbar_center %}
|
||||
<div class="flex-grow-1"></div>
|
||||
|
||||
<div class="navbar-nav">
|
||||
{{ nav_selector("enter", "Enter Race Result") }}
|
||||
{{ nav_selector("users", "Manage Users") }}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</nav>
|
||||
|
||||
<div class="px-2 pt-2" style="margin-top: 32px;">
|
||||
{% block body %}{% endblock body %}
|
||||
</div>
|
||||
|
||||
</body>
|
||||
|
||||
</html>
|
||||
@ -1,120 +0,0 @@
|
||||
{% extends 'base.jinja' %}
|
||||
|
||||
{% set active_page = "race" %}
|
||||
|
||||
{% block title %}Formula 10 - Race{% endblock title %}
|
||||
|
||||
{% block navbar_center %}
|
||||
<div class="dropdown">
|
||||
<button class="btn btn-outline-danger dropdown-toggle" type="button" data-bs-toggle="dropdown" aria-expanded="false">
|
||||
{{ chosenusername }}
|
||||
</button>
|
||||
<ul class="dropdown-menu">
|
||||
<li><a class="dropdown-item" href="/race/Everyone">Everyone</a></li>
|
||||
<li><hr class="dropdown-divider"></li>
|
||||
{% for user in users %}
|
||||
<li><a class="dropdown-item" href="/race/{{ user.name }}">{{ user.name }}</a></li>
|
||||
{% endfor %}
|
||||
</ul>
|
||||
</div>
|
||||
{% endblock navbar_center %}
|
||||
|
||||
{% block body %}
|
||||
|
||||
<table class="table table-bordered table-sm table-responsive">
|
||||
<thead>
|
||||
<tr>
|
||||
<th scope="col" rowspan="2" class="text-center">Race</th>
|
||||
<th scope="col" colspan="{{ chosenusers | length }}" class="text-center">Call</th>
|
||||
<th scope="col" rowspan="2" class="text-center">Result</th>
|
||||
</tr>
|
||||
</thead>
|
||||
|
||||
<tbody>
|
||||
|
||||
{# Users List #}
|
||||
<tr>
|
||||
<td> </td>
|
||||
|
||||
{% for user in chosenusers %}
|
||||
<td class="text-center text-nowrap">{{ user.name }}</td>
|
||||
{% endfor %}
|
||||
|
||||
<td> </td>
|
||||
</tr>
|
||||
|
||||
{# Next Race Guess #}
|
||||
{% if nextrace is not none %}
|
||||
<tr class="table-light">
|
||||
<td class="text-nowrap"><span class="fw-bold">{{ nextrace.id }}:</span> {{ nextrace.grandprix }}</td>
|
||||
|
||||
{% for user in chosenusers %}
|
||||
<td>
|
||||
<form action="/guessrace/{{ nextrace.id }}/{{ user.name }}" method="post">
|
||||
{# Driver PXX Select #}
|
||||
{{ driver_select_with_preselect(currentselection.get(user.name).pxx.abbr if user.name in currentselection else "",
|
||||
"pxxselect", "P" ~ nextrace.pxx ~ ":") }}
|
||||
|
||||
{# Driver DNF Select #}
|
||||
<div class="mt-2">
|
||||
{{ driver_select_with_preselect(currentselection.get(user.name).dnf.abbr if user.name in currentselection else "",
|
||||
"dnfselect", "DNF:") }}
|
||||
</div>
|
||||
|
||||
<input type="submit" class="btn btn-danger mt-2 w-100" value="Save">
|
||||
</form>
|
||||
</td>
|
||||
{% endfor %}
|
||||
|
||||
{# Enter Race Result #}
|
||||
<td>
|
||||
<form action="/enterresult/{{ nextrace.id }}" method="post">
|
||||
{# Driver PXX Select #}
|
||||
{{ driver_select("pxxselect", "P" ~ nextrace.pxx ~ ":") }}
|
||||
|
||||
{# Driver DNF Select #}
|
||||
<div class="mt-2">
|
||||
{{ driver_select("dnfselect", "DNF:") }}
|
||||
</div>
|
||||
|
||||
<input type="submit" class="btn btn-danger mt-2 w-100" value="Save">
|
||||
</form>
|
||||
</td>
|
||||
</tr>
|
||||
|
||||
{# Race Results #}
|
||||
{% for raceresult in raceresults %}
|
||||
<tr>
|
||||
<td class="text-nowrap"><span
|
||||
class="fw-bold">{{ raceresult.race.id }}:</span> {{ raceresult.race.grandprix }}</td>
|
||||
|
||||
{% for user in chosenusers %}
|
||||
<td class="text-center text-nowrap">
|
||||
{% if (raceresult.race_id in pastguesses) and (user.name in pastguesses.get(raceresult.race_id)) %}
|
||||
{% set pxx = pastguesses.get(raceresult.race_id).get(user.name).pxx.abbr %}
|
||||
{% set dnf = pastguesses.get(raceresult.race_id).get(user.name).dnf.abbr %}
|
||||
<ul class="list-group list-group-flush">
|
||||
<li class="list-group-item {% if pxx == raceresult.pxx.abbr %}text-success fw-bold{% endif %}">
|
||||
P{{ raceresult.race.pxx }}: {{ pxx }}</li>
|
||||
<li class="list-group-item {% if dnf == raceresult.dnf.abbr %}text-success fw-bold{% endif %}">
|
||||
DNF: {{ dnf }}</li>
|
||||
</ul>
|
||||
{% endif %}
|
||||
</td>
|
||||
{% endfor %}
|
||||
|
||||
<td class="text-center text-nowrap">
|
||||
<ul class="list-group list-group-flush">
|
||||
<li class="list-group-item">P{{ raceresult.race.pxx }}: {{ raceresult.pxx.abbr }}</li>
|
||||
<li class="list-group-item {% if raceresult.dnf.abbr == 'NON' %}text-muted{% endif %}">
|
||||
DNF: {{ raceresult.dnf.abbr }}</li>
|
||||
</ul>
|
||||
</td>
|
||||
</tr>
|
||||
{% endfor %}
|
||||
{% endif %}
|
||||
|
||||
</tbody>
|
||||
</table>
|
||||
|
||||
{% endblock body %}
|
||||
@ -1,145 +0,0 @@
|
||||
{% extends 'base.jinja' %}
|
||||
|
||||
{% set active_page = "season" %}
|
||||
|
||||
{% block title %}Formula 10 - Season{% endblock title %}
|
||||
|
||||
{% block navbar_center %}
|
||||
<div class="dropdown">
|
||||
<button class="btn btn-outline-danger dropdown-toggle" type="button" data-bs-toggle="dropdown" aria-expanded="false">
|
||||
{{ chosenusername }}
|
||||
</button>
|
||||
<ul class="dropdown-menu">
|
||||
<li><a class="dropdown-item" href="/season/Everyone">Everyone</a></li>
|
||||
<li><hr class="dropdown-divider"></li>
|
||||
{% for user in users %}
|
||||
<li><a class="dropdown-item" href="/season/{{ user.name }}">{{ user.name }}</a></li>
|
||||
{% endfor %}
|
||||
</ul>
|
||||
</div>
|
||||
{% endblock navbar_center %}
|
||||
|
||||
{% block body %}
|
||||
|
||||
<h4 class="heading-text text-danger text-center">All fields (of a single user, excluding podiums) must be set or your inputs won't be saved!</h4>
|
||||
|
||||
<div class="grid" style="grid-template-columns: repeat(auto-fit, minmax(450px, 1fr));">
|
||||
{% for user in chosenusers %}
|
||||
<div class="card mb-2 shadow-sm" style="width: 450px;">
|
||||
<div class="card-body">
|
||||
<h5 class="card-title">{{ user.name }}</h5>
|
||||
<form action="/guessseason/{{ user.name }}" method="post">
|
||||
|
||||
{# Hot Take #}
|
||||
<div class="form-floating">
|
||||
<textarea class="form-control" id="hot-take-input-{{ user.name }}" name="hottakeselect"
|
||||
style="height: 50px">{%- if (user.name in currentselection) -%}
|
||||
{{- currentselection.get(user.name).hot_take -}}{%- endif -%}</textarea>
|
||||
<label for="hot-take-input-{{ user.name }}" class="text-primary">Hot Take:</label>
|
||||
</div>
|
||||
|
||||
{# P2 Constructor #}
|
||||
<div class="mt-2">
|
||||
{{ team_select_with_preselect(currentselection.get(user.name).p2_constructor.name if user.name in currentselection else "",
|
||||
"p2select", "P2 Constructor:") }}
|
||||
</div>
|
||||
|
||||
{# Most Overtakes #}
|
||||
<div class="mt-2">
|
||||
{{ driver_select_with_preselect(currentselection.get(user.name).most_overtakes.abbr if user.name in currentselection else "",
|
||||
"overtakeselect", "Most Overtakes:") }}
|
||||
</div>
|
||||
|
||||
{# Most DNFs #}
|
||||
<div class="mt-2">
|
||||
{{ driver_select_with_preselect(currentselection.get(user.name).most_dnfs.abbr if user.name in currentselection else "",
|
||||
"dnfselect", "Most DNFs:") }}
|
||||
</div>
|
||||
|
||||
{# Most Gained #}
|
||||
<div class="mt-2">
|
||||
{{ driver_select_with_preselect(currentselection.get(user.name).most_gained.abbr if user.name in currentselection else "",
|
||||
"gainedselect", "Most Championship Positions gained:") }}
|
||||
</div>
|
||||
|
||||
{# Most Lost #}
|
||||
<div class="mt-2">
|
||||
{{ driver_select_with_preselect(currentselection.get(user.name).most_lost.abbr if user.name in currentselection else "",
|
||||
"lostselect", "Most Championship Positions lost:") }}
|
||||
</div>
|
||||
|
||||
{# Team-internal Winners #}
|
||||
<h6 class="card-subtitle mt-2">Team-Internal Winners:</h6>
|
||||
<div class="grid mt-2" style="width: 450px; row-gap: 5px;">
|
||||
{% for team in teams %}
|
||||
{% set driver_a_name = driverpairs.get(team.name)[0].name %}
|
||||
{% set driver_b_name = driverpairs.get(team.name)[1].name %}
|
||||
|
||||
<div class="g-col-6">
|
||||
<div class="form-check form-check-inline">
|
||||
<input class="form-check-input" type="radio"
|
||||
name="teamwinner-{{ team.name }}"
|
||||
id="teamwinner-{{ team.name }}-1-{{ user.name }}"
|
||||
value="{{ driver_a_name }}"
|
||||
{% if (user.name in currentselection) and (driver_a_name in currentselection.get(user.name).team_winners.winner_ids) %}checked="checked"{% endif %}>
|
||||
<label class="form-check-label"
|
||||
for="teamwinner-{{ team.name }}-1-{{ user.name }}">{{ driver_a_name }}</label>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="g-col-6">
|
||||
<div class="form-check form-check-inline">
|
||||
<input class="form-check-input" type="radio"
|
||||
name="teamwinner-{{ team.name }}"
|
||||
id="teamwinner-{{ team.name }}-2-{{ user.name }}"
|
||||
value="{{ driver_b_name }}"
|
||||
{% if (user.name in currentselection) and (driver_b_name in currentselection.get(user.name).team_winners.winner_ids) %}checked="checked"{% endif %}>
|
||||
<label class="form-check-label"
|
||||
for="teamwinner-{{ team.name }}-2-{{ user.name }}">{{ driver_b_name }}</label>
|
||||
</div>
|
||||
</div>
|
||||
{% endfor %}
|
||||
</div>
|
||||
|
||||
{# Drivers with Podiums #}
|
||||
<h6 class="card-subtitle mt-2">Drivers with Podium(s):</h6>
|
||||
<div class="grid mt-2" style="width: 450px; row-gap: 5px;">
|
||||
{% for team in teams %}
|
||||
{% set driver_a_name = driverpairs.get(team.name)[0].name %}
|
||||
{% set driver_b_name = driverpairs.get(team.name)[1].name %}
|
||||
|
||||
<div class="g-col-6">
|
||||
<div class="form-check form-check-inline">
|
||||
<input class="form-check-input" type="checkbox"
|
||||
name="podiumdrivers"
|
||||
id="podium-{{ driver_a_name }}-{{ user.name }}"
|
||||
value="{{ driver_a_name }}"
|
||||
{% if (user.name in currentselection) and (driver_a_name in currentselection.get(user.name).podium_drivers.podium_ids) %}checked="checked"{% endif %}>
|
||||
<label class="form-check-label"
|
||||
for="podium-{{ driver_a_name }}-{{ user.name }}">{{ driver_a_name }}</label>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="g-col-6">
|
||||
<div class="form-check form-check-inline">
|
||||
<input class="form-check-input" type="checkbox"
|
||||
name="podiumdrivers"
|
||||
id="podium-{{ driver_b_name }}-{{ user.name }}"
|
||||
value="{{ driver_b_name }}"
|
||||
{% if (user.name in currentselection) and (driver_b_name in currentselection.get(user.name).podium_drivers.podium_ids) %}checked="checked"{% endif %}>
|
||||
<label class="form-check-label"
|
||||
for="podium-{{ driver_b_name }}-{{ user.name }}">{{ driver_b_name }}</label>
|
||||
</div>
|
||||
</div>
|
||||
{% endfor %}
|
||||
</div>
|
||||
|
||||
<input type="submit" class="btn btn-danger mt-2 w-100" value="Save">
|
||||
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
{% endfor %}
|
||||
</div>
|
||||
|
||||
{% endblock body %}
|
||||
Reference in New Issue
Block a user