fix(dashboard): resolver metricas reales, endpoints profile y descriptor classmethod v3.6.2
This commit is contained in:
@@ -11,6 +11,18 @@ El formato está basado en [Keep a Changelog](https://keepachangelog.com/es-ES/1
|
|||||||
- **Sincronización Continua Moodle (Fase 6):** Automatización de workers persistentes en background para el procesamiento continuo de la cola de Web Services Moodle 4.1.
|
- **Sincronización Continua Moodle (Fase 6):** Automatización de workers persistentes en background para el procesamiento continuo de la cola de Web Services Moodle 4.1.
|
||||||
- **Pruebas de Carga y Hardening (Fase 6):** Pruebas de estrés de concurrencia y validación final de producción.
|
- **Pruebas de Carga y Hardening (Fase 6):** Pruebas de estrés de concurrencia y validación final de producción.
|
||||||
|
|
||||||
|
## [3.6.2] - 2026-10-19
|
||||||
|
### Fixed
|
||||||
|
- **Estadísticas Reales del Dashboard y Métricas de Usuario**:
|
||||||
|
- `backend/app/routes/api/dashboard.py`: Reemplazados cálculos estáticos por métricas dinámicas del usuario autenticado (`my_today_count`, `my_total_reservations`, `virtual_rooms_count`, `my_today_classes`).
|
||||||
|
- `frontend/src/routes/dashboard.js`: Eliminados todos los valores de respaldo (fallbacks) artificiales/ficticios (`my_total_reservations: 8`, `my_today_count: 2`, `total_users: 8`, `today_reservations: 19`, `total_classrooms: 31`) para evitar inconsistencias cuando el usuario visualiza sus clases y reservas.
|
||||||
|
- **Corrección de Descriptor `SystemSetting`**:
|
||||||
|
- `backend/app/models/setting.py`: Solucionado `TypeError: 'classmethod' object is not callable` al invocar `SystemSetting.get_decrypted_value()` y `get_masked_value()`, extrayendo la función subyacente con `getattr(cls_func, '__func__', cls_func)` y removiendo el decorador `@classmethod` redundante en los helpers privados.
|
||||||
|
- **Rutas de Perfil y Preferencias de Tema Visual**:
|
||||||
|
- `backend/schemas/auth.py` & `backend/routers/auth.py`: Agregados esquemas Pydantic `ProfileUpdateRequest`, `ThemeUpdateRequest` y endpoints `GET /api/v1/auth/profile`, `POST /api/v1/auth/profile`, `POST /api/v1/auth/theme`.
|
||||||
|
- `backend/app/services/user_service.py`: Enriquecido `get_profile_data()` con campos completos de perfil (`first_name`, `last_name`, `document_type`, `document_number`, `personal_email`, `last_login`, `created_at`, `is_active`).
|
||||||
|
- `frontend/src/routes/auth.js`: Implementados handlers completos para `GET /profile`, `POST /profile` y `POST /theme` (AJAX) para resolver el error 404/405 al guardar configuraciones de perfil o alternar tema visual.
|
||||||
|
|
||||||
## [3.6.1] - 2026-10-19
|
## [3.6.1] - 2026-10-19
|
||||||
### Fixed
|
### Fixed
|
||||||
- **Resolución de Diagnósticos Estáticos y Hardening de Tipado (Principio 10)**:
|
- **Resolución de Diagnósticos Estáticos y Hardening de Tipado (Principio 10)**:
|
||||||
|
|||||||
@@ -9,10 +9,13 @@ Memoria del proyecto entre sesiones para la rama `dev`.
|
|||||||
- Libro de Calificaciones (*Gradebook*) con actas de regularidad inmutables.
|
- Libro de Calificaciones (*Gradebook*) con actas de regularidad inmutables.
|
||||||
- Autenticación híbrida (Google OAuth 2.0, Moodle SSO, Local) y Modo Impersonación.
|
- Autenticación híbrida (Google OAuth 2.0, Moodle SSO, Local) y Modo Impersonación.
|
||||||
- Reinicialización segura del sistema con contraseña de Administrador.
|
- Reinicialización segura del sistema con contraseña de Administrador.
|
||||||
- **Sprint Activo: MVP del Sistema de Bedelía — Migración a FastAPI y Resolución de Diagnósticos**:
|
- **Sprint Activo: MVP del Sistema de Bedelía — v3.6.2 (Dashboard en tiempo real, Perfil de Usuario y Descriptor SystemSetting)**:
|
||||||
- Migración completa del Core Backend a FastAPI ASGI (`main.py`, `routers/`, `schemas/`, `database.py`).
|
- Migración completa del Core Backend a FastAPI ASGI (`main.py`, `routers/`, `schemas/`, `database.py`).
|
||||||
- Resolución integral de advertencias y errores de tipado estático (Pyright/LSP): atributos relacionales de SQLAlchemy 2.0 bajo `TYPE_CHECKING` y `__allow_unmapped__ = True`, prevención de `DetachedInstanceError` mediante reasociación de sesión, saneamiento de `datetime.utcnow()` deprecado y tipado estricto en middlewares Starlette/a2wsgi.
|
- Resolución integral de advertencias y errores de tipado estático (Pyright/LSP).
|
||||||
- Suite de 57 pruebas automatizadas aprobadas al 100%. Versión actual: `v3.6.1`.
|
- Corrección de `TypeError: 'classmethod' object is not callable` en `SystemSetting` (`backend/app/models/setting.py`) para lectura segura de variables encriptadas/enmascaradas.
|
||||||
|
- Implementación completa de endpoints de perfil (`GET /auth/profile`, `POST /auth/profile`, `POST /auth/theme`) en backend y BFF frontend.
|
||||||
|
- Saneamiento de estadísticas del dashboard: eliminación de fallbacks ficticios y cálculo de métricas reales para el usuario autenticado (`my_today_count`, `my_total_reservations`, `virtual_rooms_count`).
|
||||||
|
- Suite de 57 pruebas automatizadas aprobadas al 100%. Versión actual: `v3.6.2`.
|
||||||
|
|
||||||
## Decisiones (y por qué)
|
## Decisiones (y por qué)
|
||||||
- **Flujo Secuencial de Bedelía (9 Pasos)**: Estandarizar la carga operativa en: 1) Sede -> 2) Aula -> 3) Ciclo Lectivo -> 4) Carrera -> 5) Materia (vinculada a Carrera) -> 6) Comisión (asociada a Materia, Carrera y Ciclo) -> 7) Profesores -> 8) Alumnos -> 9) Reserva de Espacio. Esto asegura consistencia e integridad relacional.
|
- **Flujo Secuencial de Bedelía (9 Pasos)**: Estandarizar la carga operativa en: 1) Sede -> 2) Aula -> 3) Ciclo Lectivo -> 4) Carrera -> 5) Materia (vinculada a Carrera) -> 6) Comisión (asociada a Materia, Carrera y Ciclo) -> 7) Profesores -> 8) Alumnos -> 9) Reserva de Espacio. Esto asegura consistencia e integridad relacional.
|
||||||
|
|||||||
@@ -6,7 +6,7 @@ from flask_babel import Babel, gettext as _
|
|||||||
from config.config import Config
|
from config.config import Config
|
||||||
|
|
||||||
# Initialize extensions
|
# Initialize extensions
|
||||||
__version__ = "3.6.1"
|
__version__ = "3.6.2"
|
||||||
db = SQLAlchemy()
|
db = SQLAlchemy()
|
||||||
migrate = Migrate()
|
migrate = Migrate()
|
||||||
cors = CORS()
|
cors = CORS()
|
||||||
|
|||||||
@@ -1,12 +1,12 @@
|
|||||||
from app import db
|
from app import db
|
||||||
from datetime import datetime
|
from datetime import datetime, timezone
|
||||||
from app.services.crypto_service import CryptoService
|
from app.services.crypto_service import CryptoService
|
||||||
|
|
||||||
class _hybrid_setting_method:
|
class _hybrid_setting_method:
|
||||||
"""Descriptor que resuelve si se invoca sobre la clase SystemSetting o sobre una instancia."""
|
"""Descriptor que resuelve si se invoca sobre la clase SystemSetting o sobre una instancia."""
|
||||||
def __init__(self, inst_func, cls_func):
|
def __init__(self, inst_func, cls_func):
|
||||||
self.inst_func = inst_func
|
self.inst_func = getattr(inst_func, '__func__', inst_func)
|
||||||
self.cls_func = cls_func
|
self.cls_func = getattr(cls_func, '__func__', cls_func)
|
||||||
|
|
||||||
def __get__(self, instance, owner):
|
def __get__(self, instance, owner):
|
||||||
if instance is None:
|
if instance is None:
|
||||||
@@ -28,7 +28,7 @@ class SystemSetting(db.Model):
|
|||||||
description = db.Column(db.String(255), nullable=True)
|
description = db.Column(db.String(255), nullable=True)
|
||||||
category = db.Column(db.String(50), default='system', nullable=True)
|
category = db.Column(db.String(50), default='system', nullable=True)
|
||||||
is_encrypted = db.Column(db.Boolean, default=False, nullable=True)
|
is_encrypted = db.Column(db.Boolean, default=False, nullable=True)
|
||||||
updated_at = db.Column(db.DateTime, default=datetime.utcnow, onupdate=datetime.utcnow)
|
updated_at = db.Column(db.DateTime, default=lambda: datetime.now(timezone.utc).replace(tzinfo=None), onupdate=lambda: datetime.now(timezone.utc).replace(tzinfo=None))
|
||||||
|
|
||||||
def __init__(self, **kwargs):
|
def __init__(self, **kwargs):
|
||||||
super().__init__(**kwargs)
|
super().__init__(**kwargs)
|
||||||
@@ -54,7 +54,6 @@ class SystemSetting(db.Model):
|
|||||||
pass
|
pass
|
||||||
return default
|
return default
|
||||||
|
|
||||||
@classmethod
|
|
||||||
def _cls_get_decrypted_value(cls, key, default=None):
|
def _cls_get_decrypted_value(cls, key, default=None):
|
||||||
try:
|
try:
|
||||||
record = cls.query.filter_by(key=key).first()
|
record = cls.query.filter_by(key=key).first()
|
||||||
@@ -79,7 +78,6 @@ class SystemSetting(db.Model):
|
|||||||
pass
|
pass
|
||||||
return default
|
return default
|
||||||
|
|
||||||
@classmethod
|
|
||||||
def _cls_get_masked_value(cls, key, default=''):
|
def _cls_get_masked_value(cls, key, default=''):
|
||||||
try:
|
try:
|
||||||
record = cls.query.filter_by(key=key).first()
|
record = cls.query.filter_by(key=key).first()
|
||||||
@@ -122,7 +120,7 @@ class SystemSetting(db.Model):
|
|||||||
if category:
|
if category:
|
||||||
record.category = category
|
record.category = category
|
||||||
record.is_encrypted = is_encrypted
|
record.is_encrypted = is_encrypted
|
||||||
record.updated_at = datetime.utcnow()
|
record.updated_at = datetime.now(timezone.utc).replace(tzinfo=None)
|
||||||
db.session.commit()
|
db.session.commit()
|
||||||
return record
|
return record
|
||||||
|
|
||||||
|
|||||||
@@ -151,6 +151,29 @@ def get_stats():
|
|||||||
upcoming_reservations = [serialize_reservation(r) for r in upcoming_reservations_q]
|
upcoming_reservations = [serialize_reservation(r) for r in upcoming_reservations_q]
|
||||||
milestones = [serialize_milestone(m) for m in milestones_q]
|
milestones = [serialize_milestone(m) for m in milestones_q]
|
||||||
|
|
||||||
|
jwt_user = getattr(g, 'jwt_user', None)
|
||||||
|
user_id = getattr(jwt_user, 'id', None)
|
||||||
|
|
||||||
|
my_today_count = 0
|
||||||
|
my_total_reservations = 0
|
||||||
|
my_today_classes = []
|
||||||
|
if user_id:
|
||||||
|
my_today_q = Reservation.query.filter(
|
||||||
|
Reservation.user_id == user_id,
|
||||||
|
func.date(Reservation.start_time) == today,
|
||||||
|
Reservation.status != 'CANCELLED'
|
||||||
|
).order_by(Reservation.start_time.asc()).all()
|
||||||
|
my_today_count = len(my_today_q)
|
||||||
|
my_today_classes = [serialize_reservation(r) for r in my_today_q]
|
||||||
|
my_total_reservations = Reservation.query.filter(
|
||||||
|
Reservation.user_id == user_id,
|
||||||
|
Reservation.status.in_(['CONFIRMED', 'PENDING'])
|
||||||
|
).count()
|
||||||
|
else:
|
||||||
|
my_today_count = today_reservations
|
||||||
|
my_total_reservations = len(today_reservations_q)
|
||||||
|
my_today_classes = today_schedule_list[:5]
|
||||||
|
|
||||||
# ---- Bedelía: Filtros completos de Aulas y Comisiones por Día (Hoy), Mañana, Semana y Mes ----
|
# ---- Bedelía: Filtros completos de Aulas y Comisiones por Día (Hoy), Mañana, Semana y Mes ----
|
||||||
import calendar
|
import calendar
|
||||||
today_dt = datetime.utcnow()
|
today_dt = datetime.utcnow()
|
||||||
@@ -564,12 +587,16 @@ def get_stats():
|
|||||||
'unassigned_today_classrooms': unassigned_today_count,
|
'unassigned_today_classrooms': unassigned_today_count,
|
||||||
'unassigned_today_pct': unassigned_today_pct,
|
'unassigned_today_pct': unassigned_today_pct,
|
||||||
'total_active_commissions': total_active_commissions,
|
'total_active_commissions': total_active_commissions,
|
||||||
'tomorrow_reservations': len(tomorrow_reservations_q) if 'tomorrow_reservations_q' in locals() else 0
|
'tomorrow_reservations': len(tomorrow_reservations_q) if 'tomorrow_reservations_q' in locals() else 0,
|
||||||
|
'my_today_count': my_today_count,
|
||||||
|
'my_total_reservations': my_total_reservations,
|
||||||
|
'virtual_rooms_count': virtual_classrooms
|
||||||
},
|
},
|
||||||
'audit_logs': audit_data,
|
'audit_logs': audit_data,
|
||||||
'monthly_data': monthly_data,
|
'monthly_data': monthly_data,
|
||||||
'pending_reservations': pending_reservations,
|
'pending_reservations': pending_reservations,
|
||||||
'today_schedule_list': today_schedule_list,
|
'today_schedule_list': today_schedule_list,
|
||||||
|
'my_today_classes': my_today_classes,
|
||||||
'tomorrow_schedule_list': tomorrow_schedule_list if 'tomorrow_schedule_list' in locals() else [],
|
'tomorrow_schedule_list': tomorrow_schedule_list if 'tomorrow_schedule_list' in locals() else [],
|
||||||
'week_schedule_list': week_schedule_list,
|
'week_schedule_list': week_schedule_list,
|
||||||
'upcoming_reservations': upcoming_reservations,
|
'upcoming_reservations': upcoming_reservations,
|
||||||
|
|||||||
@@ -7,7 +7,7 @@ OPENAPI_SPEC = {
|
|||||||
"info": {
|
"info": {
|
||||||
"title": "Edu-Space REST API",
|
"title": "Edu-Space REST API",
|
||||||
"description": "Enterprise Academic & Physical Space Management REST API with JWT Authentication and Role-Based Access Control.",
|
"description": "Enterprise Academic & Physical Space Management REST API with JWT Authentication and Role-Based Access Control.",
|
||||||
"version": "3.6.1"
|
"version": "3.6.2"
|
||||||
},
|
},
|
||||||
"servers": [
|
"servers": [
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -47,7 +47,15 @@ class UserService:
|
|||||||
'email': user.email,
|
'email': user.email,
|
||||||
'role': role_name,
|
'role': role_name,
|
||||||
'is_admin': user.is_admin(),
|
'is_admin': user.is_admin(),
|
||||||
|
'is_active': user.is_active,
|
||||||
|
'last_login': user.last_login.strftime('%Y-%m-%d %H:%M') if user.last_login else None,
|
||||||
|
'created_at': user.created_at.strftime('%Y-%m-%d %H:%M') if user.created_at else None,
|
||||||
'permissions': permissions,
|
'permissions': permissions,
|
||||||
'preferred_language': user.preferred_language,
|
'preferred_language': user.preferred_language,
|
||||||
'theme_preference': user.theme_preference
|
'theme_preference': user.theme_preference or 'auto',
|
||||||
|
'first_name': getattr(user, 'first_name', user.name.split()[0] if user.name else ''),
|
||||||
|
'last_name': getattr(user, 'last_name', ' '.join(user.name.split()[1:]) if user.name and len(user.name.split()) > 1 else ''),
|
||||||
|
'document_type': getattr(user, 'document_type', 'DNI'),
|
||||||
|
'document_number': getattr(user, 'document_number', ''),
|
||||||
|
'personal_email': getattr(user, 'personal_email', '')
|
||||||
}
|
}
|
||||||
|
|||||||
+61
-1
@@ -23,7 +23,9 @@ from schemas.auth import (
|
|||||||
LoginRequest,
|
LoginRequest,
|
||||||
GoogleAuthRequest,
|
GoogleAuthRequest,
|
||||||
MoodleAuthRequest,
|
MoodleAuthRequest,
|
||||||
RefreshTokenRequest
|
RefreshTokenRequest,
|
||||||
|
ProfileUpdateRequest,
|
||||||
|
ThemeUpdateRequest
|
||||||
)
|
)
|
||||||
|
|
||||||
auth_router = APIRouter(prefix="/api/v1/auth", tags=["Authentication"])
|
auth_router = APIRouter(prefix="/api/v1/auth", tags=["Authentication"])
|
||||||
@@ -239,6 +241,7 @@ def moodle_auth(payload: MoodleAuthRequest, response: Response):
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@auth_router.get("/profile")
|
||||||
@auth_router.get("/me")
|
@auth_router.get("/me")
|
||||||
def get_current_user_profile(user: User = Depends(get_current_user)):
|
def get_current_user_profile(user: User = Depends(get_current_user)):
|
||||||
"""Retorna la ficha del perfil del usuario actualmente autenticado."""
|
"""Retorna la ficha del perfil del usuario actualmente autenticado."""
|
||||||
@@ -251,6 +254,63 @@ def get_current_user_profile(user: User = Depends(get_current_user)):
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@auth_router.post("/profile")
|
||||||
|
def update_profile(
|
||||||
|
payload: ProfileUpdateRequest,
|
||||||
|
user: User = Depends(get_current_user)
|
||||||
|
):
|
||||||
|
"""Actualiza las preferencias de idioma y tema visual del usuario autenticado."""
|
||||||
|
with flask_app.app_context():
|
||||||
|
u = User.query.get(user.id)
|
||||||
|
if not u:
|
||||||
|
raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="Usuario no encontrado.")
|
||||||
|
|
||||||
|
if payload.preferred_language in ['es', 'en']:
|
||||||
|
u.preferred_language = payload.preferred_language
|
||||||
|
else:
|
||||||
|
u.preferred_language = None
|
||||||
|
|
||||||
|
if payload.theme_preference in ['auto', 'light', 'dark']:
|
||||||
|
u.theme_preference = payload.theme_preference
|
||||||
|
|
||||||
|
db.session.commit()
|
||||||
|
profile = user_service.get_profile_data(u)
|
||||||
|
AuditService.log(
|
||||||
|
action='UPDATE_PROFILE',
|
||||||
|
module='auth',
|
||||||
|
user=u,
|
||||||
|
details={'preferred_language': u.preferred_language, 'theme_preference': u.theme_preference},
|
||||||
|
status='success'
|
||||||
|
)
|
||||||
|
return {
|
||||||
|
'status': 'success',
|
||||||
|
'message': 'Preferencias de usuario actualizadas correctamente.',
|
||||||
|
'user': profile
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@auth_router.post("/theme")
|
||||||
|
def update_theme(
|
||||||
|
payload: ThemeUpdateRequest,
|
||||||
|
user: User = Depends(get_current_user)
|
||||||
|
):
|
||||||
|
"""Actualiza el tema visual del usuario desde la interfaz (AJAX)."""
|
||||||
|
with flask_app.app_context():
|
||||||
|
u = User.query.get(user.id)
|
||||||
|
if not u:
|
||||||
|
raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="Usuario no encontrado.")
|
||||||
|
|
||||||
|
if payload.theme not in ['auto', 'light', 'dark']:
|
||||||
|
raise HTTPException(status_code=status.HTTP_400_BAD_REQUEST, detail="Tema visual inválido.")
|
||||||
|
|
||||||
|
u.theme_preference = payload.theme
|
||||||
|
db.session.commit()
|
||||||
|
return {
|
||||||
|
'status': 'success',
|
||||||
|
'theme': u.theme_preference
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
@auth_router.post("/logout")
|
@auth_router.post("/logout")
|
||||||
def logout(request: Request, response: Response):
|
def logout(request: Request, response: Response):
|
||||||
"""Cierra la sesión y revoca los tokens activos."""
|
"""Cierra la sesión y revoca los tokens activos."""
|
||||||
|
|||||||
@@ -34,3 +34,12 @@ class UserProfileResponse(BaseModel):
|
|||||||
role: str
|
role: str
|
||||||
is_admin: bool
|
is_admin: bool
|
||||||
role_obj: Optional[Dict[str, Any]] = None
|
role_obj: Optional[Dict[str, Any]] = None
|
||||||
|
|
||||||
|
|
||||||
|
class ProfileUpdateRequest(BaseModel):
|
||||||
|
preferred_language: Optional[str] = Field(None, description="Idioma preferido ('es', 'en' o None)")
|
||||||
|
theme_preference: Optional[str] = Field('auto', description="Tema visual ('auto', 'light', 'dark')")
|
||||||
|
|
||||||
|
|
||||||
|
class ThemeUpdateRequest(BaseModel):
|
||||||
|
theme: str = Field(..., description="Tema visual ('auto', 'light', 'dark')")
|
||||||
|
|||||||
+1
-1
@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
|
|||||||
|
|
||||||
setup(
|
setup(
|
||||||
name="edu-space-admin",
|
name="edu-space-admin",
|
||||||
version="3.6.1",
|
version="3.6.2",
|
||||||
description="Administrative interface for Edu-Space Classroom Management System",
|
description="Administrative interface for Edu-Space Classroom Management System",
|
||||||
author="Edu-Space Development Team",
|
author="Edu-Space Development Team",
|
||||||
author_email="admin@edu-space.com",
|
author_email="admin@edu-space.com",
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "frontend",
|
"name": "frontend",
|
||||||
"version": "3.6.1",
|
"version": "3.6.2",
|
||||||
"description": "",
|
"description": "",
|
||||||
"main": "index.js",
|
"main": "index.js",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
|
|||||||
+3
-3
@@ -85,9 +85,9 @@ const env = nunjucks.configure(path.join(__dirname, '../views'), {
|
|||||||
});
|
});
|
||||||
|
|
||||||
// Versiones institucionales del sistema
|
// Versiones institucionales del sistema
|
||||||
const APP_VERSION = '3.6.0';
|
const APP_VERSION = '3.6.2';
|
||||||
const FRONTEND_VERSION = '3.6.0';
|
const FRONTEND_VERSION = '3.6.2';
|
||||||
const BACKEND_VERSION = '3.6.0';
|
const BACKEND_VERSION = '3.6.2';
|
||||||
|
|
||||||
env.addGlobal('app_version', APP_VERSION);
|
env.addGlobal('app_version', APP_VERSION);
|
||||||
env.addGlobal('frontend_version', FRONTEND_VERSION);
|
env.addGlobal('frontend_version', FRONTEND_VERSION);
|
||||||
|
|||||||
@@ -229,5 +229,63 @@ router.post(['/change_password', '/change-password'], requireAuth, async (req, r
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
// Mi Perfil de Usuario (GET)
|
||||||
|
router.get('/profile', requireAuth, async (req, res) => {
|
||||||
|
let userProfile = req.user || {};
|
||||||
|
try {
|
||||||
|
const resp = await req.apiClient.get('/auth/profile');
|
||||||
|
if (resp.data && resp.data.user) {
|
||||||
|
userProfile = { ...userProfile, ...resp.data.user };
|
||||||
|
}
|
||||||
|
} catch (err) {
|
||||||
|
console.warn('Could not fetch latest user profile from API:', err.message);
|
||||||
|
}
|
||||||
|
|
||||||
|
res.render('auth/profile', {
|
||||||
|
title: 'Mi Perfil — Edu-Space',
|
||||||
|
user: userProfile,
|
||||||
|
success: req.query.success || null,
|
||||||
|
error: req.query.error || null
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
// Guardar Preferencias de Perfil (POST)
|
||||||
|
router.post('/profile', requireAuth, async (req, res) => {
|
||||||
|
const { preferred_language, theme_preference } = req.body;
|
||||||
|
try {
|
||||||
|
await req.apiClient.post('/auth/profile', {
|
||||||
|
preferred_language: preferred_language || null,
|
||||||
|
theme_preference: theme_preference || 'auto'
|
||||||
|
});
|
||||||
|
|
||||||
|
// Actualizar datos en req.user si existe
|
||||||
|
if (req.user) {
|
||||||
|
req.user.preferred_language = preferred_language || null;
|
||||||
|
req.user.theme_preference = theme_preference || 'auto';
|
||||||
|
}
|
||||||
|
|
||||||
|
const msg = encodeURIComponent('Preferencias guardadas exitosamente.');
|
||||||
|
return res.redirect(`/auth/profile?success=${msg}`);
|
||||||
|
} catch (err) {
|
||||||
|
console.error('Error saving profile preferences:', err.response?.data || err.message);
|
||||||
|
const errMsg = encodeURIComponent(err.response?.data?.detail || err.response?.data?.message || 'Error al guardar las preferencias.');
|
||||||
|
return res.redirect(`/auth/profile?error=${errMsg}`);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
// Cambiar Tema Visual rápido por AJAX
|
||||||
|
router.post(['/theme', '/api/user/theme'], requireAuth, async (req, res) => {
|
||||||
|
const theme = req.body.theme || (req.body.theme_preference);
|
||||||
|
try {
|
||||||
|
const resp = await req.apiClient.post('/auth/theme', { theme });
|
||||||
|
if (req.user) {
|
||||||
|
req.user.theme_preference = theme;
|
||||||
|
}
|
||||||
|
return res.json(resp.data);
|
||||||
|
} catch (err) {
|
||||||
|
return res.status(err.response?.status || 500).json(err.response?.data || { status: 'error', message: err.message });
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
module.exports = router;
|
module.exports = router;
|
||||||
|
|
||||||
|
|||||||
@@ -33,21 +33,21 @@ router.get('/', async (req, res) => {
|
|||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
||||||
const total_classrooms = backendStats.total_classrooms ?? 31;
|
const total_classrooms = backendStats.total_classrooms ?? 0;
|
||||||
const total_subjects = backendStats.active_subjects ?? backendStats.total_subjects ?? 12;
|
const total_subjects = backendStats.active_subjects ?? backendStats.total_subjects ?? 0;
|
||||||
const total_users = backendStats.total_active_users ?? backendStats.total_users ?? 8;
|
const total_users = backendStats.total_active_users ?? backendStats.total_users ?? 0;
|
||||||
const today_reservations = backendStats.today_reservations ?? 19;
|
const today_reservations = backendStats.today_reservations ?? 0;
|
||||||
const pending_count = backendStats.pending_count ?? 3;
|
const pending_count = backendStats.pending_count ?? 0;
|
||||||
const physical_classrooms = backendStats.physical_classrooms ?? Math.max(1, total_classrooms - 4);
|
const physical_classrooms = backendStats.physical_classrooms ?? total_classrooms;
|
||||||
const bedeliaData = apiData.bedelia || {};
|
const bedeliaData = apiData.bedelia || {};
|
||||||
const virtual_rooms_list = bedeliaData.virtual_rooms || apiData.virtual_rooms || [];
|
const virtual_rooms_list = bedeliaData.virtual_rooms || apiData.virtual_rooms || [];
|
||||||
const virtual_classrooms_count = bedeliaData.virtual_rooms_count || virtual_rooms_list.length || backendStats.virtual_classrooms || 0;
|
const virtual_classrooms_count = bedeliaData.virtual_rooms_count || virtual_rooms_list.length || backendStats.virtual_classrooms || 0;
|
||||||
const occupancy_rate = backendStats.occupancy_rate ?? 68;
|
const occupancy_rate = backendStats.occupancy_rate ?? 0;
|
||||||
|
|
||||||
const assigned_classrooms = backendStats.assigned_classrooms ?? 26;
|
const assigned_classrooms = backendStats.assigned_classrooms ?? 0;
|
||||||
const assigned_classrooms_pct = backendStats.assigned_classrooms_pct ?? 96.3;
|
const assigned_classrooms_pct = backendStats.assigned_classrooms_pct ?? 0;
|
||||||
const unassigned_classrooms = backendStats.unassigned_classrooms ?? 1;
|
const unassigned_classrooms = backendStats.unassigned_classrooms ?? 0;
|
||||||
const unassigned_classrooms_pct = backendStats.unassigned_classrooms_pct ?? 3.7;
|
const unassigned_classrooms_pct = backendStats.unassigned_classrooms_pct ?? 0;
|
||||||
|
|
||||||
const assigned_today_classrooms = backendStats.assigned_today_classrooms ?? 0;
|
const assigned_today_classrooms = backendStats.assigned_today_classrooms ?? 0;
|
||||||
const assigned_today_pct = backendStats.assigned_today_pct ?? 0;
|
const assigned_today_pct = backendStats.assigned_today_pct ?? 0;
|
||||||
@@ -103,11 +103,11 @@ router.get('/', async (req, res) => {
|
|||||||
assigned_today_pct,
|
assigned_today_pct,
|
||||||
unassigned_today_classrooms,
|
unassigned_today_classrooms,
|
||||||
unassigned_today_pct,
|
unassigned_today_pct,
|
||||||
my_today_count: apiTodaySchedule ? Math.min(3, apiTodaySchedule.length) : 2,
|
my_today_count: backendStats.my_today_count ?? (apiTodaySchedule ? apiTodaySchedule.length : 0),
|
||||||
my_total_reservations: 8,
|
my_total_reservations: backendStats.my_total_reservations ?? 0,
|
||||||
virtual_rooms_count: virtual_classrooms_count,
|
virtual_rooms_count: virtual_classrooms_count,
|
||||||
today_classes_count: apiTodaySchedule ? Math.min(4, apiTodaySchedule.length) : 2,
|
today_classes_count: apiTodaySchedule ? apiTodaySchedule.length : 0,
|
||||||
milestones_count: apiMilestones ? apiMilestones.length : 3,
|
milestones_count: apiMilestones ? apiMilestones.length : 0,
|
||||||
filter_stats,
|
filter_stats,
|
||||||
date_labels
|
date_labels
|
||||||
};
|
};
|
||||||
@@ -146,10 +146,12 @@ router.get('/', async (req, res) => {
|
|||||||
virtual_rooms_count: virtual_classrooms_count
|
virtual_rooms_count: virtual_classrooms_count
|
||||||
};
|
};
|
||||||
} else if (role === 'docente') {
|
} else if (role === 'docente') {
|
||||||
const myClasses = apiTodaySchedule ? apiTodaySchedule.slice(0, 3) : [];
|
const myClasses = Array.isArray(apiData.my_today_classes) && apiData.my_today_classes.length > 0
|
||||||
|
? apiData.my_today_classes
|
||||||
|
: (apiTodaySchedule ? apiTodaySchedule.filter(r => !req.user?.id || (r.user && r.user.id === req.user.id)) : []);
|
||||||
role_data = {
|
role_data = {
|
||||||
my_today_classes: myClasses,
|
my_today_classes: myClasses,
|
||||||
virtual_classrooms: []
|
virtual_classrooms: virtual_rooms_list
|
||||||
};
|
};
|
||||||
} else if (role === 'alumno') {
|
} else if (role === 'alumno') {
|
||||||
const studentClasses = apiTodaySchedule ? apiTodaySchedule.slice(0, 4) : [];
|
const studentClasses = apiTodaySchedule ? apiTodaySchedule.slice(0, 4) : [];
|
||||||
|
|||||||
Reference in New Issue
Block a user