fix: corregir layout de dashboard, resiliencia en filtros de asignaturas y paginacion de bd (v3.8.12)

This commit is contained in:
2026-10-26 12:25:00 -03:00
parent f022cf9bc6
commit 71a0ac5d11
23 changed files with 881 additions and 189 deletions
+37 -1
View File
@@ -1,5 +1,6 @@
from typing import Optional, List, Dict, Any
from typing import Optional, List, Dict, Any, Tuple
import json
from sqlalchemy import or_
from app import db
from app.models.audit_log import AuditLog
from app.models.user import User
@@ -94,7 +95,42 @@ class AuditService:
return query.order_by(AuditLog.created_at.desc()).limit(limit).all()
@staticmethod
def get_paginated_logs(
module: Optional[str] = None,
action: Optional[str] = None,
user_id: Optional[int] = None,
search: Optional[str] = None,
page: int = 1,
per_page: int = 25
) -> Tuple[List[AuditLog], int]:
"""Recupera eventos de auditoría con filtros SQL, búsqueda y paginación server-side."""
query = AuditLog.query
if module:
query = query.filter(AuditLog.module == module)
if action:
query = query.filter(AuditLog.action == action)
if user_id:
query = query.filter(AuditLog.user_id == user_id)
if search:
s_clean = search.strip().lower()
query = query.filter(
or_(
AuditLog.details.ilike(f'%{s_clean}%'),
AuditLog.user_email.ilike(f'%{s_clean}%'),
AuditLog.action.ilike(f'%{s_clean}%'),
AuditLog.module.ilike(f'%{s_clean}%'),
AuditLog.ip_address.ilike(f'%{s_clean}%')
)
)
total = query.count()
logs = query.order_by(AuditLog.created_at.desc()).offset((page - 1) * per_page).limit(per_page).all()
return logs, total
@staticmethod
def get_recent_logs(limit: int = 50, module: Optional[str] = None,
action: Optional[str] = None) -> List[AuditLog]:
return AuditService.get_logs(module=module, action=action, limit=limit)
+16 -3
View File
@@ -21,9 +21,22 @@ class ReservationService:
return self.reservation_repo.get_by_id(reservation_id)
def list_reservations(self, start_dt: datetime, end_dt: datetime,
classroom_id: Optional[int] = None) -> List[Reservation]:
"""Obtiene reservas dentro de un rango temporal."""
return self.reservation_repo.get_by_date_range(start_dt, end_dt, classroom_id=classroom_id)
classroom_id: Optional[int] = None,
is_hide_virtual: bool = False,
floor: Optional[str] = None,
shift: Optional[str] = None,
search: Optional[str] = None,
limit: int = 1000) -> List[Reservation]:
"""Obtiene reservas dentro de un rango temporal con filtros SQL."""
return self.reservation_repo.get_by_date_range(
start_dt, end_dt,
classroom_id=classroom_id,
is_hide_virtual=is_hide_virtual,
floor=floor,
shift=shift,
search=search,
limit=limit
)
def check_conflicts(self, classroom_id: int, start_time: datetime, end_time: datetime,
exclude_id: Optional[int] = None) -> List[Reservation]: