fix(v3.4.6): fix reservation cascade, remove calendar mocks, strip auto meet links, friendly dates, dynamic building floors and career filter

This commit is contained in:
2026-10-08 08:26:15 -03:00
parent 25039efdeb
commit 368dc71b14
23 changed files with 291 additions and 149 deletions
+6 -7
View File
@@ -7,6 +7,7 @@ from app.models.role import Role, Permission, SYSTEM_MODULES
from app.models.subject import Subject, Commission, CommissionTeacher
from app.models.career import Career
from app.models.classroom import Classroom
from app.models.building import Building
from app.models.reservation import Reservation, ReservationStatus
from app.models.academic_term import AcademicTerm
from app.models.milestone import MilestoneType, AcademicMilestone
@@ -218,7 +219,6 @@ def get_commissions():
commissions = query.order_by(Commission.id.asc()).all()
subjects = Subject.query.order_by(Subject.name.asc()).all()
from app.models.career import Career
careers = Career.query.order_by(Career.name.asc()).all()
careers_data = [{'id': cr.id, 'name': cr.name, 'code': cr.code} for cr in careers]
@@ -938,11 +938,7 @@ def create_commission():
if not subject:
return jsonify({'error': 'NotFound', 'message': f'La asignatura con ID {subject_id} no existe.'}), 404
# Generar enlace automático si no fue provisto
if not virtual_link:
s_clean = re.sub(r'[^a-zA-Z0-9]', '', subject.code).lower()[:6] or 'subj'
c_clean = re.sub(r'[^a-zA-Z0-9]', '', code).lower()[:4] or 'c1'
virtual_link = f"https://meet.google.com/edu-{s_clean}-{c_clean}"
virtual_link = (virtual_link or '').strip() or None
existing = Commission.query.filter_by(
subject_id=int(subject_id),
@@ -2518,10 +2514,13 @@ def get_building(id):
building = Building.query.get(id)
if not building:
return jsonify({'error': 'NotFound', 'message': f'Edificio con ID {id} no encontrado.'}), 404
classrooms = Classroom.query.filter(
db.or_(Classroom.building_id == id, Classroom.building == building.name)
).order_by(Classroom.floor.asc(), Classroom.code.asc()).all()
return jsonify({
'status': 'success',
'building': building.to_dict(),
'classrooms': [c.to_dict() for c in building.classrooms]
'classrooms': [c.to_dict() for c in classrooms]
}), 200
+1 -1
View File
@@ -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.5"
"version": "3.4.6"
},
"servers": [
{
+3
View File
@@ -86,6 +86,9 @@ def list_reservations():
'purpose': r.purpose,
'subject_name': r.subject_name,
'subject_code': r.subject_code,
'career_name': r.commission.career_name if (r.commission and hasattr(r.commission, 'career_name')) else '',
'career_names': r.commission.career_names if (r.commission and hasattr(r.commission, 'career_names')) else '',
'commission_code': r.commission.code if r.commission else '',
'status': str(r.status.value if hasattr(r.status, 'value') else r.status),
'shift': r.shift or 'Mañana',
'virtual_link': r.virtual_link,