carlostellocba/admin-edu-space
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix layout

Browse Source
This commit is contained in:
Alejandro Vazquez
2026-04-17 18:14:59 -03:00
parent ffb383554a
commit ec977bf90b
7 changed files with 45 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/routes/schedule.py
+8 -8
View File
@@ -27,7 +27,7 @@ def today_schedule():
).filter(
Reservation.start_time >= today_start,
Reservation.start_time <= today_end,
Reservation.status.in_([ReservationStatus.CONFIRMED, ReservationStatus.PENDING])
Reservation.status.in_([ReservationStatus.CONFIRMED.value, ReservationStatus.PENDING.value])
).order_by(Reservation.start_time).all()
# Create time blocks for timeline view
@@ -49,7 +49,7 @@ def today_schedule():
# Calculate stats
total_reservations = len(reservations)
confirmed = len([r for r in reservations if r.status == ReservationStatus.CONFIRMED])
confirmed = len([r for r in reservations if r.status == ReservationStatus.CONFIRMED.value])
pending = len([r for r in reservations if r.status == ReservationStatus.PENDING])
# Get total classrooms and calculate occupied ones
@@ -158,7 +158,7 @@ def add_reservation():
from app.models.reservation import ReservationStatus
existing_reservation = Reservation.query.filter_by(
classroom_id=form.classroom_id.data,
status=ReservationStatus.CONFIRMED
status=ReservationStatus.CONFIRMED.value
).filter(
Reservation.start_time < form.end_time.data,
Reservation.end_time > form.start_time.data
@@ -177,7 +177,7 @@ def add_reservation():
end_time=form.end_time.data,
purpose=form.purpose.data,
notes=form.notes.data,
status=ReservationStatus.PENDING,
status=ReservationStatus.PENDING.value,
expected_attendees=form.expected_attendees.data
)
@@ -209,11 +209,11 @@ def confirm_reservation(id):
reservation = Reservation.query.get_or_404(id)
# Validación de seguridad: Solo confirmar si está pendiente
if reservation.status != ReservationStatus.PENDING:
if reservation.status != ReservationStatus.PENDING.value:
flash('Only pending reservations can be confirmed.', 'warning')
return redirect(url_for('schedule.today_schedule'))
reservation.status = ReservationStatus.CONFIRMED
reservation.status = ReservationStatus.CONFIRMED.value
db.session.commit()
flash(
@@ -343,7 +343,7 @@ def calendar_data():
).filter(
Reservation.start_time >= start_date,
Reservation.start_time <= end_date,
Reservation.status.in_([ReservationStatus.CONFIRMED, ReservationStatus.PENDING])
Reservation.status.in_([ReservationStatus.CONFIRMED.value, ReservationStatus.PENDING.value])
).order_by(Reservation.start_time).all()
events = []
@@ -384,7 +384,7 @@ def api_today_events():
).filter(
Reservation.start_time >= today_start,
Reservation.start_time <= today_end,
Reservation.status == ReservationStatus.CONFIRMED
Reservation.status == ReservationStatus.CONFIRMED.value
).order_by(Reservation.start_time).all()
events = []