fixed calculator showing when league active and tournament unactive.

This commit is contained in:
2025-11-12 12:06:12 +01:00
parent fd44ca7128
commit 8b503be144
3 changed files with 32 additions and 10 deletions
+6 -1
View File
@@ -669,11 +669,16 @@
<div class="tournament-actions"> <div class="tournament-actions">
<a href="/tournament/draft" class="nav-link tournament-btn">📋 <span data-i18n="tournament.view_full_tournament_draft">Oglej si Celoten Žreb Turnirja</span></a> <a href="/tournament/draft" class="nav-link tournament-btn">📋 <span data-i18n="tournament.view_full_tournament_draft">Oglej si Celoten Žreb Turnirja</span></a>
<a href="/tournament" class="nav-link tournament-btn" id="manageTournamentLink">⚙️ <span data-i18n="tournament.manage_tournament">Upravljaj Turnir</span></a> <a href="/tournament" class="nav-link tournament-btn" id="manageTournamentLink">⚙️ <span data-i18n="tournament.manage_tournament">Upravljaj Turnir</span></a>
<a href="/results/calculator" class="nav-link tournament-btn">🎯 <span data-i18n="scoring.results_calculator">Calculator</span></a>
</div> </div>
</div> </div>
{% endif %} {% endif %}
{% if settings.tournament_active %}
<div class="settings-group">
<a href="/results/calculator" class="nav-link tournament-btn">🎯 <span data-i18n="scoring.results_calculator">Calculator</span></a>
</div>
{% endif %}
<!-- Tournaments Section --> <!-- Tournaments Section -->
<div class="settings-group"> <div class="settings-group">
<h4 data-i18n="league.tournaments">Turnirji</h4> <h4 data-i18n="league.tournaments">Turnirji</h4>
+11 -1
View File
@@ -1487,7 +1487,7 @@
{% if tournament_state %} {% if tournament_state %}
<a href="/tournament/draft" class="nav-btn">📋 <span data-i18n="tournament.view_draft">Draft</span></a> <a href="/tournament/draft" class="nav-btn">📋 <span data-i18n="tournament.view_draft">Draft</span></a>
{% endif %} {% endif %}
{% if league_state or tournament_state %} {% if tournament_state %}
<a href="/results/calculator" class="nav-btn">🎯 <span data-i18n="navigation.calculator">Results Calculator</span></a> <a href="/results/calculator" class="nav-btn">🎯 <span data-i18n="navigation.calculator">Results Calculator</span></a>
{% endif %} {% endif %}
</div> </div>
@@ -2078,16 +2078,26 @@
function renderPlayerTable() { function renderPlayerTable() {
const tbody = document.getElementById('playerTableBody'); const tbody = document.getElementById('playerTableBody');
const noResults = document.getElementById('noResults'); const noResults = document.getElementById('noResults');
// Check if playerTableBody exists before proceeding (it may not exist on all pages)
if (!tbody) {
return;
}
const filteredPlayers = getFilteredPlayers(); const filteredPlayers = getFilteredPlayers();
tbody.innerHTML = ''; tbody.innerHTML = '';
if (filteredPlayers.length === 0) { if (filteredPlayers.length === 0) {
if (noResults) {
noResults.style.display = 'block'; noResults.style.display = 'block';
}
return; return;
} else { } else {
if (noResults) {
noResults.style.display = 'none'; noResults.style.display = 'none';
} }
}
filteredPlayers.forEach(player => { filteredPlayers.forEach(player => {
const row = document.createElement('tr'); const row = document.createElement('tr');
+8 -1
View File
@@ -723,8 +723,15 @@ def index():
display_settings['tournament_active'] = False display_settings['tournament_active'] = False
display_settings['current_round'] = 1 display_settings['current_round'] = 1
display_settings['total_rounds'] = 1 display_settings['total_rounds'] = 1
display_settings['league_active'] = False
# Check if league is active when tournament is not
league_state = load_league_state()
if league_state:
display_settings['league_active'] = True
display_settings['league_tournament'] = league_state.get('current_tournament', 1)
display_settings['league_total'] = league_state.get('total_tournaments', 6)
else:
display_settings['league_active'] = False
return render_template('index.html', return render_template('index.html',
streams=STREAMS, streams=STREAMS,