ajout d'un toggle pour permission d'upload des documents dans admin pannel
CI - Security, Lint & Tests / validate (push) Failing after 1m3s
CI - Security, Lint & Tests / validate (push) Failing after 1m3s
ajout de compteur d'heure disponible ajout du calendrier de dispo dans les profils publics
This commit is contained in:
@@ -73,6 +73,7 @@ def dashboard():
|
||||
|
||||
settings = {
|
||||
'tryouts_open': AppSettings.get_bool('tryouts_open', default=True),
|
||||
'document_uploads_enabled': AppSettings.get_bool('document_uploads_enabled', default=True),
|
||||
'season_active': AppSettings.get_bool('season_active', default=False),
|
||||
'season_name': AppSettings.get('season_name') or 'Not set',
|
||||
'season_start': AppSettings.get('season_start') or 'Not set',
|
||||
@@ -326,6 +327,24 @@ def end_season():
|
||||
_log('season_ended', f'Season: {name}, End: {end_date}')
|
||||
flash(f'Season "{name}" has ended.', 'success')
|
||||
return redirect(url_for('admin.dashboard'))
|
||||
@admin_bp.route('/toggle-document-uploads', methods=['POST'])
|
||||
@login_required
|
||||
def toggle_document_uploads():
|
||||
"""Enable or disable document uploads for non-admin users."""
|
||||
if not require_admin():
|
||||
return redirect(url_for('main.dashboard'))
|
||||
|
||||
current = AppSettings.get_bool('document_uploads_enabled', default=True)
|
||||
new_value = not current
|
||||
AppSettings.set_bool('document_uploads_enabled', new_value)
|
||||
|
||||
state = 'enabled' if new_value else 'disabled'
|
||||
_log('document_uploads_toggled', f'Document uploads {state}')
|
||||
flash(f'Document uploads are now {state}.', 'success')
|
||||
return redirect(url_for('admin.dashboard'))
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
|
||||
@@ -44,6 +44,7 @@ from app.routes.users._shared import (
|
||||
)
|
||||
from app.routes.users.blueprint import users_bp
|
||||
from app.storage import discard_documents
|
||||
from app.timeslots import total_hours
|
||||
from app.validators import CreateUserSchema, EditUserSchema
|
||||
|
||||
|
||||
@@ -59,7 +60,39 @@ def list_users():
|
||||
# query without a stable ORDER BY can show the same row twice and never
|
||||
# show another (MNT-14).
|
||||
page = paginate(User.query.order_by(User.role, User.username, User.id))
|
||||
return render_template('pages/users.html', users=page.items, pagination=page, roles=USER_TYPES)
|
||||
|
||||
# Build a per-user hours map for the current page with two bounded
|
||||
# queries (one per availability table), avoiding an N+1 per row.
|
||||
user_ids = [u.id for u in page.items]
|
||||
hours_by_user: dict[int, float] = {}
|
||||
|
||||
for slots, fk in [
|
||||
(
|
||||
PlayerDisponibility.query.filter(
|
||||
PlayerDisponibility.player_id.in_(user_ids),
|
||||
).all(),
|
||||
'player_id',
|
||||
),
|
||||
(
|
||||
CoachAvailability.query.filter(
|
||||
CoachAvailability.coach_id.in_(user_ids),
|
||||
).all(),
|
||||
'coach_id',
|
||||
),
|
||||
]:
|
||||
buckets: dict[int, list] = {}
|
||||
for slot in slots:
|
||||
buckets.setdefault(getattr(slot, fk), []).append(slot)
|
||||
for uid, group in buckets.items():
|
||||
hours_by_user[uid] = total_hours(group)
|
||||
|
||||
return render_template(
|
||||
'pages/users.html',
|
||||
users=page.items,
|
||||
pagination=page,
|
||||
roles=USER_TYPES,
|
||||
hours=hours_by_user,
|
||||
)
|
||||
|
||||
|
||||
@users_bp.route('/<int:user_id>/edit', methods=['GET', 'POST'])
|
||||
@@ -380,4 +413,19 @@ def create_user():
|
||||
def view_user(user_id):
|
||||
"""View a public profile for any user."""
|
||||
user = db.get_or_404(User, user_id)
|
||||
return render_template('pages/view_user.html', profile_user=user)
|
||||
|
||||
# Load availability for players and coaches so the public profile
|
||||
# can render a read-only weekly grid.
|
||||
availability = None
|
||||
if user.role == 'player':
|
||||
availability = user.disponibilities
|
||||
elif user.role == 'coach':
|
||||
availability = user.coach_availabilities
|
||||
availability_hours = total_hours(availability) if availability else None
|
||||
|
||||
return render_template(
|
||||
'pages/view_user.html',
|
||||
profile_user=user,
|
||||
availability=availability,
|
||||
availability_hours=availability_hours,
|
||||
)
|
||||
|
||||
@@ -11,6 +11,7 @@ from werkzeug.utils import secure_filename
|
||||
|
||||
from app.extensions import db
|
||||
from app.models import Admin, Coach, Contract, Manager, Player, User
|
||||
from app.models.admin_settings import AppSettings
|
||||
from app.permissions import can_manage_player_contract, coach_player_ids
|
||||
from app.routes.users._shared import (
|
||||
ALLOWED_CONTRACT_EXTENSIONS,
|
||||
@@ -49,6 +50,17 @@ def manageable_players():
|
||||
return User.query.filter_by(role='player', is_active_account=True).order_by(User.username).all()
|
||||
|
||||
|
||||
def document_uploads_locked():
|
||||
"""Return True when document uploads are globally disabled.
|
||||
|
||||
Admins are always allowed to bypass the lock. Managers, coaches, and
|
||||
players are blocked when the toggle is off.
|
||||
"""
|
||||
if isinstance(current_user, Admin):
|
||||
return False
|
||||
return not AppSettings.get_bool('document_uploads_enabled', default=True)
|
||||
|
||||
|
||||
@users_bp.route('/contracts')
|
||||
@login_required
|
||||
def list_contracts():
|
||||
@@ -92,6 +104,10 @@ def upload_contract():
|
||||
flash(_('Only presidents, managers, and coaches can upload contracts.'), 'danger')
|
||||
return redirect(url_for('users.list_contracts'))
|
||||
|
||||
if document_uploads_locked():
|
||||
flash(_('Document uploads are currently disabled.'), 'danger')
|
||||
return redirect(url_for('users.list_contracts'))
|
||||
|
||||
players = manageable_players()
|
||||
|
||||
if request.method == 'POST':
|
||||
@@ -169,6 +185,10 @@ def upload_signed_contract(contract_id):
|
||||
flash(_('Only the player can upload their signed contract.'), 'danger')
|
||||
return redirect(url_for('users.list_contracts'))
|
||||
|
||||
if document_uploads_locked():
|
||||
flash(_('Document uploads are currently disabled.'), 'danger')
|
||||
return redirect(url_for('users.list_contracts'))
|
||||
|
||||
file = request.files.get('signed_file')
|
||||
error = pdf_upload_error(file, ALLOWED_SIGNED_EXTENSIONS)
|
||||
if error:
|
||||
|
||||
Reference in New Issue
Block a user