feat: agregar contadores de usuarios por rol y paginacion reforzada (v3.8.13)

This commit is contained in:
2026-10-26 12:41:50 -03:00
parent 71a0ac5d11
commit 85f320d96e
13 changed files with 240 additions and 22 deletions
+3 -3
View File
@@ -161,7 +161,7 @@ def list_subjects(
Subject.careers.any(Career.name.ilike(f'%{s_clean}%'))
)
)
parsed_career_id = int(career_id.strip()) if career_id and str(career_id).strip().isdigit() else None
parsed_career_id = int(career_id.strip()) if career_id and 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':
@@ -428,8 +428,8 @@ def list_commissions(
Subject.code.ilike(f'%{s_clean}%')
)
)
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
parsed_subject_id = int(subject_id.strip()) if subject_id and subject_id.strip().isdigit() else None
parsed_career_id = int(career_id.strip()) if career_id and career_id.strip().isdigit() else None
if parsed_subject_id:
query = query.filter(Commission.subject_id == parsed_subject_id)
if parsed_career_id:
+43 -4
View File
@@ -32,7 +32,7 @@ admin_router = APIRouter(prefix="/api/v1", tags=["Administration & Settings"])
@admin_router.get("/admin/users")
def get_users(
search: Optional[str] = Query(None),
role_id: Optional[int] = Query(None, alias="role"),
role_filter: Optional[str] = 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),
@@ -53,8 +53,15 @@ def get_users(
User.last_name.ilike(f'%{s_clean}%')
)
)
if role_id:
query = query.filter(User.role_id == role_id)
if role_filter and role_filter.strip():
rf = role_filter.strip()
if rf.isdigit():
rid = int(rf)
query = query.filter(or_(User.role_id == rid, User.role == rf))
else:
rf_lower = rf.lower()
query = query.filter(or_(func.lower(User.role) == rf_lower, User.role.ilike(f'%{rf}%')))
if status_filter == 'active':
query = query.filter(User.is_active == True)
elif status_filter == 'inactive':
@@ -64,6 +71,37 @@ def get_users(
roles = Role.query.order_by(Role.name.asc()).all()
roles_data = [{'id': r.id, 'name': 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
active_users_count = db.session.query(func.count(User.id)).filter(User.is_active == True).scalar() or 0
inactive_users_count = db.session.query(func.count(User.id)).filter(User.is_active == False).scalar() or 0
admin_count = db.session.query(func.count(User.id)).filter(
or_(User.role_id == 1, func.lower(User.role) == 'admin')
).scalar() or 0
bedelia_count = db.session.query(func.count(User.id)).filter(
or_(User.role_id == 7, func.lower(User.role) == 'bedelia')
).scalar() or 0
docente_count = db.session.query(func.count(User.id)).filter(
or_(User.role_id == 2, func.lower(User.role).in_(['docente', 'profesor']))
).scalar() or 0
alumno_count = db.session.query(func.count(User.id)).filter(
or_(User.role_id == 6, func.lower(User.role).in_(['alumno', 'estudiante']))
).scalar() or 0
role_counts = {
'total': total_users_count,
'active': active_users_count,
'inactive': inactive_users_count,
'admin': admin_count,
'bedelia': bedelia_count,
'docente': docente_count,
'alumno': alumno_count
}
if all_records:
users = query.order_by(User.id.asc()).limit(1000).all()
pages = 1
@@ -92,7 +130,8 @@ def get_users(
'has_next': page < pages,
'users': users_data,
'roles': roles_data,
'document_types': DOCUMENT_TYPES
'document_types': DOCUMENT_TYPES,
'role_counts': role_counts
}
+1 -1
View File
@@ -31,7 +31,7 @@ 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
parsed_building_id = int(building_id.strip()) if building_id and building_id.strip().isdigit() else None
classrooms = classroom_service.list_classrooms(
building_id=parsed_building_id,
+1 -1
View File
@@ -45,7 +45,7 @@ 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
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,