Disable stuff no longer required

These columns are not marked nullable, so ignoring them prevents entering of race results

.gitea/workflows/docker.yaml

@@ -2,7 +2,7 @@ name: Build Formula10 Docker Image
 
 on:
   push:
-    branches: [main]
+    # branches: [main]
     paths:
       - ".gitea/workflows/**"
       - "Dockerfile"

data/static_import/drivers.csv

@@ -1,22 +0,0 @@
-name,abbr,team_name,country_code
-None,None,None,NO
-Alexander Albon,ALB,Williams,TH
-Fernando Alonso,ALO,Aston Martin,ES
-Valteri Bottas,BOT,Sauber,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,Red Bull,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,Red Bull,NL
-Zhou Guanyu,ZHO,Sauber,CN

data/static_import/races.csv

@@ -1,25 +0,0 @@
-name,number,date,pxx
-Bahrain,1,2024-03-02-16-00,10
-Saudi Arabia,2,2024-03-09-18-00,6
-Australia,3,2024-03-24-05-00,15
-Japan,4,2024-04-07-07-00,9
-China,5,2024-04-21-09-00,7
-Miami,6,2024-05-05-22-00,13
-Emilia-Romagna,7,2024-05-21-15-00,17
-Monaco,8,2024-05-26-15-00,5
-Canada,9,2024-06-09-20-00,12
-Spain,10,2024-06-23-15-00,8
-Austria,11,2024-06-30-15-00,11
-Great Britain,12,2024-07-07-16-00,4
-Hungary,12,2024-07-23-15-00,17
-Belgium,13,2024-07-28-15-00,13
-Netherlands,14,2024-08-25-15-00,7
-Monza,15,2024-09-01-15-00,16
-Azerbaijan,16,2024-09-15-13-00,8
-Singapore,17,2024-09-22-14-00,11
-Austin,18,2024-10-20-21-00,5
-Mexico,19,2024-10-27-21-00,14
-Brazil,20,2024-11-03-18-00,4
-Las Vegas,21,2024-11-23-07-00,12
-Qatar,22,2024-12-01-18-00,6
-Abu Dhabi,23,2024-12-08-14-00,10

data/static_import/season_guess_results.csv

@@ -1 +0,0 @@
-user_name,hot_take_correct,overtakes_correct

data/static_import/teams.csv

@@ -1,12 +0,0 @@
-name
-None
-Alpine
-Aston Martin
-Ferrari
-Haas
-McLaren
-Mercedes
-Red Bull
-Sauber
-VCARB
-Williams

flake.nix

@@ -23,6 +23,7 @@
           flask
           flask-sqlalchemy
           sqlalchemy
+          requests
 
           pytest
         ]);

formula10/__init__.py

@@ -4,12 +4,9 @@ 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
-ENABLE_DEBUG_ENDPOINTS: bool = True if os.getenv("ENABLE_DEBUG_ENDPOINTS") == "True" else False
 print("Running Formula10 with:")
 if not ENABLE_TIMING:
     print("- Disabled timing constraints")
-if ENABLE_DEBUG_ENDPOINTS:
-    print("- Enabled debug endpoints")
 
 app: Flask = Flask(__name__)
 app.config['SQLALCHEMY_DATABASE_URI'] = "sqlite:///formula10.db"
@@ -32,28 +29,3 @@ import formula10.controller.statistics_controller
 import formula10.controller.rules_controller
 import formula10.controller.admin_controller
 import formula10.controller.error_controller
-
-
-# TODO
-# Leaderboard
-
-# - For season guess calc there is missing: Fastest laps + sprint points + sprint DNFs (in race result)
-
-# - Display total points somewhere in race table? Below the name in the table header.
-# - Auto calculate season points
-# - Highlight currently correct values for some season guesses (e.g. current most dnfs, team winners, podiums)
-# - Generate static diagram using chart.js + templating the js (funny yikes)
-# - Interesting stats:
-#   - Which driver was voted most for dnf (top 5)?
-
-# Statistics
-# - Display stats: Driver standing, Team standing, DNFs, Fastest laps
-
-# General
-# - Decouple names from IDs + Fix Valtteri/Russel spelling errors
-# - Unit testing (as much as possible, but especially points calculation)
-# - Add links to the official F1 stats page (for quali/result), probably best to store entire link in DB (because they are not entirely regular)?
-
-# Possible but probably not
-# - Show cards of previous race results, like with season guesses?
-# - Make user order changeable using drag'n'drop?

formula10/controller/admin_controller.py

@@ -1,75 +1,36 @@
-from typing import List
-from urllib.parse import unquote
-from flask import redirect, render_template, request
+from flask import render_template, request
 from werkzeug import Response
-from formula10.controller.error_controller import error_redirect
 
-from formula10.database.update_queries import update_race_result, update_user
-from formula10.database.import_export import export_dynamic_data, reload_dynamic_data, reload_season_guess_result_data, reload_static_data
+from formula10.database.update_queries import update_user
 from formula10.domain.template_model import TemplateModel
-from formula10 import ENABLE_DEBUG_ENDPOINTS, app
+from formula10 import app
 
 
-@app.route("/save/all")
-def save() -> Response:
-    export_dynamic_data()
-    return redirect("/")
+# @app.route("/result")
+# def result_root() -> Response:
+#     return redirect("/result/Current")
 
 
-@app.route("/load/all")
-def load() -> Response:
-    if not ENABLE_DEBUG_ENDPOINTS:
-        return error_redirect("Debug endpoints are disabled!")
+# @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)
 
-    reload_static_data()
-    reload_dynamic_data()
-    return redirect("/")
+#     return render_template("result.jinja", model=model)
 
 
-@app.route("/load/static")
-def load_static() -> Response:
-    reload_static_data()
-    return redirect("/")
+# @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")
 
-
-@app.route("/load/seasonresults")
-def load_season_results() -> Response:
-    reload_season_guess_result_data()
-    return redirect("/")
-
-
-@app.route("/load/dynamic")
-def load_dynamic() -> Response:
-    if not ENABLE_DEBUG_ENDPOINTS:
-        return error_redirect("Debug endpoints are disabled!")
-
-    reload_dynamic_data()
-    return redirect("/")
-
-
-@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")
-
-    return update_race_result(race_name, pxxs, first_dnfs, dnfs, excluded)
+#     # @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")

formula10/controller/race_controller.py

@@ -3,6 +3,8 @@ 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
 
@@ -22,8 +24,9 @@ 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)
+    return render_template("race.jinja", model=model, points=points)
 
 
 @app.route("/race-guess/<race_name>/<user_name>", methods=["POST"])
@@ -34,7 +37,11 @@ def race_guess_post(race_name: str, user_name: str) -> Response:
     pxx: str | None = request.form.get("pxxselect")
     dnf: str | None = request.form.get("dnfselect")
 
-    return update_race_guess(race_name, user_name, pxx, dnf)
+    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"])
@@ -42,4 +49,6 @@ def race_guess_delete_post(race_name: str, user_name: str) -> Response:
     race_name = unquote(race_name)
     user_name = unquote(user_name)
 
-    return delete_race_guess(race_name, 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)

formula10/controller/season_controller.py

@@ -5,6 +5,7 @@ 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
@@ -39,8 +40,9 @@ def season_guess_post(user_name: str) -> Response:
     ]
     # TODO: This is pretty ugly, to do queries in the controller
     team_winner_guesses: List[str | None] = [
-        request.form.get(f"teamwinner-{team.name}") for team in db.session.query(DbTeam).all() if team.name != NONE_TEAM.name
+        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")
 
-    return update_season_guess(user_name, guesses, team_winner_guesses, podium_driver_guesses)
+    user_id: int = Model().user_by(user_name=user_name).id
+    return update_season_guess(user_id, guesses, team_winner_guesses, podium_driver_guesses)

formula10/database/common_queries.py

@@ -3,8 +3,8 @@ 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_name: str) -> bool:
-    return db.session.query(DbRaceResult).filter_by(race_name=race_name).first() is not None
+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:
@@ -15,9 +15,9 @@ 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_name: str) -> DbDriver:
-    db_driver: DbDriver | None = db.session.query(DbDriver).filter_by(name=driver_name).first()
+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 name {driver_name} in database")
+        raise Exception(f"Could not find driver with id {driver_id} in database")
 
     return db_driver

formula10/database/import_export.py

@@ -1,111 +0,0 @@
-import csv
-import os.path
-from typing import List, Any
-
-from formula10 import db
-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
-
-
-def load_csv(filename: str) -> List[List[str]]:
-    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: str, objects: List[Any]):
-    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():
-    print("Initializing database with static values...")
-    # Create it/update tables (if it/they doesn't exist!)
-    db.create_all()
-
-    # Clear static data
-    db.session.query(DbTeam).delete()
-    db.session.query(DbDriver).delete()
-    db.session.query(DbRace).delete()
-
-    # Reload static data
-    for row in load_csv("data/static_import/teams.csv"):
-        db.session.add(DbTeam.from_csv(row))
-    for row in load_csv("data/static_import/drivers.csv"):
-        db.session.add(DbDriver.from_csv(row))
-    for row in load_csv("data/static_import/races.csv"):
-        db.session.add(DbRace.from_csv(row))
-
-    db.session.commit()
-
-
-def reload_dynamic_data():
-    print("Initializing database with dynamic values...")
-    # Create it/update tables (if it/they doesn't exist!)
-    db.create_all()
-
-    # Clear dynamic data
-    db.session.query(DbUser).delete()
-    db.session.query(DbRaceResult).delete()
-    db.session.query(DbRaceGuess).delete()
-    db.session.query(DbSeasonGuess).delete()
-
-    # Reload dynamic data
-    for row in load_csv("data/dynamic_export/users.csv"):
-        db.session.add(DbUser.from_csv(row))
-    for row in load_csv("data/dynamic_export/raceresults.csv"):
-        db.session.add(DbRaceResult.from_csv(row))
-    for row in load_csv("data/dynamic_export/raceguesses.csv"):
-        db.session.add(DbRaceGuess.from_csv(row))
-    for row in load_csv("data/dynamic_export/seasonguesses.csv"):
-        db.session.add(DbSeasonGuess.from_csv(row))
-
-    db.session.commit()
-
-
-def reload_season_guess_result_data():
-    print("Loading season guess results...")
-    # Create it/update tables (if it/they doesn't exist!)
-    db.create_all()
-
-    # Clear result data
-    db.session.query(DbSeasonGuessResult).delete()
-
-    # Reload result data
-    for row in load_csv("data/static_import/season_guess_results.csv"):
-        db.session.add(DbSeasonGuessResult.from_csv(row))
-
-    db.session.commit()
-
-
-def export_dynamic_data():
-    print("Exporting Userdata...")
-
-    users: List[DbUser] = db.session.query(DbUser).all()
-    raceresults: List[DbRaceResult] = db.session.query(DbRaceResult).all()
-    raceguesses: List[DbRaceGuess] = db.session.query(DbRaceGuess).all()
-    seasonguesses: List[DbSeasonGuess] = db.session.query(DbSeasonGuess).all()
-
-    write_csv("data/dynamic_export/users.csv", users)
-    write_csv("data/dynamic_export/raceresults.csv", raceresults)
-    write_csv("data/dynamic_export/raceguesses.csv", raceguesses)
-    write_csv("data/dynamic_export/seasonguesses.csv", seasonguesses)

formula10/database/model/db_driver.py

@@ -1,5 +1,4 @@
-from typing import List
-from sqlalchemy import String, ForeignKey
+from sqlalchemy import Integer, String, ForeignKey
 from sqlalchemy.orm import mapped_column, Mapped, relationship
 
 from formula10.database.model.db_team import DbTeam
@@ -13,21 +12,14 @@ class DbDriver(db.Model):
     """
     __tablename__ = "driver"
 
-    def __init__(self, *, name: str):
-        self.name = name  # Primary key
+    def __init__(self, *, id: int):
+        self.id = id  # Primary key
 
-    @classmethod
-    def from_csv(cls, row: List[str]):
-        db_driver: DbDriver = cls(name=str(row[0]))
-        db_driver.abbr = str(row[1])
-        db_driver.team_name = str(row[2])
-        db_driver.country_code = str(row[3])
-        return db_driver
-
-    name: Mapped[str] = mapped_column(String(32), primary_key=True)
-    abbr: Mapped[str] = mapped_column(String(4))
-    team_name: Mapped[str] = mapped_column(ForeignKey("team.name"))
-    country_code: Mapped[str] = mapped_column(String(2))  # alpha-2 code
+    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_name])
+    team: Mapped[DbTeam] = relationship("DbTeam", foreign_keys=[team_id])

formula10/database/model/db_race.py

@@ -1,5 +1,4 @@
 from datetime import datetime
-from typing import List
 from sqlalchemy import DateTime, Integer, String
 from sqlalchemy.orm import Mapped, mapped_column
 
@@ -13,22 +12,11 @@ class DbRace(db.Model):
     """
     __tablename__ = "race"
 
-    def __init__(self, *, name: str, number: int, date: datetime, pxx: int):
-        self.name = name  # Primary key
+    def __init__(self, *, id: int):
+        self.id = id  # Primary key
 
-        self.number = number
-        self.date = date
-        self.pxx = pxx
-
-    @classmethod
-    def from_csv(cls, row: List[str]):
-        db_race: DbRace = cls(name=str(row[0]),
-                              number=int(row[1]),
-                              date=datetime.strptime(str(row[2]), "%Y-%m-%d-%H-%M"),
-                              pxx=int(row[3]))
-        return db_race
-
-    name: Mapped[str] = mapped_column(String(64), primary_key=True)
-    number: Mapped[int] = mapped_column(Integer)
-    date: Mapped[datetime] = mapped_column(DateTime)
-    pxx: Mapped[int] = mapped_column(Integer)  # This is the place to guess
+    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

formula10/database/model/db_race_guess.py

@@ -1,4 +1,3 @@
-from typing import Any, List
 from sqlalchemy import ForeignKey
 from sqlalchemy.orm import Mapped, mapped_column, relationship
 
@@ -14,38 +13,18 @@ class DbRaceGuess(db.Model):
     It stores the corresponding race and the guessed drivers for PXX and DNF.
     """
     __tablename__ = "raceguess"
-    __csv_header__ = ["user_name", "race_name", "pxx_driver_name", "dnf_driver_name"]
 
-    def __init__(self, *, user_name: str, race_name: str, pxx_driver_name: str, dnf_driver_name: str):
-        self.user_name = user_name  # Primary key
-        self.race_name = race_name  # Primary key
+    def __init__(self, *, user_id: int, race_id: int):
+        self.user_id = user_id  # Primary key
+        self.race_id = race_id  # Primary key
 
-        self.dnf_driver_name = dnf_driver_name
-        self.pxx_driver_name = pxx_driver_name
-
-    @classmethod
-    def from_csv(cls, row: List[str]):
-        db_race_guess: DbRaceGuess = cls(user_name=str(row[0]),
-                                         race_name=str(row[1]),
-                                         pxx_driver_name=str(row[2]),
-                                         dnf_driver_name=str(row[3]))
-        return db_race_guess
-
-    def to_csv(self) -> List[Any]:
-        return [
-            self.user_name,
-            self.race_name,
-            self.pxx_driver_name,
-            self.dnf_driver_name
-        ]
-
-    user_name: Mapped[str] = mapped_column(ForeignKey("user.name"), primary_key=True)
-    race_name: Mapped[str] = mapped_column(ForeignKey("race.name"), primary_key=True)
-    pxx_driver_name: Mapped[str] = mapped_column(ForeignKey("driver.name"))
-    dnf_driver_name: Mapped[str] = mapped_column(ForeignKey("driver.name"))
+    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_name])
-    race: Mapped[DbRace] = relationship("DbRace", foreign_keys=[race_name])
-    pxx: Mapped[DbDriver] = relationship("DbDriver", foreign_keys=[pxx_driver_name])
-    dnf: Mapped[DbDriver] = relationship("DbDriver", foreign_keys=[dnf_driver_name])
+    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])

formula10/database/model/db_race_result.py

@@ -1,6 +1,6 @@
-from typing import Any, List
 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
@@ -11,39 +11,20 @@ class DbRaceResult(db.Model):
     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"
-    __csv_header__ = ["race_name", "pxx_driver_names_json", "first_dnf_driver_names_json", "dnf_driver_names_json", "excluded_driver_names_json"]
 
-    def __init__(self, *, race_name: str, pxx_driver_names_json: str, first_dnf_driver_names_json: str, dnf_driver_names_json: str, excluded_driver_names_json: str):
-        self.race_name = race_name  # Primary key
+    def __init__(self, *, race_id: int):
+        self.race_id = race_id  # Primary key
 
-        self.pxx_driver_names_json = pxx_driver_names_json
-        self.first_dnf_driver_names_json = first_dnf_driver_names_json
-        self.dnf_driver_names_json = dnf_driver_names_json
-        self.excluded_driver_names_json = excluded_driver_names_json
+    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)
 
-    @classmethod
-    def from_csv(cls, row: List[str]):
-        db_race_result: DbRaceResult = cls(race_name=str(row[0]),
-                                           pxx_driver_names_json=str(row[1]),
-                                           first_dnf_driver_names_json=str(row[2]),
-                                           dnf_driver_names_json=str(row[3]),
-                                           excluded_driver_names_json=str(row[4]))
-        return db_race_result
-
-    def to_csv(self) -> List[Any]:
-        return [
-            self.race_name,
-            self.pxx_driver_names_json,
-            self.first_dnf_driver_names_json,
-            self.dnf_driver_names_json,
-            self.excluded_driver_names_json
-        ]
-
-    race_name: Mapped[str] = mapped_column(ForeignKey("race.name"), primary_key=True)
-    pxx_driver_names_json: Mapped[str] = mapped_column(String(1024))
-    first_dnf_driver_names_json: Mapped[str] = mapped_column(String(1024))
-    dnf_driver_names_json: Mapped[str] = mapped_column(String(1024))
-    excluded_driver_names_json: Mapped[str] = mapped_column(String(1024))
+    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_name])
+    race: Mapped[DbRace] = relationship("DbRace", foreign_keys=[race_id])
+    fastest_lap_driver: Mapped[DbDriver] = relationship("DbDriver", foreign_keys=[fastest_lap_id])

formula10/database/model/db_season_guess.py

@@ -1,4 +1,3 @@
-from typing import Any, List
 from sqlalchemy import ForeignKey, String
 from sqlalchemy.orm import Mapped, mapped_column, relationship
 
@@ -12,56 +11,24 @@ class DbSeasonGuess(db.Model):
     A collection of bonus guesses for the entire season.
     """
     __tablename__ = "seasonguess"
-    __csv_header__ = ["user_name", "hot_take", "p2_team_name",
-                      "overtake_driver_name", "dnf_driver_name", "gained_driver_name", "lost_driver_name",
-                      "team_winners_driver_names_json", "podium_drivers_driver_names_json"]
 
-    def __init__(self, *, user_name: str, team_winners_driver_names_json: str, podium_drivers_driver_names_json: str):
-        self.user_name = user_name  # Primary key
+    def __init__(self, *, user_id: int):
+        self.user_id = user_id  # Primary key
 
-        self.team_winners_driver_names_json = team_winners_driver_names_json
-        self.podium_drivers_driver_names_json = podium_drivers_driver_names_json
-
-    @classmethod
-    def from_csv(cls, row: List[str]):
-        db_season_guess: DbSeasonGuess = cls(user_name=str(row[0]),
-                                             team_winners_driver_names_json=str(row[7]),
-                                             podium_drivers_driver_names_json=str(row[8]))
-        db_season_guess.hot_take = str(row[1])
-        db_season_guess.p2_team_name = str(row[2])
-        db_season_guess.overtake_driver_name = str(row[3])
-        db_season_guess.dnf_driver_name = str(row[4])
-        db_season_guess.gained_driver_name = str(row[5])
-        db_season_guess.lost_driver_name = str(row[6])
-        return db_season_guess
-
-    def to_csv(self) -> List[Any]:
-        return [
-            self.user_name,
-            self.hot_take,
-            self.p2_team_name,
-            self.overtake_driver_name,
-            self.dnf_driver_name,
-            self.gained_driver_name,
-            self.lost_driver_name,
-            self.team_winners_driver_names_json,
-            self.podium_drivers_driver_names_json
-        ]
-
-    user_name: Mapped[str] = mapped_column(ForeignKey("user.name"), primary_key=True)
+    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_name: Mapped[str | None] = mapped_column(ForeignKey("team.name"), nullable=True)
-    overtake_driver_name: Mapped[str | None] = mapped_column(ForeignKey("driver.name"), nullable=True)
-    dnf_driver_name: Mapped[str | None] = mapped_column(ForeignKey("driver.name"), nullable=True)
-    gained_driver_name: Mapped[str | None] = mapped_column(ForeignKey("driver.name"), nullable=True)
-    lost_driver_name: Mapped[str | None] = mapped_column(ForeignKey("driver.name"), nullable=True)
-    team_winners_driver_names_json: Mapped[str] = mapped_column(String(1024))
-    podium_drivers_driver_names_json: Mapped[str] = mapped_column(String(1024))
+    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_name])
-    p2_team: Mapped[DbTeam | None] = relationship("DbTeam", foreign_keys=[p2_team_name])
-    overtake_driver: Mapped[DbDriver | None] = relationship("DbDriver", foreign_keys=[overtake_driver_name])
-    dnf_driver: Mapped[DbDriver | None] = relationship("DbDriver", foreign_keys=[dnf_driver_name])
-    gained_driver: Mapped[DbDriver | None] = relationship("DbDriver", foreign_keys=[gained_driver_name])
-    lost_driver: Mapped[DbDriver | None] = relationship("DbDriver", foreign_keys=[lost_driver_name])
+    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])

formula10/database/model/db_season_guess_result.py

@@ -1,5 +1,3 @@
-from typing import List
-
 from sqlalchemy import Boolean, ForeignKey
 from sqlalchemy.orm import Mapped, mapped_column, relationship
 
@@ -12,33 +10,13 @@ class DbSeasonGuessResult(db.Model):
     """
 
     __tablename__ = "seasonguessresult"
-    __csv_header__ = ["user_name", "hot_take_correct", "overtakes_correct"]
 
-    def __init__(self, *, user_name: str, hot_take_correct: bool, overtakes_correct: bool):
-        self.user_name = user_name  # Primary key
+    def __init__(self, *, user_id: int):
+        self.user_id = user_id  # Primary key
 
-        self.hot_take_correct = hot_take_correct
-        self.overtakes_correct = overtakes_correct
-
-    @classmethod
-    def from_csv(cls, row: List[str]):
-        db_season_guess_result: DbSeasonGuessResult = cls(user_name=str(row[0]),
-                                                          hot_take_correct=True if str(row[1])=="True" else False,
-                                                          overtakes_correct=True if str(row[2])=="True" else False)
-
-        return db_season_guess_result
-
-    # This object can't be edited from the page context
-    # def to_csv(self) -> List[Any]:
-    #     return [
-    #         self.user_name,
-    #         self.hot_take_correct,
-    #         self.overtakes_correct
-    #     ]
-
-    user_name: Mapped[str] = mapped_column(ForeignKey("user.name"), primary_key=True)
-    hot_take_correct: Mapped[bool] = mapped_column(Boolean)
-    overtakes_correct: Mapped[bool] = mapped_column(Boolean)
+    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_name])
+    user: Mapped[DbUser] = relationship("DbUser", foreign_keys=[user_id])

formula10/database/model/db_team.py

@@ -1,5 +1,4 @@
-from typing import List
-from sqlalchemy import String
+from sqlalchemy import Integer, String
 from sqlalchemy.orm import Mapped, mapped_column
 
 from formula10 import db
@@ -11,12 +10,8 @@ class DbTeam(db.Model):
     """
     __tablename__ = "team"
 
-    def __init__(self, *, name: str):
-        self.name = name  # Primary key
+    def __init__(self, *, id: int):
+        self.id = id  # Primary key
 
-    @classmethod
-    def from_csv(cls, row: List[str]):
-        db_team: DbTeam = cls(name=str(row[0]))
-        return db_team
-
-    name: Mapped[str] = mapped_column(String(32), primary_key=True)
+    id: Mapped[int] = mapped_column(Integer, primary_key=True, autoincrement=False)
+    name: Mapped[str] = mapped_column(String(32), nullable=False, unique=True)

formula10/database/model/db_user.py

@@ -1,5 +1,4 @@
-from typing import Any, List
-from sqlalchemy import Boolean, String
+from sqlalchemy import Boolean, Integer, String
 from sqlalchemy.orm import Mapped, mapped_column
 
 from formula10 import db
@@ -10,24 +9,11 @@ class DbUser(db.Model):
     A user that can guess races (name only).
     """
     __tablename__ = "user"
-    __csv_header__ = ["name", "enabled"]
 
-    def __init__(self, *, name: str, enabled: bool):
-        self.name = name  # Primary key
+    def __init__(self, *, id: int | None):
+        if id is not None:
+            self.id = id  # Primary key
 
-        self.enabled = enabled
-
-    @classmethod
-    def from_csv(cls, row: List[str]):
-        db_user: DbUser = cls(name=str(row[0]),
-                              enabled=True if str(row[1])=="True" else False)
-        return db_user
-
-    def to_csv(self) -> List[Any]:
-        return [
-            self.name,
-            self.enabled
-        ]
-
-    name: Mapped[str] = mapped_column(String(32), primary_key=True)
-    enabled: Mapped[bool] = mapped_column(Boolean)
+    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)

formula10/database/update_queries.py

@@ -1,172 +1,188 @@
 import json
-from typing import Dict, List, cast
-from urllib.parse import quote
+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_race_result import DbRaceResult
 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, positions_are_contiguous, race_has_started
+from formula10.database.validation import any_is_none, race_has_started
 from formula10 import ENABLE_TIMING, db
 
 
-def find_or_create_race_guess(user_name: str, race_name: str) -> DbRaceGuess:
+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_name=user_name, race_name=race_name).first()
+    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_name=user_name, race_name=race_name, pxx_driver_name="TEMP", dnf_driver_name="TEMP")
+    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_name=user_name, race_name=race_name).first()
+    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_name: str, user_name: str, pxx_select: str | None, dnf_select: str | None) -> Response:
-    if any_is_none(pxx_select, dnf_select):
-        return error_redirect(f"Picks for race \"{race_name}\" were not saved, because you did not fill all the fields.")
+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_name=race_name):
-        return error_redirect(f"No picks for race \"{race_name}\" can be entered, as this race has already started.")
+    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_name):
-        return error_redirect(f"No picks for race \"{race_name}\" can be entered, as this race has already finished.")
+    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_name: str = cast(str, pxx_select)
-    dnf_driver_name: str = cast(str, dnf_select)
+    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_name, race_name)
-    race_guess.pxx_driver_name = pxx_driver_name
-    race_guess.dnf_driver_name = dnf_driver_name
+    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_name: str, user_name: str) -> Response:
+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_name=race_name):
-        return error_redirect(f"No picks for race \"{race_name}\" can be deleted, as this race has already started.")
+    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_name):
-        return error_redirect(f"No picks for race \"{race_name}\" can be deleted, as this race has already finished.")
+    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_name=race_name, user_name=user_name).delete()
+    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_name: str) -> DbSeasonGuess:
+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_name=user_name).first()
+    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_name=user_name, team_winners_driver_names_json=json.dumps(["TEMP"]), podium_drivers_driver_names_json=json.dumps(["TEMP"]))
+    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_name=user_name).first()
+    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_name: str, guesses: List[str | None], team_winner_guesses: List[str | None], podium_driver_guesses: List[str]) -> Response:
+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_name="Bahrain"):
+    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_name)
+    season_guess: DbSeasonGuess = find_or_create_season_guess(user_id)
     season_guess.hot_take = guesses[0]  # type: ignore
-    season_guess.p2_team_name = guesses[1]  # type: ignore
-    season_guess.overtake_driver_name = guesses[2]  # type: ignore
-    season_guess.dnf_driver_name = guesses[3]  # type: ignore
-    season_guess.gained_driver_name = guesses[4]  # type: ignore
-    season_guess.lost_driver_name = guesses[5]  # type: ignore
-    season_guess.team_winners_driver_names_json = json.dumps(team_winner_guesses)
-    season_guess.podium_drivers_driver_names_json = json.dumps(podium_driver_guesses)
+    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_name: str) -> 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_name=race_name).first()
-    if race_result is not None:
-        return race_result
+# 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_name=race_name,
-                               pxx_driver_names_json=json.dumps(["TEMP"]),
-                               first_dnf_driver_names_json=json.dumps(["TEMP"]),
-                               dnf_driver_names_json=json.dumps(["TEMP"]),
-                               excluded_driver_names_json=json.dumps(["TEMP"]))
-    db.session.add(race_result)
-    db.session.commit()
+#     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"])
 
-    # Double check if database insertion worked and obtain any values set by the database
-    race_result = db.session.query(DbRaceResult).filter_by(race_name=race_name).first()
-    if race_result is None:
-        raise Exception("Failed adding RaceResult to the database")
+#     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"})
 
-    return race_result
+#     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_name: str, pxx_driver_names_list: List[str], first_dnf_driver_names_list: List[str], dnf_driver_names_list: List[str], excluded_driver_names_list: List[str]) -> Response:
-    if ENABLE_TIMING and not race_has_started(race_name=race_name):
-        return error_redirect("No race result can be entered, as the race has not begun!")
+# 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 for position, driver in enumerate(pxx_driver_names_list)
-    }
+#     # 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 for position, driver in enumerate(pxx_driver_names_list)
-        if driver in excluded_driver_names_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!")
+#     # 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_name in first_dnf_driver_names_list:
-        if driver_name not in dnf_driver_names_list:
-            dnf_driver_names_list.append(driver_name)
+#     # 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_names_list) > 0 and len(first_dnf_driver_names_list) == 0:
-        return error_redirect("Race result was not saved, as there cannot be DNFs without (an) initial DNF(s)!")
+#     # 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_name)
-    race_result.pxx_driver_names_json = json.dumps(pxx_driver_names)
-    race_result.first_dnf_driver_names_json = json.dumps(first_dnf_driver_names_list)
-    race_result.dnf_driver_names_json = json.dumps(dnf_driver_names_list)
-    race_result.excluded_driver_names_json = json.dumps(excluded_driver_names_list)
+#     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)
 
-    db.session.commit()
+#     # @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})
 
-    return redirect(f"/result/{quote(race_name)}")
+#     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:
@@ -194,7 +210,9 @@ def update_user(user_name: str | None, add: bool = False, delete: bool = False)
             disabled_user.enabled = True
 
         else:
-            user: DbUser = DbUser(name=user_name, enabled=True)
+            user: DbUser = DbUser(id=None)
+            user.name = user_name
+            user.enabled = True
             db.session.add(user)
 
         db.session.commit()

formula10/database/validation.py

@@ -31,19 +31,19 @@ def race_has_started(*, race: Race) -> bool:
     return race_has_started(race=race)
 
 @overload
-def race_has_started(*, race_name: str) -> bool:
-    return race_has_started(race_name=race_name)
+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_name: str | None = None) -> bool:
-    if race is None and race_name is not None:
-        _race: DbRace | None = db.session.query(DbRace).filter_by(name=race_name).first()
+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 {race_name} to check date")
+            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_name is None:
+    if race is not None and race_id is None:
         return datetime.now() > race.date
 
     raise Exception("race_has_started received illegal arguments")

formula10/domain/model/driver.py

@@ -8,6 +8,7 @@ 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
@@ -15,18 +16,23 @@ class Driver():
         return driver
 
     def to_db_driver(self) -> DbDriver:
-        db_driver: DbDriver = DbDriver(name=self.name)
+        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_name = self.team.name
+        db_driver.team_id = self.team.name
         return db_driver
 
     def __eq__(self, __value: object) -> bool:
         if isinstance(__value, Driver):
-            return self.name == __value.name
+            return self.id == __value.id
 
         return NotImplemented
 
+    def __hash__(self) -> int:
+        return hash(self.id)
+
+    id: int
     name: str
     abbr: str
     country: str
@@ -38,6 +44,7 @@ class Driver():
 
 
 NONE_DRIVER: Driver = Driver()
+NONE_DRIVER.id = 0
 NONE_DRIVER.name = "None"
 NONE_DRIVER.abbr = "None"
 NONE_DRIVER.country = "NO"

formula10/domain/model/race.py

@@ -8,6 +8,7 @@ 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
@@ -15,18 +16,23 @@ class Race():
         return race
 
     def to_db_race(self) -> DbRace:
-        db_race: DbRace = DbRace(name=self.name,
-                                 number=self.number,
-                                 date=self.date,
-                                 pxx=self.place_to_guess)
+        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.name == __value.name
+            return self.id == __value.id
 
         return NotImplemented
 
+    def __hash__(self) -> int:
+        return hash(self.id)
+
+    id: int
     name: str
     number: int
     date: datetime

formula10/domain/model/race_guess.py

@@ -15,10 +15,9 @@ class RaceGuess():
         return race_guess
 
     def to_db_race_guess(self) -> DbRaceGuess:
-        db_race_guess: DbRaceGuess = DbRaceGuess(user_name=self.user.name,
-                                                 race_name=self.race.name,
-                                                 pxx_driver_name=self.pxx_guess.name,
-                                                 dnf_driver_name=self.dnf_guess.name)
+        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:
@@ -27,6 +26,9 @@ class RaceGuess():
 
         return NotImplemented
 
+    def __hash__(self) -> int:
+        return hash((self.user, self.race))
+
     user: User
     race: Race
     pxx_guess: Driver

formula10/domain/model/race_result.py

@@ -12,30 +12,41 @@ class RaceResult:
     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_names_json)
-        initial_dnf: List[str] = json.loads(db_race_result.first_dnf_driver_names_json)
-        all_dnfs: List[str] = json.loads(db_race_result.dnf_driver_names_json)
-        standing_exclusions: List[str] = json.loads(db_race_result.excluded_driver_names_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(driver_name))
-            for position, driver_name in standing.items()
+            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(driver_name))
-            for driver_name in 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(driver_name))
-            for driver_name in 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(driver_name))
-            for driver_name in 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
 
@@ -45,21 +56,30 @@ class RaceResult:
             position: driver.name for position, driver in self.standing.items()
         }
         initial_dnf: List[str] = [
-            driver.name for driver in self.initial_dnf if driver
+            str(driver.id) for driver in self.initial_dnf if driver
         ]
         all_dnfs: List[str] = [
-            driver.name for driver in self.all_dnfs if driver
+            str(driver.id) for driver in self.all_dnfs if driver
         ]
         standing_exclusions: List[str] = [
-            driver.name for driver in self.standing_exclusions if driver
+            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_name=self.race.name,
-                                                    pxx_driver_names_json=json.dumps(standing),
-                                                    first_dnf_driver_names_json=json.dumps(initial_dnf),
-                                                    dnf_driver_names_json=json.dumps(all_dnfs),
-                                                    excluded_driver_names_json=json.dumps(standing_exclusions))
+        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
 
@@ -69,12 +89,19 @@ class RaceResult:
 
         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)
 

formula10/domain/model/season_guess.py

@@ -20,17 +20,17 @@ class SeasonGuess():
         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_names_json)
-        podiums: List[str] = json.loads(db_season_guess.podium_drivers_driver_names_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(driver_name)) if driver_name is not None else None
-            for driver_name in 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(driver_name))
-            for driver_name in podiums
+            Driver.from_db_driver(find_single_driver_strict(int(driver_id)))
+            for driver_id in podiums
         ]
 
         return season_guess
@@ -46,19 +46,27 @@ class SeasonGuess():
         ]
 
         # Serialize to json
-        db_season_guess: DbSeasonGuess = DbSeasonGuess(user_name=self.user.name,
-                                                       team_winners_driver_names_json=json.dumps(team_winners),
-                                                       podium_drivers_driver_names_json=json.dumps(podiums))
-        db_season_guess.user_name = self.user.name
+        db_season_guess: DbSeasonGuess = DbSeasonGuess(user_id=self.user.id)
         db_season_guess.hot_take = self.hot_take
-        db_season_guess.p2_team_name = self.p2_wcc.name if self.p2_wcc is not None else None
-        db_season_guess.overtake_driver_name = self.most_overtakes.name if self.most_overtakes is not None else None
-        db_season_guess.dnf_driver_name = self.most_dnfs.name if self.most_dnfs is not None else None
-        db_season_guess.gained_driver_name = self.most_wdc_gained.name if self.most_wdc_gained is not None else None
-        db_season_guess.lost_driver_name = self.most_wdc_lost.name if self.most_wdc_lost is not None else None
+        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

formula10/domain/model/season_guess_result.py

@@ -12,6 +12,21 @@ class SeasonGuessResult():
 
         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

formula10/domain/model/team.py

@@ -7,19 +7,25 @@ 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(name=self.name)
+        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.name == __value.name
+            return self.id == __value.id
 
         return NotImplemented
 
+    def __hash__(self) -> int:
+        return hash(self.id)
+
+    id: int
     name: str
 
     @property
@@ -27,4 +33,5 @@ class Team():
         return quote(self.name)
 
 NONE_TEAM: Team = Team()
+NONE_TEAM.id = 0
 NONE_TEAM.name = "None"

formula10/domain/model/user.py

@@ -7,20 +7,27 @@ 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(name=self.name, enabled=self.enabled)
+        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.name == __value.name
+            return self.id == __value.id
 
         return NotImplemented
 
+    def __hash__(self) -> int:
+        return hash(self.id)
+
+    id: int
     name: str
     enabled: bool
 

formula10/domain/points_model.py

@@ -1,4 +1,5 @@
-from typing import Callable, Dict, List, Tuple, overload
+import json
+from typing import Any, Callable, Dict, List, overload
 import numpy as np
 
 from formula10.domain.domain_model import Model
@@ -42,7 +43,7 @@ DRIVER_RACE_POINTS: Dict[int, int] = {
     10: 1
 }
 
-STANDING_2023: Dict[str, int] = {
+WDC_STANDING_2023: Dict[str, int] = {
     "Max Verstappen": 1,
     "Sergio Perez": 2,
     "Lewis Hamilton": 3,
@@ -50,14 +51,14 @@ STANDING_2023: Dict[str, int] = {
     "Charles Leclerc": 5,
     "Lando Norris": 6,
     "Carlos Sainz": 7,
-    "George Russel": 8,  # @todo typo
+    "George Russell": 8,
     "Oscar Piastri": 9,
     "Lance Stroll": 10,
     "Pierre Gasly": 11,
     "Esteban Ocon": 12,
     "Alexander Albon": 13,
     "Yuki Tsunoda": 14,
-    "Valteri Bottas": 15,  # @todo typo
+    "Valtteri Bottas": 15,
     "Nico Hulkenberg": 16,
     "Daniel Ricciardo": 17,
     "Zhou Guanyu": 18,
@@ -65,6 +66,19 @@ STANDING_2023: Dict[str, int] = {
     "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:
@@ -91,8 +105,8 @@ class PointsModel(Model):
     """
 
     _points_per_step: Dict[str, List[int]] | None = None
-    _wdc_points: Dict[str, int] | None = None
-    _wcc_points: Dict[str, 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):
@@ -105,7 +119,7 @@ class PointsModel(Model):
         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] * 24  # Start at index 1, like the race numbers
+                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
@@ -120,32 +134,42 @@ class PointsModel(Model):
         return self._points_per_step
 
     # @todo Doesn't include fastest lap + sprint points
-    def wdc_points(self) -> Dict[str, int]:
-        if self._wdc_points is None:
-            self._wdc_points = dict()
-
+    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._wdc_points[driver.name] = 0
+                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():
-                    self._wdc_points[driver.name] += DRIVER_RACE_POINTS[int(position)] if int(position) in DRIVER_RACE_POINTS else 0
+                    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._wdc_points
-
-    def wcc_points(self) -> Dict[str, int]:
-        if self._wcc_points is None:
-            self._wcc_points = dict()
+        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._wcc_points[team.name] = 0
+                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 driver in race_result.standing.values():
-                    self._wcc_points[driver.team.name] += self.wdc_points()[driver.name]
+                for position, driver in race_result.standing.items():
+                    team_name: str = driver.team.name
+                    race_number: int = race_result.race.number
 
-        return self._wcc_points
+                    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]:
@@ -161,30 +185,83 @@ class PointsModel(Model):
 
         return self._dnfs
 
-    def wdc_diff_2023(self) -> Dict[str, int]:
-        diff: Dict[str, int] = dict()
+    #
+    # Driver stats
+    #
 
-        for driver in self.all_drivers(include_none=False):
-            diff[driver.name] = STANDING_2023[driver.name] - self.wdc_standing_by_driver()[driver.name]
+    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 diff
+        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, 21):
+        for position in range(1, len(self.all_drivers(include_none=False)) + 1):
             standing[position] = list()
 
         position: int = 1
         last_points: int = 0
 
-        comparator: Callable[[Tuple[str, int]], int] = lambda item: item[1]
-        for driver_name, points in sorted(self.wdc_points().items(), key=comparator, reverse=True):
+        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)
-
+            standing[position].append(driver.name)
             last_points = points
 
         return standing
@@ -195,53 +272,18 @@ class PointsModel(Model):
         position: int = 1
         last_points: int = 0
 
-        comparator: Callable[[Tuple[str, int]], int] = lambda item: item[1]
-        for driver_name, points in sorted(self.wdc_points().items(), key=comparator, reverse=True):
+        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
-
+            standing[driver.name] = position
             last_points = points
 
         return standing
 
-    def wcc_standing_by_position(self) -> Dict[int, List[str]]:
-        standing: Dict[int, List[str]] = dict()
-
-        for position in range (1, 11):
-            standing[position] = list()
-
-        position: int = 1
-        last_points: int = 0
-
-        comparator: Callable[[Tuple[str, int]], int] = lambda item: item[1]
-        for team_name, points in sorted(self.wcc_points().items(), key=comparator, reverse=True):
-            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
-
-        comparator: Callable[[Tuple[str, int]], int] = lambda item: item[1]
-        for team_name, points in sorted(self.wcc_points().items(), key=comparator, reverse=True):
-            if points < last_points:
-                position += 1
-
-            standing[team_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()
@@ -262,13 +304,13 @@ class PointsModel(Model):
         most_gained: int = 0
 
         for driver in self.all_drivers(include_none=False):
-            gained: int = self.wdc_diff_2023()[driver.name]
+            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()[driver.name]
+            gained: int = self.wdc_diff_2023_by(driver.name)
 
             if gained == most_gained:
                 most_gained_names.append(driver.name)
@@ -280,26 +322,82 @@ class PointsModel(Model):
         most_lost: int = 100
 
         for driver in self.all_drivers(include_none=False):
-            lost: int = self.wdc_diff_2023()[driver.name]
+            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()[driver.name]
+            lost: int = self.wdc_diff_2023_by(driver.name)
 
             if lost == most_lost:
                 most_lost_names.append(driver.name)
 
         return most_lost_names
 
-    def drivers_sorted_by_points(self) -> List[Driver]:
-        comparator: Callable[[Driver], int] = lambda driver: self.wdc_standing_by_driver()[driver.name]
-        return sorted(self.all_drivers(include_none=False), key=comparator)
+    #
+    # 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.wcc_standing_by_team()[team.name]
-        return sorted(self.all_teams(include_none=False), key=comparator)
+        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]]:
         """
@@ -466,3 +564,61 @@ class PointsModel(Model):
                 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)

formula10/domain/template_model.py

@@ -6,7 +6,7 @@ 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, race_has_started
+from formula10.database.validation import find_first_else_none, find_multiple_strict, find_single_strict, race_has_started
 
 
 class TemplateModel(Model):
@@ -33,10 +33,12 @@ class TemplateModel(Model):
         return not race_has_started(race=race) if ENABLE_TIMING else True
 
     def season_guess_open(self) -> bool:
-        return not race_has_started(race_name="Bahrain") if ENABLE_TIMING else True
+        return not race_has_started(race_id=1) if ENABLE_TIMING else True
 
     def race_result_open(self, race_name: str) -> bool:
-        return race_has_started(race_name=race_name) if ENABLE_TIMING else True
+        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"

formula10/static/style/diagram.css

@@ -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;
+    }
+}

formula10/static/style/grid.css

@@ -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;
+    }
+}

formula10/templates/base.jinja

@@ -26,7 +26,8 @@
 {# 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 %}>
+        <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 %}
@@ -34,7 +35,7 @@
             {% endif %}
 
             {% for driver in drivers %}
-                <option value="{{ driver.name }}">{{ driver.abbr }}</option>
+                <option value="{{ driver.id }}">{{ driver.abbr }}</option>
             {% endfor %}
         </select>
         <label for="{{ name }}" class="text-primary">{{ label }}</label>
@@ -44,7 +45,8 @@
 {# 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 %}>
+        <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) %}
 
@@ -55,13 +57,13 @@
             {% for driver in drivers %}
                 {% if driver_match == driver %}
                     {% set user_has_chosen.driverpre = true %}
-                    <option selected="selected" value="{{ driver.name }}">{{ driver.abbr }}</option>
+                    <option selected="selected" value="{{ driver.id }}">{{ driver.abbr }}</option>
                 {% else %}
-                    <option value="{{ driver.name }}">{{ driver.abbr }}</option>
+                    <option value="{{ driver.id }}">{{ driver.abbr }}</option>
                 {% endif %}
 
                 {% if (include_none == true) and (driver == model.none_driver()) %}
-                    <option disabled>──────────</option>
+                    <option disabled="disabled">──────────</option>
                 {% endif %}
             {% endfor %}
 
@@ -77,7 +79,8 @@
 {# 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 %}>
+        <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 %}
@@ -85,7 +88,7 @@
             {% endif %}
 
             {% for team in teams %}
-                <option value="{{ team.name }}">{{ team.name }}</option>
+                <option value="{{ team.id }}">{{ team.name }}</option>
             {% endfor %}
         </select>
         <label for="{{ name }}" class="text-primary">{{ label }}</label>
@@ -95,7 +98,8 @@
 {# 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 %}>
+        <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) %}
 
@@ -106,13 +110,13 @@
             {% for team in teams %}
                 {% if team_match == team %}
                     {% set user_has_chosen.teampre = true %}
-                    <option selected="selected" value="{{ team.name }}">{{ team.name }}</option>
+                    <option selected="selected" value="{{ team.id }}">{{ team.name }}</option>
                 {% else %}
-                    <option value="{{ team.name }}">{{ team.name }}</option>
+                    <option value="{{ team.id }}">{{ team.name }}</option>
                 {% endif %}
 
                 {% if (include_none == true) and (team == model.none_team()) %}
-                    <option disabled>──────────</option>
+                    <option disabled="disabled">──────────</option>
                 {% endif %}
             {% endfor %}
 
@@ -176,6 +180,12 @@
     <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']")
@@ -212,7 +222,7 @@
             <div class="flex-grow-1"></div>
 
             <div class="navbar-nav">
-                {{ nav_selector(page="/result", text="Enter Race Result") }}
+                {# {{ nav_selector(page="/result", text="Enter Race Result") }} #}
                 {{ nav_selector(page="/user", text="Manage Users") }}
             </div>
         </div>

formula10/templates/error.jinja

@@ -5,10 +5,12 @@
 {% set active_page = "/error" %}
 
 {% block body %}
-    <div class="card">
+    <div class="card shadow-sm mb-2">
+        <div class="card-header">
+            <span class="text-danger fw-bold">Error</span>
+        </div>
         <div class="card-body">
-            <h5 class="card-title text-danger fw-bold">Error</h5>
-            <h6 class="card-subtitle">{{ error_message }}</h6>
+            {{ error_message }}
         </div>
     </div>
 {% endblock body %}

formula10/templates/leaderboard.jinja

@@ -6,19 +6,33 @@
 
 {% block body %}
 
-    <div class="card">
-        <div class="card-body">
-            <h5 class="card-title">Leaderboard</h5>
-            <h6 class="card-subtitle">Points only include race picks</h6>
+    <div class="card shadow-sm mb-2">
+        <div class="card-header">
+            Note
+        </div>
 
-            <table class="table table-bordered table-sm table-responsive mt-3">
+        <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;" 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>
@@ -39,14 +53,47 @@
                 </table>
             </div>
         </div>
+    </div>
 
-    {#    <div class="card mt-2">#}
-    {#        <div class="card-body">#}
-    {#            <h5 class="card-title">History</h5>#}
+    <div class="card shadow-sm mb-2">
+        <div class="card-header">
+            History
+        </div>
 
-    {# Line chart of point history with a line per user #}
-    {#        </div>#}
-    {#    </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">#}

formula10/templates/race.jinja

@@ -14,7 +14,10 @@
 
 {% 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>
@@ -35,11 +38,14 @@
 
                 {# 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 }}</td>
+                    <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 }}</a>
+                            <a href="/race/{{ user.name_sanitized }}" class="link-dark">{{ user.name }}
+                                ({{ points.total_points_by(user.name) }})</a>
                         </td>
                     {% endfor %}
                 {% endif %}
@@ -193,5 +199,6 @@
 
             </tbody>
         </table>
+    </div>
 
 {% endblock body %}

formula10/templates/result.jinja

@@ -42,15 +42,16 @@
 
 {% block body %}
 
-    <div class="grid" style="grid-template-columns: repeat(auto-fit, minmax(450px, 1fr));">
+    <div class="grid card-grid">
 
-        <div class="card shadow-sm" style="width: 450px;">
-            <div class="card-body">
-
-                <h5 class="card-title">
+        <div class="card shadow-sm mb-2" style="max-width: 450px;">
+            <div class="card-header">
                 {{ model.active_result_race_name_or_current_race_name() }}
-                </h5>
+            </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() %}
@@ -59,6 +60,7 @@
                         {% 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"
@@ -67,47 +69,52 @@
                                 {% 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 %}>
+                                    <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.name }}"
-                                               id="first-dnf-{{ driver.name }}" name="first-dnf-drivers"
+                                                <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 %}readonly="readonly"{% endif %}>
-                                        <label for="first-dnf-{{ driver.name }}"
+                                                       {% 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.name }}"
-                                               id="dnf-{{ driver.name }}" name="dnf-drivers"
+                                                <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 %}readonly="readonly"{% endif %}>
-                                        <label for="dnf-{{ driver.name }}"
+                                                       {% 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.name }}"
-                                               id="exclude-{{ driver.name }}" name="excluded-drivers"
+                                                <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 %}readonly="readonly"{% endif %}>
-                                        <label for="exclude-{{ driver.name }}"
+                                                       {% 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.name }}">
+                                        <input type="hidden" name="pxx-drivers" value="{{ driver.id }}">
                                     </li>
                                 {% endfor %}
                             </ul>
@@ -115,7 +122,8 @@
                             <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>

formula10/templates/rules.jinja

@@ -5,10 +5,12 @@
 {% set active_page = "/rules" %}
 
 {% block body %}
-    <div class="card">
-        <div class="card-body">
-            <h5 class="card-title">Format</h5>
+    <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).
@@ -20,10 +22,12 @@
         </div>
     </div>
 
-    <div class="card mt-2">
-        <div class="card-body">
-            <h5 class="card-title">Renntipps</h5>
+    <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
@@ -39,10 +43,12 @@
         </div>
     </div>
 
-    <div class="card mt-2">
-        <div class="card-body">
-            <h5 class="card-title">Punkte</h5>
+    <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
@@ -56,10 +62,12 @@
         </div>
     </div>
 
-    <div class="card mt-2">
-        <div class="card-body">
-            <h5 class="card-title">Bonustipps</h5>
+    <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.

formula10/templates/season.jinja

@@ -10,21 +10,33 @@
 
 {% block body %}
 
-    <div class="grid" style="grid-template-columns: repeat(auto-fit, minmax(450px, 1fr));">
+    <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 mb-2 shadow-sm" style="width: 450px;">
-                <div class="card-body">
-
+            <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 %}
-                        <h5 class="card-title">{{ user.name }}</h5>
+                        {{ user.name }}
                     {% else %}
-                        <a href="/season/{{ user.name }}" class="link-dark">
-                            <h5 class="card-title">{{ user.name }}</h5>
-                        </a>
+                        <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) %}
 
@@ -70,11 +82,11 @@
                         <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 places gained:", include_none=false, drivers=model.drivers_for_wdc_gained(),
+                                   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 places lost:", include_none=false, disabled=not season_guess_open,
+                                   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>
 
@@ -82,7 +94,7 @@
                         <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" style="width: 450px; row-gap: 0;">
+                        <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] %}
@@ -90,26 +102,26 @@
                                 <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 }}"
+                                               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.name }}-1-{{ user.name }}">{{ driver_a.name }}</label>
+                                               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.name }}"
-                                               id="teamwinner-{{ team.name }}-2-{{ user.name }}"
-                                               value="{{ driver_b.name }}"
+                                               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.name }}-2-{{ user.name }}">{{ driver_b.name }}</label>
+                                               for="teamwinner-{{ team.id }}-2-{{ user.id }}">{{ driver_b.name }}</label>
                                     </div>
                                 </div>
                             {% endfor %}
@@ -118,7 +130,7 @@
                         {# 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" style="width: 450px; row-gap: 0;">
+                        <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] %}
@@ -127,12 +139,12 @@
                                     <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 }}"
+                                               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.name }}-{{ user.name }}">{{ driver_a.name }}</label>
+                                               for="podium-{{ driver_a.id }}-{{ user.id }}">{{ driver_a.name }}</label>
                                     </div>
                                 </div>
 
@@ -140,12 +152,12 @@
                                     <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 }}"
+                                               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.name }}-{{ user.name }}">{{ driver_b.name }}</label>
+                                               for="podium-{{ driver_b.id }}-{{ user.id }}">{{ driver_b.name }}</label>
                                     </div>
                                 </div>
                             {% endfor %}

formula10/templates/statistics.jinja

@@ -6,12 +6,25 @@
 
 {% block body %}
 
-    <div class="grid" style="grid-template-columns: repeat(auto-fit, minmax(450px, 1fr));">
+    <div class="card shadow-sm mb-2">
+        <div class="card-header">
+            Note
+        </div>
 
-        <div class="card mb-2">
         <div class="card-body">
-                <h5 class="card-title">Drivers</h5>
+            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>
@@ -19,6 +32,7 @@
                             <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>
 
@@ -28,25 +42,31 @@
                             <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.wdc_points()[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">
             <div class="card-body">
-                <h5 class="card-title">Constructors</h5>
-
+                <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>
 
@@ -56,13 +76,95 @@
                             <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.wcc_points()[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>
 

formula10/templates/users.jinja

@@ -6,10 +6,12 @@
 
 {% block body %}
 
-    <div class="card shadow-sm">
-        <div class="card-body">
-            <h5 class="card-title">Add User</h5>
+    <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">
@@ -25,10 +27,12 @@
     </div>
 
     {% if model.all_users() | length > 0 %}
-        <div class="card mt-2 shadow-sm">
-            <div class="card-body">
-                <h5 class="card-title">Registered Users</h5>
+        <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>
@@ -37,10 +41,12 @@
             </div>
         </div>
 
-        <div class="card mt-2 shadow-sm">
-            <div class="card-body">
-                <h5 class="card-title">Delete user</h5>
+        <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"
@@ -66,16 +72,4 @@
         </div>
     {% endif %}
 
-{#    <div class="card mt-2 border-danger shadow-sm">#}
-{#        <div class="card-body">#}
-{#            <h5 class="card-title">Functions that should not be public</h5>#}
-{#            <h6 class="card-subtitle mb-2">(F you if you click this without knowing what it does)</h6>#}
-
-{#            <a class="btn btn-outline-danger" href="/save/all">Save all data</a>#}
-{#            <a class="btn btn-outline-danger" href="/load/all">Load all data</a>#}
-{#            <a class="btn btn-outline-danger" href="/load/static">Load static data</a>#}
-{#            <a class="btn btn-outline-danger" href="/load/dynamic">Load dynamic data</a>#}
-{#        </div>#}
-{#    </div>#}
-
 {% endblock body %}