Implement entering results
This commit is contained in:
42
formula10.py
42
formula10.py
@ -29,7 +29,7 @@ def save():
|
||||
|
||||
|
||||
@app.route("/race")
|
||||
def race():
|
||||
def guessraceresults():
|
||||
users = User.query.all()
|
||||
raceresults = RaceResult.query.all()
|
||||
drivers = Driver.query.all()
|
||||
@ -65,29 +65,47 @@ def guessrace(raceid, username):
|
||||
if pxx is None or dnf is None:
|
||||
return redirect("/race")
|
||||
|
||||
if RaceResult.query.filter_by(race_id=raceid).first() is not None:
|
||||
print("Error: Can't guess race result if the race result is already known!")
|
||||
return redirect("/race")
|
||||
|
||||
raceguess: RaceGuess | None = RaceGuess.query.filter_by(user_id=username, race_id=raceid).first()
|
||||
|
||||
if raceguess is not None:
|
||||
raceguess.pxx_id = pxx
|
||||
raceguess.dnf_id = dnf
|
||||
else:
|
||||
if raceguess is None:
|
||||
raceguess = RaceGuess()
|
||||
raceguess.user_id = username
|
||||
raceguess.race_id = raceid
|
||||
|
||||
raceguess.pxx_id = pxx
|
||||
raceguess.dnf_id = dnf
|
||||
|
||||
db.session.add(raceguess)
|
||||
|
||||
raceguess.pxx_id = pxx
|
||||
raceguess.dnf_id = dnf
|
||||
db.session.commit()
|
||||
|
||||
return redirect("/race")
|
||||
|
||||
|
||||
@app.route("/enterresult")
|
||||
def enterresult():
|
||||
return render_template("enterresult.jinja")
|
||||
@app.route("/enterresult/<raceid>", methods=["POST"])
|
||||
def enterresult(raceid):
|
||||
pxx = request.form.get("pxxselect")
|
||||
dnf = request.form.get("dnfselect")
|
||||
|
||||
if pxx is None or dnf is None:
|
||||
return redirect("/race")
|
||||
|
||||
raceresult: RaceResult | None = RaceResult.query.filter_by(race_id=raceid).first()
|
||||
|
||||
if raceresult is not None:
|
||||
print("RaceResult already exists!")
|
||||
return redirect("/race")
|
||||
|
||||
raceresult = RaceResult()
|
||||
raceresult.race_id = raceid
|
||||
raceresult.pxx_id = pxx
|
||||
raceresult.dnf_id = dnf
|
||||
db.session.add(raceresult)
|
||||
db.session.commit()
|
||||
|
||||
return redirect("/race")
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
|
||||
214
model.py
214
model.py
@ -65,226 +65,32 @@ class Driver(db.Model):
|
||||
|
||||
class RaceResult(db.Model):
|
||||
__tablename__ = "raceresult"
|
||||
__csv_header__ = [
|
||||
"id",
|
||||
"race_id",
|
||||
"p01_id",
|
||||
"p02_id",
|
||||
"p03_id",
|
||||
"p04_id",
|
||||
"p05_id",
|
||||
"p06_id",
|
||||
"p07_id",
|
||||
"p08_id",
|
||||
"p09_id",
|
||||
"p10_id",
|
||||
"p11_id",
|
||||
"p12_id",
|
||||
"p13_id",
|
||||
"p14_id",
|
||||
"p15_id",
|
||||
"p16_id",
|
||||
"p17_id",
|
||||
"p18_id",
|
||||
"p19_id",
|
||||
"p20_id",
|
||||
"dnf01_id",
|
||||
"dnf02_id",
|
||||
"dnf03_id",
|
||||
"dnf04_id",
|
||||
"dnf05_id",
|
||||
"dnf06_id",
|
||||
"dnf07_id",
|
||||
"dnf08_id",
|
||||
"dnf09_id",
|
||||
"dnf10_id",
|
||||
"dnf11_id",
|
||||
"dnf12_id",
|
||||
"dnf13_id",
|
||||
"dnf14_id",
|
||||
"dnf15_id",
|
||||
"dnf16_id",
|
||||
"dnf17_id",
|
||||
"dnf18_id",
|
||||
"dnf19_id",
|
||||
"dnf20_id"
|
||||
]
|
||||
__csv_header__ = ["id", "race_id", "pxx_id", "dnf_id"]
|
||||
|
||||
def from_csv(self, row):
|
||||
self.id = int(row[0])
|
||||
self.race_id = str(row[1])
|
||||
self.p01_id = str(row[2])
|
||||
self.p02_id = str(row[3])
|
||||
self.p03_id = str(row[4])
|
||||
self.p04_id = str(row[5])
|
||||
self.p05_id = str(row[6])
|
||||
self.p06_id = str(row[7])
|
||||
self.p07_id = str(row[8])
|
||||
self.p08_id = str(row[9])
|
||||
self.p09_id = str(row[10])
|
||||
self.p10_id = str(row[11])
|
||||
self.p11_id = str(row[12])
|
||||
self.p12_id = str(row[13])
|
||||
self.p13_id = str(row[14])
|
||||
self.p14_id = str(row[15])
|
||||
self.p15_id = str(row[16])
|
||||
self.p16_id = str(row[17])
|
||||
self.p17_id = str(row[18])
|
||||
self.p18_id = str(row[19])
|
||||
self.p19_id = str(row[20])
|
||||
self.p20_id = str(row[21])
|
||||
self.dnf01_id = str(row[22])
|
||||
self.dnf02_id = str(row[23])
|
||||
self.dnf03_id = str(row[24])
|
||||
self.dnf04_id = str(row[25])
|
||||
self.dnf05_id = str(row[26])
|
||||
self.dnf06_id = str(row[27])
|
||||
self.dnf07_id = str(row[28])
|
||||
self.dnf08_id = str(row[29])
|
||||
self.dnf09_id = str(row[30])
|
||||
self.dnf10_id = str(row[31])
|
||||
self.dnf11_id = str(row[32])
|
||||
self.dnf12_id = str(row[33])
|
||||
self.dnf13_id = str(row[34])
|
||||
self.dnf14_id = str(row[35])
|
||||
self.dnf15_id = str(row[36])
|
||||
self.dnf16_id = str(row[37])
|
||||
self.dnf17_id = str(row[38])
|
||||
self.dnf18_id = str(row[39])
|
||||
self.dnf19_id = str(row[40])
|
||||
self.dnf20_id = str(row[41])
|
||||
self.pxx_id = str(row[2])
|
||||
self.dnf_id = str(row[22])
|
||||
return self
|
||||
|
||||
def to_csv(self):
|
||||
return [
|
||||
self.id,
|
||||
self.p01_id,
|
||||
self.p02_id,
|
||||
self.p03_id,
|
||||
self.p04_id,
|
||||
self.p05_id,
|
||||
self.p06_id,
|
||||
self.p07_id,
|
||||
self.p08_id,
|
||||
self.p09_id,
|
||||
self.p10_id,
|
||||
self.p11_id,
|
||||
self.p12_id,
|
||||
self.p13_id,
|
||||
self.p14_id,
|
||||
self.p15_id,
|
||||
self.p16_id,
|
||||
self.p17_id,
|
||||
self.p18_id,
|
||||
self.p19_id,
|
||||
self.p20_id,
|
||||
self.dnf01_id,
|
||||
self.dnf02_id,
|
||||
self.dnf03_id,
|
||||
self.dnf04_id,
|
||||
self.dnf05_id,
|
||||
self.dnf06_id,
|
||||
self.dnf07_id,
|
||||
self.dnf08_id,
|
||||
self.dnf09_id,
|
||||
self.dnf10_id,
|
||||
self.dnf11_id,
|
||||
self.dnf12_id,
|
||||
self.dnf13_id,
|
||||
self.dnf14_id,
|
||||
self.dnf15_id,
|
||||
self.dnf16_id,
|
||||
self.dnf17_id,
|
||||
self.dnf18_id,
|
||||
self.dnf19_id,
|
||||
self.dnf20_id
|
||||
self.race_id,
|
||||
self.pxx_id,
|
||||
self.dnf_id
|
||||
]
|
||||
|
||||
id: Mapped[int] = mapped_column(Integer, primary_key=True)
|
||||
race_id: Mapped[str] = mapped_column(ForeignKey("race.id"))
|
||||
p01_id: Mapped[str] = mapped_column(ForeignKey("driver.name"))
|
||||
p02_id: Mapped[str] = mapped_column(ForeignKey("driver.name"))
|
||||
p03_id: Mapped[str] = mapped_column(ForeignKey("driver.name"))
|
||||
p04_id: Mapped[str] = mapped_column(ForeignKey("driver.name"))
|
||||
p05_id: Mapped[str] = mapped_column(ForeignKey("driver.name"))
|
||||
p06_id: Mapped[str] = mapped_column(ForeignKey("driver.name"))
|
||||
p07_id: Mapped[str] = mapped_column(ForeignKey("driver.name"))
|
||||
p08_id: Mapped[str] = mapped_column(ForeignKey("driver.name"))
|
||||
p09_id: Mapped[str] = mapped_column(ForeignKey("driver.name"))
|
||||
p10_id: Mapped[str] = mapped_column(ForeignKey("driver.name"))
|
||||
p11_id: Mapped[str] = mapped_column(ForeignKey("driver.name"))
|
||||
p12_id: Mapped[str] = mapped_column(ForeignKey("driver.name"))
|
||||
p13_id: Mapped[str] = mapped_column(ForeignKey("driver.name"))
|
||||
p14_id: Mapped[str] = mapped_column(ForeignKey("driver.name"))
|
||||
p15_id: Mapped[str] = mapped_column(ForeignKey("driver.name"))
|
||||
p16_id: Mapped[str] = mapped_column(ForeignKey("driver.name"))
|
||||
p17_id: Mapped[str] = mapped_column(ForeignKey("driver.name"))
|
||||
p18_id: Mapped[str] = mapped_column(ForeignKey("driver.name"))
|
||||
p19_id: Mapped[str] = mapped_column(ForeignKey("driver.name"))
|
||||
p20_id: Mapped[str] = mapped_column(ForeignKey("driver.name"))
|
||||
dnf01_id: Mapped[str] = mapped_column(ForeignKey("driver.name"))
|
||||
dnf02_id: Mapped[str] = mapped_column(ForeignKey("driver.name"))
|
||||
dnf03_id: Mapped[str] = mapped_column(ForeignKey("driver.name"))
|
||||
dnf04_id: Mapped[str] = mapped_column(ForeignKey("driver.name"))
|
||||
dnf05_id: Mapped[str] = mapped_column(ForeignKey("driver.name"))
|
||||
dnf06_id: Mapped[str] = mapped_column(ForeignKey("driver.name"))
|
||||
dnf07_id: Mapped[str] = mapped_column(ForeignKey("driver.name"))
|
||||
dnf08_id: Mapped[str] = mapped_column(ForeignKey("driver.name"))
|
||||
dnf09_id: Mapped[str] = mapped_column(ForeignKey("driver.name"))
|
||||
dnf10_id: Mapped[str] = mapped_column(ForeignKey("driver.name"))
|
||||
dnf11_id: Mapped[str] = mapped_column(ForeignKey("driver.name"))
|
||||
dnf12_id: Mapped[str] = mapped_column(ForeignKey("driver.name"))
|
||||
dnf13_id: Mapped[str] = mapped_column(ForeignKey("driver.name"))
|
||||
dnf14_id: Mapped[str] = mapped_column(ForeignKey("driver.name"))
|
||||
dnf15_id: Mapped[str] = mapped_column(ForeignKey("driver.name"))
|
||||
dnf16_id: Mapped[str] = mapped_column(ForeignKey("driver.name"))
|
||||
dnf17_id: Mapped[str] = mapped_column(ForeignKey("driver.name"))
|
||||
dnf18_id: Mapped[str] = mapped_column(ForeignKey("driver.name"))
|
||||
dnf19_id: Mapped[str] = mapped_column(ForeignKey("driver.name"))
|
||||
dnf20_id: Mapped[str] = mapped_column(ForeignKey("driver.name"))
|
||||
pxx_id: Mapped[str] = mapped_column(ForeignKey("driver.name"))
|
||||
dnf_id: Mapped[str] = mapped_column(ForeignKey("driver.name"))
|
||||
|
||||
# Relationships
|
||||
race: Mapped["Race"] = relationship("Race", foreign_keys=[race_id])
|
||||
p01: Mapped["Driver"] = relationship("Driver", foreign_keys=[p01_id])
|
||||
p02: Mapped["Driver"] = relationship("Driver", foreign_keys=[p02_id])
|
||||
p03: Mapped["Driver"] = relationship("Driver", foreign_keys=[p03_id])
|
||||
p04: Mapped["Driver"] = relationship("Driver", foreign_keys=[p04_id])
|
||||
p05: Mapped["Driver"] = relationship("Driver", foreign_keys=[p05_id])
|
||||
p06: Mapped["Driver"] = relationship("Driver", foreign_keys=[p06_id])
|
||||
p07: Mapped["Driver"] = relationship("Driver", foreign_keys=[p07_id])
|
||||
p08: Mapped["Driver"] = relationship("Driver", foreign_keys=[p08_id])
|
||||
p09: Mapped["Driver"] = relationship("Driver", foreign_keys=[p09_id])
|
||||
p10: Mapped["Driver"] = relationship("Driver", foreign_keys=[p10_id])
|
||||
p11: Mapped["Driver"] = relationship("Driver", foreign_keys=[p11_id])
|
||||
p12: Mapped["Driver"] = relationship("Driver", foreign_keys=[p12_id])
|
||||
p13: Mapped["Driver"] = relationship("Driver", foreign_keys=[p13_id])
|
||||
p14: Mapped["Driver"] = relationship("Driver", foreign_keys=[p14_id])
|
||||
p15: Mapped["Driver"] = relationship("Driver", foreign_keys=[p15_id])
|
||||
p16: Mapped["Driver"] = relationship("Driver", foreign_keys=[p16_id])
|
||||
p17: Mapped["Driver"] = relationship("Driver", foreign_keys=[p17_id])
|
||||
p18: Mapped["Driver"] = relationship("Driver", foreign_keys=[p18_id])
|
||||
p19: Mapped["Driver"] = relationship("Driver", foreign_keys=[p19_id])
|
||||
p20: Mapped["Driver"] = relationship("Driver", foreign_keys=[p20_id])
|
||||
dnf01: Mapped["Driver"] = relationship("Driver", foreign_keys=[dnf01_id])
|
||||
dnf02: Mapped["Driver"] = relationship("Driver", foreign_keys=[dnf02_id])
|
||||
dnf03: Mapped["Driver"] = relationship("Driver", foreign_keys=[dnf03_id])
|
||||
dnf04: Mapped["Driver"] = relationship("Driver", foreign_keys=[dnf04_id])
|
||||
dnf05: Mapped["Driver"] = relationship("Driver", foreign_keys=[dnf05_id])
|
||||
dnf06: Mapped["Driver"] = relationship("Driver", foreign_keys=[dnf06_id])
|
||||
dnf07: Mapped["Driver"] = relationship("Driver", foreign_keys=[dnf07_id])
|
||||
dnf08: Mapped["Driver"] = relationship("Driver", foreign_keys=[dnf08_id])
|
||||
dnf09: Mapped["Driver"] = relationship("Driver", foreign_keys=[dnf09_id])
|
||||
dnf10: Mapped["Driver"] = relationship("Driver", foreign_keys=[dnf10_id])
|
||||
dnf11: Mapped["Driver"] = relationship("Driver", foreign_keys=[dnf11_id])
|
||||
dnf12: Mapped["Driver"] = relationship("Driver", foreign_keys=[dnf12_id])
|
||||
dnf13: Mapped["Driver"] = relationship("Driver", foreign_keys=[dnf13_id])
|
||||
dnf14: Mapped["Driver"] = relationship("Driver", foreign_keys=[dnf14_id])
|
||||
dnf15: Mapped["Driver"] = relationship("Driver", foreign_keys=[dnf15_id])
|
||||
dnf16: Mapped["Driver"] = relationship("Driver", foreign_keys=[dnf16_id])
|
||||
dnf17: Mapped["Driver"] = relationship("Driver", foreign_keys=[dnf17_id])
|
||||
dnf18: Mapped["Driver"] = relationship("Driver", foreign_keys=[dnf18_id])
|
||||
dnf19: Mapped["Driver"] = relationship("Driver", foreign_keys=[dnf19_id])
|
||||
dnf20: Mapped["Driver"] = relationship("Driver", foreign_keys=[dnf20_id])
|
||||
pxx: Mapped["Driver"] = relationship("Driver", foreign_keys=[pxx_id])
|
||||
dnf: Mapped["Driver"] = relationship("Driver", foreign_keys=[dnf_id])
|
||||
|
||||
|
||||
# Per race guesses: PX, DNF
|
||||
|
||||
Reference in New Issue
Block a user