fix(classrooms): sincronizar salas virtuales con dashboard y dinamizar fechas (v3.8.10)
This commit is contained in:
@@ -11,6 +11,14 @@ 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.8.10] - 2026-10-26
|
||||||
|
### Fixed
|
||||||
|
- **Sincronización y Consistencia de Salas Virtuales y Aulas (`/classrooms` vs `/dashboard`)**:
|
||||||
|
- Resuelta la discrepancia visual donde el Dashboard reportaba 19 salas virtuales mientras que la vista de Aulas (`/classrooms`) reportaba solo 1 sala activa y mostraba el catálogo de Campus Virtual vacío.
|
||||||
|
- Implementado el endpoint unificado `GET /api/v1/classrooms/virtual-rooms` en FastAPI que consolida las salas virtuales operativas del Campus Virtual, sus comisiones asociadas, enlaces de videollamada y métricas de clases por período.
|
||||||
|
- Enriquecido `DashboardService.get_stats()` con `reservations` serializadas y campos normalizados (`commission_code`, `day_count`, `week_count`, `month_count`, `total_count`) para compatibilidad directa con los modales de vista previa y edición en `list.html`.
|
||||||
|
- Reemplazadas fechas estáticas congeladas de septiembre de 2026 en `frontend/src/routes/classrooms.js` por cómputo dinámico (`new Date()`, día ISO, semana ISO de lunes a domingo y mes en curso), expandiendo además la consulta de reservas a un rango cuatrimestral amplio.
|
||||||
|
|
||||||
## [3.8.9] - 2026-10-23
|
## [3.8.9] - 2026-10-23
|
||||||
### Added
|
### Added
|
||||||
- **Endpoints de Heurística y Optimización Genética en Backend FastAPI (`/api/genetic`)**:
|
- **Endpoints de Heurística y Optimización Genética en Backend FastAPI (`/api/genetic`)**:
|
||||||
|
|||||||
@@ -9,15 +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: Endpoints y Proxy de Optimización Genética (/api/genetic) — v3.8.9**:
|
- **Sprint Activo: Sincronización y Consistencia de Salas Virtuales y Aulas — v3.8.10**:
|
||||||
- **Endpoints de Algoritmo Genético en FastAPI (`/api/genetic`)**:
|
- **Sincronización Consistente entre Dashboard y Aulas (`/classrooms`)**:
|
||||||
- Implementado `POST /api/genetic/preview-optimization` para cálculo preliminar de aptitud (fitness), resumen de comisiones y reporte de colisiones estimadas.
|
- Subsanada la discrepancia donde el Dashboard mostraba 19 salas virtuales y la vista de Aulas solo mostraba 1 sala y el catálogo virtual vacío.
|
||||||
- Implementado `POST /api/genetic/optimize` para ejecución de generaciones evolutivas concurrentes y propuesta de reservas.
|
- Implementado `GET /api/v1/classrooms/virtual-rooms` en FastAPI devolviendo el catálogo consolidado de salas virtuales a demanda, comisiones, enlaces Meet y métricas.
|
||||||
- Implementado `POST /api/genetic/apply-optimization` para confirmación y persistencia de reservas en base de datos.
|
- Normalizados campos (`commission_code`, `day_count`, `week_count`, `month_count`, `total_count`, `reservations`) en `DashboardService` y en `frontend/src/routes/classrooms.js`.
|
||||||
- Definidos esquemas Pydantic DTO con tipado fuerte (`GeneticPreviewRequestDTO`, `GeneticOptimizeRequestDTO`, `GeneticApplyRequestDTO`).
|
- Eliminadas fechas fijas de septiembre de 2026 y reemplazadas por cómputo temporal dinámico con `new Date()`.
|
||||||
- **Proxy Inverso en Frontend Express BFF**:
|
- **Versión Consolidada**: `v3.8.10`.
|
||||||
- Configurado enrutador `/api/genetic` en `frontend/src/app.js` con inyección transparente de token Bearer para llamadas AJAX del navegador (`genetic-algorithm.js`), subsanando el error 404 (Not Found).
|
|
||||||
- **Versión Consolidada**: `v3.8.9`.
|
|
||||||
|
|
||||||
## 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.
|
||||||
|
|||||||
@@ -7,7 +7,7 @@ from typing import Any
|
|||||||
from database import db, get_db, engine, SessionLocal, session
|
from database import db, get_db, engine, SessionLocal, session
|
||||||
from config.config import Config
|
from config.config import Config
|
||||||
|
|
||||||
__version__ = "3.8.9"
|
__version__ = "3.8.10"
|
||||||
|
|
||||||
class DummyContext:
|
class DummyContext:
|
||||||
def __enter__(self):
|
def __enter__(self):
|
||||||
|
|||||||
@@ -394,6 +394,14 @@ class DashboardService:
|
|||||||
)
|
)
|
||||||
comm_ids_virtual.update(comm_in_virtual_res)
|
comm_ids_virtual.update(comm_in_virtual_res)
|
||||||
|
|
||||||
|
res_map_comm_all: Dict[int, List[Reservation]] = {}
|
||||||
|
all_reservations_comm = Reservation.query.filter(
|
||||||
|
Reservation.commission_id.isnot(None)
|
||||||
|
).order_by(Reservation.start_time.asc()).all()
|
||||||
|
for r in all_reservations_comm:
|
||||||
|
if r.commission_id is not None:
|
||||||
|
res_map_comm_all.setdefault(int(r.commission_id), []).append(r)
|
||||||
|
|
||||||
virtual_rooms_data = []
|
virtual_rooms_data = []
|
||||||
for comm in all_active_commissions:
|
for comm in all_active_commissions:
|
||||||
if comm.id in comm_ids_virtual:
|
if comm.id in comm_ids_virtual:
|
||||||
@@ -401,10 +409,12 @@ class DashboardService:
|
|||||||
res_tomorrow = res_map_comm_tomorrow.get(comm.id, [])
|
res_tomorrow = res_map_comm_tomorrow.get(comm.id, [])
|
||||||
res_week = res_map_comm_week.get(comm.id, [])
|
res_week = res_map_comm_week.get(comm.id, [])
|
||||||
res_month = res_map_comm_month.get(comm.id, [])
|
res_month = res_map_comm_month.get(comm.id, [])
|
||||||
|
res_all = res_map_comm_all.get(comm.id, [])
|
||||||
v_link = comm.virtual_link or (res_today[0].virtual_link if res_today and res_today[0].virtual_link else '')
|
v_link = comm.virtual_link or (res_today[0].virtual_link if res_today and res_today[0].virtual_link else '')
|
||||||
virtual_rooms_data.append({
|
virtual_rooms_data.append({
|
||||||
'id': comm.id,
|
'id': comm.id,
|
||||||
'commission_id': comm.id,
|
'commission_id': comm.id,
|
||||||
|
'commission_code': comm.code,
|
||||||
'code': comm.code,
|
'code': comm.code,
|
||||||
'full_code': comm.get_full_code(),
|
'full_code': comm.get_full_code(),
|
||||||
'subject_name': comm.subject.name if comm.subject else 'Sin materia',
|
'subject_name': comm.subject.name if comm.subject else 'Sin materia',
|
||||||
@@ -419,14 +429,19 @@ class DashboardService:
|
|||||||
'is_virtual': True,
|
'is_virtual': True,
|
||||||
'building': 'Campus Virtual',
|
'building': 'Campus Virtual',
|
||||||
'floor': 'Remoto ∞',
|
'floor': 'Remoto ∞',
|
||||||
|
'day_count': len(res_today),
|
||||||
'today_classes': len(res_today),
|
'today_classes': len(res_today),
|
||||||
'tomorrow_classes': len(res_tomorrow),
|
'tomorrow_classes': len(res_tomorrow),
|
||||||
|
'week_count': len(res_week),
|
||||||
'week_classes': len(res_week),
|
'week_classes': len(res_week),
|
||||||
|
'month_count': len(res_month),
|
||||||
'month_classes': len(res_month),
|
'month_classes': len(res_month),
|
||||||
'res_count': len(res_month),
|
'res_count': len(res_all) if len(res_all) > 0 else len(res_month),
|
||||||
|
'total_count': len(res_all),
|
||||||
'is_active_today': len(res_today) > 0,
|
'is_active_today': len(res_today) > 0,
|
||||||
'is_active_tomorrow': len(res_tomorrow) > 0,
|
'is_active_tomorrow': len(res_tomorrow) > 0,
|
||||||
'assigned_summary': f"{comm.subject.name if comm.subject else 'Clase Virtual'} ({comm.schedule or 'Remoto'})"
|
'assigned_summary': f"{comm.subject.name if comm.subject else 'Clase Virtual'} ({comm.schedule or 'Remoto'})",
|
||||||
|
'reservations': [self.serialize_reservation(r) for r in res_all]
|
||||||
})
|
})
|
||||||
|
|
||||||
if virtual_rooms_data:
|
if virtual_rooms_data:
|
||||||
|
|||||||
@@ -9,6 +9,7 @@ from fastapi import APIRouter, Depends, HTTPException, Query, status
|
|||||||
from app import db
|
from app import db
|
||||||
from app.models.classroom import Classroom
|
from app.models.classroom import Classroom
|
||||||
from app.services.classroom_service import ClassroomService
|
from app.services.classroom_service import ClassroomService
|
||||||
|
from app.services.dashboard_service import DashboardService
|
||||||
from app.services.audit_service import AuditService
|
from app.services.audit_service import AuditService
|
||||||
from app.schemas.classroom_dto import ClassroomCreateDTO, ClassroomUpdateDTO
|
from app.schemas.classroom_dto import ClassroomCreateDTO, ClassroomUpdateDTO
|
||||||
from dependencies import get_current_user, require_roles
|
from dependencies import get_current_user, require_roles
|
||||||
@@ -16,6 +17,7 @@ from app.models.user import User
|
|||||||
|
|
||||||
classrooms_router = APIRouter(prefix="/api/v1/classrooms", tags=["Classrooms"])
|
classrooms_router = APIRouter(prefix="/api/v1/classrooms", tags=["Classrooms"])
|
||||||
classroom_service = ClassroomService()
|
classroom_service = ClassroomService()
|
||||||
|
dashboard_service = DashboardService()
|
||||||
|
|
||||||
|
|
||||||
@classrooms_router.get("")
|
@classrooms_router.get("")
|
||||||
@@ -56,6 +58,31 @@ def list_classrooms(
|
|||||||
return {'total': len(result), 'classrooms': result}
|
return {'total': len(result), 'classrooms': result}
|
||||||
|
|
||||||
|
|
||||||
|
@classrooms_router.get("/virtual-rooms")
|
||||||
|
def get_virtual_rooms(current_user: User = Depends(get_current_user)):
|
||||||
|
"""Retorna el catálogo consolidado de salas virtuales operativas en el Campus Virtual."""
|
||||||
|
stats = dashboard_service.get_stats(current_user=current_user)
|
||||||
|
vrooms = stats.get('bedelia', {}).get('virtual_rooms', [])
|
||||||
|
|
||||||
|
today_cnt = sum(r.get('today_classes', 0) for r in vrooms)
|
||||||
|
week_cnt = sum(r.get('week_classes', 0) for r in vrooms)
|
||||||
|
month_cnt = sum(r.get('month_classes', 0) for r in vrooms)
|
||||||
|
total_cnt = sum(r.get('total_count', r.get('res_count', 0)) for r in vrooms)
|
||||||
|
|
||||||
|
return {
|
||||||
|
'total': len(vrooms),
|
||||||
|
'virtual_rooms': vrooms,
|
||||||
|
'virtual_classrooms_count': len(vrooms),
|
||||||
|
'metrics': {
|
||||||
|
'today_count': today_cnt,
|
||||||
|
'week_count': week_cnt,
|
||||||
|
'month_count': month_cnt,
|
||||||
|
'commissions_count': len(vrooms),
|
||||||
|
'total_count': total_cnt
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
@classrooms_router.get("/{classroom_id}")
|
@classrooms_router.get("/{classroom_id}")
|
||||||
def get_classroom(
|
def get_classroom(
|
||||||
classroom_id: int,
|
classroom_id: int,
|
||||||
|
|||||||
+1
-1
@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
|
|||||||
|
|
||||||
setup(
|
setup(
|
||||||
name="edu-space-admin",
|
name="edu-space-admin",
|
||||||
version="3.8.9",
|
version="3.8.10",
|
||||||
description="Administrative interface for Edu-Space Classroom Management System (FastAPI ASGI Core)",
|
description="Administrative interface for Edu-Space Classroom Management System (FastAPI ASGI Core)",
|
||||||
author="Edu-Space Development Team",
|
author="Edu-Space Development Team",
|
||||||
author_email="admin@edu-space.com",
|
author_email="admin@edu-space.com",
|
||||||
|
|||||||
@@ -75,3 +75,11 @@ def test_fastapi_full_flow_auth_and_classrooms(init_database):
|
|||||||
classrooms_res = client.get('/api/v1/classrooms', headers={'Authorization': f'Bearer {token}'})
|
classrooms_res = client.get('/api/v1/classrooms', headers={'Authorization': f'Bearer {token}'})
|
||||||
assert classrooms_res.status_code == 200
|
assert classrooms_res.status_code == 200
|
||||||
assert 'classrooms' in classrooms_res.json()
|
assert 'classrooms' in classrooms_res.json()
|
||||||
|
|
||||||
|
# 5. GET /classrooms/virtual-rooms
|
||||||
|
vrooms_res = client.get('/api/v1/classrooms/virtual-rooms', headers={'Authorization': f'Bearer {token}'})
|
||||||
|
assert vrooms_res.status_code == 200
|
||||||
|
vrooms_data = vrooms_res.json()
|
||||||
|
assert 'virtual_rooms' in vrooms_data
|
||||||
|
assert 'metrics' in vrooms_data
|
||||||
|
assert 'commissions_count' in vrooms_data['metrics']
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "frontend",
|
"name": "frontend",
|
||||||
"version": "3.8.9",
|
"version": "3.8.10",
|
||||||
"description": "",
|
"description": "",
|
||||||
"main": "index.js",
|
"main": "index.js",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
|
|||||||
+3
-3
@@ -86,9 +86,9 @@ const env = nunjucks.configure(path.join(__dirname, '../views'), {
|
|||||||
});
|
});
|
||||||
|
|
||||||
// Versiones institucionales del sistema
|
// Versiones institucionales del sistema
|
||||||
const APP_VERSION = '3.8.9';
|
const APP_VERSION = '3.8.10';
|
||||||
const FRONTEND_VERSION = '3.8.9';
|
const FRONTEND_VERSION = '3.8.10';
|
||||||
const BACKEND_VERSION = '3.8.9';
|
const BACKEND_VERSION = '3.8.10';
|
||||||
|
|
||||||
env.addGlobal('app_version', APP_VERSION);
|
env.addGlobal('app_version', APP_VERSION);
|
||||||
env.addGlobal('frontend_version', FRONTEND_VERSION);
|
env.addGlobal('frontend_version', FRONTEND_VERSION);
|
||||||
|
|||||||
+116
-111
@@ -72,21 +72,117 @@ const handleClassroomsList = async (req, res) => {
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
// 1. Obtención consolidada de salas virtuales desde la API backend
|
||||||
|
let virtual_rooms = [];
|
||||||
|
let global_virtual_metrics = {
|
||||||
|
today_count: 0,
|
||||||
|
week_count: 0,
|
||||||
|
month_count: 0,
|
||||||
|
commissions_count: 0,
|
||||||
|
total_count: 0
|
||||||
|
};
|
||||||
|
let virtual_count = 0;
|
||||||
|
|
||||||
|
try {
|
||||||
|
const vRoomsRes = await req.apiClient.get('/classrooms/virtual-rooms');
|
||||||
|
if (vRoomsRes.data && vRoomsRes.data.virtual_rooms) {
|
||||||
|
virtual_rooms = vRoomsRes.data.virtual_rooms;
|
||||||
|
virtual_count = vRoomsRes.data.virtual_classrooms_count || virtual_rooms.length;
|
||||||
|
global_virtual_metrics = vRoomsRes.data.metrics || {
|
||||||
|
today_count: 0,
|
||||||
|
week_count: 0,
|
||||||
|
month_count: 0,
|
||||||
|
commissions_count: virtual_rooms.length,
|
||||||
|
total_count: 0
|
||||||
|
};
|
||||||
|
}
|
||||||
|
} catch (vErr) {
|
||||||
|
console.warn('Notice fetching virtual rooms from /classrooms/virtual-rooms:', vErr.message);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Fallback a /dashboard/stats si /classrooms/virtual-rooms no devolvió salas
|
||||||
|
if (virtual_rooms.length === 0) {
|
||||||
|
try {
|
||||||
|
const dashRes = await req.apiClient.get('/dashboard/stats');
|
||||||
|
const bData = (dashRes.data && (dashRes.data.bedelia || dashRes.data)) || {};
|
||||||
|
const vList = bData.virtual_rooms || [];
|
||||||
|
if (vList.length > 0) {
|
||||||
|
virtual_rooms = vList;
|
||||||
|
virtual_count = vList.length;
|
||||||
|
global_virtual_metrics = {
|
||||||
|
today_count: vList.reduce((acc, r) => acc + (r.today_classes || 0), 0),
|
||||||
|
week_count: vList.reduce((acc, r) => acc + (r.week_classes || 0), 0),
|
||||||
|
month_count: vList.reduce((acc, r) => acc + (r.month_classes || 0), 0),
|
||||||
|
commissions_count: vList.length,
|
||||||
|
total_count: vList.reduce((acc, r) => acc + (r.res_count || 0), 0)
|
||||||
|
};
|
||||||
|
}
|
||||||
|
} catch (dErr) {
|
||||||
|
console.warn('Fallback fetching dashboard stats notice:', dErr.message);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Normalizar campos de salas virtuales para garantizar compatibilidad con plantillas Nunjucks
|
||||||
|
virtual_rooms = virtual_rooms.map(room => ({
|
||||||
|
...room,
|
||||||
|
commission_code: room.commission_code || room.code || 'C1',
|
||||||
|
day_count: room.day_count !== undefined ? room.day_count : (room.today_classes || 0),
|
||||||
|
week_count: room.week_count !== undefined ? room.week_count : (room.week_classes || 0),
|
||||||
|
month_count: room.month_count !== undefined ? room.month_count : (room.month_classes || 0),
|
||||||
|
total_count: room.total_count !== undefined ? room.total_count : (room.res_count || 0),
|
||||||
|
reservations: room.reservations || []
|
||||||
|
}));
|
||||||
|
|
||||||
|
// Si la búsqueda está activa en modo virtual, filtrar el catálogo de salas virtuales
|
||||||
|
if (search && view_mode === 'virtual') {
|
||||||
|
virtual_rooms = virtual_rooms.filter(room =>
|
||||||
|
((room.subject_name || '').toLowerCase().includes(search)) ||
|
||||||
|
((room.code || '').toLowerCase().includes(search)) ||
|
||||||
|
((room.full_code || '').toLowerCase().includes(search)) ||
|
||||||
|
((room.subject_code || '').toLowerCase().includes(search)) ||
|
||||||
|
((room.career_name || '').toLowerCase().includes(search)) ||
|
||||||
|
((room.teacher_name || '').toLowerCase().includes(search))
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
const physical_count = allClassrooms.filter(c => !c.is_virtual && !(c.code || '').includes('VIRTUAL')).length;
|
const physical_count = allClassrooms.filter(c => !c.is_virtual && !(c.code || '').includes('VIRTUAL')).length;
|
||||||
const virtual_count = allClassrooms.filter(c => Boolean(c.is_virtual || (c.code || '').includes('VIRTUAL'))).length;
|
if (virtual_count === 0) {
|
||||||
|
virtual_count = allClassrooms.filter(c => Boolean(c.is_virtual || (c.code || '').includes('VIRTUAL'))).length;
|
||||||
|
}
|
||||||
|
|
||||||
|
// 2. Fechas operativas dinámicas calculadas desde el momento actual
|
||||||
|
const now = new Date();
|
||||||
|
const todayIso = now.toISOString().split('T')[0];
|
||||||
|
|
||||||
|
const dayOfWeek = now.getDay();
|
||||||
|
const diffToMonday = (dayOfWeek === 0 ? -6 : 1) - dayOfWeek;
|
||||||
|
const monday = new Date(now);
|
||||||
|
monday.setDate(now.getDate() + diffToMonday);
|
||||||
|
const sunday = new Date(monday);
|
||||||
|
sunday.setDate(monday.getDate() + 6);
|
||||||
|
const weekStartIso = monday.toISOString().split('T')[0];
|
||||||
|
const weekEndIso = sunday.toISOString().split('T')[0];
|
||||||
|
|
||||||
|
const firstDayOfMonth = new Date(now.getFullYear(), now.getMonth(), 1);
|
||||||
|
const lastDayOfMonth = new Date(now.getFullYear(), now.getMonth() + 1, 0);
|
||||||
|
const monthStartIso = firstDayOfMonth.toISOString().split('T')[0];
|
||||||
|
const monthEndIso = lastDayOfMonth.toISOString().split('T')[0];
|
||||||
|
|
||||||
const dateFilters = {
|
const dateFilters = {
|
||||||
today: new Date().toISOString().split('T')[0],
|
today: todayIso,
|
||||||
week_start: new Date().toISOString().split('T')[0],
|
week_start: weekStartIso,
|
||||||
week_end: new Date(Date.now() + 7 * 86400000).toISOString().split('T')[0],
|
week_end: weekEndIso,
|
||||||
month_start: new Date().toISOString().split('T')[0],
|
month_start: monthStartIso,
|
||||||
month_end: new Date(Date.now() + 30 * 86400000).toISOString().split('T')[0]
|
month_end: monthEndIso
|
||||||
};
|
};
|
||||||
|
|
||||||
|
// 3. Consultar reservas de un período cuatrimestral amplio (±90 días)
|
||||||
let allReservations = [];
|
let allReservations = [];
|
||||||
try {
|
try {
|
||||||
|
const qStart = new Date(now.getFullYear(), now.getMonth() - 2, 1).toISOString().split('T')[0];
|
||||||
|
const qEnd = new Date(now.getFullYear(), now.getMonth() + 3, 0).toISOString().split('T')[0];
|
||||||
const vRes = await req.apiClient.get('/reservations', {
|
const vRes = await req.apiClient.get('/reservations', {
|
||||||
params: { start_date: '2026-08-31', end_date: '2026-10-01' }
|
params: { start_date: qStart, end_date: qEnd }
|
||||||
});
|
});
|
||||||
allReservations = (vRes.data && vRes.data.reservations) || [];
|
allReservations = (vRes.data && vRes.data.reservations) || [];
|
||||||
} catch (vErr) {
|
} catch (vErr) {
|
||||||
@@ -95,7 +191,7 @@ const handleClassroomsList = async (req, res) => {
|
|||||||
|
|
||||||
const occupancy_metrics = {};
|
const occupancy_metrics = {};
|
||||||
|
|
||||||
// Format classrooms with fallback fields and assigned commissions/classes
|
// Formatear aulas físicas y calcular métricas de ocupación en base al calendario activo
|
||||||
const formattedItems = filtered.map(c => {
|
const formattedItems = filtered.map(c => {
|
||||||
const c_res = allReservations.filter(r => (c.id !== undefined && (String(r.classroom_id) === String(c.id) || (r.classroom && String(r.classroom.id) === String(c.id)))));
|
const c_res = allReservations.filter(r => (c.id !== undefined && (String(r.classroom_id) === String(c.id) || (r.classroom && String(r.classroom.id) === String(c.id)))));
|
||||||
const commMap = new Map();
|
const commMap = new Map();
|
||||||
@@ -112,11 +208,19 @@ const handleClassroomsList = async (req, res) => {
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
const day_res = c_res.filter(r => (r.start_time || '').startsWith('2026-09-18') || (r.start_time || '').startsWith('2026-09-15'));
|
const day_res = c_res.filter(r => (r.start_time || '').startsWith(todayIso));
|
||||||
const week_res = c_res.filter(r => (r.start_time || '') >= '2026-09-14' && (r.start_time || '') <= '2026-09-20');
|
const week_res = c_res.filter(r => {
|
||||||
|
const st = (r.start_time || '').split('T')[0];
|
||||||
|
return st >= weekStartIso && st <= weekEndIso;
|
||||||
|
});
|
||||||
|
const month_res = c_res.filter(r => {
|
||||||
|
const st = (r.start_time || '').split('T')[0];
|
||||||
|
return st >= monthStartIso && st <= monthEndIso;
|
||||||
|
});
|
||||||
|
|
||||||
const day_pct = Math.min(100, Math.round((day_res.length / 3) * 100));
|
const day_pct = Math.min(100, Math.round((day_res.length / 3) * 100));
|
||||||
const week_pct = Math.min(100, Math.round((week_res.length / 18) * 100));
|
const week_pct = Math.min(100, Math.round((week_res.length / 18) * 100));
|
||||||
const month_pct = Math.min(100, Math.round((c_res.length / 72) * 100));
|
const month_pct = Math.min(100, Math.round((month_res.length / 72) * 100));
|
||||||
|
|
||||||
occupancy_metrics[c.id] = {
|
occupancy_metrics[c.id] = {
|
||||||
day_pct,
|
day_pct,
|
||||||
@@ -124,7 +228,7 @@ const handleClassroomsList = async (req, res) => {
|
|||||||
week_pct,
|
week_pct,
|
||||||
week_count: week_res.length,
|
week_count: week_res.length,
|
||||||
month_pct,
|
month_pct,
|
||||||
month_count: c_res.length
|
month_count: month_res.length || c_res.length
|
||||||
};
|
};
|
||||||
|
|
||||||
return {
|
return {
|
||||||
@@ -137,108 +241,9 @@ const handleClassroomsList = async (req, res) => {
|
|||||||
};
|
};
|
||||||
});
|
});
|
||||||
|
|
||||||
let virtual_rooms = [];
|
|
||||||
let global_virtual_metrics = {
|
|
||||||
today_count: 0,
|
|
||||||
week_count: 0,
|
|
||||||
month_count: 0,
|
|
||||||
commissions_count: 0,
|
|
||||||
total_count: 0
|
|
||||||
};
|
|
||||||
|
|
||||||
const virtualClassroomObj = allClassrooms.find(c => Boolean(c.is_virtual || ((c.code || '').includes('VIRTUAL'))));
|
const virtualClassroomObj = allClassrooms.find(c => Boolean(c.is_virtual || ((c.code || '').includes('VIRTUAL'))));
|
||||||
const virtual_classroom_id = virtualClassroomObj ? virtualClassroomObj.id : null;
|
const virtual_classroom_id = virtualClassroomObj ? virtualClassroomObj.id : null;
|
||||||
|
|
||||||
if (view_mode === 'virtual') {
|
|
||||||
try {
|
|
||||||
const virtualReservations = allReservations.filter(r => Boolean(r.is_virtual || (r.classroom && r.classroom.is_virtual)));
|
|
||||||
|
|
||||||
const commMap = new Map();
|
|
||||||
const todayStr = '2026-09-18';
|
|
||||||
const weekStart = new Date('2026-09-14');
|
|
||||||
const weekEnd = new Date('2026-09-20');
|
|
||||||
const monthStart = new Date('2026-09-01');
|
|
||||||
const monthEnd = new Date('2026-09-30');
|
|
||||||
|
|
||||||
virtualReservations.forEach(r => {
|
|
||||||
const cid = r.commission_id || (r.commission && r.commission.id) || r.id;
|
|
||||||
if (!commMap.has(cid)) {
|
|
||||||
commMap.set(cid, {
|
|
||||||
commission_id: cid,
|
|
||||||
commission_code: (r.commission && r.commission.code) || 'C1',
|
|
||||||
subject_name: r.subject_name || r.purpose || 'Clase Virtual',
|
|
||||||
subject_code: r.subject_code || '',
|
|
||||||
career_name: 'UniCABA',
|
|
||||||
max_students: r.expected_attendees || 35,
|
|
||||||
virtual_link: r.effective_virtual_link || r.virtual_link || '',
|
|
||||||
reservations: []
|
|
||||||
});
|
|
||||||
}
|
|
||||||
commMap.get(cid).reservations.push(r);
|
|
||||||
});
|
|
||||||
|
|
||||||
virtual_rooms = Array.from(commMap.values()).map(data => {
|
|
||||||
const resList = data.reservations;
|
|
||||||
const dayCnt = resList.filter(r => (r.start_time || '').startsWith(todayStr)).length;
|
|
||||||
const weekCnt = resList.filter(r => {
|
|
||||||
if (!r.start_time) return false;
|
|
||||||
const d = new Date(r.start_time);
|
|
||||||
return d >= weekStart && d <= weekEnd;
|
|
||||||
}).length;
|
|
||||||
const monthCnt = resList.filter(r => {
|
|
||||||
if (!r.start_time) return false;
|
|
||||||
const d = new Date(r.start_time);
|
|
||||||
return d >= monthStart && d <= monthEnd;
|
|
||||||
}).length;
|
|
||||||
const shift = (resList[0] && resList[0].shift) || 'Tarde';
|
|
||||||
|
|
||||||
return {
|
|
||||||
commission_id: data.commission_id,
|
|
||||||
commission_code: data.commission_code,
|
|
||||||
subject_name: data.subject_name,
|
|
||||||
subject_code: data.subject_code,
|
|
||||||
career_name: data.career_name,
|
|
||||||
max_students: data.max_students,
|
|
||||||
virtual_link: data.virtual_link,
|
|
||||||
shift,
|
|
||||||
day_count: dayCnt,
|
|
||||||
week_count: weekCnt,
|
|
||||||
month_count: monthCnt,
|
|
||||||
total_count: resList.length,
|
|
||||||
reservations: resList.sort((a, b) => (a.start_time || '').localeCompare(b.start_time || ''))
|
|
||||||
};
|
|
||||||
});
|
|
||||||
|
|
||||||
if (search) {
|
|
||||||
virtual_rooms = virtual_rooms.filter(room =>
|
|
||||||
(room.subject_name || '').toLowerCase().includes(search) ||
|
|
||||||
(room.commission_code || '').toLowerCase().includes(search) ||
|
|
||||||
(room.subject_code || '').toLowerCase().includes(search)
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
virtual_rooms.sort((a, b) => (a.subject_name || '').localeCompare(b.subject_name || ''));
|
|
||||||
|
|
||||||
global_virtual_metrics = {
|
|
||||||
today_count: virtualReservations.filter(r => (r.start_time || '').startsWith(todayStr)).length,
|
|
||||||
week_count: virtualReservations.filter(r => {
|
|
||||||
if (!r.start_time) return false;
|
|
||||||
const d = new Date(r.start_time);
|
|
||||||
return d >= weekStart && d <= weekEnd;
|
|
||||||
}).length,
|
|
||||||
month_count: virtualReservations.filter(r => {
|
|
||||||
if (!r.start_time) return false;
|
|
||||||
const d = new Date(r.start_time);
|
|
||||||
return d >= monthStart && d <= monthEnd;
|
|
||||||
}).length,
|
|
||||||
commissions_count: commMap.size,
|
|
||||||
total_count: virtualReservations.length
|
|
||||||
};
|
|
||||||
} catch (vErr) {
|
|
||||||
console.warn('Error aggregating virtual rooms:', vErr.message);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
res.render('classrooms/list', {
|
res.render('classrooms/list', {
|
||||||
title: 'Aulas y Espacios - Edu-Space Admin',
|
title: 'Aulas y Espacios - Edu-Space Admin',
|
||||||
classrooms: {
|
classrooms: {
|
||||||
|
|||||||
Reference in New Issue
Block a user