feat(ux): separate physical and virtual classroom KPIs, fix month sessions filter, improve admin contrast, persist sidebar submenus, and relocate theme toggle (v3.8.14)
This commit is contained in:
@@ -69,7 +69,7 @@ def get_users(
|
||||
|
||||
total = query.count()
|
||||
roles = Role.query.order_by(Role.name.asc()).all()
|
||||
roles_data = [{'id': r.id, 'name': r.name} for r in roles]
|
||||
roles_data = [{'id': r.id, 'name': 'Administrador' if (r.name or '').strip().lower() == 'admin' else r.name} for r in roles]
|
||||
|
||||
# Métricas agregadas de usuarios para contadores en la vista
|
||||
total_users_count = db.session.query(func.count(User.id)).scalar() or 0
|
||||
@@ -114,10 +114,21 @@ def get_users(
|
||||
users_data = []
|
||||
for u in users:
|
||||
d = u.to_dict()
|
||||
r_name = u.role_obj.name if u.role_obj else (u.role or 'Docente')
|
||||
if (r_name or '').strip().lower() == 'admin':
|
||||
r_name = 'Administrador'
|
||||
d['role_obj'] = {
|
||||
'id': u.role_obj.id,
|
||||
'name': u.role_obj.name
|
||||
} if u.role_obj else {'id': 1, 'name': u.role or 'Admin'}
|
||||
'id': u.role_obj.id if u.role_obj else 1,
|
||||
'name': r_name
|
||||
}
|
||||
if d.get('name') == 'System Administrator':
|
||||
d['name'] = 'Administrador del Sistema'
|
||||
if d.get('first_name') == 'System' and d.get('last_name') == 'Administrator':
|
||||
d['first_name'] = 'Administrador'
|
||||
d['last_name'] = 'Sistema'
|
||||
elif d.get('first_name') == 'Administrator' and d.get('last_name') == 'System':
|
||||
d['first_name'] = 'Administrador'
|
||||
d['last_name'] = 'Sistema'
|
||||
users_data.append(d)
|
||||
|
||||
return {
|
||||
|
||||
Reference in New Issue
Block a user