setup update 3

app/models/classroom.py

@@ -5,48 +5,58 @@ class Classroom(db.Model):
     __tablename__ = 'classrooms'
     
     id = db.Column(db.Integer, primary_key=True)
-    campus_id = db.Column(db.Integer, db.ForeignKey('campuses.id'), nullable=False)
+    # campus_id = db.Column(db.Integer, db.ForeignKey('campuses.id'), nullable=False)
     building = db.Column(db.String(100), nullable=False)
-    room_number = db.Column(db.String(50), nullable=False)
+    code = db.Column(db.String(50), nullable=False)  # Changed from room_number
+    name = db.Column(db.String(100), nullable=False)
     floor = db.Column(db.Integer, nullable=False)
     capacity = db.Column(db.Integer, nullable=False)
     description = db.Column(db.Text)
+    campus_location = db.Column(db.String(100))
     is_active = db.Column(db.Boolean, default=True, nullable=False)
     created_at = db.Column(db.DateTime, default=datetime.utcnow)
     updated_at = db.Column(db.DateTime, default=datetime.utcnow, onupdate=datetime.utcnow)
     
-    # Virtual field for code (combination of building and room_number)
+    # Virtual field for compatibility - combines building and code
     @property
-    def code(self):
-        return f"{self.building}-{self.room_number}"
+    def room_number(self):
+        return self.code
     
-    # Relationships
-    reservations = db.relationship('Reservation', backref='classroom', lazy=True, cascade='all, delete-orphan')
+    @room_number.setter
+    def room_number(self, value):
+        self.code = value
     
-    # Resources relationship (教室资源)
-    resources = db.relationship('ClassroomResource', backref='classroom', lazy=True, cascade='all, delete-orphan')
+    # Override code property for consistency
+    @property
+    def code_display(self):
+        return f"{self.building}-{self.code}"
     
     def to_dict(self):
         """Convert classroom to dictionary"""
         return {
             'id': self.id,
-            'code': self.code,
+            'code': self.code_display,
             'building': self.building,
+            'name': self.name,
             'floor': self.floor,
             'capacity': self.capacity,
             'description': self.description,
+            'campus_location': self.campus_location,
             'is_active': self.is_active,
             'created_at': self.created_at.isoformat() if self.created_at else None,
             'updated_at': self.updated_at.isoformat() if self.updated_at else None,
-            'resources': [resource.to_dict() for resource in self.resources]
+            'resources': [resource.to_dict() for resource in self.resources] if hasattr(self, 'resources') else []
         }
     
     def get_full_location(self):
         """Get full classroom location"""
-        return f"{self.building} - Floor {self.floor}"
+        location = f"{self.building} - Floor {self.floor}"
+        if self.campus_location:
+            location += f" ({self.campus_location})"
+        return location
     
     def __repr__(self):
-        return f'<Classroom {self.code}>'
+        return f'<Classroom {self.code_display}>'
 
 class ClassroomResource(db.Model):
     __tablename__ = 'classroom_resources'
@@ -62,6 +72,9 @@ class ClassroomResource(db.Model):
     created_at = db.Column(db.DateTime, default=datetime.utcnow)
     updated_at = db.Column(db.DateTime, default=datetime.utcnow, onupdate=datetime.utcnow)
     
+    # Relationships
+    classroom = db.relationship('Classroom', backref=db.backref('resources', lazy=True, cascade='all, delete-orphan'))
+    
     def to_dict(self):
         """Convert resource to dictionary"""
         return {

app/models/subject.py

@@ -10,7 +10,7 @@ class Subject(db.Model):
     description = db.Column(db.Text)
     department = db.Column(db.String(100), nullable=False)
     credits = db.Column(db.Integer, nullable=False)
-    duration_in_minutes = db.Column(db.Integer, nullable=False)
+    # duration_in_minutes = db.Column(db.Integer, nullable=False)
     is_active = db.Column(db.Boolean, default=True, nullable=False)
     created_at = db.Column(db.DateTime, default=datetime.utcnow)
     updated_at = db.Column(db.DateTime, default=datetime.utcnow, onupdate=datetime.utcnow)
@@ -27,7 +27,7 @@ class Subject(db.Model):
             'description': self.description,
             'department': self.department,
             'credits': self.credits,
-            'duration_minutes': self.duration_in_minutes,
+            # 'duration_minutes': self.duration_in_minutes,
             'is_active': self.is_active,
             'created_at': self.created_at.isoformat() if self.created_at else None,
             'updated_at': self.updated_at.isoformat() if self.updated_at else None
@@ -48,10 +48,19 @@ class Commission(db.Model):
     max_students = db.Column(db.Integer, nullable=False)
     current_students = db.Column(db.Integer, default=0)
     schedule = db.Column(db.String(255))
-    is_active = db.Column(db.Boolean, default=True, nullable=False)
+    active = db.Column(db.Boolean, default=True)  # Changed from is_active to active
     created_at = db.Column(db.DateTime, default=datetime.utcnow)
     updated_at = db.Column(db.DateTime, default=datetime.utcnow, onupdate=datetime.utcnow)
     
+    # Virtual property for compatibility
+    @property
+    def is_active(self):
+        return self.active
+    
+    @is_active.setter
+    def is_active(self, value):
+        self.active = value
+    
     # Relationships
     reservations = db.relationship('Reservation', backref='commission', lazy=True, cascade='all, delete-orphan')
     teacher = db.relationship('User', backref='teaching_commissions', foreign_keys=[teacher_id])
@@ -76,7 +85,7 @@ class Commission(db.Model):
             'max_students': self.max_students,
             'current_students': self.current_students,
             'schedule': self.schedule,
-            'is_active': self.is_active,
+            'active': self.active,
             'created_at': self.created_at.isoformat() if self.created_at else None,
             'updated_at': self.updated_at.isoformat() if self.updated_at else None,
             'subject': self.subject.to_dict() if self.subject else None