changement de l'affichage des tryouts et des matchs

routes/evaluations.py

@@ -6,8 +6,9 @@ This module handles player evaluation creation, management, and viewing.
 from flask import Blueprint, render_template, redirect, url_for, flash, request
 from flask_login import login_required, current_user
 from extensions import db
-from models import User, Tryout, Evaluation, TryoutRegistration, GAME_POSITIONS
+from models import User, Tryout, Evaluation, TryoutRegistration, GAME_POSITIONS, OrgTeam
 from sqlalchemy import func
+from sqlalchemy.orm import aliased
 
 evaluations_bp = Blueprint('evaluations', __name__, url_prefix='/evaluations')
 
@@ -41,13 +42,55 @@ def list_evaluations():
     Evaluators (coach/manager): Their given evaluations.
     Players: Their received evaluations.
     
+    Supports sorting by any column header via 'sort' and 'order' query parameters.
+    
     Returns:
         Response: Rendered evaluations list template.
     """
     user = current_user
 
+    # Get sort parameters
+    sort_column = request.args.get('sort', 'created_at')
+    sort_order = request.args.get('order', 'desc')
+
+    # Validate sort_order
+    if sort_order not in ('asc', 'desc'):
+        sort_order = 'desc'
+
+    # Map sort columns to SQLAlchemy expressions using aliased User models for relationship sorting
+    player_alias = aliased(User, name='eval_player')
+    evaluator_alias = aliased(User, name='eval_evaluator')
+
+    sort_map = {
+        'tryout': Tryout.title,
+        'player': player_alias.full_name,
+        'evaluator': evaluator_alias.full_name,
+        'mecanics_score': Evaluation.mecanics_score,
+        'cohesion_score': Evaluation.cohesion_score,
+        'communication_score': Evaluation.communication_score,
+        'gamesense_score': Evaluation.gamesense_score,
+        'versatility_score': Evaluation.versatility_score,
+        'discipline_score': Evaluation.discipline_score,
+        'analysis_score': Evaluation.analysis_score,
+        'sport_ethics_score': Evaluation.sport_ethics_score,
+        'mental_score': Evaluation.mental_score,
+        'overall_score': Evaluation.overall_score,
+        'position_recommendation': Evaluation.position_recommendation,
+        'created_at': Evaluation.created_at,
+    }
+
+    sort_expr = sort_map.get(sort_column, Evaluation.created_at)
+    if sort_order == 'asc':
+        sort_expr = sort_expr.asc()
+    else:
+        sort_expr = sort_expr.desc()
+
     if user.role == 'president':
-        evaluations = Evaluation.query.order_by(Evaluation.created_at.desc()).all()
+        evaluations = Evaluation.query \
+            .outerjoin(Tryout, Evaluation.tryout_id == Tryout.id) \
+            .outerjoin(player_alias, Evaluation.player_id == player_alias.id) \
+            .outerjoin(evaluator_alias, Evaluation.evaluator_id == evaluator_alias.id) \
+            .order_by(sort_expr).all()
         avg_scores = db.session.query(
             Evaluation.player_id,
             func.count(Evaluation.id).label('eval_count'),
@@ -60,13 +103,23 @@ def list_evaluations():
                 player_scores[p.id] = {'player': p, 'count': row.eval_count, 'avg': round(row.avg_score, 1) if row.avg_score else 0}
 
     elif user.can_evaluate():
-        evaluations = Evaluation.query.filter_by(evaluator_id=user.id).order_by(Evaluation.created_at.desc()).all()
+        evaluations = Evaluation.query \
+            .outerjoin(Tryout, Evaluation.tryout_id == Tryout.id) \
+            .outerjoin(player_alias, Evaluation.player_id == player_alias.id) \
+            .outerjoin(evaluator_alias, Evaluation.evaluator_id == evaluator_alias.id) \
+            .filter(Evaluation.evaluator_id == user.id) \
+            .order_by(sort_expr).all()
         player_scores = {}
     else:
-        evaluations = Evaluation.query.filter_by(player_id=user.id).order_by(Evaluation.created_at.desc()).all()
+        evaluations = Evaluation.query \
+            .outerjoin(Tryout, Evaluation.tryout_id == Tryout.id) \
+            .outerjoin(player_alias, Evaluation.player_id == player_alias.id) \
+            .outerjoin(evaluator_alias, Evaluation.evaluator_id == evaluator_alias.id) \
+            .filter(Evaluation.player_id == user.id) \
+            .order_by(sort_expr).all()
         player_scores = {}
 
-    return render_template('pages/evaluations.html', evaluations=evaluations, player_scores=player_scores)
+    return render_template('pages/evaluations.html', evaluations=evaluations, player_scores=player_scores, sort_column=sort_column, sort_order=sort_order)
 
 
 @evaluations_bp.route('/<int:tryout_id>/<int:player_id>', methods=['GET', 'POST'])
@@ -219,4 +272,4 @@ def players_to_evaluate(tryout_id):
             ).first()
             players.append({'player': p, 'evaluated': existing is not None, 'registration': reg})
 
-    return render_template('pages/players_to_evaluate.html', tryout=tryout, players=players)
+    return render_template('pages/players_to_evaluate.html', tryout=tryout, players=players)