fix: corregir layout de dashboard, resiliencia en filtros de asignaturas y paginacion de bd (v3.8.12)
This commit is contained in:
+80
-19
@@ -6,6 +6,7 @@ from typing import Optional, List, Dict, Any
|
||||
from fastapi import APIRouter, Depends, HTTPException, Query, status, Request
|
||||
from sqlalchemy import func, or_
|
||||
from datetime import datetime, timezone
|
||||
import math
|
||||
|
||||
from app import db
|
||||
from app.models.career import Career
|
||||
@@ -142,13 +143,15 @@ def delete_career(
|
||||
@academic_router.get("/subjects")
|
||||
def list_subjects(
|
||||
search: Optional[str] = Query(None),
|
||||
career_id: Optional[int] = Query(None),
|
||||
career_id: Optional[str] = Query(None),
|
||||
active: Optional[str] = Query(None),
|
||||
page: Optional[int] = Query(None, ge=1),
|
||||
per_page: Optional[int] = Query(None, ge=1, le=200),
|
||||
current_user: User = Depends(get_current_user)
|
||||
):
|
||||
"""Lista las asignaturas con filtros opcionales de búsqueda, carrera y estado."""
|
||||
"""Lista las asignaturas con filtros opcionales de búsqueda, carrera, estado y paginación."""
|
||||
query = Subject.query
|
||||
if search:
|
||||
if search and search.strip():
|
||||
s_clean = search.strip().lower()
|
||||
query = query.filter(
|
||||
or_(
|
||||
@@ -158,16 +161,30 @@ def list_subjects(
|
||||
Subject.careers.any(Career.name.ilike(f'%{s_clean}%'))
|
||||
)
|
||||
)
|
||||
if career_id:
|
||||
query = query.filter(or_(Subject.career_id == career_id, Subject.careers.any(Career.id == career_id)))
|
||||
parsed_career_id = int(career_id.strip()) if career_id and str(career_id).strip().isdigit() else None
|
||||
if parsed_career_id:
|
||||
query = query.filter(or_(Subject.career_id == parsed_career_id, Subject.careers.any(Career.id == parsed_career_id)))
|
||||
if active == 'true':
|
||||
query = query.filter(Subject.is_active == True)
|
||||
elif active == 'false':
|
||||
query = query.filter(Subject.is_active == False)
|
||||
|
||||
subjects = query.order_by(Subject.id.asc()).all()
|
||||
total = query.count()
|
||||
careers = Career.query.order_by(Career.name.asc()).all()
|
||||
|
||||
if page and per_page:
|
||||
pages = math.ceil(total / per_page) if total > 0 else 1
|
||||
subjects = query.order_by(Subject.id.asc()).offset((page - 1) * per_page).limit(per_page).all()
|
||||
has_prev = page > 1
|
||||
has_next = page < pages
|
||||
else:
|
||||
pages = 1
|
||||
page = 1
|
||||
per_page = total or 1
|
||||
has_prev = False
|
||||
has_next = False
|
||||
subjects = query.order_by(Subject.id.asc()).all()
|
||||
|
||||
subjects_data = []
|
||||
for s in subjects:
|
||||
d = s.to_dict()
|
||||
@@ -184,7 +201,12 @@ def list_subjects(
|
||||
|
||||
return {
|
||||
'status': 'success',
|
||||
'total': len(subjects_data),
|
||||
'total': total,
|
||||
'page': page,
|
||||
'per_page': per_page,
|
||||
'pages': pages,
|
||||
'has_prev': has_prev,
|
||||
'has_next': has_next,
|
||||
'subjects': subjects_data,
|
||||
'careers': [c.to_dict() for c in careers]
|
||||
}
|
||||
@@ -382,31 +404,70 @@ def delete_subject(
|
||||
|
||||
@academic_router.get("/commissions")
|
||||
def list_commissions(
|
||||
subject_id: Optional[int] = Query(None),
|
||||
career_id: Optional[int] = Query(None),
|
||||
search: Optional[str] = Query(None),
|
||||
subject_id: Optional[str] = Query(None),
|
||||
career_id: Optional[str] = Query(None),
|
||||
shift: Optional[str] = Query(None),
|
||||
active: Optional[str] = Query(None),
|
||||
page: Optional[int] = Query(None, ge=1),
|
||||
per_page: Optional[int] = Query(None, ge=1, le=200),
|
||||
current_user: User = Depends(get_current_user)
|
||||
):
|
||||
"""Lista las comisiones académicas con soporte para filtros de carrera, materia y turno."""
|
||||
"""Lista las comisiones académicas con soporte para filtros de búsqueda, carrera, materia, turno y paginación."""
|
||||
query = Commission.query
|
||||
if subject_id:
|
||||
query = query.filter(Commission.subject_id == subject_id)
|
||||
if career_id:
|
||||
query = query.join(Subject, Commission.subject_id == Subject.id).filter(
|
||||
or_(Subject.career_id == career_id, Subject.careers.any(Career.id == career_id))
|
||||
joined_subject = False
|
||||
if search and search.strip():
|
||||
s_clean = search.strip().lower()
|
||||
query = query.outerjoin(Subject, Commission.subject_id == Subject.id)
|
||||
joined_subject = True
|
||||
query = query.filter(
|
||||
or_(
|
||||
Commission.code.ilike(f'%{s_clean}%'),
|
||||
Commission.schedule.ilike(f'%{s_clean}%'),
|
||||
Subject.name.ilike(f'%{s_clean}%'),
|
||||
Subject.code.ilike(f'%{s_clean}%')
|
||||
)
|
||||
)
|
||||
if shift:
|
||||
query = query.filter(Commission.shift == shift)
|
||||
parsed_subject_id = int(subject_id.strip()) if subject_id and str(subject_id).strip().isdigit() else None
|
||||
parsed_career_id = int(career_id.strip()) if career_id and str(career_id).strip().isdigit() else None
|
||||
if parsed_subject_id:
|
||||
query = query.filter(Commission.subject_id == parsed_subject_id)
|
||||
if parsed_career_id:
|
||||
if not joined_subject:
|
||||
query = query.join(Subject, Commission.subject_id == Subject.id)
|
||||
joined_subject = True
|
||||
query = query.filter(
|
||||
or_(Subject.career_id == parsed_career_id, Subject.careers.any(Career.id == parsed_career_id))
|
||||
)
|
||||
if shift and shift.strip():
|
||||
query = query.filter(Commission.shift == shift.strip())
|
||||
if active == 'true':
|
||||
query = query.filter(Commission.active == True)
|
||||
elif active == 'false':
|
||||
query = query.filter(Commission.active == False)
|
||||
|
||||
commissions = query.order_by(Commission.year.desc(), Commission.semester.desc(), Commission.code.asc()).all()
|
||||
total = query.count()
|
||||
if page and per_page:
|
||||
pages = math.ceil(total / per_page) if total > 0 else 1
|
||||
commissions = query.order_by(Commission.year.desc(), Commission.semester.desc(), Commission.code.asc()).offset((page - 1) * per_page).limit(per_page).all()
|
||||
has_prev = page > 1
|
||||
has_next = page < pages
|
||||
else:
|
||||
pages = 1
|
||||
page = 1
|
||||
per_page = total or 1
|
||||
has_prev = False
|
||||
has_next = False
|
||||
commissions = query.order_by(Commission.year.desc(), Commission.semester.desc(), Commission.code.asc()).all()
|
||||
|
||||
return {
|
||||
'status': 'success',
|
||||
'total': len(commissions),
|
||||
'total': total,
|
||||
'page': page,
|
||||
'per_page': per_page,
|
||||
'pages': pages,
|
||||
'has_prev': has_prev,
|
||||
'has_next': has_next,
|
||||
'commissions': [c.to_dict() for c in commissions]
|
||||
}
|
||||
|
||||
|
||||
+88
-12
@@ -7,6 +7,7 @@ from typing import Optional, List, Dict, Any
|
||||
from fastapi import APIRouter, Depends, HTTPException, Query, status, Request
|
||||
from sqlalchemy import func, or_
|
||||
from datetime import datetime, timezone
|
||||
import math
|
||||
|
||||
from app import db
|
||||
from app.models.user import User
|
||||
@@ -33,9 +34,12 @@ def get_users(
|
||||
search: Optional[str] = Query(None),
|
||||
role_id: Optional[int] = Query(None, alias="role"),
|
||||
status_filter: Optional[str] = Query(None, alias="status"),
|
||||
page: int = Query(1, ge=1),
|
||||
per_page: int = Query(25, ge=1, le=200),
|
||||
all_records: bool = Query(False, alias="all"),
|
||||
current_user: User = Depends(require_roles(["ADMIN", "BEDELIA"]))
|
||||
):
|
||||
"""Lista usuarios del sistema con filtros de búsqueda y rol."""
|
||||
"""Lista usuarios del sistema con filtros de búsqueda, rol y paginación server-side."""
|
||||
query = User.query
|
||||
if search:
|
||||
s_clean = search.strip().lower()
|
||||
@@ -56,8 +60,18 @@ def get_users(
|
||||
elif status_filter == 'inactive':
|
||||
query = query.filter(User.is_active == False)
|
||||
|
||||
users = query.order_by(User.id.asc()).all()
|
||||
total = query.count()
|
||||
roles = Role.query.order_by(Role.name.asc()).all()
|
||||
roles_data = [{'id': r.id, 'name': r.name} for r in roles]
|
||||
|
||||
if all_records:
|
||||
users = query.order_by(User.id.asc()).limit(1000).all()
|
||||
pages = 1
|
||||
page = 1
|
||||
per_page = total or 1
|
||||
else:
|
||||
pages = math.ceil(total / per_page) if total > 0 else 1
|
||||
users = query.order_by(User.id.asc()).offset((page - 1) * per_page).limit(per_page).all()
|
||||
|
||||
users_data = []
|
||||
for u in users:
|
||||
@@ -68,17 +82,63 @@ def get_users(
|
||||
} if u.role_obj else {'id': 1, 'name': u.role or 'Admin'}
|
||||
users_data.append(d)
|
||||
|
||||
roles_data = [{'id': r.id, 'name': r.name} for r in roles]
|
||||
|
||||
return {
|
||||
'status': 'success',
|
||||
'total': len(users_data),
|
||||
'total': total,
|
||||
'page': page,
|
||||
'per_page': per_page,
|
||||
'pages': pages,
|
||||
'has_prev': page > 1,
|
||||
'has_next': page < pages,
|
||||
'users': users_data,
|
||||
'roles': roles_data,
|
||||
'document_types': DOCUMENT_TYPES
|
||||
}
|
||||
|
||||
|
||||
@admin_router.get("/users/teachers")
|
||||
@admin_router.get("/admin/users/teachers")
|
||||
def get_teachers(
|
||||
search: Optional[str] = Query(None),
|
||||
current_user: User = Depends(get_current_user)
|
||||
):
|
||||
"""Retorna una lista ligera de docentes activos para selectores y comisiones."""
|
||||
query = User.query.filter(User.is_active == True)
|
||||
query = query.filter(
|
||||
or_(
|
||||
User.role.ilike('%docent%'),
|
||||
User.role.ilike('%prof%'),
|
||||
User.role.ilike('%bedel%'),
|
||||
User.role.ilike('%admin%')
|
||||
)
|
||||
)
|
||||
if search:
|
||||
s_clean = search.strip().lower()
|
||||
query = query.filter(
|
||||
or_(
|
||||
User.name.ilike(f'%{s_clean}%'),
|
||||
User.email.ilike(f'%{s_clean}%'),
|
||||
User.document_number.ilike(f'%{s_clean}%')
|
||||
)
|
||||
)
|
||||
teachers = query.order_by(User.name.asc()).all()
|
||||
teachers_data = [
|
||||
{
|
||||
'id': t.id,
|
||||
'name': t.name,
|
||||
'email': t.email,
|
||||
'document_number': t.document_number,
|
||||
'role': t.role
|
||||
}
|
||||
for t in teachers
|
||||
]
|
||||
return {
|
||||
'status': 'success',
|
||||
'total': len(teachers_data),
|
||||
'teachers': teachers_data
|
||||
}
|
||||
|
||||
|
||||
@admin_router.post("/users", status_code=status.HTTP_201_CREATED)
|
||||
@admin_router.post("/admin/users", status_code=status.HTTP_201_CREATED)
|
||||
async def create_user(
|
||||
@@ -601,25 +661,41 @@ def get_audit_logs(
|
||||
module: Optional[str] = Query(None),
|
||||
action: Optional[str] = Query(None),
|
||||
user_id: Optional[int] = Query(None),
|
||||
limit: int = Query(50),
|
||||
search: Optional[str] = Query(None),
|
||||
page: int = Query(1, ge=1),
|
||||
per_page: int = Query(25, ge=1, le=100),
|
||||
limit: Optional[int] = Query(None),
|
||||
current_user: User = Depends(require_roles(["ADMIN"]))
|
||||
):
|
||||
"""Consulta la bitácora inmutable de auditoría del sistema."""
|
||||
logs = AuditService.get_logs(module=module, action=action, user_id=user_id, limit=limit)
|
||||
"""Consulta la bitácora inmutable de auditoría del sistema con paginación server-side."""
|
||||
actual_per_page = limit if (limit and not per_page) else per_page
|
||||
logs, total = AuditService.get_paginated_logs(
|
||||
module=module,
|
||||
action=action,
|
||||
user_id=user_id,
|
||||
search=search,
|
||||
page=page,
|
||||
per_page=actual_per_page
|
||||
)
|
||||
pages = math.ceil(total / actual_per_page) if total > 0 else 1
|
||||
|
||||
distinct_modules = [m[0] for m in db.session.query(AuditLog.module).distinct().all() if m[0]]
|
||||
distinct_actions = [a[0] for a in db.session.query(AuditLog.action).distinct().all() if a[0]]
|
||||
all_modules = sorted(list(set(distinct_modules + ['auth', 'admin', 'reservations', 'classrooms', 'buildings', 'academic', 'moodle'])))
|
||||
all_actions = sorted(list(set(distinct_actions + ['LOGIN', 'LOGIN_FAILED', 'LOGOUT', 'CREATE', 'UPDATE', 'DELETE', 'IMPERSONATE_START', 'IMPERSONATE_END'])))
|
||||
return {
|
||||
'status': 'success',
|
||||
'total': len(logs),
|
||||
'total': total,
|
||||
'logs': [log.to_dict() for log in logs],
|
||||
'modules': all_modules,
|
||||
'actions': all_actions,
|
||||
'pagination': {
|
||||
'page': 1,
|
||||
'per_page': limit,
|
||||
'total': len(logs)
|
||||
'page': page,
|
||||
'per_page': actual_per_page,
|
||||
'total': total,
|
||||
'pages': pages,
|
||||
'has_prev': page > 1,
|
||||
'has_next': page < pages
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -22,7 +22,7 @@ dashboard_service = DashboardService()
|
||||
|
||||
@classrooms_router.get("")
|
||||
def list_classrooms(
|
||||
building_id: Optional[int] = Query(None),
|
||||
building_id: Optional[str] = Query(None),
|
||||
floor: Optional[str] = Query(None),
|
||||
mode: Optional[str] = Query(None),
|
||||
current_user: User = Depends(get_current_user)
|
||||
@@ -31,9 +31,10 @@ def list_classrooms(
|
||||
mode_str = (mode or '').lower()
|
||||
only_virtual = mode_str == 'virtual'
|
||||
only_physical = mode_str == 'physical'
|
||||
parsed_building_id = int(building_id.strip()) if building_id and str(building_id).strip().isdigit() else None
|
||||
|
||||
classrooms = classroom_service.list_classrooms(
|
||||
building_id=building_id,
|
||||
building_id=parsed_building_id,
|
||||
floor=floor,
|
||||
only_virtual=only_virtual,
|
||||
only_physical=only_physical
|
||||
|
||||
@@ -24,14 +24,15 @@ reservation_service = ReservationService()
|
||||
def list_reservations(
|
||||
start_date: Optional[str] = Query(None),
|
||||
end_date: Optional[str] = Query(None),
|
||||
classroom_id: Optional[int] = Query(None),
|
||||
classroom_id: Optional[str] = Query(None),
|
||||
hide_virtual: Optional[str] = Query(None),
|
||||
floor: Optional[str] = Query(None),
|
||||
shift: Optional[str] = Query(None),
|
||||
search: Optional[str] = Query(None),
|
||||
limit: int = Query(1000, le=5000),
|
||||
current_user: User = Depends(get_current_user)
|
||||
):
|
||||
"""Consulta de reservas por rango de fechas y/o aula."""
|
||||
"""Consulta de reservas por rango de fechas y/o aula con filtros en SQL."""
|
||||
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)
|
||||
@@ -44,27 +45,22 @@ def list_reservations(
|
||||
raise HTTPException(status_code=status.HTTP_400_BAD_REQUEST, detail="Formato inválido de end_date (debe ser YYYY-MM-DD).")
|
||||
|
||||
is_hide_virtual = str(hide_virtual).lower() in ['1', 'true']
|
||||
parsed_classroom_id = int(classroom_id.strip()) if classroom_id and str(classroom_id).strip().isdigit() else None
|
||||
|
||||
reservations = reservation_service.list_reservations(start_dt, end_dt, classroom_id=classroom_id)
|
||||
reservations = reservation_service.list_reservations(
|
||||
start_dt, end_dt,
|
||||
classroom_id=parsed_classroom_id,
|
||||
is_hide_virtual=is_hide_virtual,
|
||||
floor=floor,
|
||||
shift=shift,
|
||||
search=search,
|
||||
limit=limit
|
||||
)
|
||||
result = []
|
||||
for r in reservations:
|
||||
is_virt = bool(r.is_virtual or (r.classroom and r.classroom.is_virtual))
|
||||
if is_hide_virtual and is_virt:
|
||||
continue
|
||||
if floor and r.classroom and str(r.classroom.floor).strip().lower() != floor.strip().lower():
|
||||
continue
|
||||
if shift and r.shift and shift.lower() not in r.shift.lower():
|
||||
continue
|
||||
r_user: Any = getattr(r, 'user', None)
|
||||
u_name = (getattr(r_user, 'name', '') or '').lower() if r_user else ''
|
||||
if search:
|
||||
s_lower = search.lower()
|
||||
subj_n = (r.subject_name or '').lower()
|
||||
subj_c = (r.subject_code or '').lower()
|
||||
c_name = (r.classroom.code if r.classroom else '').lower()
|
||||
if s_lower not in subj_n and s_lower not in subj_c and s_lower not in c_name and s_lower not in u_name:
|
||||
continue
|
||||
|
||||
is_virt = bool(r.is_virtual or (r.classroom and getattr(r.classroom, 'is_virtual', False)))
|
||||
user_dict = {
|
||||
'id': getattr(r_user, 'id', None),
|
||||
'name': getattr(r_user, 'name', None),
|
||||
|
||||
Reference in New Issue
Block a user