From 13c7bd32391227d290d41040ed92eafe62608e9b Mon Sep 17 00:00:00 2001 From: bl3kunja-FW Date: Sat, 17 Jan 2026 09:36:27 +0100 Subject: [PATCH] Liga krog3 --- app/config.py | 2 +- app/models.py | 3 +- data/camera_settings.json | 4 +- .../league_20251115_093906.json | 134 ++ data/league_state.json | 457 ++++++ data/players.json | 80 +- data/tournament_results.json | 1242 +++++++++++++++++ locales/en.json | 3 +- locales/sl.json | 3 +- templates/league_scoreboard_display.html | 2 + templates/results_calculator.html | 113 +- templates/tournament.html | 27 +- tv_app.py | 3 +- 13 files changed, 2027 insertions(+), 46 deletions(-) create mode 100644 data/league_archives/league_20251115_093906.json create mode 100644 data/league_state.json create mode 100644 data/tournament_results.json diff --git a/app/config.py b/app/config.py index a0c50fe..8ff067a 100644 --- a/app/config.py +++ b/app/config.py @@ -10,4 +10,4 @@ class Config: SECRET_KEY = os.getenv('SECRET_KEY', 'your-secret-key-for-sessions') DEBUG = os.getenv('DEBUG', 'False').lower() == 'true' HOST = os.getenv('HOST', '0.0.0.0') - PORT = int(os.getenv('PORT', 5000)) + PORT = int(os.getenv('PORT', 5001)) diff --git a/app/models.py b/app/models.py index 0d570f0..1640b76 100644 --- a/app/models.py +++ b/app/models.py @@ -131,7 +131,8 @@ class Tournament: 'name': player['name'], 'targets': targets, 'total_score': 0, - 'completed': False + 'completed': False, + 'joker_selected': False # Track if joker was selected in calculator } return results diff --git a/data/camera_settings.json b/data/camera_settings.json index af4f44b..81fd99c 100644 --- a/data/camera_settings.json +++ b/data/camera_settings.json @@ -9,7 +9,7 @@ }, "display_options": { "show_titles": true, - "title_size": 1.2, - "target_number_size": 1.4 + "title_size": 1.4, + "target_number_size": 1.7 } } \ No newline at end of file diff --git a/data/league_archives/league_20251115_093906.json b/data/league_archives/league_20251115_093906.json new file mode 100644 index 0000000..abdd081 --- /dev/null +++ b/data/league_archives/league_20251115_093906.json @@ -0,0 +1,134 @@ +{ + "league": { + "league_id": "league_20251115_093831", + "created_at": "2025-11-15T09:38:31.193555", + "tournament_type": "20_targets", + "total_tournaments": 5, + "current_tournament": 0, + "participants": { + "1": { + "name": "Domen Pleterski", + "joker_used": false, + "tournament_results": [], + "total_score": 0, + "final_score": 0, + "tournaments_participated": 0 + }, + "5": { + "name": "Jože Verhnjak", + "joker_used": false, + "tournament_results": [], + "total_score": 0, + "final_score": 0, + "tournaments_participated": 0 + }, + "7": { + "name": "Branko Pokeržnik", + "joker_used": false, + "tournament_results": [], + "total_score": 0, + "final_score": 0, + "tournaments_participated": 0 + }, + "9": { + "name": "Janez Božič", + "joker_used": false, + "tournament_results": [], + "total_score": 0, + "final_score": 0, + "tournaments_participated": 0 + }, + "10": { + "name": "Mitja Čeh", + "joker_used": false, + "tournament_results": [], + "total_score": 0, + "final_score": 0, + "tournaments_participated": 0 + }, + "11": { + "name": "Rado Kefer", + "joker_used": false, + "tournament_results": [], + "total_score": 0, + "final_score": 0, + "tournaments_participated": 0 + }, + "14": { + "name": "Karli Proje", + "joker_used": false, + "tournament_results": [], + "total_score": 0, + "final_score": 0, + "tournaments_participated": 0 + }, + "15": { + "name": "Jan Pleterski", + "joker_used": false, + "tournament_results": [], + "total_score": 0, + "final_score": 0, + "tournaments_participated": 0 + }, + "16": { + "name": "Silvo Poročnik", + "joker_used": false, + "tournament_results": [], + "total_score": 0, + "final_score": 0, + "tournaments_participated": 0 + }, + "17": { + "name": "Dušan Onuk", + "joker_used": false, + "tournament_results": [], + "total_score": 0, + "final_score": 0, + "tournaments_participated": 0 + }, + "18": { + "name": "Matjaž Pleterski", + "joker_used": false, + "tournament_results": [], + "total_score": 0, + "final_score": 0, + "tournaments_participated": 0 + }, + "22": { + "name": "Doris Fesel", + "joker_used": false, + "tournament_results": [], + "total_score": 0, + "final_score": 0, + "tournaments_participated": 0 + }, + "24": { + "name": "Jože Verdinek", + "joker_used": false, + "tournament_results": [], + "total_score": 0, + "final_score": 0, + "tournaments_participated": 0 + }, + "50": { + "name": "Vid Ravnjak", + "joker_used": false, + "tournament_results": [], + "total_score": 0, + "final_score": 0, + "tournaments_participated": 0 + }, + "51": { + "name": "Robi Ovčar", + "joker_used": false, + "tournament_results": [], + "total_score": 0, + "final_score": 0, + "tournaments_participated": 0 + } + }, + "completed_tournaments": [], + "league_finished": false + }, + "archived_at": "2025-11-15T09:39:06.974580" +} \ No newline at end of file diff --git a/data/league_state.json b/data/league_state.json new file mode 100644 index 0000000..61ca278 --- /dev/null +++ b/data/league_state.json @@ -0,0 +1,457 @@ +{ + "league_id": "league_20251115_094741", + "created_at": "2025-11-15T09:47:41.711914", + "tournament_type": "20_targets", + "total_tournaments": 5, + "current_tournament": 3, + "participants": { + "1": { + "name": "Domen Pleterski", + "joker_used": true, + "tournament_results": [ + { + "tournament": 1, + "score": 320, + "tens_count": 3, + "participated": true + }, + { + "tournament": 2, + "score": 0, + "tens_count": 0, + "participated": false, + "joker": true + }, + { + "tournament": 3, + "score": 320, + "tens_count": 2, + "participated": true + } + ], + "total_score": 640, + "final_score": 0, + "tournaments_participated": 0 + }, + "5": { + "name": "Jože Verhnjak", + "joker_used": false, + "tournament_results": [ + { + "tournament": 1, + "score": 295, + "tens_count": 2, + "participated": true + }, + { + "tournament": 2, + "score": 293, + "tens_count": 3, + "participated": true + }, + { + "tournament": 3, + "score": 293, + "tens_count": 2, + "participated": true + } + ], + "total_score": 881, + "final_score": 0, + "tournaments_participated": 0 + }, + "7": { + "name": "Branko Pokeržnik", + "joker_used": false, + "tournament_results": [ + { + "tournament": 1, + "score": 316, + "tens_count": 1, + "participated": true + }, + { + "tournament": 2, + "score": 332, + "tens_count": 3, + "participated": true + }, + { + "tournament": 3, + "score": 318, + "tens_count": 1, + "participated": true + } + ], + "total_score": 966, + "final_score": 0, + "tournaments_participated": 0 + }, + "9": { + "name": "Janez Božič", + "joker_used": false, + "tournament_results": [ + { + "tournament": 1, + "score": 264, + "tens_count": 2, + "participated": true + }, + { + "tournament": 2, + "score": 276, + "tens_count": 0, + "participated": true + }, + { + "tournament": 3, + "score": 261, + "tens_count": 1, + "participated": true + } + ], + "total_score": 801, + "final_score": 0, + "tournaments_participated": 0 + }, + "10": { + "name": "Mitja Čeh", + "joker_used": false, + "tournament_results": [ + { + "tournament": 1, + "score": 329, + "tens_count": 1, + "participated": true + }, + { + "tournament": 2, + "score": 312, + "tens_count": 4, + "participated": true + }, + { + "tournament": 3, + "score": 307, + "tens_count": 2, + "participated": true + } + ], + "total_score": 948, + "final_score": 0, + "tournaments_participated": 0 + }, + "11": { + "name": "Rado Kefer", + "joker_used": true, + "tournament_results": [ + { + "tournament": 1, + "score": 275, + "tens_count": 0, + "participated": true + }, + { + "tournament": 2, + "score": 0, + "tens_count": 0, + "participated": false, + "joker": true + }, + { + "tournament": 3, + "score": 314, + "tens_count": 3, + "participated": true + } + ], + "total_score": 589, + "final_score": 0, + "tournaments_participated": 0 + }, + "14": { + "name": "Karli Proje", + "joker_used": true, + "tournament_results": [ + { + "tournament": 1, + "score": 0, + "tens_count": 0, + "participated": false, + "joker": true + }, + { + "tournament": 2, + "score": 0, + "tens_count": 0, + "participated": true + }, + { + "tournament": 3, + "score": 0, + "tens_count": 0, + "participated": true + } + ], + "total_score": 0, + "final_score": 0, + "tournaments_participated": 0 + }, + "15": { + "name": "Jan Pleterski", + "joker_used": true, + "tournament_results": [ + { + "tournament": 1, + "score": 269, + "tens_count": 1, + "participated": true + }, + { + "tournament": 2, + "score": 0, + "tens_count": 0, + "participated": false, + "joker": true + }, + { + "tournament": 3, + "score": 267, + "tens_count": 1, + "participated": true + } + ], + "total_score": 536, + "final_score": 0, + "tournaments_participated": 0 + }, + "16": { + "name": "Silvo Poročnik", + "joker_used": false, + "tournament_results": [ + { + "tournament": 1, + "score": 293, + "tens_count": 3, + "participated": true + }, + { + "tournament": 2, + "score": 278, + "tens_count": 3, + "participated": true + }, + { + "tournament": 3, + "score": 282, + "tens_count": 3, + "participated": true + } + ], + "total_score": 853, + "final_score": 0, + "tournaments_participated": 0 + }, + "17": { + "name": "Dušan Onuk", + "joker_used": false, + "tournament_results": [ + { + "tournament": 1, + "score": 313, + "tens_count": 4, + "participated": true + }, + { + "tournament": 2, + "score": 325, + "tens_count": 2, + "participated": true + }, + { + "tournament": 3, + "score": 192, + "tens_count": 3, + "participated": true + } + ], + "total_score": 830, + "final_score": 0, + "tournaments_participated": 0 + }, + "18": { + "name": "Matjaž Pleterski", + "joker_used": false, + "tournament_results": [ + { + "tournament": 1, + "score": 280, + "tens_count": 2, + "participated": true + }, + { + "tournament": 2, + "score": 276, + "tens_count": 4, + "participated": true + }, + { + "tournament": 3, + "score": 307, + "tens_count": 0, + "participated": true + } + ], + "total_score": 863, + "final_score": 0, + "tournaments_participated": 0 + }, + "22": { + "name": "Doris Fesel", + "joker_used": true, + "tournament_results": [ + { + "tournament": 1, + "score": 0, + "tens_count": 0, + "participated": false, + "joker": true + }, + { + "tournament": 2, + "score": 0, + "tens_count": 0, + "participated": true + }, + { + "tournament": 3, + "score": 0, + "tens_count": 0, + "participated": true + } + ], + "total_score": 0, + "final_score": 0, + "tournaments_participated": 0 + }, + "24": { + "name": "Jože Verdinek", + "joker_used": false, + "tournament_results": [ + { + "tournament": 1, + "score": 311, + "tens_count": 5, + "participated": true + }, + { + "tournament": 2, + "score": 315, + "tens_count": 5, + "participated": true + }, + { + "tournament": 3, + "score": 312, + "tens_count": 2, + "participated": true + } + ], + "total_score": 938, + "final_score": 0, + "tournaments_participated": 0 + }, + "50": { + "name": "Vid Ravnjak", + "joker_used": true, + "tournament_results": [ + { + "tournament": 1, + "score": 302, + "tens_count": 6, + "participated": true + }, + { + "tournament": 2, + "score": 309, + "tens_count": 4, + "participated": true + }, + { + "tournament": 3, + "score": 0, + "tens_count": 0, + "participated": false, + "joker": true + } + ], + "total_score": 611, + "final_score": 0, + "tournaments_participated": 0 + }, + "51": { + "name": "Robi Ovčar", + "joker_used": true, + "tournament_results": [ + { + "tournament": 1, + "score": 269, + "tens_count": 1, + "participated": true + }, + { + "tournament": 2, + "score": 0, + "tens_count": 0, + "participated": false, + "joker": true + }, + { + "tournament": 3, + "score": 265, + "tens_count": 1, + "participated": true + } + ], + "total_score": 534, + "final_score": 0, + "tournaments_participated": 0 + } + }, + "completed_tournaments": [ + { + "tournament_number": 1, + "tournament_type": "20_targets", + "finished_at": "2025-11-15T11:50:43.358782", + "results_summary": { + "participants": 15, + "shots_per_participant": 40, + "total_shots": 600, + "format_description": "20 Targets (2 shots each)" + } + }, + { + "tournament_number": 2, + "tournament_type": "20_targets", + "finished_at": "2025-12-13T12:13:29.550924", + "results_summary": { + "participants": 12, + "shots_per_participant": 40, + "total_shots": 480, + "format_description": "20 Targets (2 shots each)" + } + }, + { + "tournament_number": 3, + "tournament_type": "20_targets", + "finished_at": "2026-01-10T11:34:15.800129", + "results_summary": { + "participants": 14, + "shots_per_participant": 40, + "total_shots": 560, + "format_description": "20 Targets (2 shots each)" + } + } + ], + "league_finished": false +} \ No newline at end of file diff --git a/data/players.json b/data/players.json index 682bd6f..2e5e5a9 100644 --- a/data/players.json +++ b/data/players.json @@ -8,17 +8,17 @@ { "id": 2, "name": "Nik Pleterski", - "enabled": true + "enabled": false }, { "id": 3, "name": "Ivan Tandler", - "enabled": true + "enabled": false }, { "id": 4, "name": "Mateja Pleterski", - "enabled": true + "enabled": false }, { "id": 5, @@ -28,7 +28,7 @@ { "id": 6, "name": "Mateja Senica", - "enabled": true + "enabled": false }, { "id": 7, @@ -38,7 +38,7 @@ { "id": 8, "name": "Franc Žigart", - "enabled": true + "enabled": false }, { "id": 9, @@ -58,12 +58,12 @@ { "id": 12, "name": "Matej Kvasnik", - "enabled": true + "enabled": false }, { "id": 13, "name": "Angelca Mrak", - "enabled": true + "enabled": false }, { "id": 14, @@ -93,17 +93,17 @@ { "id": 19, "name": "Franc Rizmal", - "enabled": true + "enabled": false }, { "id": 20, "name": "Jože Preglav", - "enabled": true + "enabled": false }, { "id": 21, "name": "Marko Blimen", - "enabled": true + "enabled": false }, { "id": 22, @@ -113,7 +113,7 @@ { "id": 23, "name": "Robi Krautberger", - "enabled": true + "enabled": false }, { "id": 24, @@ -123,126 +123,136 @@ { "id": 25, "name": "Andrej Herman", - "enabled": true + "enabled": false }, { "id": 26, "name": "Jakob Herman", - "enabled": true + "enabled": false }, { "id": 27, "name": "Janez Mrak", - "enabled": true + "enabled": false }, { "id": 28, "name": "Anže Kolar", - "enabled": true + "enabled": false }, { "id": 29, "name": "Alen Kolar", - "enabled": true + "enabled": false }, { "id": 30, "name": "Maja Hirtl", - "enabled": true + "enabled": false }, { "id": 31, "name": "Dejan Kučnik", - "enabled": true + "enabled": false }, { "id": 32, "name": "David Strniša", - "enabled": true + "enabled": false }, { "id": 33, "name": "Namir Uzunović", - "enabled": true + "enabled": false }, { "id": 34, "name": "Jože Planinšec", - "enabled": true + "enabled": false }, { "id": 35, "name": "Vanja Kolar", - "enabled": true + "enabled": false }, { "id": 36, "name": "Klara Wankmuller", - "enabled": true + "enabled": false }, { "id": 37, "name": "Milan Stramec", - "enabled": true + "enabled": false }, { "id": 38, "name": "Bojan Sudar", - "enabled": true + "enabled": false }, { "id": 39, "name": "Tia Sudar", - "enabled": true + "enabled": false }, { "id": 40, "name": "Jaka Cvar", - "enabled": true + "enabled": false }, { "id": 41, "name": "Tadej Štruc", - "enabled": true + "enabled": false }, { "id": 42, "name": "Jure Glaser", - "enabled": true + "enabled": false }, { "id": 43, "name": "Marko Pokržnik", - "enabled": true + "enabled": false }, { "id": 44, "name": "Anka Kačnik", - "enabled": true + "enabled": false }, { "id": 45, "name": "Lidija Blimen", - "enabled": true + "enabled": false }, { "id": 46, "name": "Tijana Štumpfl", - "enabled": true + "enabled": false }, { "id": 47, "name": "Ljuba Mršak", - "enabled": true + "enabled": false }, { "id": 48, "name": "Janja Salcman", - "enabled": true + "enabled": false }, { "id": 49, "name": "Jolanda Verhnjak", + "enabled": false + }, + { + "id": 50, + "name": "Vid Ravnjak", + "enabled": true + }, + { + "id": 51, + "name": "Robi Ovčar", "enabled": true } ] diff --git a/data/tournament_results.json b/data/tournament_results.json new file mode 100644 index 0000000..8a9718f --- /dev/null +++ b/data/tournament_results.json @@ -0,0 +1,1242 @@ +{ + "tournament_id": "2026-01-10T09:59:15.945867", + "tournament_type": "20_targets", + "participants": { + "1": { + "name": "Domen Pleterski", + "targets": { + "1": { + "shot1": 6, + "shot2": 5 + }, + "2": { + "shot1": 8, + "shot2": 8 + }, + "3": { + "shot1": 9, + "shot2": 6 + }, + "4": { + "shot1": 9, + "shot2": 7 + }, + "5": { + "shot1": 9, + "shot2": 9 + }, + "6": { + "shot1": 10, + "shot2": 8 + }, + "7": { + "shot1": 9, + "shot2": 8 + }, + "8": { + "shot1": 8, + "shot2": 8 + }, + "9": { + "shot1": 9, + "shot2": 8 + }, + "10": { + "shot1": 9, + "shot2": 8 + }, + "11": { + "shot1": 8, + "shot2": 7 + }, + "12": { + "shot1": 10, + "shot2": 9 + }, + "13": { + "shot1": 9, + "shot2": 9 + }, + "14": { + "shot1": 8, + "shot2": 7 + }, + "15": { + "shot1": 8, + "shot2": 8 + }, + "16": { + "shot1": 9, + "shot2": 6 + }, + "17": { + "shot1": 8, + "shot2": 6 + }, + "18": { + "shot1": 7, + "shot2": 8 + }, + "19": { + "shot1": 9, + "shot2": 7 + }, + "20": { + "shot1": 9, + "shot2": 7 + } + }, + "total_score": 320, + "completed": true, + "joker_selected": false + }, + "10": { + "name": "Mitja Čeh", + "targets": { + "1": { + "shot1": 9, + "shot2": 8 + }, + "2": { + "shot1": 9, + "shot2": 7 + }, + "3": { + "shot1": 10, + "shot2": 9 + }, + "4": { + "shot1": 9, + "shot2": 7 + }, + "5": { + "shot1": 8, + "shot2": 8 + }, + "6": { + "shot1": 7, + "shot2": 5 + }, + "7": { + "shot1": 8, + "shot2": 7 + }, + "8": { + "shot1": 8, + "shot2": 5 + }, + "9": { + "shot1": 8, + "shot2": 7 + }, + "10": { + "shot1": 9, + "shot2": 8 + }, + "11": { + "shot1": 10, + "shot2": 8 + }, + "12": { + "shot1": 8, + "shot2": 0 + }, + "13": { + "shot1": 9, + "shot2": 9 + }, + "14": { + "shot1": 8, + "shot2": 8 + }, + "15": { + "shot1": 9, + "shot2": 8 + }, + "16": { + "shot1": 9, + "shot2": 7 + }, + "17": { + "shot1": 7, + "shot2": 5 + }, + "18": { + "shot1": 9, + "shot2": 7 + }, + "19": { + "shot1": 7, + "shot2": 7 + }, + "20": { + "shot1": 9, + "shot2": 7 + } + }, + "total_score": 307, + "completed": true, + "joker_selected": false + }, + "22": { + "name": "Doris Fesel", + "targets": { + "1": { + "shot1": 0, + "shot2": 0 + }, + "2": { + "shot1": 0, + "shot2": 0 + }, + "3": { + "shot1": 0, + "shot2": 0 + }, + "4": { + "shot1": 0, + "shot2": 0 + }, + "5": { + "shot1": 0, + "shot2": 0 + }, + "6": { + "shot1": 0, + "shot2": 0 + }, + "7": { + "shot1": 0, + "shot2": 0 + }, + "8": { + "shot1": 0, + "shot2": 0 + }, + "9": { + "shot1": 0, + "shot2": 0 + }, + "10": { + "shot1": 0, + "shot2": 0 + }, + "11": { + "shot1": 0, + "shot2": 0 + }, + "12": { + "shot1": 0, + "shot2": 0 + }, + "13": { + "shot1": 0, + "shot2": 0 + }, + "14": { + "shot1": 0, + "shot2": 0 + }, + "15": { + "shot1": 0, + "shot2": 0 + }, + "16": { + "shot1": 0, + "shot2": 0 + }, + "17": { + "shot1": 0, + "shot2": 0 + }, + "18": { + "shot1": 0, + "shot2": 0 + }, + "19": { + "shot1": 0, + "shot2": 0 + }, + "20": { + "shot1": 0, + "shot2": 0 + } + }, + "total_score": 0, + "completed": true, + "joker_selected": false + }, + "18": { + "name": "Matjaž Pleterski", + "targets": { + "1": { + "shot1": 9, + "shot2": 7 + }, + "2": { + "shot1": 9, + "shot2": 8 + }, + "3": { + "shot1": 8, + "shot2": 8 + }, + "4": { + "shot1": 9, + "shot2": 9 + }, + "5": { + "shot1": 8, + "shot2": 6 + }, + "6": { + "shot1": 8, + "shot2": 7 + }, + "7": { + "shot1": 9, + "shot2": 8 + }, + "8": { + "shot1": 8, + "shot2": 4 + }, + "9": { + "shot1": 9, + "shot2": 5 + }, + "10": { + "shot1": 8, + "shot2": 4 + }, + "11": { + "shot1": 9, + "shot2": 7 + }, + "12": { + "shot1": 8, + "shot2": 8 + }, + "13": { + "shot1": 8, + "shot2": 7 + }, + "14": { + "shot1": 8, + "shot2": 8 + }, + "15": { + "shot1": 9, + "shot2": 7 + }, + "16": { + "shot1": 8, + "shot2": 8 + }, + "17": { + "shot1": 9, + "shot2": 9 + }, + "18": { + "shot1": 7, + "shot2": 5 + }, + "19": { + "shot1": 8, + "shot2": 7 + }, + "20": { + "shot1": 9, + "shot2": 7 + } + }, + "total_score": 307, + "completed": true, + "joker_selected": false + }, + "17": { + "name": "Dušan Onuk", + "targets": { + "1": { + "shot1": 8, + "shot2": 8 + }, + "2": { + "shot1": 10, + "shot2": 7 + }, + "3": { + "shot1": 9, + "shot2": 8 + }, + "4": { + "shot1": 8, + "shot2": 6 + }, + "5": { + "shot1": 6, + "shot2": 7 + }, + "6": { + "shot1": 9, + "shot2": 8 + }, + "7": { + "shot1": 7, + "shot2": 7 + }, + "8": { + "shot1": 10, + "shot2": 8 + }, + "9": { + "shot1": 9, + "shot2": 7 + }, + "10": { + "shot1": 10, + "shot2": 4 + }, + "11": { + "shot1": 7, + "shot2": 7 + }, + "12": { + "shot1": 9, + "shot2": 1 + }, + "13": { + "shot1": 8, + "shot2": 4 + }, + "14": { + "shot1": 0, + "shot2": 0 + }, + "15": { + "shot1": 0, + "shot2": 0 + }, + "16": { + "shot1": 0, + "shot2": 0 + }, + "17": { + "shot1": 0, + "shot2": 0 + }, + "18": { + "shot1": 0, + "shot2": 0 + }, + "19": { + "shot1": 0, + "shot2": 0 + }, + "20": { + "shot1": 0, + "shot2": 0 + } + }, + "total_score": 192, + "completed": true, + "joker_selected": false + }, + "15": { + "name": "Jan Pleterski", + "targets": { + "1": { + "shot1": 9, + "shot2": 8 + }, + "2": { + "shot1": 7, + "shot2": 5 + }, + "3": { + "shot1": 7, + "shot2": 6 + }, + "4": { + "shot1": 8, + "shot2": 2 + }, + "5": { + "shot1": 7, + "shot2": 4 + }, + "6": { + "shot1": 7, + "shot2": 3 + }, + "7": { + "shot1": 6, + "shot2": 6 + }, + "8": { + "shot1": 8, + "shot2": 6 + }, + "9": { + "shot1": 8, + "shot2": 1 + }, + "10": { + "shot1": 9, + "shot2": 9 + }, + "11": { + "shot1": 8, + "shot2": 6 + }, + "12": { + "shot1": 9, + "shot2": 7 + }, + "13": { + "shot1": 9, + "shot2": 3 + }, + "14": { + "shot1": 9, + "shot2": 3 + }, + "15": { + "shot1": 8, + "shot2": 7 + }, + "16": { + "shot1": 7, + "shot2": 4 + }, + "17": { + "shot1": 10, + "shot2": 6 + }, + "18": { + "shot1": 8, + "shot2": 7 + }, + "19": { + "shot1": 8, + "shot2": 8 + }, + "20": { + "shot1": 9, + "shot2": 5 + } + }, + "total_score": 267, + "completed": true, + "joker_selected": false + }, + "51": { + "name": "Robi Ovčar", + "targets": { + "1": { + "shot1": 9, + "shot2": 7 + }, + "2": { + "shot1": 9, + "shot2": 4 + }, + "3": { + "shot1": 4, + "shot2": 1 + }, + "4": { + "shot1": 7, + "shot2": 6 + }, + "5": { + "shot1": 7, + "shot2": 6 + }, + "6": { + "shot1": 6, + "shot2": 2 + }, + "7": { + "shot1": 9, + "shot2": 5 + }, + "8": { + "shot1": 9, + "shot2": 8 + }, + "9": { + "shot1": 4, + "shot2": 4 + }, + "10": { + "shot1": 9, + "shot2": 9 + }, + "11": { + "shot1": 8, + "shot2": 6 + }, + "12": { + "shot1": 8, + "shot2": 8 + }, + "13": { + "shot1": 8, + "shot2": 4 + }, + "14": { + "shot1": 10, + "shot2": 8 + }, + "15": { + "shot1": 4, + "shot2": 2 + }, + "16": { + "shot1": 9, + "shot2": 7 + }, + "17": { + "shot1": 9, + "shot2": 6 + }, + "18": { + "shot1": 7, + "shot2": 7 + }, + "19": { + "shot1": 7, + "shot2": 7 + }, + "20": { + "shot1": 8, + "shot2": 7 + } + }, + "total_score": 265, + "completed": true, + "joker_selected": false + }, + "16": { + "name": "Silvo Poročnik", + "targets": { + "1": { + "shot1": 8, + "shot2": 1 + }, + "2": { + "shot1": 7, + "shot2": 7 + }, + "3": { + "shot1": 8, + "shot2": 8 + }, + "4": { + "shot1": 8, + "shot2": 7 + }, + "5": { + "shot1": 9, + "shot2": 6 + }, + "6": { + "shot1": 9, + "shot2": 5 + }, + "7": { + "shot1": 10, + "shot2": 8 + }, + "8": { + "shot1": 10, + "shot2": 7 + }, + "9": { + "shot1": 7, + "shot2": 6 + }, + "10": { + "shot1": 8, + "shot2": 7 + }, + "11": { + "shot1": 8, + "shot2": 4 + }, + "12": { + "shot1": 7, + "shot2": 4 + }, + "13": { + "shot1": 8, + "shot2": 5 + }, + "14": { + "shot1": 8, + "shot2": 8 + }, + "15": { + "shot1": 8, + "shot2": 6 + }, + "16": { + "shot1": 7, + "shot2": 2 + }, + "17": { + "shot1": 8, + "shot2": 6 + }, + "18": { + "shot1": 7, + "shot2": 7 + }, + "19": { + "shot1": 10, + "shot2": 9 + }, + "20": { + "shot1": 8, + "shot2": 6 + } + }, + "total_score": 282, + "completed": true, + "joker_selected": false + }, + "7": { + "name": "Branko Pokeržnik", + "targets": { + "1": { + "shot1": 9, + "shot2": 8 + }, + "2": { + "shot1": 8, + "shot2": 6 + }, + "3": { + "shot1": 9, + "shot2": 7 + }, + "4": { + "shot1": 9, + "shot2": 7 + }, + "5": { + "shot1": 9, + "shot2": 7 + }, + "6": { + "shot1": 8, + "shot2": 7 + }, + "7": { + "shot1": 7, + "shot2": 6 + }, + "8": { + "shot1": 9, + "shot2": 8 + }, + "9": { + "shot1": 8, + "shot2": 8 + }, + "10": { + "shot1": 8, + "shot2": 8 + }, + "11": { + "shot1": 8, + "shot2": 6 + }, + "12": { + "shot1": 7, + "shot2": 6 + }, + "13": { + "shot1": 10, + "shot2": 8 + }, + "14": { + "shot1": 9, + "shot2": 9 + }, + "15": { + "shot1": 8, + "shot2": 8 + }, + "16": { + "shot1": 9, + "shot2": 8 + }, + "17": { + "shot1": 9, + "shot2": 8 + }, + "18": { + "shot1": 9, + "shot2": 7 + }, + "19": { + "shot1": 9, + "shot2": 8 + }, + "20": { + "shot1": 8, + "shot2": 8 + } + }, + "total_score": 318, + "completed": true, + "joker_selected": false + }, + "9": { + "name": "Janez Božič", + "targets": { + "1": { + "shot1": 8, + "shot2": 6 + }, + "2": { + "shot1": 8, + "shot2": 4 + }, + "3": { + "shot1": 9, + "shot2": 6 + }, + "4": { + "shot1": 8, + "shot2": 8 + }, + "5": { + "shot1": 10, + "shot2": 8 + }, + "6": { + "shot1": 9, + "shot2": 7 + }, + "7": { + "shot1": 9, + "shot2": 8 + }, + "8": { + "shot1": 9, + "shot2": 8 + }, + "9": { + "shot1": 5, + "shot2": 5 + }, + "10": { + "shot1": 7, + "shot2": 5 + }, + "11": { + "shot1": 7, + "shot2": 6 + }, + "12": { + "shot1": 9, + "shot2": 6 + }, + "13": { + "shot1": 7, + "shot2": 6 + }, + "14": { + "shot1": 6, + "shot2": 2 + }, + "15": { + "shot1": 7, + "shot2": 4 + }, + "16": { + "shot1": 7, + "shot2": 3 + }, + "17": { + "shot1": 7, + "shot2": 5 + }, + "18": { + "shot1": 5, + "shot2": 3 + }, + "19": { + "shot1": 2, + "shot2": 4 + }, + "20": { + "shot1": 9, + "shot2": 9 + } + }, + "total_score": 261, + "completed": true, + "joker_selected": false + }, + "5": { + "name": "Jože Verhnjak", + "targets": { + "1": { + "shot1": 9, + "shot2": 8 + }, + "2": { + "shot1": 8, + "shot2": 2 + }, + "3": { + "shot1": 7, + "shot2": 8 + }, + "4": { + "shot1": 9, + "shot2": 6 + }, + "5": { + "shot1": 7, + "shot2": 6 + }, + "6": { + "shot1": 8, + "shot2": 7 + }, + "7": { + "shot1": 9, + "shot2": 7 + }, + "8": { + "shot1": 8, + "shot2": 7 + }, + "9": { + "shot1": 9, + "shot2": 6 + }, + "10": { + "shot1": 8, + "shot2": 2 + }, + "11": { + "shot1": 9, + "shot2": 6 + }, + "12": { + "shot1": 8, + "shot2": 8 + }, + "13": { + "shot1": 8, + "shot2": 4 + }, + "14": { + "shot1": 8, + "shot2": 6 + }, + "15": { + "shot1": 9, + "shot2": 7 + }, + "16": { + "shot1": 10, + "shot2": 8 + }, + "17": { + "shot1": 10, + "shot2": 7 + }, + "18": { + "shot1": 8, + "shot2": 8 + }, + "19": { + "shot1": 9, + "shot2": 8 + }, + "20": { + "shot1": 6, + "shot2": 5 + } + }, + "total_score": 293, + "completed": true, + "joker_selected": false + }, + "24": { + "name": "Jože Verdinek", + "targets": { + "1": { + "shot1": 9, + "shot2": 8 + }, + "2": { + "shot1": 9, + "shot2": 6 + }, + "3": { + "shot1": 9, + "shot2": 9 + }, + "4": { + "shot1": 8, + "shot2": 6 + }, + "5": { + "shot1": 8, + "shot2": 7 + }, + "6": { + "shot1": 8, + "shot2": 7 + }, + "7": { + "shot1": 8, + "shot2": 8 + }, + "8": { + "shot1": 9, + "shot2": 8 + }, + "9": { + "shot1": 9, + "shot2": 8 + }, + "10": { + "shot1": 8, + "shot2": 6 + }, + "11": { + "shot1": 9, + "shot2": 6 + }, + "12": { + "shot1": 8, + "shot2": 5 + }, + "13": { + "shot1": 9, + "shot2": 8 + }, + "14": { + "shot1": 9, + "shot2": 7 + }, + "15": { + "shot1": 6, + "shot2": 5 + }, + "16": { + "shot1": 9, + "shot2": 7 + }, + "17": { + "shot1": 10, + "shot2": 8 + }, + "18": { + "shot1": 10, + "shot2": 7 + }, + "19": { + "shot1": 9, + "shot2": 7 + }, + "20": { + "shot1": 9, + "shot2": 6 + } + }, + "total_score": 312, + "completed": true, + "joker_selected": false + }, + "14": { + "name": "Karli Proje", + "targets": { + "1": { + "shot1": 0, + "shot2": 0 + }, + "2": { + "shot1": 0, + "shot2": 0 + }, + "3": { + "shot1": 0, + "shot2": 0 + }, + "4": { + "shot1": 0, + "shot2": 0 + }, + "5": { + "shot1": 0, + "shot2": 0 + }, + "6": { + "shot1": 0, + "shot2": 0 + }, + "7": { + "shot1": 0, + "shot2": 0 + }, + "8": { + "shot1": 0, + "shot2": 0 + }, + "9": { + "shot1": 0, + "shot2": 0 + }, + "10": { + "shot1": 0, + "shot2": 0 + }, + "11": { + "shot1": 0, + "shot2": 0 + }, + "12": { + "shot1": 0, + "shot2": 0 + }, + "13": { + "shot1": 0, + "shot2": 0 + }, + "14": { + "shot1": 0, + "shot2": 0 + }, + "15": { + "shot1": 0, + "shot2": 0 + }, + "16": { + "shot1": 0, + "shot2": 0 + }, + "17": { + "shot1": 0, + "shot2": 0 + }, + "18": { + "shot1": 0, + "shot2": 0 + }, + "19": { + "shot1": 0, + "shot2": 0 + }, + "20": { + "shot1": 0, + "shot2": 0 + } + }, + "total_score": 0, + "completed": true, + "joker_selected": false + }, + "11": { + "name": "Rado Kefer", + "targets": { + "1": { + "shot1": 8, + "shot2": 7 + }, + "2": { + "shot1": 9, + "shot2": 6 + }, + "3": { + "shot1": 9, + "shot2": 7 + }, + "4": { + "shot1": 8, + "shot2": 8 + }, + "5": { + "shot1": 10, + "shot2": 8 + }, + "6": { + "shot1": 8, + "shot2": 8 + }, + "7": { + "shot1": 9, + "shot2": 7 + }, + "8": { + "shot1": 10, + "shot2": 8 + }, + "9": { + "shot1": 7, + "shot2": 6 + }, + "10": { + "shot1": 8, + "shot2": 7 + }, + "11": { + "shot1": 8, + "shot2": 6 + }, + "12": { + "shot1": 7, + "shot2": 4 + }, + "13": { + "shot1": 9, + "shot2": 9 + }, + "14": { + "shot1": 9, + "shot2": 8 + }, + "15": { + "shot1": 10, + "shot2": 8 + }, + "16": { + "shot1": 9, + "shot2": 7 + }, + "17": { + "shot1": 8, + "shot2": 8 + }, + "18": { + "shot1": 7, + "shot2": 8 + }, + "19": { + "shot1": 8, + "shot2": 8 + }, + "20": { + "shot1": 8, + "shot2": 7 + } + }, + "total_score": 314, + "completed": true, + "joker_selected": false + } + }, + "tournament_finished": true, + "created_at": "2026-01-10T09:59:15.947146", + "league_tournament_number": 3, + "finished_at": "2026-01-10T11:34:15.800055" +} \ No newline at end of file diff --git a/locales/en.json b/locales/en.json index b66bcb5..656e35b 100644 --- a/locales/en.json +++ b/locales/en.json @@ -95,7 +95,8 @@ "created": "Created", "tournaments": "Tournaments", "league_tournament": "League Tournament", - "finished": "Finished" + "finished": "Finished", + "view_current_results": "View Current Standings" }, "tournament_types": { "4_targets": "4 Targets", diff --git a/locales/sl.json b/locales/sl.json index b1fa566..34db67b 100644 --- a/locales/sl.json +++ b/locales/sl.json @@ -96,7 +96,8 @@ "league_completed": "Liga Zaključena", "section_title": "Sekcija", "finished": "Zaključeno", - "targets": "Število Tarč" + "targets": "Število Tarč", + "view_current_results": "Oglej Trenutne Rezultate" }, "tournament_types": { "4_targets": "4 Tarče", diff --git a/templates/league_scoreboard_display.html b/templates/league_scoreboard_display.html index f7661bf..9a8717e 100644 --- a/templates/league_scoreboard_display.html +++ b/templates/league_scoreboard_display.html @@ -1100,6 +1100,8 @@ tournamentCells += '🃏'; } else { const score = result.score; + const tensCount = result.tens_count || 0; + // Check if this specific tournament index should be excluded const isExcluded = best4Logic.excludedIndices.includes(participatedTournamentIndex) && best4Logic.allScores.length > 4; const scoreClass = isExcluded ? 'excluded' : 'counted'; diff --git a/templates/results_calculator.html b/templates/results_calculator.html index 9ce4b1d..8418ed7 100644 --- a/templates/results_calculator.html +++ b/templates/results_calculator.html @@ -236,6 +236,44 @@ font-weight: bold; } + .joker-checkbox-wrapper { + margin-top: 8px; + } + + .joker-label { + display: flex; + align-items: center; + gap: 8px; + cursor: pointer; + padding: 6px 12px; + background: #fff3cd; + border: 2px solid #ffc107; + border-radius: 8px; + transition: all 0.2s ease; + } + + .joker-label:hover { + background: #ffc107; + border-color: #ff9800; + } + + .joker-checkbox-calc { + cursor: pointer; + width: 18px; + height: 18px; + } + + .joker-checkbox-calc:disabled { + cursor: not-allowed; + opacity: 0.6; + } + + .joker-text { + font-size: 0.9rem; + font-weight: 600; + color: #856404; + } + .participant-status { display: flex; align-items: center; @@ -670,6 +708,19 @@
{{ participant.name }}
ID: {{ player_id }}
+ {% if league_state %} +
+ +
+ {% endif %}
@@ -1338,6 +1389,49 @@ } } + // Handle joker checkbox change + function handleJokerChange(playerId) { + const checkbox = document.getElementById(`joker-calc-${playerId}`); + const isChecked = checkbox.checked; + + // If checked, warn user that all scores will be set to zero + if (isChecked) { + if (confirm('Marking this player as using their Joker will set all their scores to zero. Continue?')) { + // Set all scores to zero + const participant = results.participants[playerId]; + if (participant && participant.targets) { + Object.keys(participant.targets).forEach(targetId => { + const target = participant.targets[targetId]; + Object.keys(target).forEach(shotKey => { + if (shotKey.startsWith('shot')) { + target[shotKey] = 0; + } + }); + }); + } + participant.total_score = 0; + participant.completed = true; // Mark as completed since joker is used + participant.joker_selected = true; // Mark joker as selected in results + + // Update UI + updateParticipantTotal(playerId); + updateParticipantStatus(playerId); + updateParticipantTens(playerId); + updateOverallProgress(); + updateOverallTens(); + + // Disable the checkbox so it can't be unchecked + checkbox.disabled = true; + + // Save the change + savePlayerData(playerId); + } else { + // User cancelled, uncheck the box + checkbox.checked = false; + } + } + } + // Keyboard shortcuts document.addEventListener('keydown', function(event) { if (event.ctrlKey && event.key === 's') { @@ -1352,7 +1446,7 @@ // Initialize targets for all players Object.keys(results.participants).forEach(playerId => { initializeTargetsForPlayer(parseInt(playerId)); - + // Update initial states for (let i = 1; i <= numTargets; i++) { updateTargetGroupStyling(parseInt(playerId), i); @@ -1360,7 +1454,22 @@ updateParticipantStatus(parseInt(playerId)); updateParticipantTens(parseInt(playerId)); }); - + + // Initialize joker checkboxes for league tournaments + {% if league_state %} + const leagueState = {{ league_state | tojson | safe }}; + Object.keys(results.participants).forEach(playerId => { + const checkbox = document.getElementById(`joker-calc-${playerId}`); + if (checkbox && leagueState.participants && leagueState.participants[playerId]) { + const participant = leagueState.participants[playerId]; + if (participant.joker_used) { + checkbox.checked = true; + checkbox.disabled = true; + } + } + }); + {% endif %} + updateOverallProgress(); updateOverallTens(); diff --git a/templates/tournament.html b/templates/tournament.html index b26dfce..3a85028 100644 --- a/templates/tournament.html +++ b/templates/tournament.html @@ -767,14 +767,22 @@ font-weight: bold; transition: all 0.2s ease; min-width: 200px; - text-decoration: none; + text-decoration: none !important; font-family: Arial, sans-serif; + display: inline-block; } .action-btn:hover { background: #1e7e34; transform: translateY(-1px); box-shadow: 0 4px 8px rgba(0, 123, 255, 0.3); + text-decoration: none !important; + } + + .action-btn:focus, + .action-btn:active, + .action-btn:visited { + text-decoration: none !important; } .action-btn:disabled { @@ -800,6 +808,16 @@ background: #c82333; } + .action-btn.info { + background: #007bff; + border-color: #0056b3; + } + + .action-btn.info:hover { + background: #0056b3; + box-shadow: 0 4px 8px rgba(0, 123, 255, 0.4); + } + .player-count { margin: 20px 0; font-size: 1.2rem; @@ -1606,7 +1624,7 @@
{% endfor %} @@ -1614,6 +1632,11 @@
+ {% if league_state.completed_tournaments|length > 0 %} + + 📊 View Current Standings + + {% endif %} diff --git a/tv_app.py b/tv_app.py index ebc29c7..e80f59c 100644 --- a/tv_app.py +++ b/tv_app.py @@ -1,6 +1,5 @@ """ TV_APP V1.0.0 - Tournament and League Management System -Flask web application for managing tournaments with multi-camera streaming """ from flask import Flask, render_template, request, redirect, jsonify, session @@ -1594,6 +1593,8 @@ def finish_tournament(): 'participated': False, 'joker': True }) + # Mark joker as used for this player + participant['joker_used'] = True # Calculate total shots correctly for any tournament type tournament_type = results.get('tournament_type', '20_targets')