carlostellocba/admin-edu-space
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(ui): resolver superposicion en menu colapsado, reparar edicion de ciclo lectivo, aplicar paleta UniCABA y agregar control de modo demo en config global

Browse Source
This commit is contained in:
carlostellocba
2026-09-23 16:26:42 -03:00
parent 122caca9ce
commit dd4a4c042a
9 changed files with 619 additions and 287 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend/app/routes/admin.py
+140 -2
View File
@@ -904,15 +904,22 @@ def academic_term_add():
@admin_bp.route('/academic-terms/<int:id>/edit', methods=['POST'])
@admin_bp.route('/academic_term_edit', methods=['POST'], defaults={'id': None})
@admin_bp.route('/academic_term_edit/<int:id>', 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'))
backend/app/routes/auth.py
+5 -2
View File
@@ -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