diff --git a/CHANGELOG.md b/CHANGELOG.md index 45c7b97..df5e804 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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. - **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 ### Fixed - **Restauración y UX Nativa del Menú en Dispositivos Celulares / Móviles**: diff --git a/MEMORY.md b/MEMORY.md index 4a1eab3..929ab01 100644 --- a/MEMORY.md +++ b/MEMORY.md @@ -9,13 +9,13 @@ Memoria del proyecto entre sesiones para la rama `dev`. - Libro de Calificaciones (*Gradebook*) con actas de regularidad inmutables. - 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. -- **Sprint Activo: UI/UX Móvil, Sesión en Sidebar Colapsado y Cero Errores — v3.8.16**: - - **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. - - **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". - - **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. - - **Resolución de Error 404 en `/api/user/theme`**: Endpoint registrado en Express BFF para guardar tema visual por AJAX sin errores. - - **QA & Seguridad Integral**: 100% tests aprobados (79 passed en pytest), 52 plantillas balanceadas, 0 issues en SAST/SCA (Bandit, pip-audit, njsscan, npm audit). - - **Versión Consolidada**: `v3.8.16`. +- **Sprint Activo: Disponibilidad Áulica por Piso, Métricas Reales, Auditoría Enriquecida y Rediseño UI/UX — v3.8.17**: + - **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. + - **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. + - **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. + - **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**: 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.17`. ## 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. diff --git a/backend/app/__init__.py b/backend/app/__init__.py index 43af58f..1880a0d 100644 --- a/backend/app/__init__.py +++ b/backend/app/__init__.py @@ -7,7 +7,7 @@ from typing import Any from database import db, get_db, engine, SessionLocal, session from config.config import Config -__version__ = "3.8.16" +__version__ = "3.8.17" class DummyContext: def __enter__(self): diff --git a/backend/app/services/dashboard_service.py b/backend/app/services/dashboard_service.py index cb7207e..67eba39 100644 --- a/backend/app/services/dashboard_service.py +++ b/backend/app/services/dashboard_service.py @@ -179,13 +179,35 @@ class DashboardService: AcademicMilestone.is_active == True ).order_by(AcademicMilestone.date.asc()).limit(10).all() - recent_audits = AuditLog.query.order_by(AuditLog.created_at.desc()).limit(6).all() - audit_data = [{ - 'created_at': a.created_at.strftime('%Y-%m-%d %H:%M') if a.created_at else None, - 'action_type': getattr(a, 'action', getattr(a, 'action_type', 'AUDIT')), - 'ip_address': a.ip_address, - 'user_email': getattr(a, 'user_email', None) or (getattr(a.user, 'email', 'System') if hasattr(a, 'user') else 'System') - } for a in recent_audits] + recent_audits = AuditLog.query.order_by(AuditLog.created_at.desc()).limit(8).all() + audit_data = [] + for a in recent_audits: + d = a.to_dict() + act_raw = (d.get('action') or '').upper() + mod_raw = (d.get('module') or '').lower() + 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 diff --git a/backend/setup.py b/backend/setup.py index 2646a6a..a1d3af3 100644 --- a/backend/setup.py +++ b/backend/setup.py @@ -2,7 +2,7 @@ from setuptools import setup, find_packages setup( name="edu-space-admin", - version="3.8.16", + version="3.8.17", description="Administrative interface for Edu-Space Classroom Management System (FastAPI ASGI Core)", author="Edu-Space Development Team", author_email="admin@edu-space.com", diff --git a/frontend/package.json b/frontend/package.json index 41d585c..144a4d0 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -1,6 +1,6 @@ { "name": "frontend", - "version": "3.8.16", + "version": "3.8.17", "description": "", "main": "index.js", "scripts": { diff --git a/frontend/src/app.js b/frontend/src/app.js index f21cec7..5834612 100644 --- a/frontend/src/app.js +++ b/frontend/src/app.js @@ -86,9 +86,9 @@ const env = nunjucks.configure(path.join(__dirname, '../views'), { }); // Versiones institucionales del sistema -const APP_VERSION = '3.8.16'; -const FRONTEND_VERSION = '3.8.16'; -const BACKEND_VERSION = '3.8.16'; +const APP_VERSION = '3.8.17'; +const FRONTEND_VERSION = '3.8.17'; +const BACKEND_VERSION = '3.8.17'; env.addGlobal('app_version', APP_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) => { - // Si es dashboard-stats mock directo + // Si es dashboard-stats if (req.path === '/dashboard-stats') { return res.json({ - monthly_data: [ - { month: 'Ene', reservations: 120 }, { month: 'Feb', reservations: 180 }, { month: 'Mar', reservations: 250 }, - { month: 'Abr', reservations: 220 }, { month: 'May', reservations: 300 }, { month: 'Jun', reservations: 310 }, - { month: 'Jul', reservations: 200 }, { month: 'Ago', reservations: 350 }, { month: 'Sep', reservations: 420 }, - { month: 'Oct', reservations: 480 }, { month: 'Nov', reservations: 520 }, { month: 'Dic', reservations: 210 } + status: 'success', + floor_data: [ + { floor: 'Piso 2', total: 1, available: 1, occupied: 0 }, + { floor: 'Piso 3', total: 2, available: 2, occupied: 0 } ] }); } diff --git a/frontend/src/routes/admin.js b/frontend/src/routes/admin.js index 0aa8e89..cd297fa 100644 --- a/frontend/src/routes/admin.js +++ b/frontend/src/routes/admin.js @@ -261,12 +261,33 @@ const handleOccupancyMetrics = async (req, res) => { console.warn('API error fetching metrics data:', apiErr.message); } - const physicalRooms = allClassrooms.filter(c => !c.is_virtual && (!c.code || !c.code.includes('VIRTUAL'))); - const virtualRooms = allClassrooms.filter(c => c.is_virtual || (c.code && c.code.includes('VIRTUAL'))); + const activeReservations = allReservations.filter(r => (r.status || '').toUpperCase() !== 'CANCELLED'); - 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 = { Mañana: 0, Tarde: 0, @@ -274,51 +295,106 @@ const handleOccupancyMetrics = async (req, res) => { Noche: 0 }; - allReservations.forEach(r => { - const shift = r.shift || 'Noche'; - if (shift_counts[shift] !== undefined) { - shift_counts[shift]++; + activeReservations.forEach(r => { + let s = r.shift; + if (!s && r.start_time) { + 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 { - shift_counts['Noche']++; + shift_counts.Noche++; } }); - // Ensure reasonable minimums for visualization - if (allReservations.length === 0) { - shift_counts.Mañana = 28; - shift_counts.Tarde = 22; - shift_counts.Vespertino = 15; - shift_counts.Noche = 20; + // Agrupación por piso real + const floorMap = {}; + physicalRooms.forEach(c => { + const rawFloor = c.floor !== null && c.floor !== undefined ? String(c.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 (!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); + }); + + physicalReservations.forEach(r => { + for (const fKey in floorMap) { + if (floorMap[fKey].room_ids.has(r.classroom_id)) { + floorMap[fKey].res_count++; + break; + } + } + }); + + const floor_summary = Object.values(floorMap).map(f => { + const baseCapacity = Math.max(1, f.count * 15); + 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 })); + + // Métricas globales reales + const totalPhysicalCapacityMonth = Math.max(1, physical_rooms_count * 15); + const avg_month_pct = physical_rooms_count > 0 ? Math.min(100, Math.round((physicalReservations.length / totalPhysicalCapacityMonth) * 100)) : 0; + const pTodayRes = physicalReservations.filter(r => r.start_time && r.start_time.startsWith(todayStr)).length; + 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; + + // Top y Low rooms reales + const roomReservationsCount = {}; + physicalReservations.forEach(r => { + roomReservationsCount[r.classroom_id] = (roomReservationsCount[r.classroom_id] || 0) + 1; + }); + + const calculatedRooms = physicalRooms.map(c => { + const rawFloor = c.floor !== null && c.floor !== undefined ? String(c.floor).trim() : '0'; + let floor_display = rawFloor; + 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 total_month_classes = allReservations.length > 0 ? (allReservations.length * 4) : 85; - const v_month = Math.round(total_month_classes * 0.28); - const v_week = Math.round(v_month / 4); - const v_today = Math.round(v_week / 5) || 2; - - const avg_day_pct = 64; - const avg_week_pct = 72; - const avg_month_pct = 68; - - const floor_summary = [ - { floor: 'Planta Baja', count: 8, avg_pct: 78 }, - { floor: 'Piso 1', count: 10, avg_pct: 65 }, - { floor: 'Piso 2', count: 7, avg_pct: 54 }, - { floor: 'Piso 3', count: 4, avg_pct: 42 } - ]; - - const top_rooms = [ - { classroom: { id: 1, code: 'Aula 101', floor_display: 'Piso 1', capacity: 45 }, month_pct: 88, month_count: 32 }, - { classroom: { id: 2, code: 'Aula Magna', floor_display: 'PB', capacity: 120 }, month_pct: 82, month_count: 28 }, - { classroom: { id: 3, code: 'Lab Informática 1', floor_display: 'Piso 2', capacity: 30 }, month_pct: 79, month_count: 26 }, - { classroom: { id: 4, code: 'Aula 204', floor_display: 'Piso 2', capacity: 35 }, month_pct: 75, month_count: 24 } - ]; - - const low_rooms = [ - { classroom: { id: 5, code: 'Aula 302', floor_display: 'Piso 3', capacity: 25 }, month_pct: 18, month_count: 6 }, - { classroom: { id: 6, code: 'Seminario B', floor_display: 'Piso 3', capacity: 20 }, month_pct: 22, month_count: 7 }, - { classroom: { id: 7, code: 'Taller 1', floor_display: 'PB', capacity: 30 }, month_pct: 28, month_count: 9 } - ]; + const low_rooms = [...calculatedRooms].sort((a, b) => a.month_count - b.month_count); res.render('admin/metrics/occupancy', { title: 'Gestión de Ocupación y Métricas - Edu-Space Admin', diff --git a/frontend/src/routes/classrooms.js b/frontend/src/routes/classrooms.js index 26d34b3..2c5a3bc 100644 --- a/frontend/src/routes/classrooms.js +++ b/frontend/src/routes/classrooms.js @@ -393,7 +393,7 @@ const handleAddClassroom = async (req, res) => { }); res.render('classrooms/add', { - title: 'Add Classroom - Edu-Space Admin', + title: 'Nueva Aula - Edu-Space', form, buildings, building_floors: buildingFloors, diff --git a/frontend/src/routes/dashboard.js b/frontend/src/routes/dashboard.js index add5966..810a732 100644 --- a/frontend/src/routes/dashboard.js +++ b/frontend/src/routes/dashboard.js @@ -112,16 +112,56 @@ router.get('/', async (req, res) => { 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 = {}; if (role === 'admin') { role_data = { filter_stats, date_labels, + floor_availability, + all_physical_rooms_today: allPhysicalToday, 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-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' } + { 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' } ] }; } else if (role === 'bedelia') { @@ -203,7 +243,9 @@ router.get('/', async (req, res) => { audit_logs, upcoming_reservations, filter_stats, - date_labels + date_labels, + floor_availability, + all_physical_rooms_today: allPhysicalToday }); }); diff --git a/frontend/src/routes/schedule.js b/frontend/src/routes/schedule.js index f939547..360ce57 100644 --- a/frontend/src/routes/schedule.js +++ b/frontend/src/routes/schedule.js @@ -719,7 +719,7 @@ const handleAddReservation = async (req, res) => { commissionList.forEach(c => { commissionDataMap[c.id] = c; }); res.render('schedule/add', { - title: 'New Reservation - Edu-Space Admin', + title: 'Nueva Reserva - Edu-Space', form, classroom_list: classroomList, commission_list: commissionList, diff --git a/frontend/views/base.html b/frontend/views/base.html index 37393bd..19b67c0 100644 --- a/frontend/views/base.html +++ b/frontend/views/base.html @@ -1172,7 +1172,6 @@
  • Calendario Semanal
  • Gestión de Reservas
  • Nueva Reserva
  • -
  • Comisiones en Horario
  • Optimizador IA
  • diff --git a/frontend/views/classrooms/add.html b/frontend/views/classrooms/add.html index a04fd9d..3bede4b 100644 --- a/frontend/views/classrooms/add.html +++ b/frontend/views/classrooms/add.html @@ -1,25 +1,32 @@ {% extends "base.html" %} -{% block title %}Add Classroom - Edu-Space Admin{% endblock %} +{% block title %}Nueva Aula - Edu-Space{% endblock %} {% block content %}
    -
    +
    -
    +
    -

    - Add Classroom -

    +
    +
    + +
    +
    +

    Nueva Aula / Espacio Áulico

    +

    Alta de espacio físico o virtual en el catálogo institucional de UniCABA

    +
    +
    - - Back to Classrooms + + Volver a Aulas
    @@ -30,7 +37,7 @@
    - Classroom Information + Información del Espacio Áulico
    diff --git a/frontend/views/dashadm.html b/frontend/views/dashadm.html index c757f1f..2f5c2ed 100644 --- a/frontend/views/dashadm.html +++ b/frontend/views/dashadm.html @@ -291,20 +291,84 @@
    - +
    -
    -
    - Tendencia de Ocupación y Reservas Mensuales -
    - - Métricas Detalladas - +
    +
    +
    + Disponibilidad y Ocupación Áulica por Piso +
    + + Monitoreo en vivo de aulas presenciales libres vs ocupadas (Operación Hoy) + +
    +
    + + {{ stats.unassigned_today_classrooms or 0 }} Libres + + + {{ stats.assigned_today_classrooms or 0 }} Ocupadas + + + Métricas + +
    -
    - +
    + +
    +
    + +
    +
    + +
    +
    + Estado de Aulas Presenciales +
    +
    + {% if all_physical_rooms_today and all_physical_rooms_today.length > 0 %} + {% for room in all_physical_rooms_today %} +
    +
    +
    + {{ room.code }} + + {% if room.floor == '0' or room.floor == 0 or room.floor == 'PB' %}PB{% else %}P{{ room.floor }}{% endif %} + +
    + + Capacidad: {{ room.capacity }} asientos + + {% if room.is_occupied_today and room.assigned_summary %} + + {{ room.assigned_summary }} + + {% endif %} +
    +
    + {% if room.is_occupied_today %} + + Ocupada + + {% else %} + + Libre + + {% endif %} +
    +
    + {% endfor %} + {% else %} +
    + Sin aulas registradas +
    + {% endif %} +
    +
    @@ -314,36 +378,71 @@
    - {% if role_data.recent_audits %} -
      + {% if role_data.recent_audits and role_data.recent_audits.length > 0 %} +
        {% for audit in role_data.recent_audits %} -
      • -
        -
        - {{ audit.user_email or 'Sistema' }} +
      • +
        +
        +
        + +
        + + {{ audit.user_email or 'Sistema' }} + +
        +
        + {% set act = (audit.action or audit.action_type or '') | upper %} + {% if 'LOGIN' in act %} + + Acceso + + {% elif 'CREATE' in act %} + + Creación + + {% elif 'UPDATE' in act %} + + Edición + + {% elif 'DELETE' in act %} + + Baja + + {% elif 'IMPERSONATE' in act %} + + Impersonación + + {% else %} + + {{ audit.action_label or audit.action or 'Operación' }} + + {% endif %}
        - - {{ audit.created_at }} · {{ audit.module }} -
        -
        - {% if audit.action == 'CREATE' %} - {{ audit.action }} - {% elif audit.action == 'UPDATE' %} - {{ audit.action }} - {% elif audit.action == 'DELETE' %} - {{ audit.action }} - {% else %} - {{ audit.action }} - {% endif %} + {% if audit.details %} +

        + {{ audit.details }} +

        + {% endif %} +
        + + {{ audit.created_at }} + + + {{ audit.module_label or audit.module or 'Sistema' }} +
      • {% endfor %} @@ -351,7 +450,7 @@ {% else %}
        - No hay registros recientes. + No hay registros de auditoría recientes.
        {% endif %}
    diff --git a/frontend/views/dashboard.html b/frontend/views/dashboard.html index 370245e..ddf6617 100644 --- a/frontend/views/dashboard.html +++ b/frontend/views/dashboard.html @@ -88,53 +88,96 @@ + {% endblock %} {% block extra_js %}