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:
@@ -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
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user