From dd4a4c042a3cdb0fb03bb80bfe99a21008435c6f Mon Sep 17 00:00:00 2001 From: Carlos Tello Date: Wed, 23 Sep 2026 16:26:42 -0300 Subject: [PATCH] fix(ui): resolver superposicion en menu colapsado, reparar edicion de ciclo lectivo, aplicar paleta UniCABA y agregar control de modo demo en config global --- backend/app/routes/admin.py | 142 ++++++- backend/app/routes/auth.py | 7 +- backend/app/utils/jwt_decorators.py | 9 + frontend/public/css/theme.css | 76 ++-- frontend/views/admin/academic_terms/list.html | 142 +++---- .../views/admin/settings/global_config.html | 102 +++++ frontend/views/auth/login.html | 2 + frontend/views/base.html | 370 +++++++++++------- frontend/views/layouts/base.html | 56 +-- 9 files changed, 619 insertions(+), 287 deletions(-) diff --git a/backend/app/routes/admin.py b/backend/app/routes/admin.py index 95a37b4..eea708f 100644 --- a/backend/app/routes/admin.py +++ b/backend/app/routes/admin.py @@ -904,15 +904,22 @@ def academic_term_add(): @admin_bp.route('/academic-terms//edit', methods=['POST']) +@admin_bp.route('/academic_term_edit', methods=['POST'], defaults={'id': None}) +@admin_bp.route('/academic_term_edit/', methods=['POST']) @login_required -def academic_term_edit(id): +def academic_term_edit(id=None): """Edit an academic cycle""" if not (current_user.has_permission('academic', 'read_write') or (current_user.role and current_user.role.upper() == 'ADMIN')): abort(403) + term_id = id or request.form.get('id', type=int) + if not term_id: + flash(_('Identificador de ciclo lectivo no especificado.'), 'error') + return redirect(url_for('admin.academic_terms_list')) + from app.models.academic_term import AcademicTerm from datetime import datetime - term = AcademicTerm.query.get_or_404(id) + term = AcademicTerm.query.get_or_404(term_id) code = request.form.get('code', '').strip() name = request.form.get('name', '').strip() @@ -1417,3 +1424,134 @@ def commission_update_enrollment(id, student_id): flash(_('Estado de inscripcion actualizado.'), 'success') return redirect(url_for('admin.commission_detail', id=id)) + + +# --------------------------------------------------------- +# CONFIGURACIÓN GLOBAL DEL SISTEMA & MODO DEMO +# --------------------------------------------------------- + +@admin_bp.route('/settings', methods=['GET']) +@login_required +def global_settings(): + """Vista principal del panel de Configuración Global del Sistema""" + if not (current_user.is_admin() or (current_user.role and current_user.role.upper() == 'ADMIN') or current_user.has_permission('system_settings', 'read')): + abort(403) + + from app.models.setting import SystemSetting + from app.models.user import User + + # Diccionario de parámetros para inicializar el template + settings = { + 'smtp': { + 'host': SystemSetting.get_value('smtp_host', 'smtp.gmail.com'), + 'port': int(SystemSetting.get_value('smtp_port', 587)), + 'user': SystemSetting.get_value('smtp_user', ''), + 'password_masked': SystemSetting.get_masked_value('smtp_password', ''), + 'security': SystemSetting.get_value('smtp_security', 'tls'), + 'from_email': SystemSetting.get_value('smtp_sender_email', 'notificaciones@unicaba.edu.ar'), + 'from_name': SystemSetting.get_value('smtp_sender_name', 'Edu-Space UniCABA'), + 'enabled': SystemSetting.get_value('smtp_enabled', 'true') in ['true', 'True', '1', True] + }, + 'auth_providers': { + 'local': SystemSetting.get_value('auth_local_enabled', 'true') in ['true', 'True', '1', True], + 'google': SystemSetting.get_value('auth_google_enabled', 'false') in ['true', 'True', '1', True], + 'moodle': SystemSetting.get_value('auth_moodle_enabled', 'false') in ['true', 'True', '1', True] + }, + 'google_oauth': { + 'client_id': SystemSetting.get_value('google_client_id', ''), + 'client_secret_masked': SystemSetting.get_masked_value('google_client_secret', ''), + 'callback_url': SystemSetting.get_value('google_callback_url', '/auth/google/callback'), + 'allowed_domains': SystemSetting.get_value('google_allowed_domains', 'unicaba.edu.ar,lasalle.edu.ar') + }, + 'moodle': { + 'server_url': SystemSetting.get_value('moodle_server_url', 'http://10.0.0.207/moodle'), + 'ws_token_masked': SystemSetting.get_masked_value('moodle_ws_token', ''), + 'timeout': int(SystemSetting.get_value('moodle_timeout', 10)), + 'auto_sync_enabled': SystemSetting.get_value('moodle_auto_sync_enabled', 'true') in ['true', 'True', '1', True], + 'sync_interval_minutes': int(SystemSetting.get_value('moodle_sync_interval_minutes', 15)) + } + } + + # Estado del Modo Demo y Cuentas Preconfiguradas + demo_access_enabled = SystemSetting.get_value('demo_access_enabled', 'true') in ['true', 'True', '1', True] + demo_emails = ['bedelia@edu-space.com', 'docente@edu-space.com', 'alumno@edu-space.com'] + demo_users = User.query.filter(func.lower(User.email).in_(demo_emails)).all() + demo_accounts_active = any(u.is_active for u in demo_users) + + return render_template( + 'admin/settings/global_config.html', + settings=settings, + demo_access_enabled=demo_access_enabled, + demo_accounts_active=demo_accounts_active, + demo_users=demo_users + ) + + +@admin_bp.route('/settings/demo-mode', methods=['POST']) +@login_required +def toggle_demo_mode(): + """Habilita o deshabilita el Acceso Rápido Demo y las cuentas default (Bedelía, Docente, Alumno)""" + if not (current_user.is_admin() or (current_user.role and current_user.role.upper() == 'ADMIN')): + if request.is_json: + return jsonify({'status': 'error', 'message': 'Acción no autorizada'}), 403 + abort(403) + + from app.models.setting import SystemSetting + from app.models.user import User + from app.models.audit_log import AuditLog + + data = request.get_json(silent=True) or request.form.to_dict() or {} + + # Si viene explícito el booleano 'enabled', lo usamos; si no, alternamos el valor actual + if 'enabled' in data: + target_state = data['enabled'] in [True, 'true', '1', 'on'] + else: + current_state = SystemSetting.get_value('demo_access_enabled', 'true') in ['true', 'True', '1', True] + target_state = not current_state + + # Guardar estado en SystemSetting + SystemSetting.set_value( + 'demo_access_enabled', + 'true' if target_state else 'false', + 'Acceso Rápido Demo en pantalla de Login', + category='security' + ) + + # Activar o desactivar las 3 cuentas default + demo_emails = ['bedelia@edu-space.com', 'docente@edu-space.com', 'alumno@edu-space.com'] + demo_users = User.query.filter(func.lower(User.email).in_(demo_emails)).all() + for u in demo_users: + u.is_active = target_state + db.session.commit() + + # Registro de auditoría + action_name = 'ENABLE_DEMO_ACCOUNTS' if target_state else 'DISABLE_DEMO_ACCOUNTS' + msg_detail = ( + 'Acceso Rápido Demo habilitado y cuentas Bedelía, Docente y Alumno activadas' + if target_state else + 'Acceso Rápido Demo deshabilitado y cuentas default (Bedelía, Docente, Alumno) desactivadas' + ) + try: + audit = AuditLog( + user_id=current_user.id, + user_email=current_user.email, + action=action_name, + module='settings', + details=msg_detail + ) + db.session.add(audit) + db.session.commit() + except Exception: + pass + + if request.is_json or request.headers.get('X-Requested-With') == 'XMLHttpRequest': + return jsonify({ + 'status': 'success', + 'message': msg_detail, + 'demo_access_enabled': target_state, + 'demo_accounts_active': target_state + }), 200 + + flash(_(msg_detail), 'success' if not target_state else 'info') + return redirect(url_for('admin.global_settings')) + diff --git a/backend/app/routes/auth.py b/backend/app/routes/auth.py index ef69e79..86d5c36 100644 --- a/backend/app/routes/auth.py +++ b/backend/app/routes/auth.py @@ -16,6 +16,9 @@ def login(): if current_user.is_authenticated: return redirect(url_for('main.dashboard')) + from app.models.setting import SystemSetting + demo_access_enabled = SystemSetting.get_value('demo_access_enabled', 'true') in ['true', 'True', '1', True] + form = LoginForm() if form.validate_on_submit(): clean_email = (form.email.data or '').strip().lower() @@ -24,7 +27,7 @@ def login(): if user and user.check_password(form.password.data): if not user.is_active: flash(_('Tu cuenta ha sido desactivada. Por favor contacta al administrador.'), 'error') - return render_template('auth/login.html', form=form) + return render_template('auth/login.html', form=form, demo_access_enabled=demo_access_enabled) login_user(user, remember=form.remember_me.data) user.update_last_login() @@ -69,7 +72,7 @@ def login(): pass flash(_('Correo electrónico o contraseña inválidos.'), 'error') - return render_template('auth/login.html', form=form) + return render_template('auth/login.html', form=form, demo_access_enabled=demo_access_enabled) @auth_bp.route('/logout') @login_required diff --git a/backend/app/utils/jwt_decorators.py b/backend/app/utils/jwt_decorators.py index 6aa5821..60da289 100644 --- a/backend/app/utils/jwt_decorators.py +++ b/backend/app/utils/jwt_decorators.py @@ -20,6 +20,15 @@ def jwt_required(f): token = request.cookies.get('access_token') if not token: + from flask_login import current_user + if current_user.is_authenticated and current_user.is_active: + g.jwt_user = current_user + g.jwt_payload = {'sub': str(current_user.id), 'role': getattr(current_user, 'role', '')} + g.jwt_token = None + g.real_admin_user = current_user + g.is_impersonating = False + return f(*args, **kwargs) + return jsonify({ 'error': 'Unauthorized', 'message': 'Encabezado Authorization con Bearer token no proporcionado.' diff --git a/frontend/public/css/theme.css b/frontend/public/css/theme.css index b9e9667..aba6755 100644 --- a/frontend/public/css/theme.css +++ b/frontend/public/css/theme.css @@ -4,63 +4,65 @@ */ :root { - /* --- Brand Primary (Magenta / Uva) --- */ - --brand-primary: #9E2D77; - --brand-primary-rgb: 158, 45, 119; - --brand-primary-shade: #832062; - --brand-primary-tint: #B43E8E; + /* --- Brand Primary (Magenta / Frambuesa Oficial UniCABA) --- */ + --brand-primary: #B43E8E; + --brand-primary-rgb: 180, 62, 142; + --brand-primary-shade: #9E2D77; + --brand-primary-tint: #D63384; --brand-primary-contrast: #FFFFFF; - /* --- Accent Colors (Modo Claro) con Alto Contraste --- */ - --accent-purple: #581C87; - --accent-purple-rgb: 88, 28, 135; - --secondary-magenta: #701A40; - --secondary-magenta-rgb: 112, 26, 64; + /* --- Accent Colors (Modo Claro) UniCABA: Rosas y Púrpuras Cálidos --- */ + --accent-purple: #682CAD; + --accent-purple-rgb: 104, 44, 173; + --secondary-magenta: #9E2D77; + --secondary-magenta-rgb: 158, 45, 119; + --accent-pink-soft: #FDF2F8; + --accent-pink-border: #FBCFE8; - /* --- Global Surface & Text (Modo Claro - Diseñado para Descanso Visual y Nitidez) --- */ - --app-bg: #EEF2F6; + /* --- Global Surface & Text (Modo Claro - Rosas Suaves, Blanco Puro y Contraste Nitido) --- */ + --app-bg: #FAF5F8; --card-bg: #FFFFFF; - --card-border: #D8E0E9; - --card-hover-border: #9E2D77; - --card-shadow: 0 2px 10px rgba(15, 23, 42, 0.05), 0 1px 3px rgba(15, 23, 42, 0.03); - --card-hover-shadow: 0 8px 24px rgba(15, 23, 42, 0.08); + --card-border: rgba(180, 62, 142, 0.16); + --card-hover-border: #B43E8E; + --card-shadow: 0 4px 18px rgba(180, 62, 142, 0.05), 0 1px 3px rgba(0, 0, 0, 0.02); + --card-hover-shadow: 0 8px 24px rgba(180, 62, 142, 0.12); - --text-primary: #0F172A; - --text-secondary: #334155; - --text-muted: #475569; + --text-primary: #1E293B; + --text-secondary: #475569; + --text-muted: #64748B; - --navbar-bg: linear-gradient(135deg, #9E2D77 0%, #7B2049 100%); + --navbar-bg: linear-gradient(135deg, #B43E8E 0%, #8E2B6E 100%); --navbar-text: #FFFFFF; --navbar-border: transparent; - --navbar-shadow: 0 4px 16px rgba(158, 45, 119, 0.22); + --navbar-shadow: 0 4px 18px rgba(180, 62, 142, 0.25); --input-bg: #FFFFFF; - --input-border: #94A3B8; - --input-text: #0F172A; - --input-focus-border: #9E2D77; - --input-focus-shadow: 0 0 0 0.2rem rgba(158, 45, 119, 0.2); + --input-border: #CBD5E1; + --input-text: #1E293B; + --input-focus-border: #B43E8E; + --input-focus-shadow: 0 0 0 0.2rem rgba(180, 62, 142, 0.22); - /* --- Distinctive Gradient --- */ - --gradient-primary: linear-gradient(135deg, #9E2D77 0%, #832062 100%); - --gradient-primary-shadow: 0 6px 18px rgba(158, 45, 119, 0.25); - --gradient-hero: linear-gradient(135deg, rgba(158, 45, 119, 0.06) 0%, rgba(88, 28, 135, 0.08) 100%); + /* --- Distinctive Gradient UniCABA --- */ + --gradient-primary: linear-gradient(135deg, #B43E8E 0%, #9E2D77 100%); + --gradient-primary-shadow: 0 6px 20px rgba(180, 62, 142, 0.28); + --gradient-hero: linear-gradient(135deg, rgba(180, 62, 142, 0.08) 0%, rgba(104, 44, 173, 0.06) 100%); /* --- Badges (Modo Claro) --- */ - --badge-primary-bg: #9E2D77; + --badge-primary-bg: #B43E8E; --badge-primary-text: #FFFFFF; - --badge-accent-bg: #581C87; + --badge-accent-bg: #682CAD; --badge-accent-text: #FFFFFF; - --badge-magenta-bg: #701A40; + --badge-magenta-bg: #9E2D77; --badge-magenta-text: #FFFFFF; } [data-bs-theme="light"] { - --bs-body-bg: #EEF2F6; - --bs-body-color: #0F172A; + --bs-body-bg: #FAF5F8; + --bs-body-color: #1E293B; --bs-secondary-color: #475569; - --bs-tertiary-bg: #F1F5F9; - --bs-border-color: #D8E0E9; - --bs-border-color-translucent: rgba(15, 23, 42, 0.12); + --bs-tertiary-bg: #FDF2F8; + --bs-border-color: rgba(180, 62, 142, 0.18); + --bs-border-color-translucent: rgba(180, 62, 142, 0.12); } /* ======================================================= diff --git a/frontend/views/admin/academic_terms/list.html b/frontend/views/admin/academic_terms/list.html index 73c1d3f..7fd969c 100644 --- a/frontend/views/admin/academic_terms/list.html +++ b/frontend/views/admin/academic_terms/list.html @@ -106,72 +106,6 @@ - - - {% endif %} @@ -189,11 +123,81 @@ + +{% if can_edit %} +{% for term in terms %} + +{% endfor %} +{% endif %} + {% if can_edit %} -