feat(v3.4.0): support multi-career subjects with subject_careers Many-to-Many and enhance Google Sheets importer for 6 days
This commit is contained in:
@@ -1,6 +1,13 @@
|
||||
from app import db
|
||||
from datetime import datetime
|
||||
|
||||
# Tabla asociativa Many-to-Many para materias compartidas entre carreras
|
||||
subject_careers = db.Table(
|
||||
'subject_careers',
|
||||
db.Column('subject_id', db.Integer, db.ForeignKey('subjects.id', ondelete='CASCADE'), primary_key=True),
|
||||
db.Column('career_id', db.Integer, db.ForeignKey('careers.id', ondelete='CASCADE'), primary_key=True)
|
||||
)
|
||||
|
||||
class Subject(db.Model):
|
||||
__tablename__ = 'subjects'
|
||||
|
||||
@@ -18,9 +25,16 @@ class Subject(db.Model):
|
||||
|
||||
# Relationships
|
||||
commissions = db.relationship('Commission', backref='subject', lazy=True, cascade='all, delete-orphan')
|
||||
careers = db.relationship('Career', secondary=subject_careers, lazy='subquery', backref=db.backref('shared_subjects', lazy=True))
|
||||
|
||||
def to_dict(self):
|
||||
"""Convert subject to dictionary"""
|
||||
all_careers = []
|
||||
if self.careers:
|
||||
all_careers = [{'id': c.id, 'name': c.name, 'code': c.code} for c in self.careers]
|
||||
elif self.career_obj:
|
||||
all_careers = [{'id': self.career_obj.id, 'name': self.career_obj.name, 'code': self.career_obj.code}]
|
||||
|
||||
return {
|
||||
'id': self.id,
|
||||
'code': self.code,
|
||||
@@ -30,6 +44,7 @@ class Subject(db.Model):
|
||||
'credits': self.credits,
|
||||
'career_id': self.career_id,
|
||||
'career_name': self.career_obj.name if self.career_obj else None,
|
||||
'careers': all_careers,
|
||||
'is_active': self.is_active,
|
||||
'is_short_course': bool(self.is_short_course),
|
||||
'created_at': self.created_at.isoformat() if self.created_at else None,
|
||||
@@ -125,10 +140,25 @@ class Commission(db.Model):
|
||||
def career(self):
|
||||
return self.subject.career_obj if self.subject else None
|
||||
|
||||
@property
|
||||
def careers(self):
|
||||
if self.subject and self.subject.careers:
|
||||
return [{'id': c.id, 'name': c.name, 'code': c.code} for c in self.subject.careers]
|
||||
elif self.subject and self.subject.career_obj:
|
||||
return [{'id': self.subject.career_obj.id, 'name': self.subject.career_obj.name, 'code': self.subject.career_obj.code}]
|
||||
return []
|
||||
|
||||
@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_names(self):
|
||||
c_list = self.careers
|
||||
if c_list:
|
||||
return ", ".join([c['name'] for c in c_list])
|
||||
return self.career_name
|
||||
|
||||
@property
|
||||
def career_id(self):
|
||||
return self.subject.career_id if self.subject else None
|
||||
@@ -143,6 +173,8 @@ class Commission(db.Model):
|
||||
'subject_id': self.subject_id,
|
||||
'career_id': self.career_id,
|
||||
'career_name': self.career_name,
|
||||
'career_names': self.career_names,
|
||||
'careers': self.careers,
|
||||
'code': self.code,
|
||||
'semester': self.semester,
|
||||
'year': self.year,
|
||||
|
||||
Reference in New Issue
Block a user