diff --git a/model.py b/model.py index 1712aa0..9e9266d 100644 --- a/model.py +++ b/model.py @@ -210,9 +210,8 @@ class RaceResult(db.Model): return self._excluded_drivers - @property - def pxx(self) -> Driver: - pxx_num: str = str(self.race.pxx) + def pxx(self, offset: int = 0) -> Driver: + pxx_num: str = str(self.race.pxx + offset) if pxx_num not in self.pxx_drivers: raise Exception(f"Error: Position {self.race.pxx} not contained in race result") diff --git a/static_data/races.csv b/static_data/races.csv index c799738..1ce604c 100644 --- a/static_data/races.csv +++ b/static_data/races.csv @@ -1,5 +1,5 @@ name,number,date,pxx -Bahrain,1,2023-03-05,3 +Bahrain,1,2023-03-05,4 Saudi Arabia,2,2023-03-19,17 Melbourne,3,2023-04-02,5 Baku,4,2023-04-30,6 @@ -9,14 +9,14 @@ Monaco,7,2023-05-28,9 Barcelona,8,2023-06-04,13 Montreal,9,2023-06-18,11 Spielberg,10,2023-07-02,12 -Silverstone,11,2023-07-09,18 +Silverstone,11,2023-07-09,17 Budapest,12,2023-07-23,12 Spa,13,2023-07-30,13 -Zandvoort,14,2023-08-27,3 +Zandvoort,14,2023-08-27,4 Monza,15,2023-09-03,6 Singapore,16,2023-09-17,10 Suzuka,17,2023-09-24,11 -Qatar,18,2023-10-08,3 +Qatar,18,2023-10-08,4 Austin,19,2023-10-22,11 Mexico,20,2023-10-29,17 Brazil,21,2023-11-05,14 diff --git a/templates/base.jinja b/templates/base.jinja index e7ea405..4c331e7 100644 --- a/templates/base.jinja +++ b/templates/base.jinja @@ -96,6 +96,16 @@ {% if active_page == page %}{% endif %} {% endmacro %} +{% macro pxx_guess_colorization(driver_abbr='', result=none) %} + {% if driver_abbr == result.pxx(0).abbr %}text-success fw-bold{% endif %} + {% if driver_abbr == result.pxx(1).abbr %}text-warning fw-bold{% endif %} + {% if driver_abbr == result.pxx(2).abbr %}text-danger fw-bold{% endif %} + {% if driver_abbr == result.pxx(3).abbr %}fw-bold{% endif %} + {% if driver_abbr == result.pxx(-1).abbr %}text-warning fw-bold{% endif %} + {% if driver_abbr == result.pxx(-2).abbr %}text-danger fw-bold{% endif %} + {% if driver_abbr == result.pxx(-3).abbr %}fw-bold{% endif %} +{% endmacro %} + diff --git a/templates/race.jinja b/templates/race.jinja index 4b8d409..97b506d 100644 --- a/templates/race.jinja +++ b/templates/race.jinja @@ -70,7 +70,8 @@ - {{ current_race.number }}: {{ current_race.name }}
+ {{ current_race.number }}: {{ current_race.name }}
Guess: P{{ current_race.pxx }} @@ -127,7 +128,8 @@ {% for past_result in model.all_race_results() %} - {{ past_result.race.number }}: {{ past_result.race.name }}
+ {{ past_result.race.number }}: {{ past_result.race.name }}
Guessed: P{{ past_result.race.pxx }} @@ -142,7 +144,7 @@ {% if user_guess is not none %}