Finish restructuring files
All checks were successful
Build Formula10 Docker Image / build-docker (push) Successful in 14s
All checks were successful
Build Formula10 Docker Image / build-docker (push) Successful in 14s
This commit is contained in:
41
formula10/__init__.py
Normal file
41
formula10/__init__.py
Normal file
@ -0,0 +1,41 @@
|
||||
from flask import Flask
|
||||
from flask_sqlalchemy import SQLAlchemy
|
||||
|
||||
app: Flask = Flask(__name__)
|
||||
app.config['SQLALCHEMY_DATABASE_URI'] = "sqlite:///formula10.db"
|
||||
app.config['SQLALCHEMY_TRACK_MODIFICATIONS'] = False
|
||||
app.url_map.strict_slashes = False
|
||||
|
||||
db: SQLAlchemy = SQLAlchemy()
|
||||
db.init_app(app)
|
||||
|
||||
# NOTE: These imports are required to register the routes. They need to be after "app" is declared
|
||||
import formula10.controller.race_controller # type: ignore
|
||||
import formula10.controller.season_controller # type: ignore
|
||||
import formula10.controller.admin_controller # type: ignore
|
||||
|
||||
|
||||
# TODO
|
||||
# General
|
||||
|
||||
# Split the database model from the frontend-model/template-model/domain-model
|
||||
# - Move most of the template logic into this
|
||||
# - Allow exclusion of e.g. most-gained driver and other stuff
|
||||
|
||||
# - Choose "place to guess" late before the race? Make a page for this
|
||||
# - Rules page
|
||||
|
||||
# - Make user order changeable using drag'n'drop?
|
||||
# - Show place when entering race result (would require updating the drag'n'drop code...)
|
||||
# - Show cards of previous race results, like with season guesses?
|
||||
# - Make the season card grid left-aligned? So e.g. 2 cards are not spread over the whole screen with large gaps?
|
||||
|
||||
# Statistics
|
||||
# - Auto calculate points
|
||||
# - Order user table by points + display points somewhere
|
||||
# - Show current values for some season guesses (e.g. current most dnfs)
|
||||
# - Generate static diagram using chart.js + templating the js (funny yikes)
|
||||
|
||||
|
||||
# if __name__ == "__main__":
|
||||
# app.run(debug=True, host="0.0.0.0")
|
78
formula10/controller/admin_controller.py
Normal file
78
formula10/controller/admin_controller.py
Normal file
@ -0,0 +1,78 @@
|
||||
from typing import List
|
||||
from urllib.parse import unquote
|
||||
from flask import redirect, render_template, request
|
||||
from werkzeug import Response
|
||||
|
||||
from formula10.database.update_query_util import update_race_result, update_user
|
||||
from formula10.database.import_export_util import export_dynamic_data, reload_dynamic_data, reload_static_data
|
||||
from formula10.frontend.template_model import TemplateModel
|
||||
from formula10 import app
|
||||
|
||||
|
||||
@app.route("/save/all")
|
||||
def save() -> Response:
|
||||
export_dynamic_data()
|
||||
return redirect("/")
|
||||
|
||||
|
||||
@app.route("/load/all")
|
||||
def load() -> Response:
|
||||
reload_static_data()
|
||||
reload_dynamic_data()
|
||||
return redirect("/")
|
||||
|
||||
|
||||
@app.route("/load/static")
|
||||
def load_static() -> Response:
|
||||
reload_static_data()
|
||||
return redirect("/")
|
||||
|
||||
|
||||
@app.route("/load/dynamic")
|
||||
def load_dynamic() -> Response:
|
||||
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()
|
||||
return render_template("enter.jinja",
|
||||
active_result=model.race_result_by(race_name=race_name),
|
||||
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)
|
||||
|
||||
|
||||
@app.route("/user")
|
||||
def user_root() -> str:
|
||||
model = TemplateModel()
|
||||
return render_template("users.jinja",
|
||||
model=model)
|
||||
|
||||
|
||||
@app.route("/user-add", methods=["POST"])
|
||||
def user_add_post() -> Response:
|
||||
username: str | None = request.form.get("select-add-user")
|
||||
return update_user(username, add=True)
|
||||
|
||||
|
||||
@app.route("/user-delete", methods=["POST"])
|
||||
def user_delete_post() -> Response:
|
||||
username: str | None = request.form.get("select-delete-user")
|
||||
return update_user(username, delete=True)
|
45
formula10/controller/race_controller.py
Normal file
45
formula10/controller/race_controller.py
Normal file
@ -0,0 +1,45 @@
|
||||
from urllib.parse import unquote
|
||||
from flask import redirect, render_template, request
|
||||
from werkzeug import Response
|
||||
|
||||
from formula10.database.update_query_util import delete_race_guess, update_race_guess
|
||||
from formula10.frontend.template_model import TemplateModel
|
||||
from formula10 import app
|
||||
|
||||
|
||||
@app.route("/")
|
||||
def root() -> Response:
|
||||
return redirect("/race/Everyone")
|
||||
|
||||
|
||||
@app.route("/race")
|
||||
def race_root() -> Response:
|
||||
return redirect("/race/Everyone")
|
||||
|
||||
|
||||
@app.route("/race/<user_name>")
|
||||
def race_active_user(user_name: str) -> str:
|
||||
user_name = unquote(user_name)
|
||||
model = TemplateModel()
|
||||
return render_template("race.jinja",
|
||||
active_user=model.user_by(user_name=user_name, ignore=["Everyone"]),
|
||||
model=model)
|
||||
|
||||
|
||||
@app.route("/race-guess/<race_name>/<user_name>", methods=["POST"])
|
||||
def race_guess_post(race_name: str, user_name: str) -> Response:
|
||||
race_name = unquote(race_name)
|
||||
user_name = unquote(user_name)
|
||||
|
||||
pxx: str | None = request.form.get("pxxselect")
|
||||
dnf: str | None = request.form.get("dnfselect")
|
||||
|
||||
return update_race_guess(race_name, user_name, pxx, dnf)
|
||||
|
||||
|
||||
@app.route("/race-guess-delete/<race_name>/<user_name>", methods=["POST"])
|
||||
def race_guess_delete_post(race_name: str, user_name: str) -> Response:
|
||||
race_name = unquote(race_name)
|
||||
user_name = unquote(user_name)
|
||||
|
||||
return delete_race_guess(race_name, user_name)
|
43
formula10/controller/season_controller.py
Normal file
43
formula10/controller/season_controller.py
Normal file
@ -0,0 +1,43 @@
|
||||
from typing import List
|
||||
from urllib.parse import unquote
|
||||
from flask import redirect, render_template, request
|
||||
from werkzeug import Response
|
||||
|
||||
from formula10.database.model.team import Team
|
||||
from formula10.database.update_query_util import update_season_guess
|
||||
from formula10.frontend.template_model import TemplateModel
|
||||
from formula10 import app, db
|
||||
|
||||
|
||||
@app.route("/season")
|
||||
def season_root() -> Response:
|
||||
return redirect("/season/Everyone")
|
||||
|
||||
|
||||
@app.route("/season/<user_name>")
|
||||
def season_active_user(user_name: str) -> str:
|
||||
user_name = unquote(user_name)
|
||||
model = TemplateModel()
|
||||
return render_template("season.jinja",
|
||||
active_user=model.user_by(user_name=user_name, ignore=["Everyone"]),
|
||||
model=model)
|
||||
|
||||
|
||||
@app.route("/season-guess/<user_name>", methods=["POST"])
|
||||
def season_guess_post(user_name: str) -> Response:
|
||||
user_name = unquote(user_name)
|
||||
guesses: List[str | None] = [
|
||||
request.form.get("hottakeselect"),
|
||||
request.form.get("p2select"),
|
||||
request.form.get("overtakeselect"),
|
||||
request.form.get("dnfselect"),
|
||||
request.form.get("gainedselect"),
|
||||
request.form.get("lostselect")
|
||||
]
|
||||
# TODO: This is pretty ugly, to do queries in the controller
|
||||
team_winner_guesses: List[str | None] = [
|
||||
request.form.get(f"teamwinner-{team.name}") for team in db.session.query(Team).all()
|
||||
]
|
||||
podium_driver_guesses: List[str] = request.form.getlist("podiumdrivers")
|
||||
|
||||
return update_season_guess(user_name, guesses, team_winner_guesses, podium_driver_guesses)
|
10
formula10/database/common_query_util.py
Normal file
10
formula10/database/common_query_util.py
Normal file
@ -0,0 +1,10 @@
|
||||
from formula10.database.model.race_result import RaceResult
|
||||
from formula10.database.model.user import User
|
||||
from formula10 import db
|
||||
|
||||
def race_has_result(race_name: str) -> bool:
|
||||
return db.session.query(RaceResult).filter_by(race_name=race_name).first() is not None
|
||||
|
||||
|
||||
def user_exists(user_name: str) -> bool:
|
||||
return db.session.query(User).filter_by(name=user_name).first() is not None
|
107
formula10/database/import_export_util.py
Normal file
107
formula10/database/import_export_util.py
Normal file
@ -0,0 +1,107 @@
|
||||
import csv
|
||||
import os.path
|
||||
from typing import List, Any
|
||||
|
||||
from formula10.database.model.driver import Driver
|
||||
from formula10.database.model.podium_drivers import PodiumDrivers
|
||||
from formula10.database.model.race import Race
|
||||
from formula10.database.model.race_guess import RaceGuess
|
||||
from formula10.database.model.race_result import RaceResult
|
||||
from formula10.database.model.season_guess import SeasonGuess
|
||||
from formula10.database.model.team import Team
|
||||
from formula10.database.model.team_winners import TeamWinners
|
||||
from formula10.database.model.user import User
|
||||
from formula10 import db
|
||||
|
||||
|
||||
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 (if it doesn't exist!)
|
||||
db.create_all()
|
||||
|
||||
# Clear static data
|
||||
db.session.query(Team).delete()
|
||||
db.session.query(Driver).delete()
|
||||
db.session.query(Race).delete()
|
||||
|
||||
# Reload static data
|
||||
for row in load_csv("../../data/static_import/teams.csv"):
|
||||
db.session.add(Team.from_csv(row))
|
||||
for row in load_csv("../../data/static_import/drivers.csv"):
|
||||
db.session.add(Driver.from_csv(row))
|
||||
for row in load_csv("../../data/static_import/races.csv"):
|
||||
db.session.add(Race.from_csv(row))
|
||||
|
||||
db.session.commit()
|
||||
|
||||
|
||||
def reload_dynamic_data():
|
||||
print("Initializing Database with Dynamic Values...")
|
||||
# Create it (if it doesn't exist!)
|
||||
db.create_all()
|
||||
|
||||
# Clear dynamic data
|
||||
db.session.query(User).delete()
|
||||
db.session.query(RaceResult).delete()
|
||||
db.session.query(RaceGuess).delete()
|
||||
db.session.query(TeamWinners).delete()
|
||||
db.session.query(PodiumDrivers).delete()
|
||||
db.session.query(SeasonGuess).delete()
|
||||
|
||||
# Reload dynamic data
|
||||
for row in load_csv("../../data/dynamic_export/users.csv"):
|
||||
db.session.add(User.from_csv(row))
|
||||
for row in load_csv("../../data/dynamic_export/raceresults.csv"):
|
||||
db.session.add(RaceResult.from_csv(row))
|
||||
for row in load_csv("../../data/dynamic_export/raceguesses.csv"):
|
||||
db.session.add(RaceGuess.from_csv(row))
|
||||
for row in load_csv("../../data/dynamic_export/teamwinners.csv"):
|
||||
db.session.add(TeamWinners.from_csv(row))
|
||||
for row in load_csv("../../data/dynamic_export/podiumdrivers.csv"):
|
||||
db.session.add(PodiumDrivers.from_csv(row))
|
||||
for row in load_csv("../../data/dynamic_export/seasonguesses.csv"):
|
||||
db.session.add(SeasonGuess.from_csv(row))
|
||||
|
||||
db.session.commit()
|
||||
|
||||
|
||||
def export_dynamic_data():
|
||||
print("Exporting Userdata...")
|
||||
|
||||
users: List[User] = db.session.query(User).all()
|
||||
raceresults: List[RaceResult] = db.session.query(RaceResult).all()
|
||||
raceguesses: List[RaceGuess] = db.session.query(RaceGuess).all()
|
||||
teamwinners: List[TeamWinners] = db.session.query(TeamWinners).all()
|
||||
podiumdrivers: List[PodiumDrivers] = db.session.query(PodiumDrivers).all()
|
||||
seasonguesses: List[SeasonGuess] = db.session.query(SeasonGuess).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/teamwinners.csv", teamwinners)
|
||||
write_csv("../../data/dynamic_export/podiumdrivers.csv", podiumdrivers)
|
||||
write_csv("../../data/dynamic_export/seasonguesses.csv", seasonguesses)
|
31
formula10/database/model/driver.py
Normal file
31
formula10/database/model/driver.py
Normal file
@ -0,0 +1,31 @@
|
||||
from typing import List
|
||||
from sqlalchemy import String, ForeignKey
|
||||
from sqlalchemy.orm import mapped_column, Mapped, relationship
|
||||
|
||||
from formula10.database.model.team import Team
|
||||
from formula10 import db
|
||||
|
||||
|
||||
class Driver(db.Model):
|
||||
"""
|
||||
A F1 driver.
|
||||
It stores the corresponding team + name abbreviation.
|
||||
"""
|
||||
__tablename__ = "driver"
|
||||
|
||||
@staticmethod
|
||||
def from_csv(row: List[str]):
|
||||
driver: Driver = Driver()
|
||||
driver.name = str(row[0])
|
||||
driver.abbr = str(row[1])
|
||||
driver.team_name = str(row[2])
|
||||
driver.country_code = str(row[3])
|
||||
return 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
|
||||
|
||||
# Relationships
|
||||
team: Mapped["Team"] = relationship("Team", foreign_keys=[team_name])
|
60
formula10/database/model/podium_drivers.py
Normal file
60
formula10/database/model/podium_drivers.py
Normal file
@ -0,0 +1,60 @@
|
||||
import json
|
||||
from typing import Any, List
|
||||
from sqlalchemy import ForeignKey, String
|
||||
from sqlalchemy.orm import Mapped, mapped_column, relationship
|
||||
|
||||
from formula10.database.model.user import User
|
||||
from formula10.database.model.driver import Driver
|
||||
from formula10 import db
|
||||
|
||||
|
||||
class PodiumDrivers(db.Model):
|
||||
"""
|
||||
A guessed list of each driver that will reach at least a single podium.
|
||||
"""
|
||||
__tablename__ = "podiumdrivers"
|
||||
__allow_unmapped__ = True
|
||||
__csv_header__ = ["user_name", "podium_driver_names_json"]
|
||||
|
||||
def __init__(self, user_name: str):
|
||||
self.user_name = user_name
|
||||
|
||||
@staticmethod
|
||||
def from_csv(row: List[str]):
|
||||
podium_drivers: PodiumDrivers = PodiumDrivers(str(row[0]))
|
||||
podium_drivers.podium_driver_names_json = str(row[1])
|
||||
return podium_drivers
|
||||
|
||||
def to_csv(self) -> List[Any]:
|
||||
return [
|
||||
self.user_name,
|
||||
self.podium_driver_names_json
|
||||
]
|
||||
|
||||
user_name: Mapped[str] = mapped_column(ForeignKey("user.name"), primary_key=True)
|
||||
podium_driver_names_json: Mapped[str] = mapped_column(String(1024), nullable=True)
|
||||
|
||||
@property
|
||||
def podium_driver_names(self) -> List[str]:
|
||||
return json.loads(self.podium_driver_names_json)
|
||||
|
||||
@podium_driver_names.setter
|
||||
def podium_driver_names(self, new_podium_driver_names: List[str]):
|
||||
self.podium_driver_names_json = json.dumps(new_podium_driver_names)
|
||||
|
||||
# Relationships
|
||||
user: Mapped["User"] = relationship("User", foreign_keys=[user_name])
|
||||
_podium_drivers: List[Driver] | None = None
|
||||
|
||||
@property
|
||||
def podium_drivers(self) -> List[Driver]:
|
||||
if self._podium_drivers is None:
|
||||
self._podium_drivers = list()
|
||||
for driver_name in self.podium_driver_names:
|
||||
driver: Driver | None = db.session.query(Driver).filter_by(name=driver_name).first()
|
||||
if driver is None:
|
||||
raise Exception(f"Error: Couldn't find driver with id {driver_name}")
|
||||
|
||||
self._podium_drivers.append(driver)
|
||||
|
||||
return self._podium_drivers
|
33
formula10/database/model/race.py
Normal file
33
formula10/database/model/race.py
Normal file
@ -0,0 +1,33 @@
|
||||
from datetime import datetime
|
||||
from typing import List
|
||||
from urllib.parse import quote
|
||||
from sqlalchemy import DateTime, Integer, String
|
||||
from sqlalchemy.orm import Mapped, mapped_column
|
||||
|
||||
from formula10 import db
|
||||
|
||||
|
||||
class Race(db.Model):
|
||||
"""
|
||||
A single race at a certain date and GrandPrix in the calendar.
|
||||
It stores the place to guess for this race.
|
||||
"""
|
||||
__tablename__ = "race"
|
||||
|
||||
@staticmethod
|
||||
def from_csv(row: List[str]):
|
||||
race: Race = Race()
|
||||
race.name = str(row[0])
|
||||
race.number = int(row[1])
|
||||
race.date = datetime.strptime(row[2], "%Y-%m-%d")
|
||||
race.pxx = int(row[3])
|
||||
return race
|
||||
|
||||
@property
|
||||
def name_sanitized(self) -> str:
|
||||
return quote(self.name)
|
||||
|
||||
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
|
46
formula10/database/model/race_guess.py
Normal file
46
formula10/database/model/race_guess.py
Normal file
@ -0,0 +1,46 @@
|
||||
from typing import Any, List
|
||||
from sqlalchemy import ForeignKey
|
||||
from sqlalchemy.orm import Mapped, mapped_column, relationship
|
||||
|
||||
from formula10.database.model.user import User
|
||||
from formula10.database.model.race import Race
|
||||
from formula10.database.model.driver import Driver
|
||||
from formula10 import db
|
||||
|
||||
class RaceGuess(db.Model):
|
||||
"""
|
||||
A guess a user made for a race.
|
||||
It stores the corresponding race and the guessed drivers for PXX and DNF.
|
||||
"""
|
||||
__tablename__ = "raceguess"
|
||||
__csv_header__ = ["user_name", "race_name", "pxx_driver_name", "dnf_driver_name"]
|
||||
|
||||
def __init__(self, user_name: str, race_name: str):
|
||||
self.user_name = user_name # Primary key
|
||||
self.race_name = race_name # Primery key
|
||||
|
||||
@staticmethod
|
||||
def from_csv(row: List[str]):
|
||||
race_guess: RaceGuess = RaceGuess(str(row[0]), str(row[1]))
|
||||
race_guess.pxx_driver_name = str(row[2])
|
||||
race_guess.dnf_driver_name = str(row[3])
|
||||
return 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"), nullable=True)
|
||||
dnf_driver_name: Mapped[str] = mapped_column(ForeignKey("driver.name"), nullable=True)
|
||||
|
||||
# Relationships
|
||||
user: Mapped["User"] = relationship("User", foreign_keys=[user_name])
|
||||
race: Mapped["Race"] = relationship("Race", foreign_keys=[race_name])
|
||||
pxx: Mapped["Driver"] = relationship("Driver", foreign_keys=[pxx_driver_name])
|
||||
dnf: Mapped["Driver"] = relationship("Driver", foreign_keys=[dnf_driver_name])
|
171
formula10/database/model/race_result.py
Normal file
171
formula10/database/model/race_result.py
Normal file
@ -0,0 +1,171 @@
|
||||
import json
|
||||
from typing import Any, Dict, List
|
||||
from sqlalchemy import ForeignKey, String
|
||||
from sqlalchemy.orm import Mapped, mapped_column, relationship
|
||||
|
||||
from formula10.database.model.driver import Driver
|
||||
from formula10.database.model.race import Race
|
||||
from formula10 import db
|
||||
|
||||
class RaceResult(db.Model):
|
||||
"""
|
||||
The result of a past race.
|
||||
It stores the corresponding race and dictionaries of place-/dnf-order and a list of drivers that are excluded from the standings for this race.
|
||||
"""
|
||||
__tablename__ = "raceresult"
|
||||
__allow_unmapped__ = True # TODO: Used for json conversion, move this to some other class instead
|
||||
__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):
|
||||
self.race_name = race_name # Primary key
|
||||
|
||||
@staticmethod
|
||||
def from_csv(row: List[str]):
|
||||
race_result: RaceResult = RaceResult(str(row[0]))
|
||||
race_result.pxx_driver_names_json = str(row[1])
|
||||
race_result.first_dnf_driver_names_json = str(row[2])
|
||||
race_result.dnf_driver_names_json = str(row[3])
|
||||
race_result.excluded_driver_names_json = str(row[4])
|
||||
return 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), nullable=True)
|
||||
first_dnf_driver_names_json: Mapped[str] = mapped_column(String(1024), nullable=True)
|
||||
dnf_driver_names_json: Mapped[str] = mapped_column(String(1024), nullable=True)
|
||||
excluded_driver_names_json: Mapped[str] = mapped_column(String(1024), nullable=True)
|
||||
|
||||
@property
|
||||
def pxx_driver_names(self) -> Dict[str, str]:
|
||||
return json.loads(self.pxx_driver_names_json)
|
||||
|
||||
@pxx_driver_names.setter
|
||||
def pxx_driver_names(self, new_pxx_driver_names: Dict[str, str]):
|
||||
self.pxx_driver_names_json = json.dumps(new_pxx_driver_names)
|
||||
|
||||
@property
|
||||
def first_dnf_driver_names(self) -> List[str]:
|
||||
return json.loads(self.first_dnf_driver_names_json)
|
||||
|
||||
@first_dnf_driver_names.setter
|
||||
def first_dnf_driver_names(self, new_first_dnf_driver_names: List[str]):
|
||||
self.first_dnf_driver_names_json = json.dumps(new_first_dnf_driver_names)
|
||||
|
||||
@property
|
||||
def dnf_driver_names(self) -> List[str]:
|
||||
return json.loads(self.dnf_driver_names_json)
|
||||
|
||||
@dnf_driver_names.setter
|
||||
def dnf_driver_names(self, new_dnf_driver_names: List[str]):
|
||||
self.dnf_driver_names_json = json.dumps(new_dnf_driver_names)
|
||||
|
||||
@property
|
||||
def excluded_driver_names(self) -> List[str]:
|
||||
return json.loads(self.excluded_driver_names_json)
|
||||
|
||||
@excluded_driver_names.setter
|
||||
def excluded_driver_names(self, new_excluded_driver_names: List[str]):
|
||||
self.excluded_driver_names_json = json.dumps(new_excluded_driver_names)
|
||||
|
||||
# Relationships
|
||||
race: Mapped["Race"] = relationship("Race", foreign_keys=[race_name])
|
||||
_pxx_drivers: Dict[str, Driver] | None = None
|
||||
_first_dnf_drivers: List[Driver] | None = None
|
||||
_dnf_drivers: List[Driver] | None = None
|
||||
_excluded_drivers: List[Driver] | None = None
|
||||
|
||||
@property
|
||||
def pxx_drivers(self) -> Dict[str, Driver]:
|
||||
if self._pxx_drivers is None:
|
||||
self._pxx_drivers = dict()
|
||||
for position, driver_name in self.pxx_driver_names.items():
|
||||
driver: Driver | None = db.session.query(Driver).filter_by(name=driver_name).first()
|
||||
if driver is None:
|
||||
raise Exception(f"Error: Couldn't find driver with id {driver_name}")
|
||||
|
||||
self._pxx_drivers[position] = driver
|
||||
|
||||
return self._pxx_drivers
|
||||
|
||||
def pxx_driver(self, offset: int = 0) -> Driver | None:
|
||||
pxx_num: str = str(self.race.pxx + offset)
|
||||
|
||||
if pxx_num not in self.pxx_drivers:
|
||||
raise Exception(f"Position {pxx_num} not found in RaceResult.pxx_drivers")
|
||||
|
||||
if self.pxx_drivers[pxx_num].name in self.excluded_driver_names:
|
||||
none_driver: Driver | None = db.session.query(Driver).filter_by(name="None").first()
|
||||
if none_driver is None:
|
||||
raise Exception(f"NONE-driver not found in database")
|
||||
|
||||
return none_driver
|
||||
|
||||
|
||||
return self.pxx_drivers[pxx_num]
|
||||
|
||||
def pxx_driver_position_string(self, driver_name: str) -> str:
|
||||
for position, driver in self.pxx_driver_names.items():
|
||||
if driver == driver_name and driver not in self.excluded_driver_names:
|
||||
return f"P{position}"
|
||||
|
||||
return "NC"
|
||||
|
||||
@property
|
||||
def all_positions(self) -> List[Driver]:
|
||||
return [
|
||||
self.pxx_drivers[str(position)] for position in range(1, 21)
|
||||
]
|
||||
|
||||
@property
|
||||
def first_dnf_drivers(self) -> List[Driver]:
|
||||
if self._first_dnf_drivers is None:
|
||||
self._first_dnf_drivers = list()
|
||||
for driver_name in self.first_dnf_driver_names:
|
||||
driver: Driver | None = db.session.query(Driver).filter_by(name=driver_name).first()
|
||||
if driver is None:
|
||||
raise Exception(f"Error: Couldn't find driver with id {driver_name}")
|
||||
|
||||
self._first_dnf_drivers.append(driver)
|
||||
|
||||
if len(self._first_dnf_drivers) == 0:
|
||||
none_driver: Driver | None = db.session.query(Driver).filter_by(name="None").first()
|
||||
if none_driver is None:
|
||||
raise Exception("NONE-driver not found in database")
|
||||
|
||||
self._first_dnf_drivers.append(none_driver)
|
||||
|
||||
return self._first_dnf_drivers
|
||||
|
||||
@property
|
||||
def dnf_drivers(self) -> List[Driver]:
|
||||
if self._dnf_drivers is None:
|
||||
self._dnf_drivers = list()
|
||||
for driver_name in self.dnf_driver_names:
|
||||
driver: Driver | None = db.session.query(Driver).filter_by(name=driver_name).first()
|
||||
if driver is None:
|
||||
raise Exception(f"Error: Couldn't find driver with id {driver_name}")
|
||||
|
||||
self._dnf_drivers.append(driver)
|
||||
|
||||
return self._dnf_drivers
|
||||
|
||||
@property
|
||||
def excluded_drivers(self) -> List[Driver]:
|
||||
if self._excluded_drivers is None:
|
||||
self._excluded_drivers = list()
|
||||
for driver_name in self.excluded_driver_names:
|
||||
driver: Driver | None = db.session.query(Driver).filter_by(name=driver_name).first()
|
||||
if driver is None:
|
||||
raise Exception(f"Error: Couldn't find driver with id {driver_name}")
|
||||
|
||||
self._excluded_drivers.append(driver)
|
||||
|
||||
return self._excluded_drivers
|
81
formula10/database/model/season_guess.py
Normal file
81
formula10/database/model/season_guess.py
Normal file
@ -0,0 +1,81 @@
|
||||
from typing import Any, List
|
||||
from sqlalchemy import ForeignKey, String
|
||||
from sqlalchemy.orm import Mapped, mapped_column, relationship
|
||||
|
||||
from formula10.database.model.driver import Driver
|
||||
from formula10.database.model.podium_drivers import PodiumDrivers
|
||||
from formula10.database.model.team import Team
|
||||
from formula10.database.model.team_winners import TeamWinners
|
||||
from formula10.database.model.user import User
|
||||
from formula10 import db
|
||||
|
||||
class SeasonGuess(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_id", "podium_drivers_id"]
|
||||
|
||||
def __init__(self, user_name: str, team_winners_user_name: str | None = None, podium_drivers_user_name: str | None = None):
|
||||
self.user_name = user_name # Primary key
|
||||
|
||||
# Although this is the same username, handle separately, in case they don't exist in the database yet
|
||||
if team_winners_user_name is not None:
|
||||
if user_name != team_winners_user_name:
|
||||
raise Exception(f"SeasonGuess for {user_name} was supplied TeamWinners for {team_winners_user_name}")
|
||||
|
||||
self.team_winners_id = team_winners_user_name
|
||||
|
||||
if podium_drivers_user_name is not None:
|
||||
if user_name != podium_drivers_user_name:
|
||||
raise Exception(f"SeasonGuess for {user_name} was supplied PodiumDrivers for {podium_drivers_user_name}")
|
||||
|
||||
self.podium_drivers_id = podium_drivers_user_name
|
||||
|
||||
@staticmethod
|
||||
def from_csv(row: List[str]):
|
||||
season_guess: SeasonGuess = SeasonGuess(str(row[0]), team_winners_user_name=str(row[7]), podium_drivers_user_name=str(row[8]))
|
||||
season_guess.hot_take = str(row[1])
|
||||
season_guess.p2_team_name = str(row[2])
|
||||
season_guess.overtake_driver_name = str(row[3])
|
||||
season_guess.dnf_driver_name = str(row[4])
|
||||
season_guess.gained_driver_name = str(row[5])
|
||||
season_guess.lost_driver_name = str(row[6])
|
||||
return 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_id,
|
||||
self.podium_drivers_id
|
||||
]
|
||||
|
||||
user_name: Mapped[str] = mapped_column(ForeignKey("user.name"), primary_key=True)
|
||||
hot_take: Mapped[str] = mapped_column(String(512), nullable=True)
|
||||
p2_team_name: Mapped[str] = mapped_column(ForeignKey("team.name"), nullable=True)
|
||||
overtake_driver_name: Mapped[str] = mapped_column(ForeignKey("driver.name"), nullable=True)
|
||||
dnf_driver_name: Mapped[str] = mapped_column(ForeignKey("driver.name"), nullable=True)
|
||||
gained_driver_name: Mapped[str] = mapped_column(ForeignKey("driver.name"), nullable=True)
|
||||
lost_driver_name: Mapped[str] = mapped_column(ForeignKey("driver.name"), nullable=True)
|
||||
|
||||
team_winners_id: Mapped[str] = mapped_column(ForeignKey("teamwinners.user_name"))
|
||||
podium_drivers_id: Mapped[str] = mapped_column(ForeignKey("podiumdrivers.user_name"))
|
||||
|
||||
# Relationships
|
||||
user: Mapped["User"] = relationship("User", foreign_keys=[user_name])
|
||||
p2_team: Mapped["Team"] = relationship("Team", foreign_keys=[p2_team_name])
|
||||
overtake_driver: Mapped["Driver"] = relationship("Driver", foreign_keys=[overtake_driver_name])
|
||||
dnf_driver: Mapped["Driver"] = relationship("Driver", foreign_keys=[dnf_driver_name])
|
||||
gained_driver: Mapped["Driver"] = relationship("Driver", foreign_keys=[gained_driver_name])
|
||||
lost_driver: Mapped["Driver"] = relationship("Driver", foreign_keys=[lost_driver_name])
|
||||
|
||||
team_winners: Mapped["TeamWinners"] = relationship("TeamWinners", foreign_keys=[team_winners_id])
|
||||
podium_drivers: Mapped["PodiumDrivers"] = relationship("PodiumDrivers", foreign_keys=[podium_drivers_id])
|
19
formula10/database/model/team.py
Normal file
19
formula10/database/model/team.py
Normal file
@ -0,0 +1,19 @@
|
||||
from typing import List
|
||||
from sqlalchemy import String
|
||||
from sqlalchemy.orm import Mapped, mapped_column
|
||||
|
||||
from formula10 import db
|
||||
|
||||
class Team(db.Model):
|
||||
"""
|
||||
A constructor/team (name only).
|
||||
"""
|
||||
__tablename__ = "team"
|
||||
|
||||
@staticmethod
|
||||
def from_csv(row: List[str]):
|
||||
team: Team = Team()
|
||||
team.name = str(row[0])
|
||||
return team
|
||||
|
||||
name: Mapped[str] = mapped_column(String(32), primary_key=True)
|
59
formula10/database/model/team_winners.py
Normal file
59
formula10/database/model/team_winners.py
Normal file
@ -0,0 +1,59 @@
|
||||
import json
|
||||
from typing import Any, List
|
||||
from sqlalchemy import ForeignKey, String
|
||||
from sqlalchemy.orm import Mapped, mapped_column, relationship
|
||||
|
||||
from formula10.database.model.driver import Driver
|
||||
from formula10.database.model.user import User
|
||||
from formula10 import db
|
||||
|
||||
class TeamWinners(db.Model):
|
||||
"""
|
||||
A guessed list of each best driver per team.
|
||||
"""
|
||||
__tablename__ = "teamwinners"
|
||||
__allow_unmapped__ = True
|
||||
__csv_header__ = ["user_name", "teamwinner_driver_names_json"]
|
||||
|
||||
def __init__(self, user_name: str):
|
||||
self.user_name = user_name # Primary key
|
||||
|
||||
@staticmethod
|
||||
def from_csv(row: List[str]):
|
||||
team_winners: TeamWinners = TeamWinners(str(row[0]))
|
||||
team_winners.teamwinner_driver_names_json = str(row[1])
|
||||
return team_winners
|
||||
|
||||
def to_csv(self) -> List[Any]:
|
||||
return [
|
||||
self.user_name,
|
||||
self.teamwinner_driver_names_json
|
||||
]
|
||||
|
||||
user_name: Mapped[str] = mapped_column(ForeignKey("user.name"), primary_key=True)
|
||||
teamwinner_driver_names_json: Mapped[str] = mapped_column(String(1024), nullable=True)
|
||||
|
||||
@property
|
||||
def teamwinner_driver_names(self) -> List[str]:
|
||||
return json.loads(self.teamwinner_driver_names_json)
|
||||
|
||||
@teamwinner_driver_names.setter
|
||||
def teamwinner_driver_names(self, new_teamwinner_driver_names: List[str]):
|
||||
self.teamwinner_driver_names_json = json.dumps(new_teamwinner_driver_names)
|
||||
|
||||
# Relationships
|
||||
user: Mapped["User"] = relationship("User", foreign_keys=[user_name])
|
||||
_teamwinner_drivers: List[Driver] | None = None
|
||||
|
||||
@property
|
||||
def teamwinners(self) -> List[Driver]:
|
||||
if self._teamwinner_drivers is None:
|
||||
self._teamwinner_drivers = list()
|
||||
for driver_name in self.teamwinner_driver_names:
|
||||
driver: Driver | None = db.session.query(Driver).filter_by(name=driver_name).first()
|
||||
if driver is None:
|
||||
raise Exception(f"Error: Couldn't find driver with id {driver_name}")
|
||||
|
||||
self._teamwinner_drivers.append(driver)
|
||||
|
||||
return self._teamwinner_drivers
|
32
formula10/database/model/user.py
Normal file
32
formula10/database/model/user.py
Normal file
@ -0,0 +1,32 @@
|
||||
from typing import Any, List
|
||||
from urllib.parse import quote
|
||||
from sqlalchemy import String
|
||||
from sqlalchemy.orm import Mapped, mapped_column
|
||||
|
||||
from formula10 import db
|
||||
|
||||
class User(db.Model):
|
||||
"""
|
||||
A user that can guess races (name only).
|
||||
"""
|
||||
__tablename__ = "user"
|
||||
__csv_header__ = ["name"]
|
||||
|
||||
def __init__(self, name: str):
|
||||
self.name = name # Primary key
|
||||
|
||||
@staticmethod
|
||||
def from_csv(row: List[str]):
|
||||
user: User = User(str(row[0]))
|
||||
return user
|
||||
|
||||
def to_csv(self) -> List[Any]:
|
||||
return [
|
||||
self.name
|
||||
]
|
||||
|
||||
@property
|
||||
def name_sanitized(self) -> str:
|
||||
return quote(self.name)
|
||||
|
||||
name: Mapped[str] = mapped_column(String(32), primary_key=True)
|
228
formula10/database/update_query_util.py
Normal file
228
formula10/database/update_query_util.py
Normal file
@ -0,0 +1,228 @@
|
||||
from typing import Dict, List, cast
|
||||
from urllib.parse import quote
|
||||
from flask import redirect
|
||||
from werkzeug import Response
|
||||
|
||||
from formula10.database.common_query_util import race_has_result, user_exists
|
||||
from formula10.database.model.podium_drivers import PodiumDrivers
|
||||
from formula10.database.model.race_guess import RaceGuess
|
||||
from formula10.database.model.race_result import RaceResult
|
||||
from formula10.database.model.season_guess import SeasonGuess
|
||||
from formula10.database.model.team_winners import TeamWinners
|
||||
from formula10.database.model.user import User
|
||||
from formula10.database.validation_util import any_is_none, positions_are_contiguous
|
||||
from formula10 import db
|
||||
|
||||
|
||||
def find_or_create_race_guess(user_name: str, race_name: str) -> RaceGuess:
|
||||
# There can be a single RaceGuess at most, since (user_name, race_name) is the composite primary key
|
||||
race_guess: RaceGuess | None = db.session.query(RaceGuess).filter_by(user_name=user_name, race_name=race_name).first()
|
||||
if race_guess is not None:
|
||||
return race_guess
|
||||
|
||||
# Insert a new RaceGuess
|
||||
race_guess = RaceGuess(user_name=user_name, race_name=race_name)
|
||||
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(RaceGuess).filter_by(user_name=user_name, race_name=race_name).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 redirect(f"/race/{quote(user_name)}")
|
||||
|
||||
pxx_driver_name: str = cast(str, pxx_select)
|
||||
dnf_driver_name: str = cast(str, dnf_select)
|
||||
|
||||
# TODO: Date-lock this. Otherwise there is a period of time after the race
|
||||
# but before the result where guesses can still be entered
|
||||
# We can't guess for races that are already over
|
||||
if race_has_result(race_name):
|
||||
return redirect(f"/race/{quote(user_name)}")
|
||||
|
||||
race_guess: RaceGuess = 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
|
||||
|
||||
db.session.commit()
|
||||
|
||||
return redirect("/race/Everyone")
|
||||
|
||||
|
||||
def delete_race_guess(race_name: str, user_name: str) -> Response:
|
||||
# Don't change guesses that are already over
|
||||
if race_has_result(race_name):
|
||||
return redirect(f"/race/{quote(user_name)}")
|
||||
|
||||
db.session.query(RaceGuess).filter_by(race_name=race_name, user_name=user_name).delete()
|
||||
db.session.commit()
|
||||
|
||||
return redirect("/race/Everyone")
|
||||
|
||||
|
||||
def find_or_create_team_winners(user_name: str) -> TeamWinners:
|
||||
# There can be a single TeamWinners at most, since user_name is the primary key
|
||||
team_winners: TeamWinners | None = db.session.query(TeamWinners).filter_by(user_name=user_name).first()
|
||||
if team_winners is not None:
|
||||
return team_winners
|
||||
|
||||
team_winners = TeamWinners(user_name=user_name)
|
||||
db.session.add(team_winners)
|
||||
db.session.commit()
|
||||
|
||||
# Double check if database insertion worked and obtain any values set by the database
|
||||
team_winners = db.session.query(TeamWinners).filter_by(user_name=user_name).first()
|
||||
if team_winners is None:
|
||||
raise Exception("Failed adding TeamWinners to the database")
|
||||
|
||||
return team_winners
|
||||
|
||||
|
||||
def find_or_create_podium_drivers(user_name: str) -> PodiumDrivers:
|
||||
# There can be a single PodiumDrivers at most, since user_name is the primary key
|
||||
podium_drivers: PodiumDrivers | None = db.session.query(PodiumDrivers).filter_by(user_name=user_name).first()
|
||||
if podium_drivers is not None:
|
||||
return podium_drivers
|
||||
|
||||
podium_drivers = PodiumDrivers(user_name=user_name)
|
||||
db.session.add(podium_drivers)
|
||||
db.session.commit()
|
||||
|
||||
# Double check if database insertion worked and obtain any values set by the database
|
||||
podium_drivers = db.session.query(PodiumDrivers).filter_by(user_name=user_name).first()
|
||||
if podium_drivers is None:
|
||||
raise Exception("Failed adding PodiumDrivers to the database")
|
||||
|
||||
return podium_drivers
|
||||
|
||||
|
||||
def find_or_create_season_guess(user_name: str) -> SeasonGuess:
|
||||
# There can be a single SeasonGuess at most, since user_name is the primary key
|
||||
season_guess: SeasonGuess | None = db.session.query(SeasonGuess).filter_by(user_name=user_name).first()
|
||||
if season_guess is not None:
|
||||
# There can't be more than a single one, since both also use user_name as primary key
|
||||
if db.session.query(TeamWinners).filter_by(user_name=user_name).first() is None:
|
||||
raise Exception(f"SeasonGuess for {user_name} is missing associated TeamWinners")
|
||||
if db.session.query(PodiumDrivers).filter_by(user_name=user_name).first() is None:
|
||||
raise Exception(f"SeasonGuess for {user_name} is missing associated PodiumDrivers")
|
||||
|
||||
return season_guess
|
||||
|
||||
# Insert a new SeasonGuess
|
||||
team_winners: TeamWinners = find_or_create_team_winners(user_name)
|
||||
podium_drivers: PodiumDrivers = find_or_create_podium_drivers(user_name)
|
||||
|
||||
season_guess = SeasonGuess(user_name=user_name, team_winners_user_name=team_winners.user_name, podium_drivers_user_name=podium_drivers.user_name)
|
||||
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(SeasonGuess).filter_by(user_name=user_name).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:
|
||||
# Pylance marks type errors here, but those are intended. Columns are marked nullable.
|
||||
|
||||
season_guess: SeasonGuess = find_or_create_season_guess(user_name)
|
||||
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.teamwinner_driver_names = team_winner_guesses # type: ignore
|
||||
season_guess.podium_drivers.podium_driver_names = podium_driver_guesses
|
||||
|
||||
db.session.commit()
|
||||
|
||||
return redirect(f"/season/Everyone")
|
||||
|
||||
|
||||
def find_or_create_race_result(race_name: str) -> RaceResult:
|
||||
# There can be a single RaceResult at most, since race_name is the primary key
|
||||
race_result: RaceResult | None = db.session.query(RaceResult).filter_by(race_name=race_name).first()
|
||||
if race_result is not None:
|
||||
return race_result
|
||||
|
||||
race_result = RaceResult(race_name=race_name)
|
||||
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(RaceResult).filter_by(race_name=race_name).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:
|
||||
# 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)
|
||||
}
|
||||
|
||||
# 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 redirect(f"/result/{quote(race_name)}")
|
||||
|
||||
# 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)
|
||||
|
||||
race_result: RaceResult = find_or_create_race_result(race_name)
|
||||
race_result.pxx_driver_names = pxx_driver_names
|
||||
race_result.first_dnf_driver_names = first_dnf_driver_names_list
|
||||
race_result.dnf_driver_names = dnf_driver_names_list
|
||||
race_result.excluded_driver_names = excluded_driver_names_list
|
||||
|
||||
db.session.commit()
|
||||
|
||||
return redirect(f"/result/{quote(race_name)}")
|
||||
|
||||
|
||||
def update_user(user_name: str | None, add: bool = False, delete: bool = False) -> Response:
|
||||
if user_name is None or len(user_name) < 3:
|
||||
return redirect("/user")
|
||||
|
||||
if not add and not delete:
|
||||
return redirect("/user")
|
||||
|
||||
if add and delete:
|
||||
return redirect("/user")
|
||||
|
||||
if add:
|
||||
if user_exists(user_name):
|
||||
return redirect("/user")
|
||||
|
||||
user: User = User(name=user_name)
|
||||
db.session.add(user)
|
||||
db.session.commit()
|
||||
|
||||
return redirect("/user")
|
||||
|
||||
if delete:
|
||||
if not user_exists(user_name):
|
||||
return redirect("/user")
|
||||
|
||||
db.session.query(User).filter_by(name=user_name).delete()
|
||||
db.session.commit()
|
||||
|
||||
return redirect("/user")
|
||||
|
||||
raise Exception("update_user received illegal combination of arguments")
|
69
formula10/database/validation_util.py
Normal file
69
formula10/database/validation_util.py
Normal file
@ -0,0 +1,69 @@
|
||||
from typing import Any, Callable, Iterable, List, TypeVar
|
||||
|
||||
_T = TypeVar("_T")
|
||||
|
||||
|
||||
def any_is_none(*args: Any) -> bool:
|
||||
for arg in args:
|
||||
if arg is None:
|
||||
return True
|
||||
|
||||
return False
|
||||
|
||||
|
||||
def positions_are_contiguous(positions: List[str]) -> bool:
|
||||
if len(positions) == 0:
|
||||
return True
|
||||
|
||||
positions_unique = set(positions) # Remove duplicates
|
||||
positions_sorted: List[int] = sorted([int(position) for position in positions_unique])
|
||||
|
||||
# [2, 3, 4, 5]: 2 + 3 == 5
|
||||
return positions_sorted[0] + len(positions_sorted) - 1 == positions_sorted[-1]
|
||||
|
||||
|
||||
def find_first_or_none(predicate: Callable[[_T], bool], iterable: Iterable[_T]) -> _T | None:
|
||||
"""
|
||||
Finds the first element in a sequence matching a predicate.
|
||||
Returns None if no element is found.
|
||||
"""
|
||||
return next(filter(predicate, iterable), None)
|
||||
|
||||
|
||||
def find_multiple(predicate: Callable[[_T], bool], iterable: Iterable[_T], count: int = 0) -> List[_T]:
|
||||
"""
|
||||
Finds <count> elements in a sequence matching a predicate (finds all if <count> is 0).
|
||||
Throws exception if more/fewer elements were found than specified.
|
||||
"""
|
||||
filtered = list(filter(predicate, iterable))
|
||||
|
||||
if count != 0 and len(filtered) != count:
|
||||
raise Exception(f"find_multiple found {len(filtered)} matching elements but expected {count}")
|
||||
|
||||
return filtered
|
||||
|
||||
|
||||
def find_single(predicate: Callable[[_T], bool], iterable: Iterable[_T]) -> _T:
|
||||
"""
|
||||
Find a single element in a sequence matching a predicate.
|
||||
Throws exception if more/less than a single element is found.
|
||||
"""
|
||||
filtered = list(filter(predicate, iterable))
|
||||
|
||||
if len(filtered) != 1:
|
||||
raise Exception(f"find_single found {len(filtered)} matching elements but expected 1")
|
||||
|
||||
return filtered[0]
|
||||
|
||||
|
||||
def find_single_or_none(predicate: Callable[[_T], bool], iterable: Iterable[_T]) -> _T | None:
|
||||
"""
|
||||
Find a single element in a sequence matching a predicate if it exists.
|
||||
Only throws exception if more than a single element is found.
|
||||
"""
|
||||
filtered = list(filter(predicate, iterable))
|
||||
|
||||
if len(filtered) > 1:
|
||||
raise Exception(f"find_single_or_none found {len(list(filtered))} matching elements but expected 0 or 1")
|
||||
|
||||
return filtered[0] if len(filtered) == 1 else None
|
260
formula10/frontend/template_model.py
Normal file
260
formula10/frontend/template_model.py
Normal file
@ -0,0 +1,260 @@
|
||||
from typing import List, Callable, Dict, overload
|
||||
from sqlalchemy import desc
|
||||
|
||||
from formula10.database.model.driver import Driver
|
||||
from formula10.database.model.race import Race
|
||||
from formula10.database.model.race_guess import RaceGuess
|
||||
from formula10.database.model.race_result import RaceResult
|
||||
from formula10.database.model.season_guess import SeasonGuess
|
||||
from formula10.database.model.team import Team
|
||||
from formula10.database.model.user import User
|
||||
from formula10.database.validation_util import find_first_or_none, find_multiple, find_single, find_single_or_none
|
||||
from formula10 import db
|
||||
|
||||
|
||||
# This could also be moved to database_utils (at least partially), but I though the template should cache the database responses
|
||||
class TemplateModel:
|
||||
"""
|
||||
This class bundles all data required from inside a template.
|
||||
"""
|
||||
|
||||
_all_users: List[User] | None = None
|
||||
_all_race_results: List[RaceResult] | None = None
|
||||
_all_race_guesses: List[RaceGuess] | None = None
|
||||
_all_season_guesses: List[SeasonGuess] | None = None
|
||||
_all_races: List[Race] | None = None
|
||||
_all_drivers: List[Driver] | None = None
|
||||
_all_teams: List[Team] | None = None
|
||||
|
||||
def all_users(self) -> List[User]:
|
||||
"""
|
||||
Returns a list of all users in the database.
|
||||
"""
|
||||
if self._all_users is None:
|
||||
self._all_users = db.session.query(User).all()
|
||||
|
||||
return self._all_users
|
||||
|
||||
@overload
|
||||
def user_by(self, *, user_name: str) -> User:
|
||||
"""
|
||||
Tries to obtain the user object for a specific username.
|
||||
"""
|
||||
return self.user_by(user_name=user_name)
|
||||
|
||||
@overload
|
||||
def user_by(self, *, user_name: str, ignore: List[str]) -> User | None:
|
||||
"""
|
||||
Tries to obtain the user object for a specific username, but ignores certain usernames.
|
||||
"""
|
||||
return self.user_by(user_name=user_name, ignore=ignore)
|
||||
|
||||
def user_by(self, *, user_name: str, ignore: List[str] | None = None) -> User | None:
|
||||
if ignore is None:
|
||||
ignore = []
|
||||
|
||||
if len(ignore) > 0 and user_name in ignore:
|
||||
return None
|
||||
|
||||
predicate: Callable[[User], bool] = lambda user: user.name == user_name
|
||||
return find_single(predicate, self.all_users())
|
||||
|
||||
def all_race_results(self) -> List[RaceResult]:
|
||||
"""
|
||||
Returns a list of all race results in the database, in descending order (most recent first).
|
||||
"""
|
||||
if self._all_race_results is None:
|
||||
self._all_race_results = db.session.query(RaceResult).join(RaceResult.race).order_by(desc(Race.number)).all()
|
||||
|
||||
return self._all_race_results
|
||||
|
||||
def race_result_by(self, *, race_name: str) -> RaceResult | None:
|
||||
"""
|
||||
Tries to obtain the race result corresponding to a race name.
|
||||
"""
|
||||
predicate: Callable[[RaceResult], bool] = lambda result: result.race.name == race_name
|
||||
return find_single_or_none(predicate, self.all_race_results())
|
||||
|
||||
def all_race_guesses(self) -> List[RaceGuess]:
|
||||
"""
|
||||
Returns a list of all race guesses in the database.
|
||||
"""
|
||||
if self._all_race_guesses is None:
|
||||
self._all_race_guesses = db.session.query(RaceGuess).all()
|
||||
|
||||
return self._all_race_guesses
|
||||
|
||||
@overload
|
||||
def race_guesses_by(self, *, user_name: str) -> List[RaceGuess]:
|
||||
"""
|
||||
Returns a list of all race guesses made by a specific user.
|
||||
"""
|
||||
return self.race_guesses_by(user_name=user_name)
|
||||
|
||||
@overload
|
||||
def race_guesses_by(self, *, race_name: str) -> List[RaceGuess]:
|
||||
"""
|
||||
Returns a list of all race guesses made for a specific race.
|
||||
"""
|
||||
return self.race_guesses_by(race_name=race_name)
|
||||
|
||||
@overload
|
||||
def race_guesses_by(self, *, user_name: str, race_name: str) -> RaceGuess | None:
|
||||
"""
|
||||
Returns a single race guess by a specific user for a specific race, or None, if this guess doesn't exist.
|
||||
"""
|
||||
return self.race_guesses_by(user_name=user_name, race_name=race_name)
|
||||
|
||||
@overload
|
||||
def race_guesses_by(self) -> Dict[str, Dict[str, RaceGuess]]:
|
||||
"""
|
||||
Returns a dictionary that maps race-ids to user-id - guess dictionaries.
|
||||
"""
|
||||
return self.race_guesses_by()
|
||||
|
||||
def race_guesses_by(self, *, user_name: str | None = None, race_name: str | None = None) -> RaceGuess | List[RaceGuess] | Dict[str, Dict[str, RaceGuess]] | None:
|
||||
# List of all guesses by a single user
|
||||
if user_name is not None and race_name is None:
|
||||
predicate: Callable[[RaceGuess], bool] = lambda guess: guess.user_name == user_name
|
||||
return find_multiple(predicate, self.all_race_guesses())
|
||||
|
||||
# List of all guesses for a single race
|
||||
if user_name is None and race_name is not None:
|
||||
predicate: Callable[[RaceGuess], bool] = lambda guess: guess.race_name == race_name
|
||||
return find_multiple(predicate, self.all_race_guesses())
|
||||
|
||||
# Guess for a single race by a single user
|
||||
if user_name is not None and race_name is not None:
|
||||
predicate: Callable[[RaceGuess], bool] = lambda guess: guess.user_name == user_name and guess.race_name == race_name
|
||||
return find_single_or_none(predicate, self.all_race_guesses())
|
||||
|
||||
# Dict with all guesses
|
||||
if user_name is None and race_name is None:
|
||||
guesses_by: Dict[str, Dict[str, RaceGuess]] = dict()
|
||||
guess: RaceGuess
|
||||
|
||||
for guess in self.all_race_guesses():
|
||||
if guess.race_name not in guesses_by:
|
||||
guesses_by[guess.race_name] = dict()
|
||||
|
||||
guesses_by[guess.race_name][guess.user_name] = guess
|
||||
|
||||
return guesses_by
|
||||
|
||||
raise Exception("race_guesses_by encountered illegal combination of arguments")
|
||||
|
||||
def all_season_guesses(self) -> List[SeasonGuess]:
|
||||
if self._all_season_guesses is None:
|
||||
self._all_season_guesses = db.session.query(SeasonGuess).all()
|
||||
|
||||
return self._all_season_guesses
|
||||
|
||||
@overload
|
||||
def season_guesses_by(self, *, user_name: str) -> SeasonGuess:
|
||||
"""
|
||||
Returns the season guess made by a specific user.
|
||||
"""
|
||||
return self.season_guesses_by(user_name=user_name)
|
||||
|
||||
@overload
|
||||
def season_guesses_by(self) -> Dict[str, SeasonGuess]:
|
||||
"""
|
||||
Returns a dictionary of season guesses mapped to usernames.
|
||||
"""
|
||||
return self.season_guesses_by()
|
||||
|
||||
def season_guesses_by(self, *, user_name: str | None = None) -> SeasonGuess | Dict[str, SeasonGuess] | None:
|
||||
if user_name is not None:
|
||||
predicate: Callable[[SeasonGuess], bool] = lambda guess: guess.user_name == user_name
|
||||
return find_single_or_none(predicate, self.all_season_guesses())
|
||||
|
||||
if user_name is None:
|
||||
guesses_by: Dict[str, SeasonGuess] = dict()
|
||||
guess: SeasonGuess
|
||||
|
||||
for guess in self.all_season_guesses():
|
||||
guesses_by[guess.user_name] = guess
|
||||
|
||||
return guesses_by
|
||||
|
||||
raise Exception("season_guesses_by encountered illegal combination of arguments")
|
||||
|
||||
def all_races(self) -> List[Race]:
|
||||
"""
|
||||
Returns a list of all races in the database.
|
||||
"""
|
||||
if self._all_races is None:
|
||||
self._all_races = db.session.query(Race).order_by(desc(Race.number)).all()
|
||||
|
||||
return self._all_races
|
||||
|
||||
def first_race_without_result(self) -> Race | None:
|
||||
"""
|
||||
Returns the first race-object with no associated race result.
|
||||
"""
|
||||
results: List[RaceResult] = self.all_race_results()
|
||||
if len(results) == 0:
|
||||
return self.all_races()[-1] # all_races is sorted descending by number
|
||||
|
||||
most_recent_result: RaceResult = results[0]
|
||||
predicate: Callable[[Race], bool] = lambda race: race.number == most_recent_result.race.number + 1
|
||||
|
||||
return find_first_or_none(predicate, self.all_races())
|
||||
|
||||
def all_teams(self) -> List[Team]:
|
||||
"""
|
||||
Returns a list of all teams in the database.
|
||||
"""
|
||||
if self._all_teams is None:
|
||||
self._all_teams = db.session.query(Team).all()
|
||||
|
||||
return self._all_teams
|
||||
|
||||
def all_drivers(self) -> List[Driver]:
|
||||
"""
|
||||
Returns a list of all drivers in the database, including the NONE driver.
|
||||
"""
|
||||
if self._all_drivers is None:
|
||||
self._all_drivers = db.session.query(Driver).all()
|
||||
|
||||
return self._all_drivers
|
||||
|
||||
def all_drivers_except_none(self) -> List[Driver]:
|
||||
"""
|
||||
Returns a list of all drivers in the database, excluding the NONE driver.
|
||||
"""
|
||||
predicate: Callable[[Driver], bool] = lambda driver: driver.name != "None"
|
||||
return find_multiple(predicate, self.all_drivers())
|
||||
|
||||
@overload
|
||||
def drivers_by(self, *, team_name: str) -> List[Driver]:
|
||||
"""
|
||||
Returns a list of all drivers driving for a certain team.
|
||||
"""
|
||||
return self.drivers_by(team_name=team_name)
|
||||
|
||||
@overload
|
||||
def drivers_by(self) -> Dict[str, List[Driver]]:
|
||||
"""
|
||||
Returns a dictionary of drivers mapped to team names.
|
||||
"""
|
||||
return self.drivers_by()
|
||||
|
||||
def drivers_by(self, *, team_name: str | None = None) -> List[Driver] | Dict[str, List[Driver]]:
|
||||
if team_name is not None:
|
||||
predicate: Callable[[Driver], bool] = lambda driver: driver.team.name == team_name
|
||||
return find_multiple(predicate, self.all_drivers_except_none(), 2)
|
||||
|
||||
if team_name is None:
|
||||
drivers_by: Dict[str, List[Driver]] = dict()
|
||||
driver: Driver
|
||||
team: Team
|
||||
|
||||
for team in self.all_teams():
|
||||
drivers_by[team.name] = []
|
||||
for driver in self.all_drivers_except_none():
|
||||
drivers_by[driver.team.name] += [driver]
|
||||
|
||||
return drivers_by
|
||||
|
||||
raise Exception("drivers_by encountered illegal combination of arguments")
|
0
formula10/logic/points_model.py
Normal file
0
formula10/logic/points_model.py
Normal file
16
formula10/static/image/f1_logo.svg
Normal file
16
formula10/static/image/f1_logo.svg
Normal file
@ -0,0 +1,16 @@
|
||||
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 120 30" version="1.1" class="injected-svg js-svg-inject">
|
||||
<!-- Generator: Sketch 49.1 (51147) - http://www.bohemiancoding.com/sketch -->
|
||||
<title>Logos / F1-logo red</title>
|
||||
<desc>Created with Sketch.</desc>
|
||||
<defs>
|
||||
<path d="M101.086812,30 L101.711812,30 L101.711812,27.106875 L101.722437,27.106875 L102.761812,30 L103.302437,30 L104.341812,27.106875 L104.352437,27.106875 L104.352437,30 L104.977437,30 L104.977437,26.25125 L104.063687,26.25125 L103.055562,29.18625 L103.044937,29.18625 L102.011187,26.25125 L101.086812,26.25125 L101.086812,30 Z M97.6274375,26.818125 L98.8136875,26.818125 L98.8136875,30 L99.4699375,30 L99.4699375,26.818125 L100.661812,26.818125 L100.661812,26.25125 L97.6274375,26.25125 L97.6274375,26.818125 Z M89.9999375,30 L119.999937,0 L101.943687,0 L71.9443125,30 L89.9999375,30 Z M85.6986875,13.065 L49.3818125,13.065 C38.3136875,13.065 36.3768125,13.651875 31.6361875,18.3925 C27.2024375,22.82625 20.0005625,30 20.0005625,30 L35.7324375,30 L39.4855625,26.246875 C41.9530625,23.779375 43.2255625,23.52375 48.4068125,23.52375 L75.2405625,23.52375 L85.6986875,13.065 Z M31.1518125,16.253125 C27.8774375,19.3425 20.7530625,26.263125 16.9130625,30 L-6.25e-05,30 C-6.25e-05,30 13.5524375,16.486875 21.0849375,9.0725 C28.8455625,1.685 32.7143125,0 46.9486875,0 L98.7643125,0 L87.5449375,11.21875 L48.0011875,11.21875 C37.9993125,11.21875 35.7518125,11.911875 31.1518125,16.253125 Z" id="path-1"/>
|
||||
</defs>
|
||||
<g id="Logos-/-F1-logo-red" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
|
||||
<g id="Page-1">
|
||||
<mask id="mask-2" fill="white">
|
||||
<use xlink:href="#path-1"/>
|
||||
</mask>
|
||||
<use id="Fill-1" fill="#EE0000" xlink:href="#path-1"/>
|
||||
</g>
|
||||
</g>
|
||||
</svg>
|
After Width: | Height: | Size: 1.8 KiB |
16
formula10/static/image/favicon.svg
Normal file
16
formula10/static/image/favicon.svg
Normal file
@ -0,0 +1,16 @@
|
||||
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 120 60" version="1.1" class="injected-svg js-svg-inject">
|
||||
<!-- Generator: Sketch 49.1 (51147) - http://www.bohemiancoding.com/sketch -->
|
||||
<title>Logos / F1-logo red</title>
|
||||
<desc>Created with Sketch.</desc>
|
||||
<defs>
|
||||
<path d="M101.086812,30 L101.711812,30 L101.711812,27.106875 L101.722437,27.106875 L102.761812,30 L103.302437,30 L104.341812,27.106875 L104.352437,27.106875 L104.352437,30 L104.977437,30 L104.977437,26.25125 L104.063687,26.25125 L103.055562,29.18625 L103.044937,29.18625 L102.011187,26.25125 L101.086812,26.25125 L101.086812,30 Z M97.6274375,26.818125 L98.8136875,26.818125 L98.8136875,30 L99.4699375,30 L99.4699375,26.818125 L100.661812,26.818125 L100.661812,26.25125 L97.6274375,26.25125 L97.6274375,26.818125 Z M89.9999375,30 L119.999937,0 L101.943687,0 L71.9443125,30 L89.9999375,30 Z M85.6986875,13.065 L49.3818125,13.065 C38.3136875,13.065 36.3768125,13.651875 31.6361875,18.3925 C27.2024375,22.82625 20.0005625,30 20.0005625,30 L35.7324375,30 L39.4855625,26.246875 C41.9530625,23.779375 43.2255625,23.52375 48.4068125,23.52375 L75.2405625,23.52375 L85.6986875,13.065 Z M31.1518125,16.253125 C27.8774375,19.3425 20.7530625,26.263125 16.9130625,30 L-6.25e-05,30 C-6.25e-05,30 13.5524375,16.486875 21.0849375,9.0725 C28.8455625,1.685 32.7143125,0 46.9486875,0 L98.7643125,0 L87.5449375,11.21875 L48.0011875,11.21875 C37.9993125,11.21875 35.7518125,11.911875 31.1518125,16.253125 Z" id="path-1"/>
|
||||
</defs>
|
||||
<g id="Logos-/-F1-logo-red" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
|
||||
<g id="Page-1">
|
||||
<mask id="mask-2" fill="white">
|
||||
<use xlink:href="#path-1"/>
|
||||
</mask>
|
||||
<use id="Fill-1" fill="#EE0000" xlink:href="#path-1"/>
|
||||
</g>
|
||||
</g>
|
||||
</svg>
|
After Width: | Height: | Size: 1.8 KiB |
6314
formula10/static/script/bootstrap.bundle.js
vendored
Normal file
6314
formula10/static/script/bootstrap.bundle.js
vendored
Normal file
File diff suppressed because it is too large
Load Diff
7
formula10/static/script/bootstrap.bundle.min.js
vendored
Normal file
7
formula10/static/script/bootstrap.bundle.min.js
vendored
Normal file
File diff suppressed because one or more lines are too long
78
formula10/static/script/draggable.js
Normal file
78
formula10/static/script/draggable.js
Normal file
@ -0,0 +1,78 @@
|
||||
// https://codepen.io/retrofuturistic/pen/DJWYBv
|
||||
|
||||
let dragSrcEl = null;
|
||||
|
||||
function handleDragStart(e) {
|
||||
// Target (this) element is the source node.
|
||||
dragSrcEl = this;
|
||||
|
||||
e.dataTransfer.effectAllowed = 'move';
|
||||
e.dataTransfer.setData('text/html', this.outerHTML);
|
||||
|
||||
this.classList.add('dragElem');
|
||||
}
|
||||
|
||||
function handleDragOver(e) {
|
||||
if (e.preventDefault) {
|
||||
e.preventDefault(); // Necessary. Allows us to drop.
|
||||
}
|
||||
this.classList.add('over');
|
||||
|
||||
e.dataTransfer.dropEffect = 'move'; // See the section on the DataTransfer object.
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
function handleDragEnter(e) {
|
||||
// this / e.target is the current hover target.
|
||||
}
|
||||
|
||||
function handleDragLeave(e) {
|
||||
this.classList.remove('over'); // this / e.target is previous target element.
|
||||
}
|
||||
|
||||
function handleDrop(e) {
|
||||
// this/e.target is current target element.
|
||||
|
||||
if (e.stopPropagation) {
|
||||
e.stopPropagation(); // Stops some browsers from redirecting.
|
||||
}
|
||||
|
||||
// Don't do anything if dropping the same column we're dragging.
|
||||
if (dragSrcEl != this) {
|
||||
// Set the source column's HTML to the HTML of the column we dropped on.
|
||||
//alert(this.outerHTML);
|
||||
//dragSrcEl.innerHTML = this.innerHTML;
|
||||
//this.innerHTML = e.dataTransfer.getData('text/html');
|
||||
this.parentNode.removeChild(dragSrcEl);
|
||||
let dropHTML = e.dataTransfer.getData('text/html');
|
||||
this.insertAdjacentHTML('beforebegin', dropHTML);
|
||||
let dropElem = this.previousSibling;
|
||||
addDnDHandlers(dropElem);
|
||||
}
|
||||
|
||||
this.classList.remove('over');
|
||||
return false;
|
||||
}
|
||||
|
||||
function handleDragEnd(e) {
|
||||
// this/e.target is the source node.
|
||||
this.classList.remove('over');
|
||||
|
||||
/*[].forEach.call(cols, function (col) {
|
||||
col.classList.remove('over');
|
||||
});*/
|
||||
}
|
||||
|
||||
function addDnDHandlers(elem) {
|
||||
elem.addEventListener('dragstart', handleDragStart, false);
|
||||
elem.addEventListener('dragenter', handleDragEnter, false)
|
||||
elem.addEventListener('dragover', handleDragOver, false);
|
||||
elem.addEventListener('dragleave', handleDragLeave, false);
|
||||
elem.addEventListener('drop', handleDrop, false);
|
||||
elem.addEventListener('dragend', handleDragEnd, false);
|
||||
|
||||
}
|
||||
|
||||
const cols = document.querySelectorAll('#columns .column');
|
||||
[].forEach.call(cols, addDnDHandlers);
|
11219
formula10/static/style/bootstrap.css
vendored
Normal file
11219
formula10/static/style/bootstrap.css
vendored
Normal file
File diff suppressed because it is too large
Load Diff
1
formula10/static/style/bootstrap.css.map
Normal file
1
formula10/static/style/bootstrap.css.map
Normal file
File diff suppressed because one or more lines are too long
5
formula10/static/style/bootstrap.scss
vendored
Normal file
5
formula10/static/style/bootstrap.scss
vendored
Normal file
@ -0,0 +1,5 @@
|
||||
// Disable Bootstrap Grid and use CSS Grid instead
|
||||
$enable-grid-classes: false;
|
||||
$enable-cssgrid: true;
|
||||
|
||||
@import "../../bootstrap/scss/bootstrap";
|
21
formula10/static/style/draggable.css
Normal file
21
formula10/static/style/draggable.css
Normal file
@ -0,0 +1,21 @@
|
||||
/* https://codepen.io/retrofuturistic/pen/DJWYBv */
|
||||
|
||||
[draggable] {
|
||||
-moz-user-select: none;
|
||||
-khtml-user-select: none;
|
||||
-webkit-user-select: none;
|
||||
user-select: none;
|
||||
|
||||
/* Required to make elements draggable in old WebKit */
|
||||
-khtml-user-drag: element;
|
||||
-webkit-user-drag: element;
|
||||
}
|
||||
|
||||
.column {
|
||||
cursor: move;
|
||||
}
|
||||
|
||||
.column.over {
|
||||
//border: 2px dashed #000;
|
||||
border-top: 2px solid blue;
|
||||
}
|
196
formula10/templates/base.jinja
Normal file
196
formula10/templates/base.jinja
Normal file
@ -0,0 +1,196 @@
|
||||
<!DOCTYPE html>
|
||||
<html lang="en">
|
||||
|
||||
{# Simple driver dropdown. Requires list of drivers. #}
|
||||
{% macro driver_select(name='', label='', include_none=true) %}
|
||||
<div class="form-floating">
|
||||
<select name="{{ name }}" id="{{ name }}" class="form-select" aria-label="{{ name }}">
|
||||
<option value="" selected disabled hidden></option>
|
||||
{% if include_none == true %}
|
||||
{% set drivers = model.all_drivers() %}
|
||||
{% else %}
|
||||
{% set drivers = model.all_drivers_except_none() %}
|
||||
{% endif %}
|
||||
|
||||
{% for driver in drivers %}
|
||||
<option value="{{ driver.name }}">{{ driver.abbr }}</option>
|
||||
{% endfor %}
|
||||
</select>
|
||||
<label for="{{ name }}" class="text-primary">{{ label }}</label>
|
||||
</div>
|
||||
{% endmacro %}
|
||||
|
||||
{# Driver dropdown where a value might be preselected. Requires list of drivers. #}
|
||||
{% macro driver_select_with_preselect(match='', name='', label='', include_none=true) %}
|
||||
<div class="form-floating">
|
||||
<select name="{{ name }}" id="{{ name }}" class="form-select" aria-label="{{ name }}">
|
||||
{# Use namespace wrapper to persist scope between loop iterations #}
|
||||
{% set user_has_chosen = namespace(driverpre="false") %}
|
||||
|
||||
{% if include_none == true %}
|
||||
{% set drivers = model.all_drivers() %}
|
||||
{% else %}
|
||||
{% set drivers = model.all_drivers_except_none() %}
|
||||
{% endif %}
|
||||
|
||||
{% for driver in drivers %}
|
||||
{% if match == driver.abbr %}
|
||||
{% set user_has_chosen.driverpre = "true" %}
|
||||
<option selected="selected" value="{{ driver.name }}">{{ driver.abbr }}</option>
|
||||
{% else %}
|
||||
<option value="{{ driver.name }}">{{ driver.abbr }}</option>
|
||||
{% endif %}
|
||||
|
||||
{% if (include_none == true) and (driver.abbr == "None") %}
|
||||
<option disabled>──────────</option>
|
||||
{% endif %}
|
||||
{% endfor %}
|
||||
|
||||
{# Add an empty default if nothing has been chosen #}
|
||||
{% if user_has_chosen.driverpre == "false" %}
|
||||
<option value="" selected="selected" disabled="disabled" hidden="hidden"></option>
|
||||
{% endif %}
|
||||
</select>
|
||||
<label for="{{ name }}" class="text-primary">{{ label }}</label>
|
||||
</div>
|
||||
{% endmacro %}
|
||||
|
||||
{# Simple team dropdown. Requires list of teams. #}
|
||||
{% macro team_select(name='', label='') %}
|
||||
<div class="form-floating">
|
||||
<select name="{{ name }}" id="{{ name }}" class="form-select" aria-label="{{ name }}">
|
||||
<option value="" selected disabled hidden></option>
|
||||
{% for team in model.all_teams() %}
|
||||
<option value="{{ team.name }}">{{ team.name }}</option>
|
||||
{% endfor %}
|
||||
</select>
|
||||
<label for="{{ name }}" class="text-primary">{{ label }}</label>
|
||||
</div>
|
||||
{% endmacro %}
|
||||
|
||||
{# Team dropdown where a value might be preselected. Requires list of teams. #}
|
||||
{% macro team_select_with_preselect(match='', name='', label='') %}
|
||||
<div class="form-floating">
|
||||
<select name="{{ name }}" id="{{ name }}" class="form-select" aria-label="{{ name }}">
|
||||
{# Use namespace wrapper to persist scope between loop iterations #}
|
||||
{% set user_has_chosen = namespace(teampre="false") %}
|
||||
|
||||
{% for team in model.all_teams() %}
|
||||
{% if match == team.name %}
|
||||
{% set user_has_chosen.teampre = "true" %}
|
||||
<option selected="selected" value="{{ team.name }}">{{ team.name }}</option>
|
||||
{% else %}
|
||||
<option value="{{ team.name }}">{{ team.name }}</option>
|
||||
{% endif %}
|
||||
{% endfor %}
|
||||
|
||||
{# Add an empty default if nothing has been chosen #}
|
||||
{% if user_has_chosen.teampre == "false" %}
|
||||
<option value="" selected="selected" disabled="disabled" hidden="hidden"></option>
|
||||
{% endif %}
|
||||
</select>
|
||||
<label for="{{ name }}" class="text-primary">{{ label }}</label>
|
||||
</div>
|
||||
{% endmacro %}
|
||||
|
||||
{# Easy nav-bar entries. When a page sets the active_page variable, the current entry will be underlined #}
|
||||
{% macro nav_selector(page='', text='') %}
|
||||
<a class="nav-link text-nowrap" href="{{ page }}">{% if active_page == page %}<u>{% endif %} {{ text }}
|
||||
{# NOTE: This should be set at the top of each template #}
|
||||
{% if active_page == page %}</u>{% endif %}</a>
|
||||
{% endmacro %}
|
||||
|
||||
{#@formatter:off#}
|
||||
{% macro pxx_guess_colorization(driver_abbr='', result=none) -%}
|
||||
{% if (driver_abbr == result.pxx_driver(-3).abbr) and (driver_abbr != "None") %}fw-bold
|
||||
{% elif (driver_abbr == result.pxx_driver(-2).abbr) and (driver_abbr != "None") %}text-danger fw-bold
|
||||
{% elif (driver_abbr == result.pxx_driver(-1).abbr) and (driver_abbr != "None") %}text-warning fw-bold
|
||||
{% elif (driver_abbr == result.pxx_driver(0).abbr) %}text-success fw-bold
|
||||
{% elif (driver_abbr == result.pxx_driver(1).abbr) and (driver_abbr != "None") %}text-warning fw-bold
|
||||
{% elif (driver_abbr == result.pxx_driver(2).abbr) and (driver_abbr != "None") %}text-danger fw-bold
|
||||
{% elif (driver_abbr == result.pxx_driver(3).abbr) and (driver_abbr != "None") %}fw-bold{% endif %}
|
||||
{% endmacro %}
|
||||
|
||||
{% macro pxx_points_tooltip_text(driver_abbr='', result=none) -%}
|
||||
{% if (driver_abbr == result.pxx_driver(-3).abbr) and (driver_abbr != "None") %}1 Point
|
||||
{% elif (driver_abbr == result.pxx_driver(-2).abbr) and (driver_abbr != "None") %}3 Points
|
||||
{% elif (driver_abbr == result.pxx_driver(-1).abbr) and (driver_abbr != "None") %}6 Points
|
||||
{% elif (driver_abbr == result.pxx_driver(0).abbr) %}10 Points
|
||||
{% elif (driver_abbr == result.pxx_driver(1).abbr) and (driver_abbr != "None") %}6 Points
|
||||
{% elif (driver_abbr == result.pxx_driver(2).abbr) and (driver_abbr != "None") %}3 Points
|
||||
{% elif (driver_abbr == result.pxx_driver(3).abbr) and (driver_abbr != "None") %}1 Point
|
||||
{% else %}0 Points{% endif %}
|
||||
{%- endmacro %}
|
||||
|
||||
{% macro pxx_standing_tooltip_text(result=none) -%}
|
||||
P{{ result.race.pxx - 3 }}: {{ result.pxx_driver(-3).abbr }}
|
||||
P{{ result.race.pxx - 2 }}: {{ result.pxx_driver(-2).abbr }}
|
||||
P{{ result.race.pxx - 1 }}: {{ result.pxx_driver(-1).abbr }}
|
||||
P{{ result.race.pxx }}: {{ result.pxx_driver(0).abbr }}
|
||||
P{{ result.race.pxx + 1 }}: {{ result.pxx_driver(1).abbr }}
|
||||
P{{ result.race.pxx + 2 }}: {{ result.pxx_driver(2).abbr }}
|
||||
P{{ result.race.pxx + 3 }}: {{ result.pxx_driver(3).abbr }}
|
||||
{% endmacro %}
|
||||
{#@formatter:on#}
|
||||
|
||||
<head>
|
||||
<meta charset="UTF-8">
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
||||
|
||||
<!-- Title -->
|
||||
<title>{% block title %}{% endblock title %}</title>
|
||||
<link rel="icon" href="../static/image/favicon.svg" sizes="any" type="image/svg+xml">
|
||||
|
||||
<!-- Bootstrap -->
|
||||
<link href="../static/style/bootstrap.css" rel="stylesheet">
|
||||
<script src="../static/script/bootstrap.bundle.js"></script>
|
||||
|
||||
<script defer>
|
||||
{# Initialize Bootstrap Tooltips #}
|
||||
let tooltipTriggerList = document.querySelectorAll("[data-bs-toggle='tooltip']")
|
||||
let tooltipList = [...tooltipTriggerList].map(tooltipTriggerEl => new bootstrap.Tooltip(tooltipTriggerEl))
|
||||
</script>
|
||||
|
||||
{% block head_extra %}{% endblock head_extra %}
|
||||
</head>
|
||||
|
||||
<body>
|
||||
|
||||
<nav class="navbar fixed-top navbar-expand-lg bg-body-tertiary shadow-sm">
|
||||
<div class="container-fluid">
|
||||
<a class="navbar-brand" href="/race">
|
||||
<img src="../static/image/f1_logo.svg" alt="Logo" width="120" height="30"
|
||||
class="d-inline-block align-text-top">
|
||||
Formula 10
|
||||
</a>
|
||||
|
||||
<button type="button" class="navbar-toggler" data-bs-toggle="collapse" data-bs-target="#navbarCollapse">
|
||||
<span class="navbar-toggler-icon"></span>
|
||||
</button>
|
||||
|
||||
<div class="collapse navbar-collapse" id="navbarCollapse">
|
||||
<div class="navbar-nav me-2">
|
||||
{{ nav_selector("/race/" ~ (active_user.name_sanitized if active_user is not none else "Everyone"), "Race Picks") }}
|
||||
{{ nav_selector("/season/" ~ (active_user.name_sanitized if active_user is not none else "Everyone"), "Season Picks") }}
|
||||
{{ nav_selector("/graphs", "Statistics") }}
|
||||
{{ nav_selector("/rules", "Rules") }}
|
||||
</div>
|
||||
|
||||
{% block navbar_center %}{% endblock navbar_center %}
|
||||
<div class="flex-grow-1"></div>
|
||||
|
||||
<div class="navbar-nav">
|
||||
{{ nav_selector("/result", "Enter Race Result") }}
|
||||
{{ nav_selector("/user", "Manage Users") }}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</nav>
|
||||
|
||||
<div class="px-2 pt-2" style="margin-top: 55px !important;">
|
||||
{% block body %}{% endblock body %}
|
||||
</div>
|
||||
|
||||
</body>
|
||||
|
||||
</html>
|
126
formula10/templates/enter.jinja
Normal file
126
formula10/templates/enter.jinja
Normal file
@ -0,0 +1,126 @@
|
||||
{% extends 'base.jinja' %}
|
||||
|
||||
{% block title %}Formula 10 - Race Result{% endblock title %}
|
||||
|
||||
{% set active_page = "/result" %}
|
||||
{% set active_user = none %}
|
||||
|
||||
{% block head_extra %}
|
||||
<link href="../style/draggable.css" rel="stylesheet">
|
||||
<script src="../script/draggable.js" defer></script>
|
||||
{% endblock head_extra %}
|
||||
|
||||
{% set current_race = model.first_race_without_result() %}
|
||||
|
||||
{% block navbar_center %}
|
||||
|
||||
{% if model.all_race_results() | length > 0 %}
|
||||
<div class="dropdown">
|
||||
<button class="btn btn-outline-danger dropdown-toggle" type="button" data-bs-toggle="dropdown"
|
||||
aria-expanded="false">
|
||||
{% if active_result is not none %}
|
||||
{{ active_result.race.name }}
|
||||
{% elif current_race is not none %}
|
||||
{{ current_race.name }}
|
||||
{% else %}
|
||||
{{ model.all_race_results()[0].race.name }}
|
||||
{% endif %}
|
||||
</button>
|
||||
<ul class="dropdown-menu">
|
||||
{% if model.first_race_without_result() is not none %}
|
||||
<li>
|
||||
<a class="dropdown-item" href="/result/{{ current_race.name }}">{{ current_race.name }}</a>
|
||||
</li>
|
||||
<li>
|
||||
<hr class="dropdown-divider">
|
||||
</li>
|
||||
{% endif %}
|
||||
|
||||
{% for result in model.all_race_results() %}
|
||||
<li>
|
||||
<a class="dropdown-item"
|
||||
href="/result/{{ result.race.name }}">{{ result.race.name }}</a>
|
||||
</li>
|
||||
{% endfor %}
|
||||
</ul>
|
||||
</div>
|
||||
{% endif %}
|
||||
|
||||
{% endblock navbar_center %}
|
||||
|
||||
{% block body %}
|
||||
|
||||
<div class="grid" style="grid-template-columns: repeat(auto-fit, minmax(450px, 1fr));">
|
||||
|
||||
<div class="card shadow-sm" style="width: 450px;">
|
||||
<div class="card-body">
|
||||
|
||||
<h5 class="card-title">
|
||||
{% if active_result is not none %}
|
||||
{{ active_result.race.name }}
|
||||
{% elif current_race is not none %}
|
||||
{{ current_race.name }}
|
||||
{% else %}
|
||||
{{ model.all_race_results()[0].race.name }}
|
||||
{% endif %}
|
||||
</h5>
|
||||
|
||||
{# @formatter:off #}
|
||||
<form action="/result-enter/{%- if active_result is not none %}{{ active_result.race.name }}{% else %}{{ current_race.name }}{% endif %}"
|
||||
method="post">
|
||||
{# @formatter:on #}
|
||||
<ul id="columns" class="list-group list-group-flush">
|
||||
|
||||
{% if active_result is not none %}
|
||||
{% set drivers = active_result.all_positions %}
|
||||
{% else %}
|
||||
{% set drivers = model.all_drivers_except_none() %}
|
||||
{% endif %}
|
||||
|
||||
{% for driver in drivers %}
|
||||
<li class="list-group-item column p-1" draggable="true">
|
||||
{{ driver.name }}
|
||||
|
||||
<div class="d-inline-block float-end">
|
||||
{# 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"
|
||||
{% if (active_result is not none) and (driver in active_result.first_dnf_drivers) %}checked{% endif %}>
|
||||
<label for="first-dnf-{{ driver.name }}"
|
||||
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"
|
||||
{% if (active_result is not none) and (driver in active_result.dnf_drivers) %}checked{% endif %}>
|
||||
<label for="dnf-{{ driver.name }}"
|
||||
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"
|
||||
{% if (active_result is not none) and (driver in active_result.excluded_drivers) %}checked{% endif %}>
|
||||
<label for="exclude-{{ driver.name }}"
|
||||
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 }}"></li>
|
||||
{% endfor %}
|
||||
</ul>
|
||||
|
||||
<input type="submit" class="btn btn-danger mt-2 w-100" value="Save">
|
||||
</form>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
{% endblock body %}
|
185
formula10/templates/race.jinja
Normal file
185
formula10/templates/race.jinja
Normal file
@ -0,0 +1,185 @@
|
||||
{% extends 'base.jinja' %}
|
||||
|
||||
{% block title %}Formula 10 - Race{% endblock title %}
|
||||
|
||||
{% set active_page = "/race/" ~ (active_user.name_sanitized if active_user is not none else "Everyone") %}
|
||||
|
||||
{% block navbar_center %}
|
||||
{% if model.all_users() | length > 1 %}
|
||||
<div class="dropdown">
|
||||
<button class="btn btn-outline-danger dropdown-toggle" type="button" data-bs-toggle="dropdown"
|
||||
aria-expanded="false">
|
||||
{% if active_user is none %}
|
||||
Everyone
|
||||
{% else %}
|
||||
{{ active_user.name }}
|
||||
{% endif %}
|
||||
</button>
|
||||
<ul class="dropdown-menu">
|
||||
<li><a class="dropdown-item" href="/race/Everyone">Everyone</a></li>
|
||||
<li>
|
||||
<hr class="dropdown-divider">
|
||||
</li>
|
||||
|
||||
{% for user in model.all_users() %}
|
||||
<li><a class="dropdown-item" href="/race/{{ user.name_sanitized }}">{{ user.name }}</a></li>
|
||||
{% endfor %}
|
||||
</ul>
|
||||
</div>
|
||||
{% endif %}
|
||||
{% endblock navbar_center %}
|
||||
|
||||
{% block body %}
|
||||
|
||||
<table class="table table-bordered table-sm table-responsive shadow-sm">
|
||||
<thead>
|
||||
<tr>
|
||||
<th scope="col" rowspan="2" class="text-center" style="width: 200px;">Race</th>
|
||||
|
||||
<th scope="col" {% if active_user is none %}colspan="{{ model.all_users() | length }}"{% endif %}
|
||||
class="text-center">Call
|
||||
</th>
|
||||
|
||||
<th scope="col" rowspan="2" class="text-center" style="width: 200px;">Result</th>
|
||||
</tr>
|
||||
</thead>
|
||||
|
||||
<tbody>
|
||||
|
||||
{# Users List #}
|
||||
<tr>
|
||||
<td> </td>
|
||||
|
||||
{% if active_user is none %}
|
||||
{% 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>
|
||||
</td>
|
||||
{% endfor %}
|
||||
{% else %}
|
||||
<td class="text-center text-nowrap" style="min-width: 100px;">{{ active_user.name }}</td>
|
||||
{% endif %}
|
||||
|
||||
<td> </td>
|
||||
</tr>
|
||||
|
||||
{% set current_race = model.first_race_without_result() %}
|
||||
|
||||
{# Current Result, only displayed for all users overview and if guess is remaining #}
|
||||
{% if (active_user is none) and (model.first_race_without_result() is not none) %}
|
||||
|
||||
<tr class="table-danger">
|
||||
<td class="text-nowrap">
|
||||
<span class="fw-bold">{{ current_race.number }}:</span> {{ current_race.name }}<br>
|
||||
<small><span class="fw-bold">Guess:</span> P{{ current_race.pxx }}</small>
|
||||
</td>
|
||||
|
||||
{% for user in model.all_users() %}
|
||||
{% set user_guess = model.race_guesses_by(user_name=user.name, race_name=current_race.name) %}
|
||||
|
||||
<td class="text-center text-nowrap">
|
||||
{% if user_guess is not none %}
|
||||
<ul class="list-group list-group-flush">
|
||||
<li class="list-group-item" style="background-color: inherit;">
|
||||
{{ user_guess.pxx.abbr }}
|
||||
</li>
|
||||
<li class="list-group-item" style="background-color: inherit;">
|
||||
{{ user_guess.dnf.abbr }}
|
||||
</li>
|
||||
</ul>
|
||||
{% else %}
|
||||
|
||||
{% endif %}
|
||||
</td>
|
||||
{% endfor %}
|
||||
|
||||
<td> </td>
|
||||
</tr>
|
||||
{% endif %}
|
||||
|
||||
{# Enter Guess, only displayed for single user focused view and if guess is remaining #}
|
||||
{% if (active_user is not none) and (model.first_race_without_result() is not none) %}
|
||||
<tr class="table-danger">
|
||||
<td class="text-nowrap">
|
||||
<span class="fw-bold">{{ current_race.number }}:</span> {{ current_race.name }}<br>
|
||||
<small><span class="fw-bold">Guess:</span> P{{ current_race.pxx }}</small>
|
||||
</td>
|
||||
|
||||
<td>
|
||||
<form action="/race-guess/{{ current_race.name_sanitized }}/{{ active_user.name_sanitized }}" method="post">
|
||||
{% set user_guess = model.race_guesses_by(user_name=active_user.name, race_name=current_race.name) %}
|
||||
|
||||
{# Driver PXX Select #}
|
||||
{{ driver_select_with_preselect(user_guess.pxx.abbr if user_guess is not none else "", "pxxselect", "P" ~ current_race.pxx ~ ":") }}
|
||||
|
||||
<div class="mt-2"></div>
|
||||
|
||||
{# Driver DNF Select #}
|
||||
{{ driver_select_with_preselect(user_guess.dnf.abbr if user_guess is not none else "", "dnfselect", "DNF:") }}
|
||||
|
||||
<input type="submit" class="btn btn-danger mt-2 w-100" value="Save">
|
||||
</form>
|
||||
<form action="/race-guess-delete/{{ current_race.name_sanitized }}/{{ active_user.name_sanitized }}" method="post">
|
||||
<input type="submit" class="btn btn-dark mt-2 w-100" value="Delete">
|
||||
</form>
|
||||
</td>
|
||||
|
||||
<td> </td>
|
||||
</tr>
|
||||
{% endif %}
|
||||
|
||||
{# Past Race Results #}
|
||||
{% for past_result in model.all_race_results() %}
|
||||
<tr>
|
||||
<td class="text-nowrap">
|
||||
<span class="fw-bold">{{ past_result.race.number }}:</span> {{ past_result.race.name }}<br>
|
||||
<small><span class="fw-bold">Guessed:</span> P{{ past_result.race.pxx }}</small>
|
||||
</td>
|
||||
|
||||
{% if active_user is none %}
|
||||
{% set users = model.all_users() %}
|
||||
{% else %}
|
||||
{% set users = [active_user] %}
|
||||
{% endif %}
|
||||
|
||||
{% for user in users %}
|
||||
<td class="text-center text-nowrap">
|
||||
{% set user_guess = model.race_guesses_by(user_name=user.name, race_name=past_result.race.name) %}
|
||||
|
||||
{% if user_guess is not none %}
|
||||
<ul class="list-group list-group-flush">
|
||||
<li class="list-group-item {{ pxx_guess_colorization(user_guess.pxx.abbr, past_result) }}">
|
||||
<span data-bs-toggle="tooltip" title="{{ pxx_points_tooltip_text(user_guess.pxx.abbr, past_result) }}">
|
||||
{{ user_guess.pxx.abbr }}{% if user_guess.pxx.abbr != "None" %} ({{ past_result.pxx_driver_position_string(user_guess.pxx.name) }}){% endif %}
|
||||
</span>
|
||||
</li>
|
||||
<li class="list-group-item {% if user_guess.dnf.name in past_result.first_dnf_driver_names %}text-success fw-bold{% endif %}">
|
||||
<span data-bs-toggle="tooltip" title="{% if user_guess.dnf.name in past_result.first_dnf_driver_names %}10 Points{% else %}0 Points{% endif %}">
|
||||
{{ user_guess.dnf.abbr }}
|
||||
</span>
|
||||
</li>
|
||||
</ul>
|
||||
{% else %}
|
||||
|
||||
{% endif %}
|
||||
</td>
|
||||
{% endfor %}
|
||||
|
||||
<td class="text-center text-nowrap">
|
||||
<ul class="list-group list-group-flush">
|
||||
<li class="list-group-item">
|
||||
<span data-bs-toggle="tooltip" title="{{ pxx_standing_tooltip_text(past_result) }}">
|
||||
P{{ past_result.race.pxx }}: {{ past_result.pxx_driver().abbr }}
|
||||
</span>
|
||||
</li>
|
||||
<li class="list-group-item">
|
||||
DNF: {% for dnf_driver in past_result.first_dnf_drivers %}{{ dnf_driver.abbr }} {% endfor %}</li>
|
||||
</ul>
|
||||
</td>
|
||||
</tr>
|
||||
{% endfor %}
|
||||
|
||||
</tbody>
|
||||
</table>
|
||||
|
||||
{% endblock body %}
|
167
formula10/templates/season.jinja
Normal file
167
formula10/templates/season.jinja
Normal file
@ -0,0 +1,167 @@
|
||||
{% extends 'base.jinja' %}
|
||||
|
||||
{% block title %}Formula 10 - Season{% endblock title %}
|
||||
|
||||
{% set active_page = "/season/" ~ (active_user.name_sanitized if active_user is not none else "Everyone") %}
|
||||
|
||||
{% block navbar_center %}
|
||||
{% if model.all_users() | length > 1 %}
|
||||
<div class="dropdown">
|
||||
<button class="btn btn-outline-danger dropdown-toggle" type="button" data-bs-toggle="dropdown"
|
||||
aria-expanded="false">
|
||||
{% if active_user is none %}
|
||||
Everyone
|
||||
{% else %}
|
||||
{{ active_user.name }}
|
||||
{% endif %}
|
||||
</button>
|
||||
<ul class="dropdown-menu">
|
||||
<li><a class="dropdown-item" href="/season/Everyone">Everyone</a></li>
|
||||
<li>
|
||||
<hr class="dropdown-divider">
|
||||
</li>
|
||||
|
||||
{% for user in model.all_users() %}
|
||||
<li><a class="dropdown-item" href="/season/{{ user.name }}">{{ user.name }}</a></li>
|
||||
{% endfor %}
|
||||
</ul>
|
||||
</div>
|
||||
{% endif %}
|
||||
{% endblock navbar_center %}
|
||||
|
||||
{% block body %}
|
||||
|
||||
<div class="grid" style="grid-template-columns: repeat(auto-fit, minmax(450px, 1fr));">
|
||||
|
||||
{% if active_user is none %}
|
||||
{% set users = model.all_users() %}
|
||||
{% else %}
|
||||
{% set users = [active_user] %}
|
||||
{% endif %}
|
||||
{% for user in users %}
|
||||
|
||||
<div class="card mb-2 shadow-sm" style="width: 450px;">
|
||||
<div class="card-body">
|
||||
{% if active_user is none %}
|
||||
<a href="/season/{{ user.name }}" class="link-dark">
|
||||
<h5 class="card-title">{{ user.name }}</h5>
|
||||
</a>
|
||||
{% else %}
|
||||
<h5 class="card-title">{{ user.name }}</h5>
|
||||
{% endif %}
|
||||
|
||||
{% set user_guess = model.season_guesses_by(user_name=user.name) %}
|
||||
|
||||
<form action="/season-guess/{{ user.name }}" method="post">
|
||||
|
||||
{# Hot Take #}
|
||||
<div class="form-floating">
|
||||
{% if user_guess is not none %}
|
||||
<textarea class="form-control" id="hot-take-input-{{ user.name }}" name="hottakeselect"
|
||||
style="height: 50px">{{ user_guess.hot_take }}</textarea>
|
||||
{% else %}
|
||||
<textarea class="form-control" id="hot-take-input-{{ user.name }}" name="hottakeselect"
|
||||
style="height: 50px"></textarea>
|
||||
{% endif %}
|
||||
|
||||
<label for="hot-take-input-{{ user.name }}" class="text-primary">Hot Take:</label>
|
||||
</div>
|
||||
|
||||
{# P2 Constructor #}
|
||||
<div class="mt-2">
|
||||
{{ team_select_with_preselect(user_guess.p2_team.name if user_guess is not none else "",
|
||||
"p2select", "P2 in WCC:") }}
|
||||
</div>
|
||||
|
||||
{# Most Overtakes + DNFs #}
|
||||
<div class="input-group mt-2">
|
||||
{{ driver_select_with_preselect(user_guess.overtake_driver.abbr if user_guess is not none else "",
|
||||
"overtakeselect", "Most overtakes:", false) }}
|
||||
{{ driver_select_with_preselect(user_guess.dnf_driver.abbr if user_guess is not none else "",
|
||||
"dnfselect", "Most DNFs:", false) }}
|
||||
</div>
|
||||
|
||||
{# Most Gained + Lost #}
|
||||
<div class="input-group mt-2" data-bs-toggle="tooltip" title="Which driver will gain/lose the most places in comparison to last season's results?">
|
||||
{{ driver_select_with_preselect(user_guess.gained_driver.abbr if user_guess is not none else "",
|
||||
"gainedselect", "Most WDC places gained:", false) }}
|
||||
{{ driver_select_with_preselect(user_guess.lost_driver.abbr if user_guess is not none else "",
|
||||
"lostselect", "Most WDC places lost:", false) }}
|
||||
</div>
|
||||
|
||||
{# Team-internal Winners #}
|
||||
<h6 class="card-subtitle mt-2" data-bs-toggle="tooltip" title="Which driver will finish the season higher than his teammate?">Teammate battle winners:</h6>
|
||||
<div class="grid mt-2" style="width: 450px; row-gap: 0;">
|
||||
{% for team in model.all_teams() %}
|
||||
{% set driver_a_name = model.drivers_by(team_name=team.name)[0].name %}
|
||||
{% set driver_b_name = model.drivers_by(team_name=team.name)[1].name %}
|
||||
|
||||
<div class="g-col-6">
|
||||
<div class="form-check form-check-inline">
|
||||
<input class="form-check-input" type="radio"
|
||||
name="teamwinner-{{ team.name }}"
|
||||
id="teamwinner-{{ team.name }}-1-{{ user.name }}"
|
||||
value="{{ driver_a_name }}"
|
||||
{% if (user_guess is not none) and (driver_a_name in user_guess.team_winners.teamwinner_driver_names) %}checked="checked"{% endif %}>
|
||||
<label class="form-check-label"
|
||||
for="teamwinner-{{ team.name }}-1-{{ user.name }}">{{ driver_a_name }}</label>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="g-col-6">
|
||||
<div class="form-check form-check-inline">
|
||||
<input class="form-check-input" type="radio"
|
||||
name="teamwinner-{{ team.name }}"
|
||||
id="teamwinner-{{ team.name }}-2-{{ user.name }}"
|
||||
value="{{ driver_b_name }}"
|
||||
{% if (user_guess is not none) and (driver_b_name in user_guess.team_winners.teamwinner_driver_names) %}checked="checked"{% endif %}>
|
||||
<label class="form-check-label"
|
||||
for="teamwinner-{{ team.name }}-2-{{ user.name }}">{{ driver_b_name }}</label>
|
||||
</div>
|
||||
</div>
|
||||
{% endfor %}
|
||||
</div>
|
||||
|
||||
{# Drivers with Podiums #}
|
||||
<h6 class="card-subtitle mt-2" 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;">
|
||||
{% for team in model.all_teams() %}
|
||||
{% set driver_a_name = model.drivers_by(team_name=team.name)[0].name %}
|
||||
{% set driver_b_name = model.drivers_by(team_name=team.name)[1].name %}
|
||||
|
||||
<div class="g-col-6">
|
||||
<div class="form-check form-check-inline">
|
||||
<input class="form-check-input" type="checkbox"
|
||||
name="podiumdrivers"
|
||||
id="podium-{{ driver_a_name }}-{{ user.name }}"
|
||||
value="{{ driver_a_name }}"
|
||||
{% if (user_guess is not none) and (driver_a_name in user_guess.podium_drivers.podium_driver_names) %}checked="checked"{% endif %}>
|
||||
<label class="form-check-label"
|
||||
for="podium-{{ driver_a_name }}-{{ user.name }}">{{ driver_a_name }}</label>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="g-col-6">
|
||||
<div class="form-check form-check-inline">
|
||||
<input class="form-check-input" type="checkbox"
|
||||
name="podiumdrivers"
|
||||
id="podium-{{ driver_b_name }}-{{ user.name }}"
|
||||
value="{{ driver_b_name }}"
|
||||
{% if (user_guess is not none) and (driver_b_name in user_guess.podium_drivers.podium_driver_names) %}checked="checked"{% endif %}>
|
||||
<label class="form-check-label"
|
||||
for="podium-{{ driver_b_name }}-{{ user.name }}">{{ driver_b_name }}</label>
|
||||
</div>
|
||||
</div>
|
||||
{% endfor %}
|
||||
</div>
|
||||
|
||||
<input type="submit" class="btn btn-danger mt-2 w-100" value="Save">
|
||||
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
{% endfor %}
|
||||
</div>
|
||||
|
||||
{% endblock body %}
|
83
formula10/templates/users.jinja
Normal file
83
formula10/templates/users.jinja
Normal file
@ -0,0 +1,83 @@
|
||||
{% extends 'base.jinja' %}
|
||||
|
||||
{% block title %}Formula 10 - Users{% endblock title %}
|
||||
|
||||
{% set active_page = "/users" %}
|
||||
{% set active_user = none %}
|
||||
|
||||
{% block body %}
|
||||
|
||||
<div class="card shadow-sm">
|
||||
<div class="card-body">
|
||||
<h5 class="card-title">Add User</h5>
|
||||
|
||||
<form action="/user-add" method="post">
|
||||
<div class="input-group">
|
||||
<div class="form-floating">
|
||||
<input type="text" class="form-control" id="select-add-user" name="select-add-user"
|
||||
placeholder="Username:">
|
||||
<label for="select-add-user">Username:</label>
|
||||
</div>
|
||||
|
||||
<input type="submit" class="form-control btn btn-danger" value="Add" style="max-width: 200px;">
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
{% if model.all_users() | length > 0 %}
|
||||
<div class="card mt-2 shadow-sm">
|
||||
<div class="card-body">
|
||||
<h5 class="card-title">Registered Users</h5>
|
||||
|
||||
<ul class="list-group list-group-flush">
|
||||
{% for user in model.all_users() %}
|
||||
<li class="list-group-item">{{ user.name }}</li>
|
||||
{% endfor %}
|
||||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="card mt-2 shadow-sm">
|
||||
<div class="card-body">
|
||||
<h5 class="card-title">Delete user</h5>
|
||||
|
||||
<form action="/user-delete" method="post">
|
||||
<div class="input-group">
|
||||
<select class="form-control form-select" aria-label="select-delete-user"
|
||||
name="select-delete-user">
|
||||
<option selected="selected" disabled="disabled" hidden="hidden">Select User</option>
|
||||
{% for user in model.all_users() %}
|
||||
<option value="{{ user.name }}">{{ user.name }}</option>
|
||||
{% endfor %}
|
||||
</select>
|
||||
|
||||
<input type="submit" class="form-control btn btn-danger" value="Delete"
|
||||
style="max-width: 200px;">
|
||||
</div>
|
||||
|
||||
<div class="form-text">
|
||||
"Deleting" a user just hides it from the user interface without deleting any inputs, your
|
||||
"pERsoNaL
|
||||
DaTa" belongs to ME now.<br>
|
||||
Re-adding a user with the same name will "restore" it. That doesn't mean you're allowed to
|
||||
remove everyone though.
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
{% endif %}
|
||||
|
||||
<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 %}
|
Reference in New Issue
Block a user