diff --git a/formula10/__init__.py b/formula10/__init__.py index 7a4b494..d1d203d 100644 --- a/formula10/__init__.py +++ b/formula10/__init__.py @@ -18,7 +18,8 @@ import formula10.controller.admin_controller # type: ignore # TODO # General -# - Choose "place to guess" late before the race? Make a page for this +# - Show date for race name, also store time in database +# - Choose "place to guess" late before the race? Make a page for this? # - Rules page # - Make user order changeable using drag'n'drop? @@ -26,7 +27,8 @@ import formula10.controller.admin_controller # type: ignore # - Show cards of previous race results, like with season guesses? # Statistics +# - Rename "Statistics" to "Leaderboard" # - Auto calculate points # - Order user table by points + display points somewhere -# - Show current values for some season guesses (e.g. current most dnfs) +# - Highlight currently correct values for some season guesses (e.g. current most dnfs) # - Generate static diagram using chart.js + templating the js (funny yikes) \ No newline at end of file diff --git a/formula10/database/model/db_race.py b/formula10/database/model/db_race.py index de2efcd..f075e79 100644 --- a/formula10/database/model/db_race.py +++ b/formula10/database/model/db_race.py @@ -24,7 +24,7 @@ class DbRace(db.Model): def from_csv(cls, row: List[str]): db_race: DbRace = cls(name=str(row[0]), number=int(row[1]), - date=datetime.strptime(row[2], "%Y-%m-%d"), + date=datetime.strptime(str(row[2]), "%Y-%m-%d-%H-%M"), pxx=int(row[3])) return db_race diff --git a/formula10/templates/race.jinja b/formula10/templates/race.jinja index 740d2f6..81ce8bf 100644 --- a/formula10/templates/race.jinja +++ b/formula10/templates/race.jinja @@ -49,7 +49,8 @@ {{ model.current_race.number }}: {{ model.current_race.name }}
- Guess: P{{ model.current_race.place_to_guess }} + Guess: P{{ model.current_race.place_to_guess }}
+ Date: {{ model.current_race.date.strftime("%d.%m.%Y %H:%M") }} {% if model.all_users() | length > 0 %} @@ -117,7 +118,8 @@ {{ past_result.race.number }}: {{ past_result.race.name }}
- Guessed: P{{ past_result.race.place_to_guess }} + Guessed: P{{ past_result.race.place_to_guess }}
+ Date: {{ past_result.race.date.strftime("%d.%m.%Y %H:%M") }} {% if model.all_users_or_active_user() | length > 0 %}