feat(ux): separate physical and virtual classroom KPIs, fix month sessions filter, improve admin contrast, persist sidebar submenus, and relocate theme toggle (v3.8.14)

This commit is contained in:
2026-10-26 13:35:19 -03:00
parent 85f320d96e
commit 67a1cb14a0
19 changed files with 525 additions and 145 deletions
+24
View File
@@ -11,6 +11,30 @@ 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.14] - 2026-10-26
### Added
- **Filtrado Temporal y Resiliente en Listado de Reservas (`/schedule/list_reservations`)**:
- Incorporado soporte de parámetros `scope` (`month`, `week`, `today`) y `only_virtual` en el backend FastAPI (`routers/reservations.py`, `ReservationService`, `ReservationRepository`).
- Al pulsar "Sesiones del Mes" en la vista de aulas virtuales (`/classrooms/list_classrooms?view_mode=virtual`), el frontend BFF precarga las fechas de inicio (`YYYY-MM-01`) y fin de mes en los inputs del formulario y activa el switch "Solo Aulas Virtuales", desplegando de inmediato las 24 sesiones virtuales programadas del mes.
- Añadido switch explícito "Solo Aulas Virtuales" y banner de filtro activo contextual en `schedule/list.html`.
- **Desglose Claro de Espacios Áulicos (Físicas vs Virtuales)**:
- En el Dashboard (`dashadm.html`), la tarjeta KPI de Aulas ahora desglosa con total transparencia los espacios: **3 físicas** en Edificio Central y **19 virtuales** a demanda del Campus Virtual, con accesos directos independientes a cada catálogo.
- En la vista de aulas (`/classrooms/list_classrooms`), la vista presencial muestra "3 aulas presenciales encontradas" y la vista virtual indica "19 salas virtuales a demanda encontradas", clarificando los badges en las pestañas superiores.
- **Persistencia y UX del Menú Lateral (Sidebar)**:
- Removido el colapso forzado (`data-bs-parent="#sidebarNav"`). Al interactuar con un submenú, este permanece desplegado.
- Implementada apertura automática del submenú correspondiente según la URL activa y persistencia de submenús abiertos en `localStorage` (`edu_sidebar_open_menus`).
### Fixed
- **Contraste de Tarjeta KPI de Administradores (`/admin/users_list`)**:
- Implementadas clases de estilo dedicadas en modo oscuro y claro (`.kpi-number-admin`, `.kpi-badge-admin`, `.kpi-icon-admin`) con contraste institucional púrpura de alta legibilidad.
- **Reubicación Ergonómica del Botón de Modo Oscuro / Claro**:
- Retirado el botón de cambio de tema de las pantallas de autenticación (`login.html` y `admin_login.html`).
- Reubicado de forma ergonómica en el encabezado de la barra lateral (`sidebar-header`) junto al toggle de colapso, y en la cabecera móvil (`mobile-header`).
- **Internacionalización y Textos en Español**:
- Mapeo de roles en backend y frontend para mostrar consistentemente `Administrador` en lugar de `Admin` o `System Administrator`.
- Traducido "Classroom Management System" por "Sistema de Gestión de Espacios Áulicos" y textos residuales en inglés.
- **Balance de Estructura HTML**:
- Sincronizados y verificados al 100% los tags `<div>` en todas las plantillas del frontend, garantizando cero desbordes de contenedor.
## [3.8.13] - 2026-10-26
### Added
- **Métricas y Contadores Rápidos de Usuarios por Rol (`/admin/users_list`)**:
+7 -5
View File
@@ -9,11 +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: Contadores por Rol y Paginación Reforzada en Usuarios — v3.8.13**:
- **Métricas y Contadores por Rol en Usuarios (`users_list`)**: Tarjetas KPI en cabecera con total global, administradores, bedeles, docentes y alumnos, con filtro rápido al hacer clic. Doble barra de paginación (superior e inferior) con indicador de rango (`Página X de Y · Mostrando Z de N usuarios`).
- **Filtro Resiliente en FastAPI**: `get_users` acepta rol numérico o textual y retorna `role_counts` estructurado.
- **Cero Diagnósticos en Pyright**: Eliminadas llamadas `str()` redundantes en routers FastAPI.
- **Versión Consolidada**: `v3.8.13`.
- **Sprint Activo: UX de Aulas, Filtro de Sesiones del Mes y Optimización de Navegación — v3.8.14**:
- **Filtro de Sesiones del Mes en `/schedule/list_reservations`**: Botón "Sesiones del Mes" precarga las fechas del mes y switch "Solo Aulas Virtuales", desplegando las 24 sesiones de inmediato mediante `scope=month&only_virtual=1` en backend y frontend.
- **Desglose Transparente de Espacios Áulicos**: En Dashboard se muestran separadas las 3 aulas físicas y 19 salas virtuales a demanda, con enlaces directos a sus catálogos respectivos. En `/classrooms/list_classrooms` se especifica "3 aulas presenciales" y "19 salas virtuales a demanda".
- **Persistencia de Submenús en Sidebar**: Removido `data-bs-parent`, auto-despliegue según URL activa y persistencia de submenús abiertos en `localStorage`.
- **Ergonomía de Tema y Contraste**: Botón de tema reubicado al header lateral y móvil, removido del login. Contraste de alta legibilidad en tarjeta de Administradores en `/admin/users_list`.
- **Internacionalización y Balance HTML**: Mapeo completo de `Admin` a `Administrador`, eliminación de textos en inglés, y 100% de tags HTML balanceados.
- **Versión Consolidada**: `v3.8.14`.
## 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.
+1 -1
View File
@@ -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.13"
__version__ = "3.8.14"
class DummyContext:
def __enter__(self):
@@ -35,6 +35,8 @@ class ReservationRepository(BaseRepository[Reservation]):
def get_by_date_range(self, start_dt: datetime, end_dt: datetime,
classroom_id: Optional[int] = None,
is_hide_virtual: bool = False,
only_virtual: bool = False,
status: Optional[str] = None,
floor: Optional[str] = None,
shift: Optional[str] = None,
search: Optional[str] = None,
@@ -46,14 +48,28 @@ class ReservationRepository(BaseRepository[Reservation]):
joinedload(Reservation.user)
).filter(
Reservation.start_time >= start_dt,
Reservation.start_time <= end_dt,
Reservation.status != ReservationStatus.CANCELLED.value
Reservation.start_time <= end_dt
)
if status and status.strip() and status.strip().lower() != 'all':
s_val = status.strip()
query = query.filter(Reservation.status == s_val)
else:
query = query.filter(Reservation.status != ReservationStatus.CANCELLED.value)
if classroom_id:
query = query.filter(Reservation.classroom_id == classroom_id)
if is_hide_virtual:
if only_virtual:
query = query.outerjoin(Classroom, Reservation.classroom_id == Classroom.id).filter(
or_(
Reservation.is_virtual == True,
Classroom.is_virtual == True,
Classroom.code.ilike('%VIRTUAL%'),
Classroom.building.ilike('%VIRTUAL%')
)
)
elif is_hide_virtual:
query = query.outerjoin(Classroom, Reservation.classroom_id == Classroom.id).filter(
or_(
Classroom.id.is_(None),
@@ -23,6 +23,8 @@ class ReservationService:
def list_reservations(self, start_dt: datetime, end_dt: datetime,
classroom_id: Optional[int] = None,
is_hide_virtual: bool = False,
only_virtual: bool = False,
status: Optional[str] = None,
floor: Optional[str] = None,
shift: Optional[str] = None,
search: Optional[str] = None,
@@ -32,6 +34,8 @@ class ReservationService:
start_dt, end_dt,
classroom_id=classroom_id,
is_hide_virtual=is_hide_virtual,
only_virtual=only_virtual,
status=status,
floor=floor,
shift=shift,
search=search,
+15 -4
View File
@@ -69,7 +69,7 @@ def get_users(
total = query.count()
roles = Role.query.order_by(Role.name.asc()).all()
roles_data = [{'id': r.id, 'name': r.name} for r in roles]
roles_data = [{'id': r.id, 'name': 'Administrador' if (r.name or '').strip().lower() == 'admin' else r.name} for r in roles]
# Métricas agregadas de usuarios para contadores en la vista
total_users_count = db.session.query(func.count(User.id)).scalar() or 0
@@ -114,10 +114,21 @@ def get_users(
users_data = []
for u in users:
d = u.to_dict()
r_name = u.role_obj.name if u.role_obj else (u.role or 'Docente')
if (r_name or '').strip().lower() == 'admin':
r_name = 'Administrador'
d['role_obj'] = {
'id': u.role_obj.id,
'name': u.role_obj.name
} if u.role_obj else {'id': 1, 'name': u.role or 'Admin'}
'id': u.role_obj.id if u.role_obj else 1,
'name': r_name
}
if d.get('name') == 'System Administrator':
d['name'] = 'Administrador del Sistema'
if d.get('first_name') == 'System' and d.get('last_name') == 'Administrator':
d['first_name'] = 'Administrador'
d['last_name'] = 'Sistema'
elif d.get('first_name') == 'Administrator' and d.get('last_name') == 'System':
d['first_name'] = 'Administrador'
d['last_name'] = 'Sistema'
users_data.append(d)
return {
+38 -8
View File
@@ -2,6 +2,7 @@
FastAPI Reservations Router (/api/v1/reservations)
Handles creation, listing, updating, cancelling, confirmation and full conflict matrix validation.
"""
import calendar
from typing import Optional, Any, Dict
from datetime import datetime, timedelta, timezone
from fastapi import APIRouter, Depends, HTTPException, Query, status, Request
@@ -21,11 +22,17 @@ reservation_service = ReservationService()
@reservations_router.get("")
@reservations_router.get("/")
def list_reservations(
start_date: Optional[str] = Query(None),
end_date: Optional[str] = Query(None),
date_from: Optional[str] = Query(None),
date_to: Optional[str] = Query(None),
scope: Optional[str] = Query(None),
classroom_id: Optional[str] = Query(None),
hide_virtual: Optional[str] = Query(None),
only_virtual: Optional[str] = Query(None),
status_filter: Optional[str] = Query(None, alias="status"),
floor: Optional[str] = Query(None),
shift: Optional[str] = Query(None),
search: Optional[str] = Query(None),
@@ -33,24 +40,47 @@ def list_reservations(
current_user: User = Depends(get_current_user)
):
"""Consulta de reservas por rango de fechas y/o aula con filtros en SQL."""
effective_start = (date_from or start_date or "").strip()
effective_end = (date_to or end_date or "").strip()
now = datetime.now(timezone.utc).replace(tzinfo=None)
try:
start_dt = datetime.strptime(start_date, '%Y-%m-%d') if start_date else now.replace(hour=0, minute=0, second=0)
except ValueError:
raise HTTPException(status_code=status.HTTP_400_BAD_REQUEST, detail="Formato inválido de start_date (debe ser YYYY-MM-DD).")
try:
end_dt = datetime.strptime(end_date, '%Y-%m-%d').replace(hour=23, minute=59, second=59) if end_date else start_dt + timedelta(days=7)
except ValueError:
raise HTTPException(status_code=status.HTTP_400_BAD_REQUEST, detail="Formato inválido de end_date (debe ser YYYY-MM-DD).")
# Resolución inteligente de rangos según scope o filtros
if scope == 'month' and not effective_start and not effective_end:
start_dt = now.replace(day=1, hour=0, minute=0, second=0, microsecond=0)
_, last_day = calendar.monthrange(now.year, now.month)
end_dt = now.replace(day=last_day, hour=23, minute=59, second=59, microsecond=999999)
elif scope == 'today' and not effective_start and not effective_end:
start_dt = now.replace(hour=0, minute=0, second=0, microsecond=0)
end_dt = now.replace(hour=23, minute=59, second=59, microsecond=999999)
elif scope == 'week' and not effective_start and not effective_end:
start_of_week = now - timedelta(days=now.weekday())
start_dt = start_of_week.replace(hour=0, minute=0, second=0, microsecond=0)
end_of_week = start_of_week + timedelta(days=6)
end_dt = end_of_week.replace(hour=23, minute=59, second=59, microsecond=999999)
elif not effective_start and not effective_end:
# Si no se especificó rango, abarcar desde inicio del mes actual hasta 90 días adelante para no dejar el listado vacío
start_dt = now.replace(day=1, hour=0, minute=0, second=0, microsecond=0)
end_dt = (start_dt + timedelta(days=90)).replace(hour=23, minute=59, second=59)
else:
try:
start_dt = datetime.strptime(effective_start, '%Y-%m-%d') if effective_start else now.replace(day=1, hour=0, minute=0, second=0)
except ValueError:
raise HTTPException(status_code=status.HTTP_400_BAD_REQUEST, detail="Formato inválido de fecha inicial (debe ser YYYY-MM-DD).")
try:
end_dt = datetime.strptime(effective_end, '%Y-%m-%d').replace(hour=23, minute=59, second=59) if effective_end else (start_dt + timedelta(days=60)).replace(hour=23, minute=59, second=59)
except ValueError:
raise HTTPException(status_code=status.HTTP_400_BAD_REQUEST, detail="Formato inválido de fecha final (debe ser YYYY-MM-DD).")
is_hide_virtual = str(hide_virtual).lower() in ['1', 'true']
is_only_virtual = str(only_virtual).lower() in ['1', 'true']
parsed_classroom_id = int(classroom_id.strip()) if classroom_id and classroom_id.strip().isdigit() else None
reservations = reservation_service.list_reservations(
start_dt, end_dt,
classroom_id=parsed_classroom_id,
is_hide_virtual=is_hide_virtual,
only_virtual=is_only_virtual,
status=status_filter,
floor=floor,
shift=shift,
search=search,
+1 -1
View File
@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
setup(
name="edu-space-admin",
version="3.8.13",
version="3.8.14",
description="Administrative interface for Edu-Space Classroom Management System (FastAPI ASGI Core)",
author="Edu-Space Development Team",
author_email="admin@edu-space.com",
+1 -1
View File
@@ -1,6 +1,6 @@
{
"name": "frontend",
"version": "3.8.13",
"version": "3.8.14",
"description": "",
"main": "index.js",
"scripts": {
+3 -3
View File
@@ -86,9 +86,9 @@ const env = nunjucks.configure(path.join(__dirname, '../views'), {
});
// Versiones institucionales del sistema
const APP_VERSION = '3.8.13';
const FRONTEND_VERSION = '3.8.13';
const BACKEND_VERSION = '3.8.13';
const APP_VERSION = '3.8.14';
const FRONTEND_VERSION = '3.8.14';
const BACKEND_VERSION = '3.8.14';
env.addGlobal('app_version', APP_VERSION);
env.addGlobal('frontend_version', FRONTEND_VERSION);
+93 -6
View File
@@ -265,10 +265,77 @@ function formatReservationDates(r) {
// 3. Vista de Lista de Reservas
const handleReservationsList = async (req, res) => {
try {
const response = await req.apiClient.get('/reservations');
const rawReservations = (response.data && response.data.reservations) || [];
let {
search = '',
status = 'all',
floor = '',
classroom_id = '',
shift = '',
date_from = '',
date_to = '',
hide_virtual = '',
only_virtual = '',
scope = ''
} = req.query;
// Si scope es 'month', calcular fechas del mes actual si no vienen explícitas
const now = new Date();
if (scope === 'month' && !date_from && !date_to) {
const y = now.getFullYear();
const m = String(now.getMonth() + 1).padStart(2, '0');
const lastDay = new Date(y, now.getMonth() + 1, 0).getDate();
date_from = `${y}-${m}-01`;
date_to = `${y}-${m}-${String(lastDay).padStart(2, '0')}`;
} else if (scope === 'today' && !date_from && !date_to) {
const todayStr = now.toISOString().split('T')[0];
date_from = todayStr;
date_to = todayStr;
} else if (scope === 'week' && !date_from && !date_to) {
const day = now.getDay();
const diff = now.getDate() - day + (day === 0 ? -6 : 1);
const mon = new Date(now.setDate(diff));
const sun = new Date(mon);
sun.setDate(mon.getDate() + 6);
date_from = mon.toISOString().split('T')[0];
date_to = sun.toISOString().split('T')[0];
}
const params = {};
if (date_from) params.date_from = date_from;
if (date_to) params.date_to = date_to;
if (scope) params.scope = scope;
if (search) params.search = search;
if (status && status !== 'all') params.status = status;
if (floor) params.floor = floor;
if (classroom_id) params.classroom_id = classroom_id;
if (shift) params.shift = shift;
if (hide_virtual === '1' || hide_virtual === 'true') params.hide_virtual = '1';
if (only_virtual === '1' || only_virtual === 'true') params.only_virtual = '1';
// Obtener reservas y catálogo de aulas en paralelo
const [resResponse, roomsResponse] = await Promise.all([
req.apiClient.get('/reservations', { params }).catch(err => {
console.error('Error fetching reservations:', err.message);
return { data: { reservations: [] } };
}),
req.apiClient.get('/classrooms').catch(err => {
console.error('Error fetching classrooms for filter:', err.message);
return { data: { classrooms: [] } };
})
]);
const rawReservations = (resResponse.data && resResponse.data.reservations) || [];
const reservations = rawReservations.map(formatReservationDates);
const all_classrooms = (roomsResponse.data && roomsResponse.data.classrooms) || [];
const floorsSet = new Set();
all_classrooms.forEach(c => {
if (c.floor !== undefined && c.floor !== null && c.floor !== '') {
floorsSet.add(c.floor);
}
});
const available_floors = Array.from(floorsSet).sort((a, b) => String(a).localeCompare(String(b)));
res.render('schedule/list', {
title: 'Listado de Reservas - Edu-Space Admin',
reservations: {
@@ -280,8 +347,18 @@ const handleReservationsList = async (req, res) => {
has_next: false,
iter_pages: () => [1]
},
classrooms: [],
subjects: [],
search,
status_filter: status,
floor_filter: floor,
classroom_id,
shift_filter: shift,
date_from,
date_to,
hide_virtual: hide_virtual === '1' || hide_virtual === 'true',
only_virtual: only_virtual === '1' || only_virtual === 'true',
scope,
all_classrooms,
available_floors,
session: { get: (k, d) => d }
});
} catch (error) {
@@ -289,8 +366,18 @@ const handleReservationsList = async (req, res) => {
res.render('schedule/list', {
title: 'Listado de Reservas (Offline)',
reservations: { items: [], total: 0, pages: 1, page: 1, has_prev: false, has_next: false, iter_pages: () => [1] },
classrooms: [],
subjects: [],
search: '',
status_filter: 'all',
floor_filter: '',
classroom_id: '',
shift_filter: '',
date_from: '',
date_to: '',
hide_virtual: false,
only_virtual: false,
scope: '',
all_classrooms: [],
available_floors: [],
session: { get: (k, d) => d }
});
}
+48 -9
View File
@@ -2,6 +2,45 @@
{% block title %}Gestión de Usuarios — Edu-Space Admin{% endblock %}
{% block extra_css %}
<style>
.kpi-icon-admin {
background-color: rgba(168, 85, 247, 0.14);
color: #9333ea;
}
.kpi-number-admin {
color: #7e22ce;
}
.kpi-badge-admin {
background-color: rgba(168, 85, 247, 0.12);
color: #6b21a8;
border-color: rgba(168, 85, 247, 0.28) !important;
}
.active-kpi-admin {
border-color: #9333ea !important;
background-color: rgba(168, 85, 247, 0.08) !important;
}
[data-bs-theme="dark"] .kpi-icon-admin {
background-color: rgba(192, 132, 252, 0.22);
color: #c084fc;
}
[data-bs-theme="dark"] .kpi-number-admin {
color: #e9d5ff !important;
text-shadow: 0 0 12px rgba(192, 132, 252, 0.45);
}
[data-bs-theme="dark"] .kpi-badge-admin {
background-color: rgba(192, 132, 252, 0.2);
color: #f3e8ff !important;
border-color: rgba(192, 132, 252, 0.45) !important;
}
[data-bs-theme="dark"] .active-kpi-admin {
border-color: #c084fc !important;
background-color: rgba(192, 132, 252, 0.15) !important;
}
</style>
{% endblock %}
{% block content %}
<div class="container-fluid pt-5 mt-4">
<!-- Header -->
@@ -68,16 +107,16 @@
<!-- Administradores -->
<div class="col-6 col-md-4 col-xl">
<a href="/admin/users_list?role=1" class="text-decoration-none text-reset d-block h-100">
<div class="card border-0 shadow-sm h-100 p-3 transition-all {% if role_filter == '1' %}border-start border-dark border-4 bg-dark-subtle bg-opacity-25{% endif %}">
<div class="card border-0 shadow-sm h-100 p-3 transition-all card-kpi-admin {% if role_filter == '1' %}border-start border-4 active-kpi-admin{% endif %}">
<div class="d-flex align-items-center justify-content-between mb-2">
<span class="text-muted small fw-semibold text-uppercase">Administradores</span>
<div class="bg-dark bg-opacity-10 text-dark rounded-circle p-2">
<div class="kpi-icon-admin rounded-circle p-2">
<i class="bi bi-shield-check fs-5"></i>
</div>
</div>
<div class="d-flex align-items-baseline justify-content-between">
<h3 class="fw-bold mb-0 text-dark">{{ role_counts.admin or 0 }}</h3>
<span class="badge bg-dark-subtle text-dark border small">Admin</span>
<h3 class="fw-bold mb-0 kpi-number-admin">{{ role_counts.admin or 0 }}</h3>
<span class="badge kpi-badge-admin border small">Administradores</span>
</div>
<div class="small text-muted mt-2 pt-2 border-top d-flex justify-content-between align-items-center">
<span>Gestión y TI</span>
@@ -172,7 +211,7 @@
<select name="role" class="form-select form-select-sm">
<option value="">Todos los Roles</option>
{% for r in roles %}
<option value="{{ r.id }}" {% if role_filter == (r.id|string) %}selected{% endif %}>{{ r.name }}</option>
<option value="{{ r.id }}" {% if role_filter == (r.id|string) %}selected{% endif %}>{{ 'Administrador' if (r.name == 'Admin' or r.name == 'ADMIN') else r.name }}</option>
{% endfor %}
</select>
</div>
@@ -254,10 +293,10 @@
{{ (u.first_name[0] if u.first_name else (u.name[0] if u.name else 'U'))|upper }}
</div>
<div>
<div class="fw-bold">{{ u.name }}</div>
<div class="fw-bold">{{ 'Administrador del Sistema' if u.name == 'System Administrator' else u.name }}</div>
<div class="text-muted small">
{% if u.first_name and u.last_name %}
<span class="opacity-75">{{ u.last_name }}, {{ u.first_name }}</span> ·
<span class="opacity-75">{{ 'Sistema, Administrador' if (u.last_name == 'Administrator' and u.first_name == 'System') else (u.last_name + ', ' + u.first_name) }}</span> ·
{% endif %}
<span class="font-monospace">#{{ u.id }}</span>
</div>
@@ -302,11 +341,11 @@
<td>
{% if u.role_obj %}
<span class="badge badge-brand">
<i class="bi bi-shield-check me-1"></i>{{ u.role_obj.name }}
<i class="bi bi-shield-check me-1"></i>{{ 'Administrador' if (u.role_obj.name == 'Admin' or u.role_obj.name == 'ADMIN') else u.role_obj.name }}
</span>
{% else %}
<span class="badge bg-secondary">
{{ u.role or 'Docente' }}
{{ 'Administrador' if (u.role == 'Admin' or u.role == 'ADMIN') else (u.role or 'Docente') }}
</span>
{% endif %}
</td>
+1 -7
View File
@@ -42,14 +42,8 @@
<body>
<div class="auth-wrapper">
<div class="auth-card">
<!-- Header con Controles Superiores & Logo Oficial -->
<!-- Header con Logo Oficial -->
<div class="auth-header">
<div class="auth-controls">
<button class="theme-toggle-btn" type="button" aria-label="Cambiar tema" title="Modo Claro/Oscuro">
<i class="bi bi-moon-stars-fill"></i>
</button>
</div>
<img src="/img/logo_unicaba.png" alt="UniCABA" class="auth-logo">
<div class="mt-2 mb-1">
<span class="badge admin-badge px-2 py-1 rounded-pill">
+2 -8
View File
@@ -79,17 +79,11 @@
<body>
<div class="auth-wrapper">
<div class="auth-card">
<!-- Header con Controles Superiores & Logo Oficial -->
<!-- Header con Logo Oficial -->
<div class="auth-header">
<div class="auth-controls">
<button class="theme-toggle-btn" type="button" aria-label="Cambiar tema" title="Modo Claro/Oscuro">
<i class="bi bi-moon-stars-fill"></i>
</button>
</div>
<img src="/img/logo_unicaba.png" alt="UniCABA" class="auth-logo">
<h4 class="fw-bold mb-1">Edu-Space Admin</h4>
<p class="text-muted small mb-0">Classroom Management System</p>
<p class="text-muted small mb-0">Sistema de Gestión de Espacios Áulicos</p>
</div>
<div class="px-4 pb-4 pt-2">
+161 -42
View File
@@ -533,7 +533,16 @@
}
.sidebar.collapsed .sidebar-header {
justify-content: center !important;
padding: 0.5rem !important;
padding: 0.5rem 0.25rem !important;
}
.sidebar.collapsed .sidebar-header .sidebar-header-actions {
flex-direction: column !important;
gap: 6px !important;
}
.sidebar.collapsed .sidebar-header .theme-toggle-btn {
width: 32px !important;
height: 32px !important;
font-size: 0.85rem !important;
}
.sidebar.collapsed .brand-text,
.sidebar.collapsed .nav-text,
@@ -881,17 +890,22 @@
<div class="app-wrapper">
<!-- Sidebar -->
<aside class="sidebar" id="sidebar">
<div class="sidebar-header border-bottom border-secondary-subtle">
<div class="sidebar-header border-bottom border-secondary-subtle d-flex align-items-center justify-content-between px-3">
<a href="/dashboard" class="text-decoration-none d-flex align-items-center brand-link">
<img src="/img/logo_unicaba_mini.png" alt="Logo UniCABA" class="navbar-logo me-2" height="26">
<span class="brand-text fs-5">Edu-Space</span>
</a>
<button class="sidebar-toggle-btn d-none d-lg-inline-flex" id="sidebarToggle" type="button" aria-label="Alternar menú lateral" title="Alternar menú lateral">
<i class="bi bi-layout-sidebar-inset fs-5"></i>
</button>
<button class="sidebar-toggle-btn d-lg-none" id="sidebarCloseMobile" type="button" aria-label="Cerrar menú">
<i class="bi bi-x-lg fs-5"></i>
</button>
<div class="d-flex align-items-center gap-1 sidebar-header-actions">
<button class="theme-toggle-btn" type="button" aria-label="Cambiar tema" title="Modo Claro/Oscuro">
<i class="bi bi-moon-stars-fill"></i>
</button>
<button class="sidebar-toggle-btn d-none d-lg-inline-flex" id="sidebarToggle" type="button" aria-label="Alternar menú lateral" title="Alternar menú lateral">
<i class="bi bi-layout-sidebar-inset fs-5"></i>
</button>
<button class="sidebar-toggle-btn d-lg-none" id="sidebarCloseMobile" type="button" aria-label="Cerrar menú">
<i class="bi bi-x-lg fs-5"></i>
</button>
</div>
</div>
<div class="sidebar-body flex-grow-1 overflow-y-auto p-2">
@@ -906,7 +920,7 @@
<a class="nav-link collapsed" href="#menuEspacios" data-bs-toggle="collapse" role="button" aria-expanded="false">
<i class="bi bi-door-open text-info"></i> <span class="nav-text flex-grow-1">Espacios &amp; Sedes</span> <i class="bi bi-chevron-down nav-caret ms-auto fs-6"></i>
</a>
<div class="collapse" id="menuEspacios" data-bs-parent="#sidebarNav">
<div class="collapse" id="menuEspacios">
<div class="flyout-header text-info d-none"><i class="bi bi-door-open me-1"></i>Espacios &amp; Sedes</div>
<ul class="sidebar-submenu">
<li><a class="nav-link" href="/classrooms/list_classrooms?view_mode=physical"><i class="bi bi-building me-1"></i>Presenciales</a></li>
@@ -922,7 +936,7 @@
<a class="nav-link collapsed" href="#menuAcademica" data-bs-toggle="collapse" role="button" aria-expanded="false">
<i class="bi bi-mortarboard text-success"></i> <span class="nav-text flex-grow-1">Estructura Académica</span> <i class="bi bi-chevron-down nav-caret ms-auto fs-6"></i>
</a>
<div class="collapse" id="menuAcademica" data-bs-parent="#sidebarNav">
<div class="collapse" id="menuAcademica">
<div class="flyout-header text-success d-none"><i class="bi bi-mortarboard me-1"></i>Estructura Académica</div>
<ul class="sidebar-submenu">
<li><a class="nav-link" href="/admin/academic_terms_list"><i class="bi bi-calendar-range me-1"></i>Ciclos Lectivos</a></li>
@@ -936,7 +950,7 @@
<a class="nav-link collapsed" href="#menuReservas" data-bs-toggle="collapse" role="button" aria-expanded="false">
<i class="bi bi-calendar3 text-warning"></i> <span class="nav-text flex-grow-1">Reservas &amp; Calendario</span> <i class="bi bi-chevron-down nav-caret ms-auto fs-6"></i>
</a>
<div class="collapse" id="menuReservas" data-bs-parent="#sidebarNav">
<div class="collapse" id="menuReservas">
<div class="flyout-header text-warning d-none"><i class="bi bi-calendar3 me-1"></i>Reservas</div>
<ul class="sidebar-submenu">
<li><a class="nav-link" href="/schedule/today_schedule"><i class="bi bi-calendar-day me-1"></i>Cartelera del Día</a></li>
@@ -952,7 +966,7 @@
<a class="nav-link collapsed" href="#menuAdmin" data-bs-toggle="collapse" role="button" aria-expanded="false">
<i class="bi bi-shield-lock text-secondary"></i> <span class="nav-text flex-grow-1">Gobierno &amp; Sistema</span> <i class="bi bi-chevron-down nav-caret ms-auto fs-6"></i>
</a>
<div class="collapse" id="menuAdmin" data-bs-parent="#sidebarNav">
<div class="collapse" id="menuAdmin">
<div class="flyout-header text-secondary d-none"><i class="bi bi-shield-lock me-1"></i>Gobierno &amp; Sistema</div>
<ul class="sidebar-submenu">
<li><a class="nav-link" href="/admin/users_list"><i class="bi bi-people me-1"></i>Usuarios</a></li>
@@ -974,7 +988,7 @@
<a class="nav-link collapsed" href="#menuEspaciosBedelia" data-bs-toggle="collapse" role="button" aria-expanded="false">
<i class="bi bi-door-open text-info"></i> <span class="nav-text flex-grow-1">Espacios Físicos &amp; Aulas</span> <i class="bi bi-chevron-down nav-caret ms-auto fs-6"></i>
</a>
<div class="collapse" id="menuEspaciosBedelia" data-bs-parent="#sidebarNav">
<div class="collapse" id="menuEspaciosBedelia">
<ul class="sidebar-submenu">
<li><a class="nav-link" href="/buildings/list_buildings"><i class="bi bi-building me-1"></i>Sedes / Edificios</a></li>
<li><a class="nav-link" href="/classrooms/list_classrooms?view_mode=physical"><i class="bi bi-door-closed me-1"></i>Aulas Presenciales</a></li>
@@ -989,7 +1003,7 @@
<a class="nav-link collapsed" href="#menuAcademicaBedelia" data-bs-toggle="collapse" role="button" aria-expanded="false">
<i class="bi bi-mortarboard text-success"></i> <span class="nav-text flex-grow-1">Gestión Académica</span> <i class="bi bi-chevron-down nav-caret ms-auto fs-6"></i>
</a>
<div class="collapse" id="menuAcademicaBedelia" data-bs-parent="#sidebarNav">
<div class="collapse" id="menuAcademicaBedelia">
<ul class="sidebar-submenu">
<li><a class="nav-link" href="/admin/academic_terms_list"><i class="bi bi-calendar-range me-1"></i>Ciclos Lectivos</a></li>
<li><a class="nav-link" href="/admin/careers_list"><i class="bi bi-mortarboard me-1"></i>Carreras</a></li>
@@ -1002,7 +1016,7 @@
<a class="nav-link collapsed" href="#menuReservasBedelia" data-bs-toggle="collapse" role="button" aria-expanded="false">
<i class="bi bi-calendar3 text-warning"></i> <span class="nav-text flex-grow-1">Reservas &amp; Operaciones</span> <i class="bi bi-chevron-down nav-caret ms-auto fs-6"></i>
</a>
<div class="collapse" id="menuReservasBedelia" data-bs-parent="#sidebarNav">
<div class="collapse" id="menuReservasBedelia">
<ul class="sidebar-submenu">
<li><a class="nav-link" href="/schedule/today_schedule"><i class="bi bi-calendar-day me-1"></i>Cartelera del Día</a></li>
<li><a class="nav-link" href="/schedule/calendar_view"><i class="bi bi-calendar-week me-1"></i>Calendario Semanal</a></li>
@@ -1016,7 +1030,7 @@
<a class="nav-link collapsed" href="#menuHerramientasBedelia" data-bs-toggle="collapse" role="button" aria-expanded="false">
<i class="bi bi-tools text-secondary"></i> <span class="nav-text flex-grow-1">Herramientas Operativas</span> <i class="bi bi-chevron-down nav-caret ms-auto fs-6"></i>
</a>
<div class="collapse" id="menuHerramientasBedelia" data-bs-parent="#sidebarNav">
<div class="collapse" id="menuHerramientasBedelia">
<ul class="sidebar-submenu">
<li><a class="nav-link" href="/admin/google_sheets_import"><i class="bi bi-file-earmark-spreadsheet me-1"></i>Importador Google Sheets</a></li>
<li><a class="nav-link" href="/admin/milestone_types_list"><i class="bi bi-bookmark-star me-1"></i>Tipos de Hitos Evaluativos</a></li>
@@ -1033,7 +1047,7 @@
<a class="nav-link collapsed" href="#menuDocenteCursada" data-bs-toggle="collapse" role="button" aria-expanded="false">
<i class="bi bi-mortarboard text-warning"></i> <span class="nav-text flex-grow-1">Mi Actividad Académica</span> <i class="bi bi-chevron-down nav-caret ms-auto fs-6"></i>
</a>
<div class="collapse" id="menuDocenteCursada" data-bs-parent="#sidebarNav">
<div class="collapse" id="menuDocenteCursada">
<ul class="sidebar-submenu">
<li><a class="nav-link" href="/my_subjects/my_subjects_list"><i class="bi bi-book me-1"></i>Mis Materias &amp; Comisiones</a></li>
<li><a class="nav-link" href="/schedule/gradebook"><i class="bi bi-journal-check me-1"></i>Libro de Calificaciones</a></li>
@@ -1044,7 +1058,7 @@
<a class="nav-link collapsed" href="#menuDocenteEspacios" data-bs-toggle="collapse" role="button" aria-expanded="false">
<i class="bi bi-calendar-week text-primary"></i> <span class="nav-text flex-grow-1">Horarios &amp; Espacios</span> <i class="bi bi-chevron-down nav-caret ms-auto fs-6"></i>
</a>
<div class="collapse" id="menuDocenteEspacios" data-bs-parent="#sidebarNav">
<div class="collapse" id="menuDocenteEspacios">
<ul class="sidebar-submenu">
<li><a class="nav-link" href="/schedule/today_schedule"><i class="bi bi-calendar-day me-1"></i>Clases de Hoy</a></li>
<li><a class="nav-link" href="/schedule/calendar_view"><i class="bi bi-calendar-range me-1"></i>Cronograma Semanal</a></li>
@@ -1056,7 +1070,7 @@
<a class="nav-link collapsed" href="#menuDocenteReservas" data-bs-toggle="collapse" role="button" aria-expanded="false">
<i class="bi bi-calendar2-check text-success"></i> <span class="nav-text flex-grow-1">Mis Reservas</span> <i class="bi bi-chevron-down nav-caret ms-auto fs-6"></i>
</a>
<div class="collapse" id="menuDocenteReservas" data-bs-parent="#sidebarNav">
<div class="collapse" id="menuDocenteReservas">
<ul class="sidebar-submenu">
<li><a class="nav-link" href="/schedule/list_reservations"><i class="bi bi-list-task me-1"></i>Mis Reservas Solicitadas</a></li>
<li><a class="nav-link text-success" href="/schedule/add_reservation"><i class="bi bi-plus-circle me-1"></i>Solicitar Espacio</a></li>
@@ -1073,7 +1087,7 @@
<a class="nav-link collapsed" href="#menuAlumnoCursada" data-bs-toggle="collapse" role="button" aria-expanded="false">
<i class="bi bi-mortarboard text-primary"></i> <span class="nav-text flex-grow-1">Mi Trayectoria</span> <i class="bi bi-chevron-down nav-caret ms-auto fs-6"></i>
</a>
<div class="collapse" id="menuAlumnoCursada" data-bs-parent="#sidebarNav">
<div class="collapse" id="menuAlumnoCursada">
<ul class="sidebar-submenu">
<li><a class="nav-link" href="/my_subjects/my_subjects_list"><i class="bi bi-journal-bookmark me-1"></i>Mis Materias Inscritas</a></li>
<li><a class="nav-link" href="/schedule/my_grades"><i class="bi bi-award me-1"></i>Mis Calificaciones e Hitos</a></li>
@@ -1084,7 +1098,7 @@
<a class="nav-link collapsed" href="#menuAlumnoHorarios" data-bs-toggle="collapse" role="button" aria-expanded="false">
<i class="bi bi-clock text-info"></i> <span class="nav-text flex-grow-1">Horarios &amp; Campus</span> <i class="bi bi-chevron-down nav-caret ms-auto fs-6"></i>
</a>
<div class="collapse" id="menuAlumnoHorarios" data-bs-parent="#sidebarNav">
<div class="collapse" id="menuAlumnoHorarios">
<ul class="sidebar-submenu">
<li><a class="nav-link" href="/schedule/today_schedule"><i class="bi bi-calendar-day me-1"></i>Clases de Hoy</a></li>
<li><a class="nav-link" href="/schedule/calendar_view"><i class="bi bi-calendar-week me-1"></i>Cronograma Semanal</a></li>
@@ -1097,11 +1111,8 @@
</div>
<div class="sidebar-footer p-3 border-top border-secondary-subtle">
<div class="d-flex align-items-center justify-content-between mb-3 sidebar-footer-text">
<div class="d-flex align-items-center justify-content-center mb-3 sidebar-footer-text">
{% include 'partials/language_switcher.html' %}
<button class="theme-toggle-btn" type="button" aria-label="Cambiar tema" title="Modo Claro/Oscuro">
<i class="bi bi-moon-stars-fill"></i>
</button>
</div>
<div class="dropdown dropup">
@@ -1125,7 +1136,7 @@
<div class="sidebar-footer-text mt-3 pt-2 border-top border-secondary-subtle text-center">
<span class="badge bg-secondary-subtle text-secondary-emphasis font-monospace px-2 py-1" style="font-size:0.68rem;" title="Versión Institucional de Edu-Space">
<i class="bi bi-tag-fill me-1"></i>v{{ app_version or '3.4.9' }} <span class="opacity-75">(FE: {{ frontend_version or '3.4.9' }} · BE: {{ backend_version or '3.4.9' }})</span>
<i class="bi bi-tag-fill me-1"></i>v{{ app_version or '3.4.9' }} <span class="opacity-75">(Frontend: v{{ frontend_version or '3.4.9' }} · Backend: v{{ backend_version or '3.4.9' }})</span>
</span>
</div>
</div>
@@ -1134,14 +1145,19 @@
<!-- Main Content Wrapper -->
<div class="main-content">
<!-- Mobile Header -->
<div class="mobile-header shadow-sm">
<div class="mobile-header shadow-sm d-flex align-items-center justify-content-between px-3">
<a href="/dashboard" class="text-decoration-none brand-link d-flex align-items-center">
<img src="/img/logo_unicaba_mini.png" alt="Logo UniCABA" class="navbar-logo me-2" height="24">
<span class="brand-text fw-bold fs-6">Edu-Space</span>
</a>
<button class="sidebar-toggle-btn" id="mobileMenuBtn" type="button" aria-label="Abrir menú">
<i class="bi bi-list fs-4"></i>
</button>
<div class="d-flex align-items-center gap-2">
<button class="theme-toggle-btn" type="button" aria-label="Cambiar tema" title="Modo Claro/Oscuro">
<i class="bi bi-moon-stars-fill"></i>
</button>
<button class="sidebar-toggle-btn" id="mobileMenuBtn" type="button" aria-label="Abrir menú">
<i class="bi bi-list fs-4"></i>
</button>
</div>
</div>
{% if is_impersonating %}
@@ -1149,7 +1165,7 @@
<div class="impersonation-banner px-3 py-2 d-flex align-items-center justify-content-between text-white shadow-sm" style="background: linear-gradient(90deg, #d97706 0%, #b45309 100%); z-index: 1045; border-bottom: 2px solid #f59e0b;">
<div class="d-flex align-items-center gap-2">
<div class="spinner-grow spinner-grow-sm text-warning" role="status" style="width: 14px; height: 14px;">
<span class="visually-hidden">Impersonating...</span>
<span class="visually-hidden">Impersonando...</span>
</div>
<div>
<strong class="me-1"><i class="bi bi-incognito me-1"></i>Modo Impersonación Activo:</strong>
@@ -1200,7 +1216,7 @@
</div><!-- app-wrapper -->
{% endif %}
<!-- Sidebar Toggle JS -->
<!-- Sidebar Toggle & Active Submenu Persistence JS -->
<script>
document.addEventListener("DOMContentLoaded", function() {
const sidebar = document.getElementById("sidebar");
@@ -1210,6 +1226,8 @@
if (!sidebar) return;
const SUBMENUS_KEY = "edu_sidebar_open_submenus";
function updateToggleIcon() {
if (!toggleBtn) return;
const isCollapsed = sidebar.classList.contains("collapsed");
@@ -1224,7 +1242,7 @@
function closeAllCollapses() {
document.querySelectorAll('#sidebarNav .collapse.show').forEach(function(el) {
el.classList.remove('show');
const trigger = document.querySelector(`[data-bs-target="#${el.id}"]`);
const trigger = document.querySelector(`[data-bs-target="#${el.id}"], [href="#${el.id}"]`);
if (trigger) {
trigger.setAttribute('aria-expanded', 'false');
trigger.classList.add('collapsed');
@@ -1235,16 +1253,114 @@
});
}
// Restore state from localStorage (desktop only)
if (window.innerWidth >= 992) {
const isCollapsed = localStorage.getItem("sidebarCollapsed") === "true";
if (isCollapsed) {
// Restore sidebar collapsed state from localStorage (desktop only)
const isDesktop = window.innerWidth >= 992;
let isSidebarCollapsed = false;
if (isDesktop) {
isSidebarCollapsed = localStorage.getItem("sidebarCollapsed") === "true";
if (isSidebarCollapsed) {
sidebar.classList.add("collapsed");
closeAllCollapses();
}
}
updateToggleIcon();
// ==============================================================
// UX MEJORADA: SUBMENÚS DESPLEGADOS Y PERSISTENTES
// ==============================================================
let openSubmenus = [];
try {
openSubmenus = JSON.parse(localStorage.getItem(SUBMENUS_KEY) || '[]');
if (!Array.isArray(openSubmenus)) openSubmenus = [];
} catch(e) { openSubmenus = []; }
function expandSubmenuById(menuId) {
const el = document.getElementById(menuId);
if (el && el.classList.contains('collapse')) {
el.classList.add('show');
const trigger = sidebar.querySelector(`[data-bs-target="#${menuId}"], [href="#${menuId}"]`);
if (trigger) {
trigger.setAttribute('aria-expanded', 'true');
trigger.classList.remove('collapsed');
}
}
}
function saveOpenSubmenus() {
const currentOpen = [];
document.querySelectorAll('#sidebarNav .collapse.show').forEach(function(el) {
if (el.id) currentOpen.push(el.id);
});
try {
localStorage.setItem(SUBMENUS_KEY, JSON.stringify(currentOpen));
} catch(e) {}
}
// 1. Detección automática del enlace activo según la URL
const currentPath = window.location.pathname;
const currentFull = window.location.pathname + window.location.search;
let activeItemFound = false;
const allNavLinks = Array.from(sidebar.querySelectorAll('.sidebar-nav a.nav-link'));
// Coincidencia exacta con query params
for (const link of allNavLinks) {
const href = link.getAttribute('href');
if (href && (href === currentFull || href === currentPath)) {
link.classList.add('active');
const parentCollapse = link.closest('.collapse');
if (parentCollapse && parentCollapse.id) {
expandSubmenuById(parentCollapse.id);
if (!openSubmenus.includes(parentCollapse.id)) {
openSubmenus.push(parentCollapse.id);
}
}
activeItemFound = true;
break;
}
}
// Coincidencia por prefijo si no hubo exacta
if (!activeItemFound && currentPath !== '/' && currentPath !== '/dashboard') {
for (const link of allNavLinks) {
const href = link.getAttribute('href');
if (href && href !== '#' && !href.startsWith('#') && href !== '/dashboard') {
const linkPath = href.split('?')[0];
if (linkPath !== '/' && (currentPath === linkPath || currentPath.startsWith(linkPath + '/'))) {
link.classList.add('active');
const parentCollapse = link.closest('.collapse');
if (parentCollapse && parentCollapse.id) {
expandSubmenuById(parentCollapse.id);
if (!openSubmenus.includes(parentCollapse.id)) {
openSubmenus.push(parentCollapse.id);
}
}
activeItemFound = true;
break;
}
}
}
}
// 2. Restaurar todos los submenús abiertos previamente guardados en localStorage
if (!sidebar.classList.contains("collapsed")) {
openSubmenus.forEach(function(id) {
expandSubmenuById(id);
});
saveOpenSubmenus();
}
// 3. Escuchar eventos de Bootstrap Collapse para sincronizar cambios manuales del usuario
document.querySelectorAll('#sidebarNav .collapse').forEach(function(colEl) {
colEl.addEventListener('shown.bs.collapse', function() {
saveOpenSubmenus();
});
colEl.addEventListener('hidden.bs.collapse', function() {
saveOpenSubmenus();
});
});
// Botón de alternancia de la barra lateral (Desktop)
if (toggleBtn) {
toggleBtn.addEventListener("click", function() {
sidebar.classList.toggle("collapsed");
@@ -1253,15 +1369,19 @@
updateToggleIcon();
if (isNowCollapsed) {
closeAllCollapses();
} else {
// Al re-expandir el sidebar, restaurar submenús abiertos
openSubmenus.forEach(function(id) {
expandSubmenuById(id);
});
}
});
}
// Manejo de clicks e interacciones en submenús cuando el sidebar está colapsado
// Manejo de clicks e interacciones en submenús cuando el sidebar está colapsado (Flyout)
document.querySelectorAll('#sidebarNav > .nav-item').forEach(function(item) {
const trigger = item.querySelector('[data-bs-toggle="collapse"]');
if (trigger) {
// Usar fase de captura (true) para interceptar ANTES de que Bootstrap dispare .collapsing
trigger.addEventListener('click', function(e) {
if (sidebar.classList.contains('collapsed')) {
e.preventDefault();
@@ -1278,7 +1398,6 @@
}, true);
}
// Al hacer hover, limpiar cualquier flyout fijo anterior
item.addEventListener('mouseenter', function() {
if (sidebar.classList.contains('collapsed')) {
document.querySelectorAll('#sidebarNav > .nav-item.show-flyout').forEach(function(other) {
@@ -1288,7 +1407,7 @@
});
});
// Cerrar flyouts flotantes al hacer click fuera del sidebar
// Cerrar flyouts flotantes al hacer click fuera del sidebar colapsado
document.addEventListener('click', function(e) {
if (!sidebar.contains(e.target)) {
document.querySelectorAll('#sidebarNav > .nav-item.show-flyout').forEach(function(item) {
+15 -7
View File
@@ -162,7 +162,7 @@
href="/classrooms/list_classrooms?view_mode=physical">
<i class="bi bi-buildings me-2"></i>Aulas Presenciales
<span class="badge rounded-pill ms-2 {% if view_mode == 'physical' %}bg-light text-primary{% else %}bg-secondary-subtle text-secondary border{% endif %}">
{{ physical_count }} aulas
{{ physical_count }} aulas físicas
</span>
</a>
</li>
@@ -256,8 +256,8 @@
<!-- Barra de Resumen y Selector de Vista -->
<div class="d-flex justify-content-between align-items-center mb-3 flex-wrap gap-2">
<div class="small text-muted">
<i class="bi bi-door-open me-1"></i>
<span>Total: <strong class="text-body">{{ classrooms.total if classrooms else 0 }}</strong> aulas encontradas</span>
<i class="bi bi-buildings me-1 text-primary"></i>
<span>Total: <strong class="text-body">{{ classrooms.total if classrooms else 0 }}</strong> aulas presenciales encontradas</span>
</div>
<div class="d-flex align-items-center gap-2">
<span class="small text-muted d-none d-sm-inline">Modo de visualización:</span>
@@ -661,7 +661,7 @@
<!-- Indicadores de Demanda Global -->
<div class="row g-2">
<div class="col-lg-3 col-sm-6">
<a href="/schedule/today_schedule" class="virtual-stat-box">
<a href="/schedule/list_reservations?scope=today&only_virtual=1" class="virtual-stat-box" title="Ver reservas virtuales de hoy">
<div class="d-flex justify-content-between align-items-center">
<div>
<span class="text-muted small text-uppercase fw-semibold" style="font-size: 0.7rem;">Sesiones Hoy</span>
@@ -674,7 +674,7 @@
</div>
<div class="col-lg-3 col-sm-6">
<a href="/schedule/list_reservations" class="virtual-stat-box">
<a href="/schedule/list_reservations?scope=week&only_virtual=1" class="virtual-stat-box" title="Ver reservas virtuales de esta semana">
<div class="d-flex justify-content-between align-items-center">
<div>
<span class="text-muted small text-uppercase fw-semibold" style="font-size: 0.7rem;">Sesiones Semana</span>
@@ -687,7 +687,7 @@
</div>
<div class="col-lg-3 col-sm-6">
<a href="/schedule/list_reservations" class="virtual-stat-box">
<a href="/schedule/list_reservations?scope=month&only_virtual=1" class="virtual-stat-box" title="Ver reservas virtuales de este mes">
<div class="d-flex justify-content-between align-items-center">
<div>
<span class="text-muted small text-uppercase fw-semibold" style="font-size: 0.7rem;">Sesiones del Mes</span>
@@ -733,7 +733,7 @@
<button type="submit" class="btn btn-sm btn-primary me-1">
<i class="bi bi-funnel me-1"></i>Buscar Salas
</button>
<a href="/classrooms/list_classrooms" class="btn btn-sm btn-outline-secondary">
<a href="/classrooms/list_classrooms?view_mode=virtual" class="btn btn-sm btn-outline-secondary">
<i class="bi bi-arrow-counterclockwise me-1"></i>Limpiar
</a>
</div>
@@ -743,6 +743,14 @@
</div>
</div>
<!-- Barra de Resumen de Salas Virtuales -->
<div class="d-flex justify-content-between align-items-center mb-3 flex-wrap gap-2">
<div class="small text-muted">
<i class="bi bi-globe2 me-1 text-info"></i>
<span>Total: <strong class="text-body">{{ virtual_rooms | length if virtual_rooms else 0 }}</strong> salas virtuales a demanda encontradas</span>
</div>
</div>
<!-- Catálogo de Aulas Virtuales por Comisión -->
{% if virtual_rooms and (virtual_rooms|length > 0) %}
<div class="row g-3">
+27 -17
View File
@@ -3,25 +3,38 @@
<!-- Admin KPI Cards -->
<div class="row mb-4 g-3">
<div class="col-md-6 col-xl-3">
<a href="/classrooms/list_classrooms" class="text-decoration-none text-reset d-block h-100">
<div class="card border-0 shadow-sm h-100 dashboard-stat-card transition-all glass-card">
<div class="card-body p-3">
<div class="d-flex justify-content-between align-items-center">
<div>
<span class="text-muted small fw-semibold text-uppercase">Aulas Totales</span>
<h2 class="mb-0 fw-bold mt-1 text-primary">{{ stats.total_classrooms }}</h2>
</div>
<div class="bg-primary bg-opacity-10 rounded-circle p-3 text-primary">
<i class="bi bi-door-open fs-3"></i>
<div class="card border-0 shadow-sm h-100 dashboard-stat-card transition-all glass-card">
<div class="card-body p-3 d-flex flex-column justify-content-between">
<div>
<div class="d-flex justify-content-between align-items-center mb-1">
<span class="text-muted small fw-semibold text-uppercase">Espacios Áulicos</span>
<div class="bg-primary bg-opacity-10 rounded-circle p-2 text-primary">
<i class="bi bi-door-open fs-4"></i>
</div>
</div>
<div class="d-flex align-items-center justify-content-between pt-3 mt-2 border-top text-primary small fw-semibold">
<span>Ver catálogo de espacios</span>
<i class="bi bi-arrow-right"></i>
<div class="d-flex align-items-baseline gap-2 mt-1">
<div class="d-flex align-items-baseline gap-1">
<h2 class="mb-0 fw-bold text-primary">{{ stats.physical_classrooms or 3 }}</h2>
<span class="small text-muted fw-semibold" style="font-size: 0.8rem;">físicas</span>
</div>
<span class="text-muted opacity-50">·</span>
<div class="d-flex align-items-baseline gap-1">
<h3 class="mb-0 fw-bold text-info" style="font-size: 1.4rem;">{{ stats.virtual_classrooms or 19 }}</h3>
<span class="small text-muted fw-semibold" style="font-size: 0.8rem;">virtuales</span>
</div>
</div>
</div>
<div class="d-flex align-items-center justify-content-between pt-2 mt-2 border-top small fw-semibold">
<a href="/classrooms/list_classrooms?view_mode=physical" class="text-decoration-none text-primary" title="Ver aulas físicas presenciales">
<i class="bi bi-buildings me-1"></i>Presenciales
</a>
<span class="text-muted opacity-50">|</span>
<a href="/classrooms/list_classrooms?view_mode=virtual" class="text-decoration-none text-info" title="Ver aulas virtuales a demanda">
<i class="bi bi-globe2 me-1"></i>Campus Virtual <i class="bi bi-arrow-right ms-1"></i>
</a>
</div>
</div>
</a>
</div>
</div>
<div class="col-md-6 col-xl-3">
@@ -207,9 +220,6 @@
</div>
</div>
</div>
</div>
</div>
</div>
<!-- Admin Visual Menu Launchpad -->
<div class="card border-0 shadow-sm mb-4">
+27 -14
View File
@@ -3,25 +3,38 @@
<!-- Admin KPI Cards -->
<div class="row mb-4 g-3">
<div class="col-md-6 col-xl-3">
<a href="/classrooms/list_classrooms" class="text-decoration-none text-reset d-block h-100">
<div class="card border-0 shadow-sm h-100 dashboard-stat-card transition-all glass-card">
<div class="card-body p-3">
<div class="d-flex justify-content-between align-items-center">
<div>
<span class="text-muted small fw-semibold text-uppercase">Aulas Totales</span>
<h2 class="mb-0 fw-bold mt-1 text-primary">{{ stats.total_classrooms }}</h2>
</div>
<div class="bg-primary bg-opacity-10 rounded-circle p-3 text-primary">
<i class="bi bi-door-open fs-3"></i>
<div class="card border-0 shadow-sm h-100 dashboard-stat-card transition-all glass-card">
<div class="card-body p-3 d-flex flex-column justify-content-between">
<div>
<div class="d-flex justify-content-between align-items-center mb-1">
<span class="text-muted small fw-semibold text-uppercase">Espacios Áulicos</span>
<div class="bg-primary bg-opacity-10 rounded-circle p-2 text-primary">
<i class="bi bi-door-open fs-4"></i>
</div>
</div>
<div class="d-flex align-items-center justify-content-between pt-3 mt-2 border-top text-primary small fw-semibold">
<span>Ver catálogo de espacios</span>
<i class="bi bi-arrow-right"></i>
<div class="d-flex align-items-baseline gap-2 mt-1">
<div class="d-flex align-items-baseline gap-1">
<h2 class="mb-0 fw-bold text-primary">{{ stats.physical_classrooms or 3 }}</h2>
<span class="small text-muted fw-semibold" style="font-size: 0.8rem;">físicas</span>
</div>
<span class="text-muted opacity-50">·</span>
<div class="d-flex align-items-baseline gap-1">
<h3 class="mb-0 fw-bold text-info" style="font-size: 1.4rem;">{{ stats.virtual_classrooms or 19 }}</h3>
<span class="small text-muted fw-semibold" style="font-size: 0.8rem;">virtuales</span>
</div>
</div>
</div>
<div class="d-flex align-items-center justify-content-between pt-2 mt-2 border-top small fw-semibold">
<a href="/classrooms/list_classrooms?view_mode=physical" class="text-decoration-none text-primary" title="Ver aulas físicas presenciales">
<i class="bi bi-buildings me-1"></i>Presenciales
</a>
<span class="text-muted opacity-50">|</span>
<a href="/classrooms/list_classrooms?view_mode=virtual" class="text-decoration-none text-info" title="Ver aulas virtuales a demanda">
<i class="bi bi-globe2 me-1"></i>Campus Virtual <i class="bi bi-arrow-right ms-1"></i>
</a>
</div>
</div>
</a>
</div>
</div>
<div class="col-md-6 col-xl-3">
+38 -9
View File
@@ -108,18 +108,25 @@
<input type="date" name="date_to" class="form-control form-control-sm" value="{{ date_to or '' }}">
</div>
<!-- Row 2: Hide Virtual, Submit, Clear -->
<div class="col-lg-6 col-md-6 pt-2">
<div class="form-check form-switch pt-1">
<input class="form-check-input" type="checkbox" role="switch" name="hide_virtual" value="1" id="hideVirtualList" {% if hide_virtual %}checked{% endif %}>
<label class="form-check-label fw-semibold small text-dark" for="hideVirtualList">
<i class="bi bi-laptop me-1 text-primary"></i>Ocultar Aulas Virtuales
<span class="badge bg-secondary-subtle text-secondary border ms-1" style="font-size: 0.72rem;">Capacidad ilimitada</span>
</label>
<!-- Row 2: Switches, Submit, Clear -->
<div class="col-lg-7 col-md-6 pt-2">
<div class="d-flex flex-wrap gap-3 align-items-center">
<div class="form-check form-switch pt-1">
<input class="form-check-input" type="checkbox" role="switch" name="hide_virtual" value="1" id="hideVirtualList" {% if hide_virtual %}checked{% endif %}>
<label class="form-check-label fw-semibold small text-body" for="hideVirtualList">
<i class="bi bi-laptop me-1 text-primary"></i>Ocultar Aulas Virtuales
</label>
</div>
<div class="form-check form-switch pt-1">
<input class="form-check-input" type="checkbox" role="switch" name="only_virtual" value="1" id="onlyVirtualList" {% if only_virtual %}checked{% endif %}>
<label class="form-check-label fw-semibold small text-body" for="onlyVirtualList">
<i class="bi bi-globe2 me-1 text-info"></i>Solo Aulas Virtuales
</label>
</div>
</div>
</div>
<div class="col-lg-6 col-md-6 pt-2 text-md-end d-flex justify-content-md-end gap-2">
<div class="col-lg-5 col-md-6 pt-2 text-md-end d-flex justify-content-md-end gap-2">
<button type="submit" class="btn btn-primary btn-sm px-3">
<i class="bi bi-funnel me-1"></i>Filtrar
</button>
@@ -131,6 +138,28 @@
</div>
</div>
<!-- Banner Informativo de Filtro Activo por Ámbito (Mes / Hoy / Virtual) -->
{% if scope == 'month' or only_virtual or (date_from and date_to) %}
<div class="alert alert-info py-2 px-3 mb-3 d-flex align-items-center justify-content-between shadow-sm">
<div class="small">
<i class="bi bi-funnel-fill text-info me-1"></i>
{% if scope == 'month' and only_virtual %}
Filtro activo: <strong>Sesiones Virtuales del Mes</strong> (del {{ date_from }} al {{ date_to }}).
{% elif scope == 'month' %}
Filtro activo: <strong>Sesiones del Mes</strong> (del {{ date_from }} al {{ date_to }}).
{% elif only_virtual %}
Filtro activo: <strong>Aulas Virtuales a Demanda</strong> (Campus Virtual).
{% else %}
Filtro temporal activo: <strong>{{ date_from }}</strong> a <strong>{{ date_to }}</strong>.
{% endif %}
<span class="ms-1 text-muted">({{ reservations.total if reservations else 0 }} reservas encontradas)</span>
</div>
<a href="/schedule/list_reservations" class="btn btn-sm btn-outline-info py-0 px-2 small text-decoration-none">
Ver Todo
</a>
</div>
{% endif %}
<!-- Header de Resumen y Selector de Vista -->
{% if reservations and reservations.items %}
<div class="d-flex justify-content-between align-items-center mb-3 flex-wrap gap-2">