feat: optimizacion zocalos aulas, metricas ocupacion dia/semana/mes, modificacion de reservas y permisos RBAC en gestion

app/routes/classrooms.py

@@ -122,13 +122,80 @@ def list_classrooms():
                 )
             )
 
-        classrooms = query.order_by(Classroom.building, Classroom.floor, Classroom.code).paginate(
-            page=page, per_page=12, error_out=False
+        classrooms = query.order_by(Classroom.building_id.asc(), Classroom.floor.asc(), Classroom.code.asc()).paginate(
+            page=page, per_page=20, error_out=False
         )
 
         buildings = Building.query.filter_by(is_active=True).order_by(Building.name.asc()).all()
         floors = [f[0] for f in db.session.query(Classroom.floor).filter(Classroom.is_active==True, Classroom.floor.isnot(None)).distinct().order_by(Classroom.floor.asc()).all()]
 
+        # Fechas y cálculo de métricas de ocupación (Día, Semana, Mes)
+        import calendar
+        from datetime import date, timedelta
+        today = datetime.utcnow().date()
+        today_start = datetime.combine(today, datetime.min.time())
+        today_end = datetime.combine(today, datetime.max.time())
+        
+        week_start = datetime.combine(today - timedelta(days=today.weekday()), datetime.min.time())
+        week_end = datetime.combine(week_start.date() + timedelta(days=6), datetime.max.time())
+        
+        _, last_day = calendar.monthrange(today.year, today.month)
+        month_start = datetime(today.year, today.month, 1, 0, 0, 0)
+        month_end = datetime(today.year, today.month, last_day, 23, 59, 59)
+
+        # Consultar en lote las reservas del mes para las aulas visibles
+        from app.models.reservation import Reservation, ReservationStatus
+        visible_ids = [c.id for c in classrooms.items]
+        month_reservations = Reservation.query.filter(
+            Reservation.classroom_id.in_(visible_ids),
+            Reservation.start_time >= month_start,
+            Reservation.start_time <= month_end,
+            Reservation.status.in_([ReservationStatus.CONFIRMED.value, ReservationStatus.PENDING.value])
+        ).all() if visible_ids else []
+
+        # Horas base operativas académicas:
+        # Día: 15 hs (07:00 a 22:00 = 900 min)
+        # Semana: 6 días x 15 hs = 5400 min
+        # Mes: ~24 días hábiles x 15 hs = 21600 min
+        DAILY_OP_MINS = 15 * 60
+        WEEKLY_OP_MINS = 6 * 15 * 60
+        MONTHLY_OP_MINS = 24 * 15 * 60
+
+        occupancy_metrics = {}
+        for c in classrooms.items:
+            c_res = [r for r in month_reservations if r.classroom_id == c.id]
+            
+            # Día
+            day_res = [r for r in c_res if today_start <= r.start_time <= today_end]
+            day_mins = sum((min(r.end_time, today_end) - max(r.start_time, today_start)).total_seconds() / 60 for r in day_res)
+            day_pct = min(100, int(round((day_mins / DAILY_OP_MINS) * 100))) if not c.is_virtual else len(day_res)
+            
+            # Semana
+            week_res = [r for r in c_res if week_start <= r.start_time <= week_end]
+            week_mins = sum((min(r.end_time, week_end) - max(r.start_time, week_start)).total_seconds() / 60 for r in week_res)
+            week_pct = min(100, int(round((week_mins / WEEKLY_OP_MINS) * 100))) if not c.is_virtual else len(week_res)
+            
+            # Mes
+            month_mins = sum((min(r.end_time, month_end) - max(r.start_time, month_start)).total_seconds() / 60 for r in c_res)
+            month_pct = min(100, int(round((month_mins / MONTHLY_OP_MINS) * 100))) if not c.is_virtual else len(c_res)
+            
+            occupancy_metrics[c.id] = {
+                'day_pct': day_pct,
+                'day_count': len(day_res),
+                'week_pct': week_pct,
+                'week_count': len(week_res),
+                'month_pct': month_pct,
+                'month_count': len(c_res)
+            }
+
+        date_filters = {
+            'today': today.strftime('%Y-%m-%d'),
+            'week_start': week_start.strftime('%Y-%m-%d'),
+            'week_end': week_end.strftime('%Y-%m-%d'),
+            'month_start': month_start.strftime('%Y-%m-%d'),
+            'month_end': month_end.strftime('%Y-%m-%d')
+        }
+
         return render_template('classrooms/list.html', 
                              classrooms=classrooms, 
                              buildings=buildings,
@@ -137,6 +204,8 @@ def list_classrooms():
                              floor_filter=floor_filter,
                              active_only=active_only,
                              search=search,
+                             occupancy_metrics=occupancy_metrics,
+                             date_filters=date_filters,
                              title='Classrooms')
 
     except Exception as e: