feat(ux): separate physical and virtual classroom KPIs, fix month sessions filter, improve admin contrast, persist sidebar submenus, and relocate theme toggle (v3.8.14)

This commit is contained in:
2026-10-26 13:35:19 -03:00
parent 85f320d96e
commit 67a1cb14a0
19 changed files with 525 additions and 145 deletions
@@ -35,6 +35,8 @@ class ReservationRepository(BaseRepository[Reservation]):
def get_by_date_range(self, start_dt: datetime, end_dt: datetime,
classroom_id: Optional[int] = None,
is_hide_virtual: bool = False,
only_virtual: bool = False,
status: Optional[str] = None,
floor: Optional[str] = None,
shift: Optional[str] = None,
search: Optional[str] = None,
@@ -46,14 +48,28 @@ class ReservationRepository(BaseRepository[Reservation]):
joinedload(Reservation.user)
).filter(
Reservation.start_time >= start_dt,
Reservation.start_time <= end_dt,
Reservation.status != ReservationStatus.CANCELLED.value
Reservation.start_time <= end_dt
)
if status and status.strip() and status.strip().lower() != 'all':
s_val = status.strip()
query = query.filter(Reservation.status == s_val)
else:
query = query.filter(Reservation.status != ReservationStatus.CANCELLED.value)
if classroom_id:
query = query.filter(Reservation.classroom_id == classroom_id)
if is_hide_virtual:
if only_virtual:
query = query.outerjoin(Classroom, Reservation.classroom_id == Classroom.id).filter(
or_(
Reservation.is_virtual == True,
Classroom.is_virtual == True,
Classroom.code.ilike('%VIRTUAL%'),
Classroom.building.ilike('%VIRTUAL%')
)
)
elif is_hide_virtual:
query = query.outerjoin(Classroom, Reservation.classroom_id == Classroom.id).filter(
or_(
Classroom.id.is_(None),