fix(dashboard): resolver metricas reales, endpoints profile y descriptor classmethod v3.6.2
This commit is contained in:
@@ -151,6 +151,29 @@ def get_stats():
|
||||
upcoming_reservations = [serialize_reservation(r) for r in upcoming_reservations_q]
|
||||
milestones = [serialize_milestone(m) for m in milestones_q]
|
||||
|
||||
jwt_user = getattr(g, 'jwt_user', None)
|
||||
user_id = getattr(jwt_user, 'id', None)
|
||||
|
||||
my_today_count = 0
|
||||
my_total_reservations = 0
|
||||
my_today_classes = []
|
||||
if user_id:
|
||||
my_today_q = Reservation.query.filter(
|
||||
Reservation.user_id == user_id,
|
||||
func.date(Reservation.start_time) == today,
|
||||
Reservation.status != 'CANCELLED'
|
||||
).order_by(Reservation.start_time.asc()).all()
|
||||
my_today_count = len(my_today_q)
|
||||
my_today_classes = [serialize_reservation(r) for r in my_today_q]
|
||||
my_total_reservations = Reservation.query.filter(
|
||||
Reservation.user_id == user_id,
|
||||
Reservation.status.in_(['CONFIRMED', 'PENDING'])
|
||||
).count()
|
||||
else:
|
||||
my_today_count = today_reservations
|
||||
my_total_reservations = len(today_reservations_q)
|
||||
my_today_classes = today_schedule_list[:5]
|
||||
|
||||
# ---- Bedelía: Filtros completos de Aulas y Comisiones por Día (Hoy), Mañana, Semana y Mes ----
|
||||
import calendar
|
||||
today_dt = datetime.utcnow()
|
||||
@@ -564,12 +587,16 @@ def get_stats():
|
||||
'unassigned_today_classrooms': unassigned_today_count,
|
||||
'unassigned_today_pct': unassigned_today_pct,
|
||||
'total_active_commissions': total_active_commissions,
|
||||
'tomorrow_reservations': len(tomorrow_reservations_q) if 'tomorrow_reservations_q' in locals() else 0
|
||||
'tomorrow_reservations': len(tomorrow_reservations_q) if 'tomorrow_reservations_q' in locals() else 0,
|
||||
'my_today_count': my_today_count,
|
||||
'my_total_reservations': my_total_reservations,
|
||||
'virtual_rooms_count': virtual_classrooms
|
||||
},
|
||||
'audit_logs': audit_data,
|
||||
'monthly_data': monthly_data,
|
||||
'pending_reservations': pending_reservations,
|
||||
'today_schedule_list': today_schedule_list,
|
||||
'my_today_classes': my_today_classes,
|
||||
'tomorrow_schedule_list': tomorrow_schedule_list if 'tomorrow_schedule_list' in locals() else [],
|
||||
'week_schedule_list': week_schedule_list,
|
||||
'upcoming_reservations': upcoming_reservations,
|
||||
|
||||
@@ -7,7 +7,7 @@ OPENAPI_SPEC = {
|
||||
"info": {
|
||||
"title": "Edu-Space REST API",
|
||||
"description": "Enterprise Academic & Physical Space Management REST API with JWT Authentication and Role-Based Access Control.",
|
||||
"version": "3.6.1"
|
||||
"version": "3.6.2"
|
||||
},
|
||||
"servers": [
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user