feat: modularize dashboard templates by roles, fix google sheets import error, fix bedelia virtual classrooms, update constitution to v3.4.1
This commit is contained in:
@@ -6,7 +6,7 @@ from flask_babel import Babel, gettext as _
|
||||
from config.config import Config
|
||||
|
||||
# Initialize extensions
|
||||
__version__ = "3.4.0"
|
||||
__version__ = "3.4.1"
|
||||
db = SQLAlchemy()
|
||||
migrate = Migrate()
|
||||
cors = CORS()
|
||||
|
||||
@@ -291,6 +291,57 @@ def get_stats():
|
||||
commissions_assigned_month = [build_comm_item(comm, res_map_comm_month[comm.id]) for comm in all_active_commissions if comm.id in res_map_comm_month]
|
||||
commissions_unassigned_month = [build_comm_item(comm, []) for comm in all_active_commissions if comm.id not in res_map_comm_month]
|
||||
|
||||
# Identificar comisiones en modalidad virtual (por enlace Meet/Teams/Zoom o asignadas a Campus Virtual)
|
||||
virtual_room_ids = set(c.id for c in virtual_classrooms_list)
|
||||
comm_ids_virtual = set()
|
||||
for comm in all_active_commissions:
|
||||
if comm.virtual_link and comm.virtual_link.strip():
|
||||
comm_ids_virtual.add(comm.id)
|
||||
if virtual_room_ids:
|
||||
comm_in_virtual_res = set(
|
||||
r[0] for r in db.session.query(Reservation.commission_id).filter(
|
||||
Reservation.classroom_id.in_(virtual_room_ids),
|
||||
Reservation.commission_id.isnot(None)
|
||||
).distinct().all()
|
||||
)
|
||||
comm_ids_virtual.update(comm_in_virtual_res)
|
||||
|
||||
virtual_rooms_data = []
|
||||
for comm in all_active_commissions:
|
||||
if comm.id in comm_ids_virtual:
|
||||
res_today = res_map_comm_today.get(comm.id, [])
|
||||
res_week = res_map_comm_week.get(comm.id, [])
|
||||
res_month = res_map_comm_month.get(comm.id, [])
|
||||
v_link = comm.virtual_link or (res_today[0].virtual_link if res_today and res_today[0].virtual_link else '')
|
||||
virtual_rooms_data.append({
|
||||
'id': comm.id,
|
||||
'commission_id': comm.id,
|
||||
'code': comm.code,
|
||||
'full_code': comm.get_full_code(),
|
||||
'subject_name': comm.subject.name if comm.subject else 'Sin materia',
|
||||
'subject_code': comm.subject.code if comm.subject else '',
|
||||
'career_name': comm.subject.career.name if (comm.subject and comm.subject.career) else 'UniCABA',
|
||||
'teacher_name': comm.teacher_name or 'Docente a confirmar',
|
||||
'schedule': comm.schedule or 'Horario regular',
|
||||
'shift': comm.shift or 'Tarde',
|
||||
'max_students': comm.max_students or 35,
|
||||
'capacity': comm.max_students or 35,
|
||||
'virtual_link': v_link,
|
||||
'is_virtual': True,
|
||||
'building': 'Campus Virtual',
|
||||
'floor': 'Remoto ∞',
|
||||
'today_classes': len(res_today),
|
||||
'week_classes': len(res_week),
|
||||
'month_classes': len(res_month),
|
||||
'res_count': len(res_month),
|
||||
'is_active_today': len(res_today) > 0,
|
||||
'assigned_summary': f"{comm.subject.name if comm.subject else 'Clase Virtual'} ({comm.schedule or 'Remoto'})"
|
||||
})
|
||||
|
||||
# Las salas virtuales disponibles corresponden a las salas de comisiones virtuales activas o catálogo virtual
|
||||
if virtual_rooms_data:
|
||||
virtual_classrooms = len(virtual_rooms_data)
|
||||
|
||||
# Comisiones huérfanas generales (sin ninguna reserva histórica ni link virtual)
|
||||
comm_ids_with_any_res = set(
|
||||
r[0] for r in db.session.query(Reservation.commission_id).filter(
|
||||
@@ -380,7 +431,9 @@ def get_stats():
|
||||
'unassigned_pct': round((len(commissions_unassigned_month) / max(1, total_active_commissions)) * 100, 1),
|
||||
'total': total_active_commissions
|
||||
}
|
||||
}
|
||||
},
|
||||
'virtual_rooms': virtual_rooms_data,
|
||||
'virtual_rooms_count': len(virtual_rooms_data)
|
||||
}
|
||||
|
||||
except Exception as e:
|
||||
@@ -468,7 +521,9 @@ def get_stats():
|
||||
'unassigned_commissions_general': unassigned_commissions_general,
|
||||
'available_classrooms_today': available_classrooms_today,
|
||||
'available_classrooms_week': available_classrooms_week,
|
||||
'available_classrooms_month': available_classrooms_month
|
||||
'available_classrooms_month': available_classrooms_month,
|
||||
'virtual_rooms': virtual_rooms_data,
|
||||
'virtual_rooms_count': len(virtual_rooms_data)
|
||||
}
|
||||
}), 200
|
||||
|
||||
|
||||
@@ -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.4.0"
|
||||
"version": "3.4.1"
|
||||
},
|
||||
"servers": [
|
||||
{
|
||||
|
||||
+1
-1
@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
|
||||
|
||||
setup(
|
||||
name="edu-space-admin",
|
||||
version="3.4.0",
|
||||
version="3.4.1",
|
||||
description="Administrative interface for Edu-Space Classroom Management System",
|
||||
author="Edu-Space Development Team",
|
||||
author_email="admin@edu-space.com",
|
||||
|
||||
Reference in New Issue
Block a user