bl3kunja/Sdk_TV_app
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Enhance print layouts with branded headers and fix navigation consistency

Browse Source 
- Replace plain print headers with full branded headers including logo
  - Add dynamic tournament-type styling (🎯 4-target, ⚡ 20-target, 💪 40-target)
  - Remove border lines and optimize spacing for clean print appearance
  - Fix emoji positioning in league championship headers
  - Standardize navigation with proper active button indicators
  - Add missing translation keys for calculator instructions
  - Update print media queries for professional document output

  Print improvements:
  - Logo and branding now appear on printed results
  - Consistent 20px spacing between header and table
  - Clean white background with subtle borders
  - Optimized typography for print readability

  Navigation fixes:
  - Added active button highlighting across all PC pages
  - Consistent navigation order: Dashboard → Tournament → Player Analysis → Archive → Draft →
  Calculator
  - Fixed draft page active indicator

  🤖 Generated with Claude Code

  Co-Authored-By: Claude <noreply@anthropic.com>

  This commit message covers all the major improvements we made:
  - Print layout enhancements with branded headers
  - Navigation standardization and active indicators
  - Translation fixes
  - Visual styling improvements
  - Professional document output optimization
This commit is contained in:
bl3kunja
2025-09-20 20:03:44 +02:00
parent 33758e7340
commit c61c1448e4
62 changed files with 45554 additions and 11528 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app.py
+139 -36
View File
@@ -1,4 +1,4 @@
from flask import Flask, render_template, request, redirect, jsonify
from flask import Flask, render_template, request, redirect, jsonify, session
import json
import os
import random
@@ -8,6 +8,37 @@ from datetime import datetime
import re
app = Flask(__name__)
app.secret_key = 'your-secret-key-for-sessions' # Change this to a random secret key
# Language support
SUPPORTED_LANGUAGES = ['sl', 'en']
DEFAULT_LANGUAGE = 'sl'
def load_translations(language='sl'):
"""Load translations for the specified language"""
try:
locale_file = f'locales/{language}.json'
if os.path.exists(locale_file):
with open(locale_file, 'r', encoding='utf-8') as f:
return json.load(f)
except Exception as e:
print(f"Error loading translations for {language}: {e}")
# Fallback to default language
try:
with open(f'locales/{DEFAULT_LANGUAGE}.json', 'r', encoding='utf-8') as f:
return json.load(f)
except Exception as e:
print(f"Error loading default translations: {e}")
return {}
def get_current_language():
"""Get current language from session or default"""
return session.get('language', DEFAULT_LANGUAGE)
def get_translations():
"""Get translations for current language"""
return load_translations(get_current_language())
def is_mobile_device():
"""Check if the request is coming from a mobile device"""
@@ -228,14 +259,14 @@ def archive_league(league_data):
return False
def create_league(enabled_players, tournament_type):
"""Create a new league with 6 tournaments"""
"""Create a new league with 5 tournaments (changed from 6)"""
league_id = f"league_{datetime.now().strftime('%Y%m%d_%H%M%S')}"
league_data = {
'league_id': league_id,
'created_at': datetime.now().isoformat(),
'tournament_type': tournament_type,
'total_tournaments': 6,
'total_tournaments': 5, # Changed from 6 to 5
'current_tournament': 0, # Will be 1 when first tournament starts
'participants': {},
'completed_tournaments': [],
@@ -249,7 +280,7 @@ def create_league(enabled_players, tournament_type):
'joker_used': False,
'tournament_results': [],
'total_score': 0,
'final_score': 0, # Best 5 tournaments
'final_score': 0, # Best 4 tournaments (changed from 5)
'tournaments_participated': 0
}
@@ -366,7 +397,7 @@ def is_participant_completed(targets):
return True
def calculate_league_final_scores(league_data):
"""Calculate final league scores using best 5 tournaments (joker system)"""
"""Calculate final league scores using best 4 tournaments (changed from best 5)"""
for participant_id, participant in league_data['participants'].items():
tournament_scores = []
@@ -375,17 +406,20 @@ def calculate_league_final_scores(league_data):
if result['participated']:
tournament_scores.append(result['score'])
# Sort scores descending and take best 5 (or all if less than 6)
# Sort scores descending and take best 4 (changed from 5)
tournament_scores.sort(reverse=True)
best_scores = tournament_scores[:5] if len(tournament_scores) > 5 else tournament_scores
best_scores = tournament_scores[:4] if len(tournament_scores) > 4 else tournament_scores
participant['final_score'] = sum(best_scores)
participant['tournaments_participated'] = len(tournament_scores)
def get_league_final_rankings(league_data):
"""Get final league rankings sorted by final score"""
participants = []
for player_id, data in league_data['participants'].items():
# Calculate total 10s across all tournaments
total_tens = sum(result.get('tens_count', 0) for result in data['tournament_results'] if result.get('participated', False))
participants.append({
'id': player_id,
'name': data['name'],
@@ -393,11 +427,12 @@ def get_league_final_rankings(league_data):
'total_score': data['total_score'],
'tournaments_participated': data['tournaments_participated'],
'joker_used': data['joker_used'],
'tournament_results': data['tournament_results']
'tournament_results': data['tournament_results'],
'total_tens': total_tens
})
# Sort by final score (best 5 tournaments) descending
participants.sort(key=lambda x: x['final_score'], reverse=True)
# Sort by final score (best 5 tournaments) descending, then by total 10s for tiebreaking
participants.sort(key=lambda x: (x['final_score'], x['total_tens']), reverse=True)
# Add rankings
for i, participant in enumerate(participants):
@@ -427,11 +462,13 @@ def calculate_current_league_standings(league_data):
# Calculate current standings based on completed tournaments
tournament_scores = []
completed_tournaments = 0
total_tens = 0
for result in data['tournament_results']:
if result['participated']:
tournament_scores.append(result['score'])
completed_tournaments += 1
total_tens += result.get('tens_count', 0)
# Current score is sum of all completed tournaments
current_total = sum(tournament_scores)
@@ -447,11 +484,12 @@ def calculate_current_league_standings(league_data):
'projected_final': projected_final,
'tournaments_completed': completed_tournaments,
'joker_used': data['joker_used'],
'tournament_results': data['tournament_results']
'tournament_results': data['tournament_results'],
'total_tens': total_tens
})
# Sort by current total score (descending)
participants.sort(key=lambda x: x['current_total'], reverse=True)
# Sort by current total score (descending), then by total 10s for tiebreaking
participants.sort(key=lambda x: (x['current_total'], x['total_tens']), reverse=True)
# Add rankings
for i, participant in enumerate(participants):
@@ -467,6 +505,9 @@ def get_league_current_standings(league_state):
# Start with current league participants
participants = []
for player_id, data in league_state['participants'].items():
# Calculate total 10s from completed tournaments
total_tens = sum(result.get('tens_count', 0) for result in data['tournament_results'] if result.get('participated', False))
participant = {
'id': player_id,
'name': data['name'],
@@ -475,6 +516,7 @@ def get_league_current_standings(league_state):
'tournaments_participated': data['tournaments_participated'],
'joker_used': data['joker_used'],
'tournament_results': data['tournament_results'],
'total_tens': total_tens,
'current_tournament_score': 0, # Score from current tournament
'current_tournament_participating': False
}
@@ -491,8 +533,8 @@ def get_league_current_standings(league_state):
participant['current_tournament_participating'] = True
break
# Sort by final score (best 5 tournaments) descending
participants.sort(key=lambda x: x['final_score'], reverse=True)
# Sort by final score (best 5 tournaments) descending, then by total 10s for tiebreaking
participants.sort(key=lambda x: (x['final_score'], x['total_tens']), reverse=True)
# Add rankings
for i, participant in enumerate(participants):
@@ -797,10 +839,12 @@ def archive_index():
}
# Use the new template
return render_template('modern_archive_index.html',
return render_template('modern_archive_index.html',
tournaments=tournaments,
leagues=leagues,
stats=stats)
stats=stats,
translations=get_translations(),
current_language=get_current_language())
@app.route('/archive/player-analysis')
def player_analysis():
@@ -843,9 +887,11 @@ def player_analysis():
'top_score': top_score
}
return render_template('modern_player_analysis.html',
return render_template('modern_player_analysis.html',
players=all_players,
overview_stats=overview_stats)
overview_stats=overview_stats,
translations=get_translations(),
current_language=get_current_language())
@app.route('/archive/player/<int:player_id>')
def view_player_stats(player_id):
@@ -870,7 +916,9 @@ def view_player_stats(player_id):
return render_template('modern_player_stats.html',
player=player_info,
stats=player_stats)
stats=player_stats,
translations=get_translations(),
current_language=get_current_language())
# Enhanced API endpoints for the modern archive system
@@ -1144,7 +1192,12 @@ def index():
display_settings['total_rounds'] = 1
display_settings['league_active'] = False
return render_template('index.html', streams=STREAMS, settings=display_settings)
return render_template('index.html',
streams=STREAMS,
settings=display_settings,
translations=get_translations(),
current_language=get_current_language())
# MOBILE ROUTES
@app.route('/mobile')
@@ -1159,13 +1212,15 @@ def mobile_menu():
results_available = results is not None and results.get('tournament_finished', False)
league_results_available = league_state is not None and league_state.get('league_finished', False)
return render_template('mobile_menu.html',
return render_template('mobile_menu.html',
tournament_active=tournament_active,
league_active=league_active,
tournament_state=tournament_state,
league_state=league_state,
results_available=results_available,
league_results_available=league_results_available)
league_results_available=league_results_available,
translations=get_translations(),
current_language=get_current_language())
@app.route('/mobile/streams')
def mobile_streams():
@@ -1177,12 +1232,14 @@ def mobile_streams():
tournament_active = tournament_state is not None
current_round_data = get_current_round_data() if tournament_active else None
return render_template('mobile_streams.html',
streams=STREAMS,
return render_template('mobile_streams.html',
streams=STREAMS,
settings=settings,
tournament_active=tournament_active,
current_round_data=current_round_data,
tournament_state=tournament_state)
tournament_state=tournament_state,
translations=get_translations(),
current_language=get_current_language())
@app.route('/mobile/draft')
def mobile_draft():
@@ -1337,10 +1394,12 @@ def tournament():
tournament_state = load_tournament_state()
league_state = load_league_state()
return render_template('tournament.html',
return render_template('tournament.html',
players=players_data['players'],
tournament_state=tournament_state,
league_state=league_state)
league_state=league_state,
translations=get_translations(),
current_language=get_current_language())
@app.route('/tournament/draft')
def tournament_draft():
@@ -1374,9 +1433,11 @@ def results_calculator():
results = create_results_structure(tournament_state)
save_results(results)
return render_template('results_calculator.html',
return render_template('results_calculator.html',
tournament=tournament_state,
results=results)
results=results,
translations=get_translations(),
current_language=get_current_language())
@app.route('/results')
def results_display():
@@ -1398,7 +1459,9 @@ def results_display():
return render_template('league_scoreboard_display.html',
league=league_state,
participants=participants,
results=None)
results=None,
translations=get_translations(),
current_language=get_current_language())
else:
# Show ongoing league scoreboard
calculate_league_final_scores(league_state)
@@ -1412,7 +1475,9 @@ def results_display():
participants=participants,
tournament_state=tournament_state,
current_tournament_results=current_tournament_results,
results=None)
results=None,
translations=get_translations(),
current_language=get_current_language())
# Priority 1.5: Check if current results are from a finished league (even if league state was archived)
elif results and results.get('league_tournament_number'):
@@ -1466,7 +1531,9 @@ def results_display():
return render_template('results_display.html',
results=results,
participants=participants,
league=None)
league=None,
translations=get_translations(),
current_language=get_current_language())
else:
return redirect('/tournament')
@@ -1860,10 +1927,19 @@ def finish_tournament():
if player_id in league_state['participants']:
league_participant = league_state['participants'][player_id]
# Add tournament result
# Calculate 10s using existing logic
tens_count = 0
targets = participant.get('targets', {})
for target in targets.values():
for shot_key, shot_value in target.items():
if shot_key.startswith('shot') and shot_value == 10:
tens_count += 1
# Add tournament result with 10s count
league_participant['tournament_results'].append({
'tournament': tournament_number,
'score': participant['total_score'],
'tens_count': tens_count,
'participated': True
})
@@ -1877,6 +1953,7 @@ def finish_tournament():
participant['tournament_results'].append({
'tournament': tournament_number,
'score': 0,
'tens_count': 0,
'participated': False,
'joker': True
})
@@ -2611,9 +2688,35 @@ def api_get_tournament_leaders():
})
return jsonify({'status': 'success', 'tournament_types': tournament_leaders})
except Exception as e:
return jsonify({'status': 'error', 'message': str(e)}), 500
# Language API endpoints
@app.route('/api/language', methods=['GET'])
def get_language():
"""Get current language"""
return jsonify({
'current_language': get_current_language(),
'supported_languages': SUPPORTED_LANGUAGES,
'translations': get_translations()
})
@app.route('/api/language/<language>', methods=['POST'])
def set_language(language):
"""Set current language"""
if language in SUPPORTED_LANGUAGES:
session['language'] = language
return jsonify({
'status': 'success',
'language': language,
'translations': get_translations()
})
else:
return jsonify({
'status': 'error',
'message': f'Unsupported language: {language}'
}), 400
if __name__ == '__main__':
app.run(host='0.0.0.0', port=5000, debug=True)