feat(bedelia): associate careers to commissions and subjects, clean dashboard mock fallbacks, and update SSD documentation

This commit is contained in:
2026-10-07 17:02:56 -03:00
parent 1e6f493358
commit 8dc055cd1e
18 changed files with 564 additions and 318 deletions
+19
View File
@@ -36,6 +36,11 @@ class Subject(db.Model):
'updated_at': self.updated_at.isoformat() if self.updated_at else None
}
@property
def career(self):
"""Helper to access career_obj directly"""
return self.career_obj
def __repr__(self):
return f'<Subject {self.code}>'
@@ -116,6 +121,18 @@ class Commission(db.Model):
return "Sin asignar"
return ", ".join([f"{t['name']} ({t['role']})" for t in t_list])
@property
def career(self):
return self.subject.career_obj if self.subject else None
@property
def career_name(self):
return self.subject.career_obj.name if (self.subject and self.subject.career_obj) else 'Carrera General'
@property
def career_id(self):
return self.subject.career_id if self.subject else None
# Unique constraint
__table_args__ = (db.UniqueConstraint('subject_id', 'code', 'semester', 'year'),)
@@ -124,6 +141,8 @@ class Commission(db.Model):
return {
'id': self.id,
'subject_id': self.subject_id,
'career_id': self.career_id,
'career_name': self.career_name,
'code': self.code,
'semester': self.semester,
'year': self.year,
+14 -5
View File
@@ -182,12 +182,15 @@ def get_careers():
def get_commissions():
search = request.args.get('search', '').strip().lower()
subject_id = request.args.get('subject_id', type=int)
career_id = request.args.get('career_id', type=int)
shift = request.args.get('shift', '').strip()
active = request.args.get('active', '').strip().lower()
query = Commission.query
if subject_id:
query = query.filter(Commission.subject_id == subject_id)
if career_id:
query = query.join(Subject, Commission.subject_id == Subject.id).filter(Subject.career_id == career_id)
if shift:
query = query.filter(Commission.shift == shift)
if active == 'true':
@@ -198,6 +201,10 @@ 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]
commissions_data = []
for c in commissions:
if search:
@@ -206,9 +213,8 @@ def get_commissions():
if search not in s_name and search not in c_code:
continue
career_name = 'Carrera General'
if c.subject and hasattr(c.subject, 'career') and c.subject.career:
career_name = c.subject.career.name
career_name = c.career_name if hasattr(c, 'career_name') else 'Carrera General'
career_id_val = c.career_id if hasattr(c, 'career_id') else (c.subject.career_id if c.subject else None)
commissions_data.append({
'id': c.id,
@@ -217,6 +223,7 @@ def get_commissions():
'subject_id': c.subject_id,
'subject_name': c.subject.name if c.subject else 'Sin materia',
'subject_code': c.subject.code if c.subject else '-',
'career_id': career_id_val,
'career_name': career_name,
'semester': getattr(c, 'semester', '1C') or '1C',
'year': getattr(c, 'year', 2026) or 2026,
@@ -235,11 +242,12 @@ def get_commissions():
subjects_data = []
for s in subjects:
c_name = s.career.name if (hasattr(s, 'career') and s.career) else 'Carrera General'
c_name = s.career_obj.name if (hasattr(s, 'career_obj') and s.career_obj) else 'Carrera General'
subjects_data.append({
'id': s.id,
'name': s.name,
'code': s.code,
'career_id': s.career_id,
'career': c_name,
'career_name': c_name
})
@@ -253,7 +261,8 @@ def get_commissions():
'total': len(commissions_data),
'commissions': commissions_data,
'subjects': subjects_data,
'academic_terms': terms_data
'academic_terms': terms_data,
'careers': careers_data
}), 200
# ---------------------------------------------------------