fix: corregir layout de dashboard, resiliencia en filtros de asignaturas y paginacion de bd (v3.8.12)
This commit is contained in:
@@ -1,8 +1,10 @@
|
||||
from typing import Optional, List
|
||||
from datetime import datetime, date, time
|
||||
from sqlalchemy.orm import joinedload
|
||||
from sqlalchemy import and_, or_
|
||||
from sqlalchemy import and_, or_, func, not_
|
||||
from app.models.reservation import Reservation, ReservationStatus
|
||||
from app.models.classroom import Classroom
|
||||
from app.models.user import User
|
||||
from app.repositories.base_repository import BaseRepository
|
||||
from app import db
|
||||
|
||||
@@ -31,8 +33,13 @@ class ReservationRepository(BaseRepository[Reservation]):
|
||||
return query.all()
|
||||
|
||||
def get_by_date_range(self, start_dt: datetime, end_dt: datetime,
|
||||
classroom_id: Optional[int] = None) -> List[Reservation]:
|
||||
"""Obtiene reservas dentro de una ventana temporal con carga ansiosa de relaciones."""
|
||||
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 una ventana temporal con carga ansiosa y filtros en SQL."""
|
||||
query = Reservation.query.options(
|
||||
joinedload(Reservation.classroom),
|
||||
joinedload(Reservation.commission),
|
||||
@@ -46,7 +53,38 @@ class ReservationRepository(BaseRepository[Reservation]):
|
||||
if classroom_id:
|
||||
query = query.filter(Reservation.classroom_id == classroom_id)
|
||||
|
||||
return query.order_by(Reservation.start_time.asc()).all()
|
||||
if is_hide_virtual:
|
||||
query = query.outerjoin(Classroom, Reservation.classroom_id == Classroom.id).filter(
|
||||
or_(
|
||||
Classroom.id.is_(None),
|
||||
and_(
|
||||
not_(Classroom.code.ilike('%VIRTUAL%')),
|
||||
not_(Classroom.building.ilike('%VIRTUAL%'))
|
||||
)
|
||||
)
|
||||
)
|
||||
|
||||
if floor:
|
||||
query = query.join(Classroom, Reservation.classroom_id == Classroom.id).filter(
|
||||
func.lower(Classroom.floor) == floor.strip().lower()
|
||||
)
|
||||
|
||||
if shift:
|
||||
query = query.filter(Reservation.shift.ilike(f'%{shift.strip()}%'))
|
||||
|
||||
if search:
|
||||
s_clean = search.strip().lower()
|
||||
query = query.outerjoin(Classroom, Reservation.classroom_id == Classroom.id)\
|
||||
.outerjoin(User, Reservation.user_id == User.id)\
|
||||
.filter(
|
||||
or_(
|
||||
Reservation.purpose.ilike(f'%{s_clean}%'),
|
||||
Classroom.code.ilike(f'%{s_clean}%'),
|
||||
User.name.ilike(f'%{s_clean}%')
|
||||
)
|
||||
)
|
||||
|
||||
return query.order_by(Reservation.start_time.asc()).limit(limit).all()
|
||||
|
||||
def get_by_teacher(self, teacher_id: int) -> List[Reservation]:
|
||||
"""Obtiene reservas asignadas a un docente."""
|
||||
|
||||
Reference in New Issue
Block a user