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]
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user