feat(dashboard): disponibilidad por piso, métricas reales, auditoría y UI/UX v3.8.17
This commit is contained in:
@@ -11,6 +11,21 @@ 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.17] - 2026-10-26
|
||||||
|
### Changed & Improved
|
||||||
|
- **Disponibilidad Áulica por Piso en Dashboard de Bedelía & Administración**:
|
||||||
|
- Reemplazado el gráfico genérico de curva mensual de reservas por el nuevo **Panel de Disponibilidad & Ocupación Áulica por Piso (Operación Hoy)**, facilitando la toma de decisiones operativas de Bedelía con Chart.js en barras horizontales apiladas (`Libres Hoy` en verde vs `Con Cursada Activa` en magenta `#B43E8E`).
|
||||||
|
- Incorporada mini-matriz interactiva de Aulas Presenciales en vivo con badges de estatus (`Libre` con botón de asignación directa o `Ocupada` con detalle de comisión y horario).
|
||||||
|
- **Cálculo Real y Dinámico de Métricas de Ocupación (`/admin/occupancy_metrics`)**:
|
||||||
|
- Eliminadas las constantes estáticas y mockeadas (aulas y pisos ficticios); ahora las métricas se computan en tiempo real contra los registros relacionales de la base de datos (`physicalRooms`, reservas activas, conteo de turnos reales Mañana/Tarde/Vespertino/Noche y distribución real por piso).
|
||||||
|
- **Enriquecimiento Visual y Detalle en Últimos Eventos de Auditoría**:
|
||||||
|
- Enriquecido el serializador del backend (`dashboard_service.py`) mapeando `action_label` y `module_label` en español institucional.
|
||||||
|
- Rediseñada la tarjeta de auditoría en el Dashboard con avatar de usuario, badges semánticos por color de operación (`Acceso`, `Creación`, `Edición`, `Baja`, `Impersonación`), fecha/hora y renderizado del detalle explicativo (`audit.details`) que antes se encontraba omitido.
|
||||||
|
- **Internacionalización y Modernización de Cabeceras (UI/UX)**:
|
||||||
|
- Traducidos al español y modernizados los formularios de alta de aulas (`/classrooms/add_classroom`) y reservas (`/schedule/add_reservation`).
|
||||||
|
- Rediseñada la cabecera tosca de `add_classroom` sustituyéndola por una tarjeta institucional con acento magenta `#B43E8E`, badges informativos y breadcrumbs ergonómicos.
|
||||||
|
- Eliminada la opción redundante "Comisiones en Horario" del submenú de Reservas & Calendario para centralizar la gestión en Estructura Académica.
|
||||||
|
|
||||||
## [3.8.16] - 2026-10-26
|
## [3.8.16] - 2026-10-26
|
||||||
### Fixed
|
### Fixed
|
||||||
- **Restauración y UX Nativa del Menú en Dispositivos Celulares / Móviles**:
|
- **Restauración y UX Nativa del Menú en Dispositivos Celulares / Móviles**:
|
||||||
|
|||||||
@@ -9,13 +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: UI/UX Móvil, Sesión en Sidebar Colapsado y Cero Errores — v3.8.16**:
|
- **Sprint Activo: Disponibilidad Áulica por Piso, Métricas Reales, Auditoría Enriquecida y Rediseño UI/UX — v3.8.17**:
|
||||||
- **Móvil Restaurado & UX Nativa**: Restablecida la visibilidad de `.mobile-header` en pantallas `< 992px`, incorporado `.sidebar-backdrop` y cierre automático al navegar o tocar el fondo.
|
- **Disponibilidad Áulica por Piso en Dashboard**: Sustituido el gráfico genérico de tendencia mensual por el nuevo Panel de Disponibilidad y Ocupación Áulica por Piso (Operación Hoy) con Chart.js en barras horizontales apiladas y mini-matriz interactiva de Aulas Presenciales.
|
||||||
- **Menú de Usuario y Cierre de Sesión en Colapsado**: Sustituido `.sidebar-submenu` por `.user-menu-list` para evitar ocultamiento indeseado, asegurando acceso completo a "Mi Perfil", "Cambiar Contraseña" y "Cerrar Sesión".
|
- **Cálculo Real de Métricas de Ocupación (`/admin/occupancy_metrics`)**: Eliminadas las constantes estáticas ficticias, computando turnos, tasas de ocupación por piso y ranking de aulas directamente desde la base de datos relacional.
|
||||||
- **Corrección de Badge de Versión**: Estructurado en bloque vertical compacto con `text-truncate` y `overflow-x: hidden !important`, impidiendo que sobresalga o se superponga con otros componentes.
|
- **Logs de Auditoría Enriquecidos**: Mapeadas etiquetas semánticas en español para acciones y módulos en `dashboard_service.py`, renderizando badges visuales por acción y el detalle explicativo de eventos (`audit.details`) en el dashboard.
|
||||||
- **Resolución de Error 404 en `/api/user/theme`**: Endpoint registrado en Express BFF para guardar tema visual por AJAX sin errores.
|
- **Internacionalización y Refinamiento UI/UX**: Traducidas las páginas `/schedule/add_reservation` y `/classrooms/add_classroom` al español, rediseñada la cabecera tosca de alta de aulas con tarjeta institucional y breadcrumbs ergonómicos, y eliminada la redundancia de "Comisiones en Horario".
|
||||||
- **QA & Seguridad Integral**: 100% tests aprobados (79 passed en pytest), 52 plantillas balanceadas, 0 issues en SAST/SCA (Bandit, pip-audit, njsscan, npm audit).
|
- **QA & Seguridad**: 79 tests aprobados en pytest, 0 vulnerabilidades en SAST/SCA (Bandit, pip-audit, njsscan, npm audit) y todas las plantillas verificadas.
|
||||||
- **Versión Consolidada**: `v3.8.16`.
|
- **Versión Consolidada**: `v3.8.17`.
|
||||||
|
|
||||||
## 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.16"
|
__version__ = "3.8.17"
|
||||||
|
|
||||||
class DummyContext:
|
class DummyContext:
|
||||||
def __enter__(self):
|
def __enter__(self):
|
||||||
|
|||||||
@@ -179,13 +179,35 @@ class DashboardService:
|
|||||||
AcademicMilestone.is_active == True
|
AcademicMilestone.is_active == True
|
||||||
).order_by(AcademicMilestone.date.asc()).limit(10).all()
|
).order_by(AcademicMilestone.date.asc()).limit(10).all()
|
||||||
|
|
||||||
recent_audits = AuditLog.query.order_by(AuditLog.created_at.desc()).limit(6).all()
|
recent_audits = AuditLog.query.order_by(AuditLog.created_at.desc()).limit(8).all()
|
||||||
audit_data = [{
|
audit_data = []
|
||||||
'created_at': a.created_at.strftime('%Y-%m-%d %H:%M') if a.created_at else None,
|
for a in recent_audits:
|
||||||
'action_type': getattr(a, 'action', getattr(a, 'action_type', 'AUDIT')),
|
d = a.to_dict()
|
||||||
'ip_address': a.ip_address,
|
act_raw = (d.get('action') or '').upper()
|
||||||
'user_email': getattr(a, 'user_email', None) or (getattr(a.user, 'email', 'System') if hasattr(a, 'user') else 'System')
|
mod_raw = (d.get('module') or '').lower()
|
||||||
} for a in recent_audits]
|
action_label = {
|
||||||
|
'LOGIN': 'Inicio de Sesión',
|
||||||
|
'LOGOUT': 'Cierre de Sesión',
|
||||||
|
'CREATE': 'Creación',
|
||||||
|
'UPDATE': 'Actualización',
|
||||||
|
'DELETE': 'Eliminación',
|
||||||
|
'IMPERSONATE': 'Impersonación',
|
||||||
|
'RESET': 'Reinicio de Sistema',
|
||||||
|
'CANCEL': 'Cancelación'
|
||||||
|
}.get(act_raw, d.get('action') or 'Operación')
|
||||||
|
module_label = {
|
||||||
|
'auth': 'Autenticación',
|
||||||
|
'users': 'Usuarios',
|
||||||
|
'classrooms': 'Aulas',
|
||||||
|
'reservations': 'Reservas',
|
||||||
|
'academic': 'Académica',
|
||||||
|
'system': 'Sistema'
|
||||||
|
}.get(mod_raw, d.get('module') or 'Sistema')
|
||||||
|
|
||||||
|
d['action_label'] = action_label
|
||||||
|
d['module_label'] = module_label
|
||||||
|
d['action_type'] = act_raw
|
||||||
|
audit_data.append(d)
|
||||||
|
|
||||||
occupancy_rate = min(100, int((today_reservations / max(1, physical_classrooms * 3)) * 100)) if physical_classrooms > 0 else 0
|
occupancy_rate = min(100, int((today_reservations / max(1, physical_classrooms * 3)) * 100)) if physical_classrooms > 0 else 0
|
||||||
|
|
||||||
|
|||||||
+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.16",
|
version="3.8.17",
|
||||||
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",
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "frontend",
|
"name": "frontend",
|
||||||
"version": "3.8.16",
|
"version": "3.8.17",
|
||||||
"description": "",
|
"description": "",
|
||||||
"main": "index.js",
|
"main": "index.js",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
|
|||||||
+9
-10
@@ -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.16';
|
const APP_VERSION = '3.8.17';
|
||||||
const FRONTEND_VERSION = '3.8.16';
|
const FRONTEND_VERSION = '3.8.17';
|
||||||
const BACKEND_VERSION = '3.8.16';
|
const BACKEND_VERSION = '3.8.17';
|
||||||
|
|
||||||
env.addGlobal('app_version', APP_VERSION);
|
env.addGlobal('app_version', APP_VERSION);
|
||||||
env.addGlobal('frontend_version', FRONTEND_VERSION);
|
env.addGlobal('frontend_version', FRONTEND_VERSION);
|
||||||
@@ -418,16 +418,15 @@ app.post(['/api/user/theme', '/theme'], async (req, res) => {
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
// Proxy transparente de peticiones /api a Flask
|
// Proxy transparente de peticiones /api a FastAPI
|
||||||
app.use('/api', async (req, res) => {
|
app.use('/api', async (req, res) => {
|
||||||
// Si es dashboard-stats mock directo
|
// Si es dashboard-stats
|
||||||
if (req.path === '/dashboard-stats') {
|
if (req.path === '/dashboard-stats') {
|
||||||
return res.json({
|
return res.json({
|
||||||
monthly_data: [
|
status: 'success',
|
||||||
{ month: 'Ene', reservations: 120 }, { month: 'Feb', reservations: 180 }, { month: 'Mar', reservations: 250 },
|
floor_data: [
|
||||||
{ month: 'Abr', reservations: 220 }, { month: 'May', reservations: 300 }, { month: 'Jun', reservations: 310 },
|
{ floor: 'Piso 2', total: 1, available: 1, occupied: 0 },
|
||||||
{ month: 'Jul', reservations: 200 }, { month: 'Ago', reservations: 350 }, { month: 'Sep', reservations: 420 },
|
{ floor: 'Piso 3', total: 2, available: 2, occupied: 0 }
|
||||||
{ month: 'Oct', reservations: 480 }, { month: 'Nov', reservations: 520 }, { month: 'Dic', reservations: 210 }
|
|
||||||
]
|
]
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|||||||
+115
-39
@@ -261,12 +261,33 @@ const handleOccupancyMetrics = async (req, res) => {
|
|||||||
console.warn('API error fetching metrics data:', apiErr.message);
|
console.warn('API error fetching metrics data:', apiErr.message);
|
||||||
}
|
}
|
||||||
|
|
||||||
const physicalRooms = allClassrooms.filter(c => !c.is_virtual && (!c.code || !c.code.includes('VIRTUAL')));
|
const activeReservations = allReservations.filter(r => (r.status || '').toUpperCase() !== 'CANCELLED');
|
||||||
const virtualRooms = allClassrooms.filter(c => c.is_virtual || (c.code && c.code.includes('VIRTUAL')));
|
|
||||||
|
|
||||||
const physical_rooms_count = physicalRooms.length || 29;
|
const virtualRoomIds = new Set(
|
||||||
|
allClassrooms.filter(c => c.is_virtual || (c.code && c.code.toUpperCase().includes('VIRTUAL')) || (c.building && c.building.toUpperCase().includes('VIRTUAL'))).map(c => c.id)
|
||||||
|
);
|
||||||
|
const physicalRooms = allClassrooms.filter(c => !virtualRoomIds.has(c.id));
|
||||||
|
const physical_rooms_count = physicalRooms.length;
|
||||||
|
|
||||||
// Shift counts
|
const virtualReservations = activeReservations.filter(r => virtualRoomIds.has(r.classroom_id));
|
||||||
|
const physicalReservations = activeReservations.filter(r => !virtualRoomIds.has(r.classroom_id));
|
||||||
|
|
||||||
|
const total_month_classes = activeReservations.length;
|
||||||
|
const v_month = virtualReservations.length;
|
||||||
|
|
||||||
|
const todayStr = new Date().toISOString().slice(0, 10);
|
||||||
|
const now = new Date();
|
||||||
|
const startOfWeek = new Date(now);
|
||||||
|
startOfWeek.setDate(now.getDate() - ((now.getDay() + 6) % 7));
|
||||||
|
startOfWeek.setHours(0, 0, 0, 0);
|
||||||
|
|
||||||
|
const v_today = virtualReservations.filter(r => r.start_time && r.start_time.startsWith(todayStr)).length;
|
||||||
|
const v_week = virtualReservations.filter(r => {
|
||||||
|
if (!r.start_time) return false;
|
||||||
|
return new Date(r.start_time) >= startOfWeek;
|
||||||
|
}).length;
|
||||||
|
|
||||||
|
// Turnos reales
|
||||||
const shift_counts = {
|
const shift_counts = {
|
||||||
Mañana: 0,
|
Mañana: 0,
|
||||||
Tarde: 0,
|
Tarde: 0,
|
||||||
@@ -274,51 +295,106 @@ const handleOccupancyMetrics = async (req, res) => {
|
|||||||
Noche: 0
|
Noche: 0
|
||||||
};
|
};
|
||||||
|
|
||||||
allReservations.forEach(r => {
|
activeReservations.forEach(r => {
|
||||||
const shift = r.shift || 'Noche';
|
let s = r.shift;
|
||||||
if (shift_counts[shift] !== undefined) {
|
if (!s && r.start_time) {
|
||||||
shift_counts[shift]++;
|
const timePart = r.start_time.includes('T') ? r.start_time.split('T')[1] : (r.start_time.split(' ')[1] || '00:00');
|
||||||
|
const h = parseInt(timePart.split(':')[0], 10);
|
||||||
|
if (h < 13) s = 'Mañana';
|
||||||
|
else if (h < 18) s = 'Tarde';
|
||||||
|
else if (h < 20) s = 'Vespertino';
|
||||||
|
else s = 'Noche';
|
||||||
|
}
|
||||||
|
if (s && shift_counts[s] !== undefined) {
|
||||||
|
shift_counts[s]++;
|
||||||
} else {
|
} else {
|
||||||
shift_counts['Noche']++;
|
shift_counts.Noche++;
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
// Ensure reasonable minimums for visualization
|
// Agrupación por piso real
|
||||||
if (allReservations.length === 0) {
|
const floorMap = {};
|
||||||
shift_counts.Mañana = 28;
|
physicalRooms.forEach(c => {
|
||||||
shift_counts.Tarde = 22;
|
const rawFloor = c.floor !== null && c.floor !== undefined ? String(c.floor).trim() : '0';
|
||||||
shift_counts.Vespertino = 15;
|
let floorLabel = rawFloor;
|
||||||
shift_counts.Noche = 20;
|
if (rawFloor === '0' || rawFloor.toUpperCase() === 'PB' || rawFloor.toLowerCase().includes('baja')) {
|
||||||
|
floorLabel = 'Planta Baja';
|
||||||
|
} else if (!isNaN(rawFloor) && !rawFloor.toLowerCase().includes('piso')) {
|
||||||
|
floorLabel = `Piso ${rawFloor}`;
|
||||||
}
|
}
|
||||||
|
if (!floorMap[floorLabel]) {
|
||||||
|
floorMap[floorLabel] = { floor: floorLabel, count: 0, res_count: 0, room_ids: new Set() };
|
||||||
|
}
|
||||||
|
floorMap[floorLabel].count++;
|
||||||
|
floorMap[floorLabel].room_ids.add(c.id);
|
||||||
|
});
|
||||||
|
|
||||||
const total_month_classes = allReservations.length > 0 ? (allReservations.length * 4) : 85;
|
physicalReservations.forEach(r => {
|
||||||
const v_month = Math.round(total_month_classes * 0.28);
|
for (const fKey in floorMap) {
|
||||||
const v_week = Math.round(v_month / 4);
|
if (floorMap[fKey].room_ids.has(r.classroom_id)) {
|
||||||
const v_today = Math.round(v_week / 5) || 2;
|
floorMap[fKey].res_count++;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
const avg_day_pct = 64;
|
const floor_summary = Object.values(floorMap).map(f => {
|
||||||
const avg_week_pct = 72;
|
const baseCapacity = Math.max(1, f.count * 15);
|
||||||
const avg_month_pct = 68;
|
const avg_pct = Math.min(100, Math.round((f.res_count / baseCapacity) * 100));
|
||||||
|
return {
|
||||||
|
floor: f.floor,
|
||||||
|
count: f.count,
|
||||||
|
res_count: f.res_count,
|
||||||
|
avg_pct: avg_pct
|
||||||
|
};
|
||||||
|
});
|
||||||
|
floor_summary.sort((a, b) => a.floor.localeCompare(b.floor, 'es', { numeric: true }));
|
||||||
|
|
||||||
const floor_summary = [
|
// Métricas globales reales
|
||||||
{ floor: 'Planta Baja', count: 8, avg_pct: 78 },
|
const totalPhysicalCapacityMonth = Math.max(1, physical_rooms_count * 15);
|
||||||
{ floor: 'Piso 1', count: 10, avg_pct: 65 },
|
const avg_month_pct = physical_rooms_count > 0 ? Math.min(100, Math.round((physicalReservations.length / totalPhysicalCapacityMonth) * 100)) : 0;
|
||||||
{ floor: 'Piso 2', count: 7, avg_pct: 54 },
|
const pTodayRes = physicalReservations.filter(r => r.start_time && r.start_time.startsWith(todayStr)).length;
|
||||||
{ floor: 'Piso 3', count: 4, avg_pct: 42 }
|
const pWeekRes = physicalReservations.filter(r => {
|
||||||
];
|
if (!r.start_time) return false;
|
||||||
|
return new Date(r.start_time) >= startOfWeek;
|
||||||
|
}).length;
|
||||||
|
const avg_day_pct = physical_rooms_count > 0 ? Math.min(100, Math.round((pTodayRes / Math.max(1, physical_rooms_count * 3)) * 100)) : 0;
|
||||||
|
const avg_week_pct = physical_rooms_count > 0 ? Math.min(100, Math.round((pWeekRes / totalPhysicalCapacityMonth) * 100)) : 0;
|
||||||
|
|
||||||
const top_rooms = [
|
// Top y Low rooms reales
|
||||||
{ classroom: { id: 1, code: 'Aula 101', floor_display: 'Piso 1', capacity: 45 }, month_pct: 88, month_count: 32 },
|
const roomReservationsCount = {};
|
||||||
{ classroom: { id: 2, code: 'Aula Magna', floor_display: 'PB', capacity: 120 }, month_pct: 82, month_count: 28 },
|
physicalReservations.forEach(r => {
|
||||||
{ classroom: { id: 3, code: 'Lab Informática 1', floor_display: 'Piso 2', capacity: 30 }, month_pct: 79, month_count: 26 },
|
roomReservationsCount[r.classroom_id] = (roomReservationsCount[r.classroom_id] || 0) + 1;
|
||||||
{ classroom: { id: 4, code: 'Aula 204', floor_display: 'Piso 2', capacity: 35 }, month_pct: 75, month_count: 24 }
|
});
|
||||||
];
|
|
||||||
|
|
||||||
const low_rooms = [
|
const calculatedRooms = physicalRooms.map(c => {
|
||||||
{ classroom: { id: 5, code: 'Aula 302', floor_display: 'Piso 3', capacity: 25 }, month_pct: 18, month_count: 6 },
|
const rawFloor = c.floor !== null && c.floor !== undefined ? String(c.floor).trim() : '0';
|
||||||
{ classroom: { id: 6, code: 'Seminario B', floor_display: 'Piso 3', capacity: 20 }, month_pct: 22, month_count: 7 },
|
let floor_display = rawFloor;
|
||||||
{ classroom: { id: 7, code: 'Taller 1', floor_display: 'PB', capacity: 30 }, month_pct: 28, month_count: 9 }
|
if (rawFloor === '0' || rawFloor.toUpperCase() === 'PB' || rawFloor.toLowerCase().includes('baja')) {
|
||||||
];
|
floor_display = 'PB';
|
||||||
|
} else if (!isNaN(rawFloor) && !rawFloor.toLowerCase().includes('piso')) {
|
||||||
|
floor_display = `Piso ${rawFloor}`;
|
||||||
|
}
|
||||||
|
const count = roomReservationsCount[c.id] || 0;
|
||||||
|
const month_pct = Math.min(100, Math.round((count / 15) * 100));
|
||||||
|
return {
|
||||||
|
classroom: {
|
||||||
|
id: c.id,
|
||||||
|
code: c.code || c.name || `Aula ${c.id}`,
|
||||||
|
floor_display: floor_display,
|
||||||
|
capacity: c.capacity || 30
|
||||||
|
},
|
||||||
|
month_count: count,
|
||||||
|
month_pct: month_pct
|
||||||
|
};
|
||||||
|
});
|
||||||
|
|
||||||
|
calculatedRooms.sort((a, b) => b.month_count - a.month_count);
|
||||||
|
const top_rooms = calculatedRooms.filter(r => r.month_count > 0);
|
||||||
|
if (top_rooms.length === 0 && calculatedRooms.length > 0) {
|
||||||
|
top_rooms.push(...calculatedRooms.slice(0, 4));
|
||||||
|
}
|
||||||
|
const low_rooms = [...calculatedRooms].sort((a, b) => a.month_count - b.month_count);
|
||||||
|
|
||||||
res.render('admin/metrics/occupancy', {
|
res.render('admin/metrics/occupancy', {
|
||||||
title: 'Gestión de Ocupación y Métricas - Edu-Space Admin',
|
title: 'Gestión de Ocupación y Métricas - Edu-Space Admin',
|
||||||
|
|||||||
@@ -393,7 +393,7 @@ const handleAddClassroom = async (req, res) => {
|
|||||||
});
|
});
|
||||||
|
|
||||||
res.render('classrooms/add', {
|
res.render('classrooms/add', {
|
||||||
title: 'Add Classroom - Edu-Space Admin',
|
title: 'Nueva Aula - Edu-Space',
|
||||||
form,
|
form,
|
||||||
buildings,
|
buildings,
|
||||||
building_floors: buildingFloors,
|
building_floors: buildingFloors,
|
||||||
|
|||||||
@@ -112,16 +112,56 @@ router.get('/', async (req, res) => {
|
|||||||
date_labels
|
date_labels
|
||||||
};
|
};
|
||||||
|
|
||||||
|
// Agrupación y disponibilidad de aulas físicas por piso para la operación de Bedelía
|
||||||
|
const assignedToday = (filter_stats.today && filter_stats.today.classrooms && filter_stats.today.classrooms.assigned) || [];
|
||||||
|
const unassignedToday = (filter_stats.today && filter_stats.today.classrooms && filter_stats.today.classrooms.unassigned) || [];
|
||||||
|
|
||||||
|
const allPhysicalToday = [
|
||||||
|
...assignedToday.map(r => ({ ...r, is_occupied_today: true })),
|
||||||
|
...unassignedToday.map(r => ({ ...r, is_occupied_today: false }))
|
||||||
|
];
|
||||||
|
|
||||||
|
const floorAvailabilityMap = {};
|
||||||
|
allPhysicalToday.forEach(room => {
|
||||||
|
const rawFloor = room.floor !== null && room.floor !== undefined ? String(room.floor).trim() : '0';
|
||||||
|
let floorLabel = rawFloor;
|
||||||
|
if (rawFloor === '0' || rawFloor.toUpperCase() === 'PB' || rawFloor.toLowerCase().includes('baja')) {
|
||||||
|
floorLabel = 'Planta Baja';
|
||||||
|
} else if (!isNaN(rawFloor) && !rawFloor.toLowerCase().includes('piso')) {
|
||||||
|
floorLabel = `Piso ${rawFloor}`;
|
||||||
|
}
|
||||||
|
if (!floorAvailabilityMap[floorLabel]) {
|
||||||
|
floorAvailabilityMap[floorLabel] = {
|
||||||
|
floor: floorLabel,
|
||||||
|
total: 0,
|
||||||
|
occupied: 0,
|
||||||
|
available: 0,
|
||||||
|
rooms: []
|
||||||
|
};
|
||||||
|
}
|
||||||
|
floorAvailabilityMap[floorLabel].total++;
|
||||||
|
if (room.is_occupied_today) {
|
||||||
|
floorAvailabilityMap[floorLabel].occupied++;
|
||||||
|
} else {
|
||||||
|
floorAvailabilityMap[floorLabel].available++;
|
||||||
|
}
|
||||||
|
floorAvailabilityMap[floorLabel].rooms.push(room);
|
||||||
|
});
|
||||||
|
|
||||||
|
const floor_availability = Object.values(floorAvailabilityMap).sort((a, b) =>
|
||||||
|
a.floor.localeCompare(b.floor, 'es', { numeric: true })
|
||||||
|
);
|
||||||
|
|
||||||
let role_data = {};
|
let role_data = {};
|
||||||
|
|
||||||
if (role === 'admin') {
|
if (role === 'admin') {
|
||||||
role_data = {
|
role_data = {
|
||||||
filter_stats,
|
filter_stats,
|
||||||
date_labels,
|
date_labels,
|
||||||
|
floor_availability,
|
||||||
|
all_physical_rooms_today: allPhysicalToday,
|
||||||
recent_audits: audit_logs.length > 0 ? audit_logs : [
|
recent_audits: audit_logs.length > 0 ? audit_logs : [
|
||||||
{ created_at: '2026-09-18 21:15', action_type: 'UPDATE_PERMISSION', user_email: 'admin@edu-space.com', ip_address: '127.0.0.1' },
|
{ created_at: '2026-10-26 15:30:00', action: 'LOGIN', action_label: 'Inicio de Sesión', module: 'auth', module_label: 'Autenticación', user_email: 'admin@unicaba.edu.ar', details: 'Acceso autenticado con credenciales de Bedelía' }
|
||||||
{ created_at: '2026-09-18 20:30', action_type: 'CREATE_COMMISSION', user_email: 'admin@edu-space.com', ip_address: '127.0.0.1' },
|
|
||||||
{ created_at: '2026-09-18 19:45', action_type: 'LOGIN_SUCCESS', user_email: 'admin@edu-space.com', ip_address: '127.0.0.1' }
|
|
||||||
]
|
]
|
||||||
};
|
};
|
||||||
} else if (role === 'bedelia') {
|
} else if (role === 'bedelia') {
|
||||||
@@ -203,7 +243,9 @@ router.get('/', async (req, res) => {
|
|||||||
audit_logs,
|
audit_logs,
|
||||||
upcoming_reservations,
|
upcoming_reservations,
|
||||||
filter_stats,
|
filter_stats,
|
||||||
date_labels
|
date_labels,
|
||||||
|
floor_availability,
|
||||||
|
all_physical_rooms_today: allPhysicalToday
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|||||||
@@ -719,7 +719,7 @@ const handleAddReservation = async (req, res) => {
|
|||||||
commissionList.forEach(c => { commissionDataMap[c.id] = c; });
|
commissionList.forEach(c => { commissionDataMap[c.id] = c; });
|
||||||
|
|
||||||
res.render('schedule/add', {
|
res.render('schedule/add', {
|
||||||
title: 'New Reservation - Edu-Space Admin',
|
title: 'Nueva Reserva - Edu-Space',
|
||||||
form,
|
form,
|
||||||
classroom_list: classroomList,
|
classroom_list: classroomList,
|
||||||
commission_list: commissionList,
|
commission_list: commissionList,
|
||||||
|
|||||||
@@ -1172,7 +1172,6 @@
|
|||||||
<li><a class="nav-link" href="/schedule/calendar_view"><i class="bi bi-calendar-week me-1"></i>Calendario Semanal</a></li>
|
<li><a class="nav-link" href="/schedule/calendar_view"><i class="bi bi-calendar-week me-1"></i>Calendario Semanal</a></li>
|
||||||
<li><a class="nav-link" href="/schedule/list_reservations"><i class="bi bi-list-check me-1"></i>Gestión de Reservas</a></li>
|
<li><a class="nav-link" href="/schedule/list_reservations"><i class="bi bi-list-check me-1"></i>Gestión de Reservas</a></li>
|
||||||
<li><a class="nav-link text-success" href="/schedule/add_reservation"><i class="bi bi-plus-circle me-1"></i>Nueva Reserva</a></li>
|
<li><a class="nav-link text-success" href="/schedule/add_reservation"><i class="bi bi-plus-circle me-1"></i>Nueva Reserva</a></li>
|
||||||
<li><a class="nav-link" href="/schedule/commissions_view"><i class="bi bi-clock-history me-1"></i>Comisiones en Horario</a></li>
|
|
||||||
<li><a class="nav-link text-info fw-semibold" href="/genetic_algorithm_web/genetic_optimizer"><i class="bi bi-cpu me-1"></i>Optimizador IA</a></li>
|
<li><a class="nav-link text-info fw-semibold" href="/genetic_algorithm_web/genetic_optimizer"><i class="bi bi-cpu me-1"></i>Optimizador IA</a></li>
|
||||||
</ul>
|
</ul>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -1,25 +1,32 @@
|
|||||||
{% extends "base.html" %}
|
{% extends "base.html" %}
|
||||||
|
|
||||||
{% block title %}Add Classroom - Edu-Space Admin{% endblock %}
|
{% block title %}Nueva Aula - Edu-Space{% endblock %}
|
||||||
|
|
||||||
{% block content %}
|
{% block content %}
|
||||||
<div class="container-fluid px-0">
|
<div class="container-fluid px-0">
|
||||||
<div class="row">
|
<div class="row mb-4">
|
||||||
<div class="col-12">
|
<div class="col-12">
|
||||||
<div class="d-flex justify-content-between align-items-center mb-3">
|
<div class="d-flex flex-wrap justify-content-between align-items-center gap-3 pb-2 border-bottom border-secondary-subtle">
|
||||||
<div>
|
<div>
|
||||||
<nav aria-label="breadcrumb">
|
<nav aria-label="breadcrumb">
|
||||||
<ol class="breadcrumb mb-1 small">
|
<ol class="breadcrumb mb-2 small">
|
||||||
<li class="breadcrumb-item"><a href="/classrooms/list_classrooms">Classrooms</a></li>
|
<li class="breadcrumb-item"><a href="/dashboard" class="text-decoration-none text-muted"><i class="bi bi-house-door me-1"></i>Inicio</a></li>
|
||||||
<li class="breadcrumb-item active">Add Classroom</li>
|
<li class="breadcrumb-item"><a href="/classrooms/list_classrooms" class="text-decoration-none text-muted">Aulas y Espacios</a></li>
|
||||||
|
<li class="breadcrumb-item active text-primary fw-semibold" aria-current="page">Nueva Aula</li>
|
||||||
</ol>
|
</ol>
|
||||||
</nav>
|
</nav>
|
||||||
<h1 class="h3 mb-0">
|
<div class="d-flex align-items-center gap-3">
|
||||||
<i class="bi bi-plus-circle text-primary me-2"></i>Add Classroom
|
<div class="rounded-3 p-2 d-flex align-items-center justify-content-center shadow-sm" style="background: rgba(180, 62, 142, 0.12); color: #B43E8E; width: 44px; height: 44px;">
|
||||||
</h1>
|
<i class="bi bi-door-open-fill fs-4"></i>
|
||||||
</div>
|
</div>
|
||||||
<a href="/classrooms/list_classrooms" class="btn btn-outline-secondary">
|
<div>
|
||||||
<i class="bi bi-arrow-left me-1"></i>Back to Classrooms
|
<h1 class="h4 fw-bold mb-0">Nueva Aula / Espacio Áulico</h1>
|
||||||
|
<p class="text-muted small mb-0">Alta de espacio físico o virtual en el catálogo institucional de UniCABA</p>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<a href="/classrooms/list_classrooms" class="btn btn-outline-secondary rounded-pill px-3 shadow-none">
|
||||||
|
<i class="bi bi-arrow-left me-1"></i>Volver a Aulas
|
||||||
</a>
|
</a>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
@@ -30,7 +37,7 @@
|
|||||||
<div class="card border-0 shadow-sm">
|
<div class="card border-0 shadow-sm">
|
||||||
<div class="card-header bg-body-tertiary border-0 py-3">
|
<div class="card-header bg-body-tertiary border-0 py-3">
|
||||||
<h5 class="mb-0 h6 fw-bold">
|
<h5 class="mb-0 h6 fw-bold">
|
||||||
<i class="bi bi-door-open text-primary me-2"></i>Classroom Information
|
<i class="bi bi-door-open text-primary me-2"></i>Información del Espacio Áulico
|
||||||
</h5>
|
</h5>
|
||||||
</div>
|
</div>
|
||||||
<div class="card-body p-4">
|
<div class="card-body p-4">
|
||||||
|
|||||||
+124
-25
@@ -291,20 +291,84 @@
|
|||||||
|
|
||||||
<!-- Admin Analytics & Audit Row -->
|
<!-- Admin Analytics & Audit Row -->
|
||||||
<div class="row mb-4">
|
<div class="row mb-4">
|
||||||
<!-- Monthly Chart -->
|
<!-- Disponibilidad y Ocupación Áulica por Piso (Operación Hoy) -->
|
||||||
<div class="col-lg-8 mb-4 mb-lg-0">
|
<div class="col-lg-8 mb-4 mb-lg-0">
|
||||||
<div class="card border-0 shadow-sm h-100 glass-card">
|
<div class="card border-0 shadow-sm h-100 glass-card">
|
||||||
<div class="card-header border-0 py-3 bg-body-tertiary d-flex justify-content-between align-items-center">
|
<div class="card-header border-0 py-3 bg-body-tertiary d-flex flex-wrap justify-content-between align-items-center gap-2">
|
||||||
|
<div>
|
||||||
<h5 class="mb-0 h6 fw-bold">
|
<h5 class="mb-0 h6 fw-bold">
|
||||||
<i class="bi bi-graph-up text-primary me-2"></i>Tendencia de Ocupación y Reservas Mensuales
|
<i class="bi bi-building-check text-primary me-2"></i>Disponibilidad y Ocupación Áulica por Piso
|
||||||
</h5>
|
</h5>
|
||||||
<a href="/admin/occupancy_metrics" class="btn btn-sm btn-outline-primary">
|
<small class="text-muted" style="font-size: 0.75rem;">
|
||||||
<i class="bi bi-bar-chart me-1"></i>Métricas Detalladas
|
Monitoreo en vivo de aulas presenciales libres vs ocupadas (Operación Hoy)
|
||||||
|
</small>
|
||||||
|
</div>
|
||||||
|
<div class="d-flex align-items-center gap-2">
|
||||||
|
<span class="badge bg-success-subtle text-success border border-success-subtle font-monospace">
|
||||||
|
<i class="bi bi-circle-fill me-1" style="font-size: 0.5rem;"></i>{{ stats.unassigned_today_classrooms or 0 }} Libres
|
||||||
|
</span>
|
||||||
|
<span class="badge bg-primary-subtle text-primary border border-primary-subtle font-monospace">
|
||||||
|
<i class="bi bi-circle-fill me-1" style="font-size: 0.5rem;"></i>{{ stats.assigned_today_classrooms or 0 }} Ocupadas
|
||||||
|
</span>
|
||||||
|
<a href="/admin/occupancy_metrics" class="btn btn-sm btn-outline-primary py-1 px-2" title="Ver métricas completas">
|
||||||
|
<i class="bi bi-bar-chart me-1"></i>Métricas
|
||||||
</a>
|
</a>
|
||||||
</div>
|
</div>
|
||||||
|
</div>
|
||||||
<div class="card-body p-3">
|
<div class="card-body p-3">
|
||||||
<div style="position: relative; height: 260px; max-height: 260px; width: 100%;">
|
<div class="row g-3 align-items-center">
|
||||||
<canvas id="monthlyChart"></canvas>
|
<!-- Chart de Barras Horizontales por Piso -->
|
||||||
|
<div class="col-md-7">
|
||||||
|
<div style="position: relative; height: 230px; max-height: 230px; width: 100%;">
|
||||||
|
<canvas id="floorAvailabilityChart"></canvas>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<!-- Mini matriz rápida de Aulas Físicas -->
|
||||||
|
<div class="col-md-5 border-start">
|
||||||
|
<h6 class="small fw-bold text-uppercase text-muted mb-2" style="font-size: 0.72rem; letter-spacing: 0.05em;">
|
||||||
|
<i class="bi bi-door-closed me-1"></i>Estado de Aulas Presenciales
|
||||||
|
</h6>
|
||||||
|
<div class="d-flex flex-column gap-2" style="max-height: 220px; overflow-y: auto;">
|
||||||
|
{% if all_physical_rooms_today and all_physical_rooms_today.length > 0 %}
|
||||||
|
{% for room in all_physical_rooms_today %}
|
||||||
|
<div class="p-2 rounded bg-body-tertiary border d-flex justify-content-between align-items-center">
|
||||||
|
<div>
|
||||||
|
<div class="fw-bold text-body small d-flex align-items-center gap-1">
|
||||||
|
<span>{{ room.code }}</span>
|
||||||
|
<span class="badge bg-secondary-subtle text-secondary" style="font-size: 0.65rem;">
|
||||||
|
{% if room.floor == '0' or room.floor == 0 or room.floor == 'PB' %}PB{% else %}P{{ room.floor }}{% endif %}
|
||||||
|
</span>
|
||||||
|
</div>
|
||||||
|
<small class="text-muted d-block" style="font-size: 0.70rem;">
|
||||||
|
Capacidad: {{ room.capacity }} asientos
|
||||||
|
</small>
|
||||||
|
{% if room.is_occupied_today and room.assigned_summary %}
|
||||||
|
<small class="text-primary fw-semibold d-block text-truncate" style="font-size: 0.68rem; max-width: 140px;" title="{{ room.assigned_summary }}">
|
||||||
|
{{ room.assigned_summary }}
|
||||||
|
</small>
|
||||||
|
{% endif %}
|
||||||
|
</div>
|
||||||
|
<div class="text-end">
|
||||||
|
{% if room.is_occupied_today %}
|
||||||
|
<span class="badge bg-primary-subtle text-primary border border-primary-subtle" style="font-size: 0.70rem;">
|
||||||
|
<i class="bi bi-mortarboard-fill me-1"></i>Ocupada
|
||||||
|
</span>
|
||||||
|
{% else %}
|
||||||
|
<a href="/schedule/add_reservation?classroom_id={{ room.id }}"
|
||||||
|
class="btn btn-sm btn-outline-success py-0 px-2" style="font-size: 0.70rem;" title="Asignar clase en esta aula libre">
|
||||||
|
<i class="bi bi-plus-lg me-1"></i>Libre
|
||||||
|
</a>
|
||||||
|
{% endif %}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
{% endfor %}
|
||||||
|
{% else %}
|
||||||
|
<div class="text-center py-3 text-muted small">
|
||||||
|
<i class="bi bi-info-circle me-1"></i>Sin aulas registradas
|
||||||
|
</div>
|
||||||
|
{% endif %}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
@@ -314,44 +378,79 @@
|
|||||||
<div class="col-lg-4">
|
<div class="col-lg-4">
|
||||||
<div class="card border-0 shadow-sm h-100 glass-card">
|
<div class="card border-0 shadow-sm h-100 glass-card">
|
||||||
<div class="card-header border-0 py-3 bg-body-tertiary d-flex justify-content-between align-items-center">
|
<div class="card-header border-0 py-3 bg-body-tertiary d-flex justify-content-between align-items-center">
|
||||||
|
<div>
|
||||||
<h5 class="mb-0 h6 fw-bold">
|
<h5 class="mb-0 h6 fw-bold">
|
||||||
<i class="bi bi-shield-check text-success me-2"></i>Últimos Eventos de Auditoría
|
<i class="bi bi-shield-check text-success me-2"></i>Últimos Eventos de Auditoría
|
||||||
</h5>
|
</h5>
|
||||||
<a href="/admin/audit_logs" class="btn btn-sm btn-outline-secondary py-0 px-2">
|
<small class="text-muted" style="font-size: 0.75rem;">Trazabilidad y seguridad</small>
|
||||||
|
</div>
|
||||||
|
<a href="/admin/audit_logs" class="btn btn-sm btn-outline-secondary py-0 px-2" style="font-size: 0.75rem;">
|
||||||
Ver todo
|
Ver todo
|
||||||
</a>
|
</a>
|
||||||
</div>
|
</div>
|
||||||
<div class="card-body p-0">
|
<div class="card-body p-0">
|
||||||
{% if role_data.recent_audits %}
|
{% if role_data.recent_audits and role_data.recent_audits.length > 0 %}
|
||||||
<ul class="list-group list-group-flush small">
|
<ul class="list-group list-group-flush small mb-0">
|
||||||
{% for audit in role_data.recent_audits %}
|
{% for audit in role_data.recent_audits %}
|
||||||
<li class="list-group-item d-flex justify-content-between align-items-center py-2 px-3">
|
<li class="list-group-item py-2 px-3 border-bottom">
|
||||||
<div>
|
<div class="d-flex justify-content-between align-items-start gap-2 mb-1">
|
||||||
<div class="fw-semibold text-truncate" style="max-width: 180px;">
|
<div class="d-flex align-items-center gap-2 text-truncate">
|
||||||
{{ audit.user_email or 'Sistema' }}
|
<div class="rounded-circle bg-body-secondary d-flex align-items-center justify-content-center" style="width: 24px; height: 24px; min-width: 24px;">
|
||||||
|
<i class="bi bi-person-fill text-secondary" style="font-size: 0.75rem;"></i>
|
||||||
</div>
|
</div>
|
||||||
<span class="text-muted font-monospace" style="font-size: 0.72rem;">
|
<span class="fw-bold text-body text-truncate" style="font-size: 0.80rem;" title="{{ audit.user_email or 'Sistema' }}">
|
||||||
{{ audit.created_at }} · {{ audit.module }}
|
{{ audit.user_email or 'Sistema' }}
|
||||||
</span>
|
</span>
|
||||||
</div>
|
</div>
|
||||||
<div>
|
<div class="flex-shrink-0">
|
||||||
{% if audit.action == 'CREATE' %}
|
{% set act = (audit.action or audit.action_type or '') | upper %}
|
||||||
<span class="badge bg-success-subtle text-success border">{{ audit.action }}</span>
|
{% if 'LOGIN' in act %}
|
||||||
{% elif audit.action == 'UPDATE' %}
|
<span class="badge bg-info-subtle text-info border border-info-subtle" style="font-size: 0.68rem;">
|
||||||
<span class="badge bg-primary-subtle text-primary border">{{ audit.action }}</span>
|
<i class="bi bi-box-arrow-in-right me-1"></i>Acceso
|
||||||
{% elif audit.action == 'DELETE' %}
|
</span>
|
||||||
<span class="badge bg-danger-subtle text-danger border">{{ audit.action }}</span>
|
{% elif 'CREATE' in act %}
|
||||||
|
<span class="badge bg-success-subtle text-success border border-success-subtle" style="font-size: 0.68rem;">
|
||||||
|
<i class="bi bi-plus-circle me-1"></i>Creación
|
||||||
|
</span>
|
||||||
|
{% elif 'UPDATE' in act %}
|
||||||
|
<span class="badge bg-primary-subtle text-primary border border-primary-subtle" style="font-size: 0.68rem;">
|
||||||
|
<i class="bi bi-pencil me-1"></i>Edición
|
||||||
|
</span>
|
||||||
|
{% elif 'DELETE' in act %}
|
||||||
|
<span class="badge bg-danger-subtle text-danger border border-danger-subtle" style="font-size: 0.68rem;">
|
||||||
|
<i class="bi bi-trash me-1"></i>Baja
|
||||||
|
</span>
|
||||||
|
{% elif 'IMPERSONATE' in act %}
|
||||||
|
<span class="badge bg-warning-subtle text-warning-emphasis border border-warning-subtle" style="font-size: 0.68rem;">
|
||||||
|
<i class="bi bi-person-badge me-1"></i>Impersonación
|
||||||
|
</span>
|
||||||
{% else %}
|
{% else %}
|
||||||
<span class="badge bg-secondary-subtle text-secondary border">{{ audit.action }}</span>
|
<span class="badge bg-secondary-subtle text-secondary border" style="font-size: 0.68rem;">
|
||||||
|
{{ audit.action_label or audit.action or 'Operación' }}
|
||||||
|
</span>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
</div>
|
</div>
|
||||||
|
</div>
|
||||||
|
{% if audit.details %}
|
||||||
|
<p class="text-body-secondary small mb-1 text-truncate" style="font-size: 0.74rem;" title="{{ audit.details }}">
|
||||||
|
<i class="bi bi-info-circle text-muted me-1"></i>{{ audit.details }}
|
||||||
|
</p>
|
||||||
|
{% endif %}
|
||||||
|
<div class="d-flex align-items-center justify-content-between text-muted" style="font-size: 0.70rem;">
|
||||||
|
<span>
|
||||||
|
<i class="bi bi-clock me-1"></i>{{ audit.created_at }}
|
||||||
|
</span>
|
||||||
|
<span class="badge bg-body-tertiary text-muted border">
|
||||||
|
<i class="bi bi-folder2 me-1"></i>{{ audit.module_label or audit.module or 'Sistema' }}
|
||||||
|
</span>
|
||||||
|
</div>
|
||||||
</li>
|
</li>
|
||||||
{% endfor %}
|
{% endfor %}
|
||||||
</ul>
|
</ul>
|
||||||
{% else %}
|
{% else %}
|
||||||
<div class="text-center py-4 text-muted">
|
<div class="text-center py-4 text-muted">
|
||||||
<i class="bi bi-shield-check fs-2 d-block mb-1 text-secondary"></i>
|
<i class="bi bi-shield-check fs-2 d-block mb-1 text-secondary"></i>
|
||||||
<span class="small">No hay registros recientes.</span>
|
<span class="small">No hay registros de auditoría recientes.</span>
|
||||||
</div>
|
</div>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -88,53 +88,96 @@
|
|||||||
<script id="filter-stats-json" type="application/json">
|
<script id="filter-stats-json" type="application/json">
|
||||||
{{ filter_stats | dump | safe }}
|
{{ filter_stats | dump | safe }}
|
||||||
</script>
|
</script>
|
||||||
|
<script id="floor-availability-json" type="application/json">
|
||||||
|
{{ floor_availability | dump | safe }}
|
||||||
|
</script>
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
|
|
||||||
{% block extra_js %}
|
{% block extra_js %}
|
||||||
<script src="https://cdn.jsdelivr.net/npm/chart.js"></script>
|
<script src="https://cdn.jsdelivr.net/npm/chart.js"></script>
|
||||||
<script>
|
<script>
|
||||||
$(document).ready(function() {
|
$(document).ready(function() {
|
||||||
const chartElem = document.getElementById('monthlyChart');
|
const floorChartElem = document.getElementById('floorAvailabilityChart');
|
||||||
if (chartElem) {
|
if (floorChartElem) {
|
||||||
$.get('/api/dashboard-stats')
|
let floorData = [];
|
||||||
.done(function(data) {
|
try {
|
||||||
const ctx = chartElem.getContext('2d');
|
const rawJson = document.getElementById('floor-availability-json');
|
||||||
|
if (rawJson) {
|
||||||
|
floorData = JSON.parse(rawJson.textContent || '[]');
|
||||||
|
}
|
||||||
|
} catch (e) {
|
||||||
|
console.warn('Error leyendo floor-availability-json:', e);
|
||||||
|
}
|
||||||
|
|
||||||
|
const labels = floorData.map(f => f.floor);
|
||||||
|
const availableData = floorData.map(f => f.available);
|
||||||
|
const occupiedData = floorData.map(f => f.occupied);
|
||||||
|
|
||||||
|
const ctx = floorChartElem.getContext('2d');
|
||||||
new Chart(ctx, {
|
new Chart(ctx, {
|
||||||
type: 'line',
|
type: 'bar',
|
||||||
data: {
|
data: {
|
||||||
labels: data.monthly_data.map(item => item.month),
|
labels: labels.length > 0 ? labels : ['Piso 2', 'Piso 3'],
|
||||||
datasets: [{
|
datasets: [
|
||||||
label: 'Reservas',
|
{
|
||||||
data: data.monthly_data.map(item => item.reservations),
|
label: 'Aulas Libres (Hoy)',
|
||||||
borderColor: '#B43E8E',
|
data: availableData.length > 0 ? availableData : [1, 2],
|
||||||
backgroundColor: 'rgba(180, 62, 142, 0.12)',
|
backgroundColor: '#198754',
|
||||||
borderWidth: 2,
|
borderRadius: 6,
|
||||||
fill: true,
|
barThickness: 24
|
||||||
tension: 0.4,
|
},
|
||||||
pointBackgroundColor: '#B43E8E',
|
{
|
||||||
pointRadius: 3
|
label: 'Aulas Asignadas con Cursada',
|
||||||
}]
|
data: occupiedData.length > 0 ? occupiedData : [0, 0],
|
||||||
|
backgroundColor: '#B43E8E',
|
||||||
|
borderRadius: 6,
|
||||||
|
barThickness: 24
|
||||||
|
}
|
||||||
|
]
|
||||||
},
|
},
|
||||||
options: {
|
options: {
|
||||||
|
indexAxis: 'y',
|
||||||
responsive: true,
|
responsive: true,
|
||||||
maintainAspectRatio: false,
|
maintainAspectRatio: false,
|
||||||
resizeDelay: 100,
|
resizeDelay: 100,
|
||||||
plugins: {
|
plugins: {
|
||||||
legend: {
|
legend: {
|
||||||
display: false
|
position: 'top',
|
||||||
|
labels: {
|
||||||
|
boxWidth: 12,
|
||||||
|
padding: 12,
|
||||||
|
font: { size: 12 }
|
||||||
|
}
|
||||||
|
},
|
||||||
|
tooltip: {
|
||||||
|
callbacks: {
|
||||||
|
label: function(context) {
|
||||||
|
return ` ${context.dataset.label}: ${context.raw} aula(s)`;
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
scales: {
|
scales: {
|
||||||
y: {
|
x: {
|
||||||
|
stacked: true,
|
||||||
beginAtZero: true,
|
beginAtZero: true,
|
||||||
ticks: {
|
ticks: {
|
||||||
stepSize: 1
|
stepSize: 1,
|
||||||
|
precision: 0
|
||||||
|
},
|
||||||
|
grid: {
|
||||||
|
color: 'rgba(0,0,0,0.06)'
|
||||||
|
}
|
||||||
|
},
|
||||||
|
y: {
|
||||||
|
stacked: true,
|
||||||
|
grid: {
|
||||||
|
display: false
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
});
|
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|||||||
@@ -291,20 +291,84 @@
|
|||||||
|
|
||||||
<!-- Admin Analytics & Audit Row -->
|
<!-- Admin Analytics & Audit Row -->
|
||||||
<div class="row mb-4">
|
<div class="row mb-4">
|
||||||
<!-- Monthly Chart -->
|
<!-- Disponibilidad y Ocupación Áulica por Piso (Operación Hoy) -->
|
||||||
<div class="col-lg-8 mb-4 mb-lg-0">
|
<div class="col-lg-8 mb-4 mb-lg-0">
|
||||||
<div class="card border-0 shadow-sm h-100 glass-card">
|
<div class="card border-0 shadow-sm h-100 glass-card">
|
||||||
<div class="card-header border-0 py-3 bg-body-tertiary d-flex justify-content-between align-items-center">
|
<div class="card-header border-0 py-3 bg-body-tertiary d-flex flex-wrap justify-content-between align-items-center gap-2">
|
||||||
|
<div>
|
||||||
<h5 class="mb-0 h6 fw-bold">
|
<h5 class="mb-0 h6 fw-bold">
|
||||||
<i class="bi bi-graph-up text-primary me-2"></i>Tendencia de Ocupación y Reservas Mensuales
|
<i class="bi bi-building-check text-primary me-2"></i>Disponibilidad y Ocupación Áulica por Piso
|
||||||
</h5>
|
</h5>
|
||||||
<a href="/admin/occupancy_metrics" class="btn btn-sm btn-outline-primary">
|
<small class="text-muted" style="font-size: 0.75rem;">
|
||||||
<i class="bi bi-bar-chart me-1"></i>Métricas Detalladas
|
Monitoreo en vivo de aulas presenciales libres vs ocupadas (Operación Hoy)
|
||||||
|
</small>
|
||||||
|
</div>
|
||||||
|
<div class="d-flex align-items-center gap-2">
|
||||||
|
<span class="badge bg-success-subtle text-success border border-success-subtle font-monospace">
|
||||||
|
<i class="bi bi-circle-fill me-1" style="font-size: 0.5rem;"></i>{{ stats.unassigned_today_classrooms or 0 }} Libres
|
||||||
|
</span>
|
||||||
|
<span class="badge bg-primary-subtle text-primary border border-primary-subtle font-monospace">
|
||||||
|
<i class="bi bi-circle-fill me-1" style="font-size: 0.5rem;"></i>{{ stats.assigned_today_classrooms or 0 }} Ocupadas
|
||||||
|
</span>
|
||||||
|
<a href="/admin/occupancy_metrics" class="btn btn-sm btn-outline-primary py-1 px-2" title="Ver métricas completas">
|
||||||
|
<i class="bi bi-bar-chart me-1"></i>Métricas
|
||||||
</a>
|
</a>
|
||||||
</div>
|
</div>
|
||||||
|
</div>
|
||||||
<div class="card-body p-3">
|
<div class="card-body p-3">
|
||||||
<div style="position: relative; height: 260px; max-height: 260px; width: 100%;">
|
<div class="row g-3 align-items-center">
|
||||||
<canvas id="monthlyChart"></canvas>
|
<!-- Chart de Barras Horizontales por Piso -->
|
||||||
|
<div class="col-md-7">
|
||||||
|
<div style="position: relative; height: 230px; max-height: 230px; width: 100%;">
|
||||||
|
<canvas id="floorAvailabilityChart"></canvas>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<!-- Mini matriz rápida de Aulas Físicas -->
|
||||||
|
<div class="col-md-5 border-start">
|
||||||
|
<h6 class="small fw-bold text-uppercase text-muted mb-2" style="font-size: 0.72rem; letter-spacing: 0.05em;">
|
||||||
|
<i class="bi bi-door-closed me-1"></i>Estado de Aulas Presenciales
|
||||||
|
</h6>
|
||||||
|
<div class="d-flex flex-column gap-2" style="max-height: 220px; overflow-y: auto;">
|
||||||
|
{% if all_physical_rooms_today and all_physical_rooms_today.length > 0 %}
|
||||||
|
{% for room in all_physical_rooms_today %}
|
||||||
|
<div class="p-2 rounded bg-body-tertiary border d-flex justify-content-between align-items-center">
|
||||||
|
<div>
|
||||||
|
<div class="fw-bold text-body small d-flex align-items-center gap-1">
|
||||||
|
<span>{{ room.code }}</span>
|
||||||
|
<span class="badge bg-secondary-subtle text-secondary" style="font-size: 0.65rem;">
|
||||||
|
{% if room.floor == '0' or room.floor == 0 or room.floor == 'PB' %}PB{% else %}P{{ room.floor }}{% endif %}
|
||||||
|
</span>
|
||||||
|
</div>
|
||||||
|
<small class="text-muted d-block" style="font-size: 0.70rem;">
|
||||||
|
Capacidad: {{ room.capacity }} asientos
|
||||||
|
</small>
|
||||||
|
{% if room.is_occupied_today and room.assigned_summary %}
|
||||||
|
<small class="text-primary fw-semibold d-block text-truncate" style="font-size: 0.68rem; max-width: 140px;" title="{{ room.assigned_summary }}">
|
||||||
|
{{ room.assigned_summary }}
|
||||||
|
</small>
|
||||||
|
{% endif %}
|
||||||
|
</div>
|
||||||
|
<div class="text-end">
|
||||||
|
{% if room.is_occupied_today %}
|
||||||
|
<span class="badge bg-primary-subtle text-primary border border-primary-subtle" style="font-size: 0.70rem;">
|
||||||
|
<i class="bi bi-mortarboard-fill me-1"></i>Ocupada
|
||||||
|
</span>
|
||||||
|
{% else %}
|
||||||
|
<a href="/schedule/add_reservation?classroom_id={{ room.id }}"
|
||||||
|
class="btn btn-sm btn-outline-success py-0 px-2" style="font-size: 0.70rem;" title="Asignar clase en esta aula libre">
|
||||||
|
<i class="bi bi-plus-lg me-1"></i>Libre
|
||||||
|
</a>
|
||||||
|
{% endif %}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
{% endfor %}
|
||||||
|
{% else %}
|
||||||
|
<div class="text-center py-3 text-muted small">
|
||||||
|
<i class="bi bi-info-circle me-1"></i>Sin aulas registradas
|
||||||
|
</div>
|
||||||
|
{% endif %}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
@@ -314,44 +378,79 @@
|
|||||||
<div class="col-lg-4">
|
<div class="col-lg-4">
|
||||||
<div class="card border-0 shadow-sm h-100 glass-card">
|
<div class="card border-0 shadow-sm h-100 glass-card">
|
||||||
<div class="card-header border-0 py-3 bg-body-tertiary d-flex justify-content-between align-items-center">
|
<div class="card-header border-0 py-3 bg-body-tertiary d-flex justify-content-between align-items-center">
|
||||||
|
<div>
|
||||||
<h5 class="mb-0 h6 fw-bold">
|
<h5 class="mb-0 h6 fw-bold">
|
||||||
<i class="bi bi-shield-check text-success me-2"></i>Últimos Eventos de Auditoría
|
<i class="bi bi-shield-check text-success me-2"></i>Últimos Eventos de Auditoría
|
||||||
</h5>
|
</h5>
|
||||||
<a href="/admin/audit_logs" class="btn btn-sm btn-outline-secondary py-0 px-2">
|
<small class="text-muted" style="font-size: 0.75rem;">Trazabilidad y seguridad</small>
|
||||||
|
</div>
|
||||||
|
<a href="/admin/audit_logs" class="btn btn-sm btn-outline-secondary py-0 px-2" style="font-size: 0.75rem;">
|
||||||
Ver todo
|
Ver todo
|
||||||
</a>
|
</a>
|
||||||
</div>
|
</div>
|
||||||
<div class="card-body p-0">
|
<div class="card-body p-0">
|
||||||
{% if role_data.recent_audits %}
|
{% if role_data.recent_audits and role_data.recent_audits.length > 0 %}
|
||||||
<ul class="list-group list-group-flush small">
|
<ul class="list-group list-group-flush small mb-0">
|
||||||
{% for audit in role_data.recent_audits %}
|
{% for audit in role_data.recent_audits %}
|
||||||
<li class="list-group-item d-flex justify-content-between align-items-center py-2 px-3">
|
<li class="list-group-item py-2 px-3 border-bottom">
|
||||||
<div>
|
<div class="d-flex justify-content-between align-items-start gap-2 mb-1">
|
||||||
<div class="fw-semibold text-truncate" style="max-width: 180px;">
|
<div class="d-flex align-items-center gap-2 text-truncate">
|
||||||
{{ audit.user_email or 'Sistema' }}
|
<div class="rounded-circle bg-body-secondary d-flex align-items-center justify-content-center" style="width: 24px; height: 24px; min-width: 24px;">
|
||||||
|
<i class="bi bi-person-fill text-secondary" style="font-size: 0.75rem;"></i>
|
||||||
</div>
|
</div>
|
||||||
<span class="text-muted font-monospace" style="font-size: 0.72rem;">
|
<span class="fw-bold text-body text-truncate" style="font-size: 0.80rem;" title="{{ audit.user_email or 'Sistema' }}">
|
||||||
{{ audit.created_at }} · {{ audit.module }}
|
{{ audit.user_email or 'Sistema' }}
|
||||||
</span>
|
</span>
|
||||||
</div>
|
</div>
|
||||||
<div>
|
<div class="flex-shrink-0">
|
||||||
{% if audit.action == 'CREATE' %}
|
{% set act = (audit.action or audit.action_type or '') | upper %}
|
||||||
<span class="badge bg-success-subtle text-success border">{{ audit.action }}</span>
|
{% if 'LOGIN' in act %}
|
||||||
{% elif audit.action == 'UPDATE' %}
|
<span class="badge bg-info-subtle text-info border border-info-subtle" style="font-size: 0.68rem;">
|
||||||
<span class="badge bg-primary-subtle text-primary border">{{ audit.action }}</span>
|
<i class="bi bi-box-arrow-in-right me-1"></i>Acceso
|
||||||
{% elif audit.action == 'DELETE' %}
|
</span>
|
||||||
<span class="badge bg-danger-subtle text-danger border">{{ audit.action }}</span>
|
{% elif 'CREATE' in act %}
|
||||||
|
<span class="badge bg-success-subtle text-success border border-success-subtle" style="font-size: 0.68rem;">
|
||||||
|
<i class="bi bi-plus-circle me-1"></i>Creación
|
||||||
|
</span>
|
||||||
|
{% elif 'UPDATE' in act %}
|
||||||
|
<span class="badge bg-primary-subtle text-primary border border-primary-subtle" style="font-size: 0.68rem;">
|
||||||
|
<i class="bi bi-pencil me-1"></i>Edición
|
||||||
|
</span>
|
||||||
|
{% elif 'DELETE' in act %}
|
||||||
|
<span class="badge bg-danger-subtle text-danger border border-danger-subtle" style="font-size: 0.68rem;">
|
||||||
|
<i class="bi bi-trash me-1"></i>Baja
|
||||||
|
</span>
|
||||||
|
{% elif 'IMPERSONATE' in act %}
|
||||||
|
<span class="badge bg-warning-subtle text-warning-emphasis border border-warning-subtle" style="font-size: 0.68rem;">
|
||||||
|
<i class="bi bi-person-badge me-1"></i>Impersonación
|
||||||
|
</span>
|
||||||
{% else %}
|
{% else %}
|
||||||
<span class="badge bg-secondary-subtle text-secondary border">{{ audit.action }}</span>
|
<span class="badge bg-secondary-subtle text-secondary border" style="font-size: 0.68rem;">
|
||||||
|
{{ audit.action_label or audit.action or 'Operación' }}
|
||||||
|
</span>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
</div>
|
</div>
|
||||||
|
</div>
|
||||||
|
{% if audit.details %}
|
||||||
|
<p class="text-body-secondary small mb-1 text-truncate" style="font-size: 0.74rem;" title="{{ audit.details }}">
|
||||||
|
<i class="bi bi-info-circle text-muted me-1"></i>{{ audit.details }}
|
||||||
|
</p>
|
||||||
|
{% endif %}
|
||||||
|
<div class="d-flex align-items-center justify-content-between text-muted" style="font-size: 0.70rem;">
|
||||||
|
<span>
|
||||||
|
<i class="bi bi-clock me-1"></i>{{ audit.created_at }}
|
||||||
|
</span>
|
||||||
|
<span class="badge bg-body-tertiary text-muted border">
|
||||||
|
<i class="bi bi-folder2 me-1"></i>{{ audit.module_label or audit.module or 'Sistema' }}
|
||||||
|
</span>
|
||||||
|
</div>
|
||||||
</li>
|
</li>
|
||||||
{% endfor %}
|
{% endfor %}
|
||||||
</ul>
|
</ul>
|
||||||
{% else %}
|
{% else %}
|
||||||
<div class="text-center py-4 text-muted">
|
<div class="text-center py-4 text-muted">
|
||||||
<i class="bi bi-shield-check fs-2 d-block mb-1 text-secondary"></i>
|
<i class="bi bi-shield-check fs-2 d-block mb-1 text-secondary"></i>
|
||||||
<span class="small">No hay registros recientes.</span>
|
<span class="small">No hay registros de auditoría recientes.</span>
|
||||||
</div>
|
</div>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -1,19 +1,32 @@
|
|||||||
{% extends "base.html" %}
|
{% extends "base.html" %}
|
||||||
|
|
||||||
{% block title %}New Reservation - Edu-Space Admin{% endblock %}
|
{% block title %}Nueva Reserva - Edu-Space{% endblock %}
|
||||||
|
|
||||||
{% block content %}
|
{% block content %}
|
||||||
<div class="container-fluid pt-5 mt-4">
|
<div class="container-fluid px-0">
|
||||||
<div class="row">
|
<div class="row mb-4">
|
||||||
<div class="col-12">
|
<div class="col-12">
|
||||||
<div class="d-flex justify-content-between align-items-center mb-4">
|
<div class="d-flex flex-wrap justify-content-between align-items-center gap-3 pb-2 border-bottom border-secondary-subtle">
|
||||||
<div>
|
<div>
|
||||||
<h1 class="h3 mb-0">
|
<nav aria-label="breadcrumb">
|
||||||
<i class="bi bi-calendar-plus text-primary me-2"></i>New Reservation
|
<ol class="breadcrumb mb-2 small">
|
||||||
</h1>
|
<li class="breadcrumb-item"><a href="/dashboard" class="text-decoration-none text-muted"><i class="bi bi-house-door me-1"></i>Inicio</a></li>
|
||||||
|
<li class="breadcrumb-item"><a href="/schedule/list_reservations" class="text-decoration-none text-muted">Reservas & Calendario</a></li>
|
||||||
|
<li class="breadcrumb-item active text-primary fw-semibold" aria-current="page">Nueva Reserva</li>
|
||||||
|
</ol>
|
||||||
|
</nav>
|
||||||
|
<div class="d-flex align-items-center gap-3">
|
||||||
|
<div class="rounded-3 p-2 d-flex align-items-center justify-content-center shadow-sm" style="background: rgba(180, 62, 142, 0.12); color: #B43E8E; width: 44px; height: 44px;">
|
||||||
|
<i class="bi bi-calendar-plus-fill fs-4"></i>
|
||||||
</div>
|
</div>
|
||||||
<a href="/schedule/list_reservations" class="btn btn-outline-secondary">
|
<div>
|
||||||
<i class="bi bi-arrow-left me-1"></i>Back to Reservations
|
<h1 class="h4 fw-bold mb-0">Nueva Reserva / Asignación de Aula</h1>
|
||||||
|
<p class="text-muted small mb-0">Asignar espacio físico o clase virtual a una comisión o actividad académica</p>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<a href="/schedule/list_reservations" class="btn btn-outline-secondary rounded-pill px-3 shadow-none">
|
||||||
|
<i class="bi bi-arrow-left me-1"></i>Volver a Reservas
|
||||||
</a>
|
</a>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
Reference in New Issue
Block a user