diff --git a/CHANGELOG.md b/CHANGELOG.md index a17ea37..23c12f1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,13 @@ 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.6.3] - 2026-10-19 +### Fixed +- **Resolución de Diagnósticos Estáticos en `dashboard.py` (Principio 10)**: + - Inicialización unificada de variables de estadísticas (`tomorrow_reservations_q`, `my_today_count`, `my_total_reservations`, `my_today_classes`, `tomorrow_schedule_list`, `filter_stats`, `date_labels`, `unassigned_commissions_tomorrow`, `available_classrooms_tomorrow`, `virtual_rooms_data`) en `backend/app/routes/api/dashboard.py` antes de los bloques de ejecución y captura. + - Eliminación de advertencias de variables posiblemente no inicializadas (`uninitialized`) en `sync_google_sheets` (`filter_career`, `filter_subject`, `filter_day`). + - Reemplazo de llamadas deprecadas `datetime.utcnow()` por `datetime.now(timezone.utc)` conforme a los estándares de Python 3.12/3.14. + ## [3.6.2] - 2026-10-19 ### Fixed - **Estadísticas Reales del Dashboard y Métricas de Usuario**: diff --git a/MEMORY.md b/MEMORY.md index 714bb00..cc55d50 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: MVP del Sistema de Bedelía — v3.6.2 (Dashboard en tiempo real, Perfil de Usuario y Descriptor SystemSetting)**: +- **Sprint Activo: MVP del Sistema de Bedelía — v3.6.3 (Saneamiento Estático Dashboard y Hardening de Producción)**: - Migración completa del Core Backend a FastAPI ASGI (`main.py`, `routers/`, `schemas/`, `database.py`). - - Resolución integral de advertencias y errores de tipado estático (Pyright/LSP). + - Resolución integral de advertencias y errores de tipado estático (Pyright/LSP): inicialización uniforme de variables en `dashboard.py` y eliminación de llamadas deprecadas `datetime.utcnow()`. - Corrección de `TypeError: 'classmethod' object is not callable` en `SystemSetting` (`backend/app/models/setting.py`) para lectura segura de variables encriptadas/enmascaradas. - Implementación completa de endpoints de perfil (`GET /auth/profile`, `POST /auth/profile`, `POST /auth/theme`) en backend y BFF frontend. - Saneamiento de estadísticas del dashboard: eliminación de fallbacks ficticios y cálculo de métricas reales para el usuario autenticado (`my_today_count`, `my_total_reservations`, `virtual_rooms_count`). - - Suite de 57 pruebas automatizadas aprobadas al 100%. Versión actual: `v3.6.2`. + - Suite de 57 pruebas automatizadas aprobadas al 100%. Versión actual: `v3.6.3`. ## 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 348753f..b361698 100644 --- a/backend/app/__init__.py +++ b/backend/app/__init__.py @@ -6,7 +6,7 @@ from flask_babel import Babel, gettext as _ from config.config import Config # Initialize extensions -__version__ = "3.6.2" +__version__ = "3.6.3" db = SQLAlchemy() migrate = Migrate() cors = CORS() diff --git a/backend/app/resources/bg_course-card.png b/backend/app/resources/bg_course-card.png new file mode 100644 index 0000000..e76fe35 Binary files /dev/null and b/backend/app/resources/bg_course-card.png differ diff --git a/backend/app/resources/mini_logo_icon.png b/backend/app/resources/mini_logo_icon.png new file mode 100644 index 0000000..7fd0d56 Binary files /dev/null and b/backend/app/resources/mini_logo_icon.png differ diff --git a/backend/app/resources/square_course_name.png b/backend/app/resources/square_course_name.png new file mode 100644 index 0000000..11e79c5 Binary files /dev/null and b/backend/app/resources/square_course_name.png differ diff --git a/backend/app/routes/api/dashboard.py b/backend/app/routes/api/dashboard.py index ac4d3d2..de9a327 100644 --- a/backend/app/routes/api/dashboard.py +++ b/backend/app/routes/api/dashboard.py @@ -6,7 +6,7 @@ from app.models.user import User from app.models.reservation import Reservation from app.models.audit_log import AuditLog from app.services.audit_service import AuditService -from datetime import datetime, timedelta +from datetime import datetime, timedelta, timezone from sqlalchemy import func from app import db @@ -67,8 +67,48 @@ def serialize_milestone(m): @jwt_required def get_stats(): """Retorna estadísticas clave y datos operativos para el Dashboard.""" - today = datetime.utcnow().date() + today = datetime.now(timezone.utc).date() + total_classrooms = 0 + total_subjects = 0 + total_users = 0 + today_reservations = 0 + pending_count = 0 + physical_classrooms = 0 + virtual_classrooms = 0 + occupancy_rate = 0 + assigned_classrooms = 0 + assigned_pct = 0.0 + unassigned_classrooms = 0 + unassigned_pct = 0.0 + assigned_today_count = 0 + assigned_today_pct = 0.0 + unassigned_today_count = 0 + unassigned_today_pct = 0.0 + total_active_commissions = 0 + tomorrow_reservations_q = [] + my_today_count = 0 + my_total_reservations = 0 + my_today_classes = [] + tomorrow_schedule_list = [] + filter_stats = {} + date_labels = {} + unassigned_commissions_tomorrow = [] + unassigned_commissions_week = [] + unassigned_commissions_month = [] + unassigned_commissions_general = [] + available_classrooms_today = [] + available_classrooms_tomorrow = [] + available_classrooms_week = [] + available_classrooms_month = [] + virtual_rooms_data = [] + audit_data = [] + pending_reservations = [] + today_schedule_list = [] + week_schedule_list = [] + upcoming_reservations = [] + milestones = [] + try: total_classrooms = Classroom.query.filter_by(is_active=True).count() total_subjects = Subject.query.filter_by(is_active=True).count() @@ -129,7 +169,7 @@ def get_stats(): pending_count = len(pending_reservations_q) upcoming_reservations_q = Reservation.query.filter( - Reservation.start_time >= datetime.utcnow() + Reservation.start_time >= datetime.now(timezone.utc).replace(tzinfo=None) ).order_by(Reservation.start_time.asc()).limit(10).all() milestones_q = AcademicMilestone.query.filter( @@ -176,7 +216,7 @@ def get_stats(): # ---- Bedelía: Filtros completos de Aulas y Comisiones por Día (Hoy), Mañana, Semana y Mes ---- import calendar - today_dt = datetime.utcnow() + today_dt = datetime.now(timezone.utc).replace(tzinfo=None) tomorrow_dt = today_dt + timedelta(days=1) tomorrow_start = tomorrow_dt.replace(hour=0, minute=0, second=0, microsecond=0) tomorrow_end = tomorrow_dt.replace(hour=23, minute=59, second=59, microsecond=0) @@ -587,7 +627,7 @@ def get_stats(): 'unassigned_today_classrooms': unassigned_today_count, 'unassigned_today_pct': unassigned_today_pct, 'total_active_commissions': total_active_commissions, - 'tomorrow_reservations': len(tomorrow_reservations_q) if 'tomorrow_reservations_q' in locals() else 0, + 'tomorrow_reservations': len(tomorrow_reservations_q), 'my_today_count': my_today_count, 'my_total_reservations': my_total_reservations, 'virtual_rooms_count': virtual_classrooms @@ -597,22 +637,22 @@ def get_stats(): 'pending_reservations': pending_reservations, 'today_schedule_list': today_schedule_list, 'my_today_classes': my_today_classes, - 'tomorrow_schedule_list': tomorrow_schedule_list if 'tomorrow_schedule_list' in locals() else [], + 'tomorrow_schedule_list': tomorrow_schedule_list, 'week_schedule_list': week_schedule_list, 'upcoming_reservations': upcoming_reservations, 'milestones': milestones, - 'filter_stats': filter_stats if 'filter_stats' in locals() else {}, - 'date_labels': date_labels if 'date_labels' in locals() else {}, + 'filter_stats': filter_stats, + 'date_labels': date_labels, 'ui': { 'show_role_banner': SystemSetting.get_value('dashboard_role_banner_enabled', 'true') in ['true', 'True', '1', True] }, 'bedelia': { - 'unassigned_commissions_tomorrow': unassigned_commissions_tomorrow if 'unassigned_commissions_tomorrow' in locals() else [], + 'unassigned_commissions_tomorrow': unassigned_commissions_tomorrow, 'unassigned_commissions_week': unassigned_commissions_week, 'unassigned_commissions_month': unassigned_commissions_month, 'unassigned_commissions_general': unassigned_commissions_general, 'available_classrooms_today': available_classrooms_today, - 'available_classrooms_tomorrow': available_classrooms_tomorrow if 'available_classrooms_tomorrow' in locals() else [], + 'available_classrooms_tomorrow': available_classrooms_tomorrow, 'available_classrooms_week': available_classrooms_week, 'available_classrooms_month': available_classrooms_month, 'virtual_rooms': virtual_rooms_data, @@ -625,6 +665,9 @@ def get_stats(): def sync_google_sheets(): """Ejecuta la sincronización real con las hojas de cálculo de Google Sheets con soporte de filtros y entidades.""" from app.services.sheets_importer import GoogleSheetsImporter + filter_career = None + filter_subject = None + filter_day = None try: data = request.get_json(silent=True) or {} custom_url = data.get('sheets_url') or data.get('base_url') diff --git a/backend/app/routes/api/openapi.py b/backend/app/routes/api/openapi.py index 7298be2..69d9979 100644 --- a/backend/app/routes/api/openapi.py +++ b/backend/app/routes/api/openapi.py @@ -7,7 +7,7 @@ OPENAPI_SPEC = { "info": { "title": "Edu-Space REST API", "description": "Enterprise Academic & Physical Space Management REST API with JWT Authentication and Role-Based Access Control.", - "version": "3.6.2" + "version": "3.6.3" }, "servers": [ { diff --git a/backend/setup.py b/backend/setup.py index 1e4ec96..ae9ff82 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.6.2", + version="3.6.3", description="Administrative interface for Edu-Space Classroom Management System", author="Edu-Space Development Team", author_email="admin@edu-space.com", diff --git a/frontend/package.json b/frontend/package.json index ff54f85..7bb18bb 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -1,6 +1,6 @@ { "name": "frontend", - "version": "3.6.2", + "version": "3.6.3", "description": "", "main": "index.js", "scripts": { diff --git a/frontend/src/app.js b/frontend/src/app.js index bed602f..9f8fc6f 100644 --- a/frontend/src/app.js +++ b/frontend/src/app.js @@ -85,9 +85,9 @@ const env = nunjucks.configure(path.join(__dirname, '../views'), { }); // Versiones institucionales del sistema -const APP_VERSION = '3.6.2'; -const FRONTEND_VERSION = '3.6.2'; -const BACKEND_VERSION = '3.6.2'; +const APP_VERSION = '3.6.3'; +const FRONTEND_VERSION = '3.6.3'; +const BACKEND_VERSION = '3.6.3'; env.addGlobal('app_version', APP_VERSION); env.addGlobal('frontend_version', FRONTEND_VERSION);