setup update 2

app/models/classroom.py

@@ -5,17 +5,21 @@ class Classroom(db.Model):
     __tablename__ = 'classrooms'
     
     id = db.Column(db.Integer, primary_key=True)
-    code = db.Column(db.String(20), unique=True, nullable=False, index=True)
-    name = db.Column(db.String(100), nullable=False)
-    building = db.Column(db.String(50), 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)
     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(50), default='Main Campus')
     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)
+    @property
+    def code(self):
+        return f"{self.building}-{self.room_number}"
+    
     # Relationships
     reservations = db.relationship('Reservation', backref='classroom', lazy=True, cascade='all, delete-orphan')
     
@@ -27,12 +31,10 @@ class Classroom(db.Model):
         return {
             'id': self.id,
             'code': self.code,
-            'name': self.name,
             'building': self.building,
             '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,
@@ -55,10 +57,10 @@ class ClassroomResource(db.Model):
     brand = db.Column(db.String(100))
     model = db.Column(db.String(100))
     specifications = db.Column(db.Text)
-    quantity = db.Column(db.Integer, default=1)
-    is_functional = db.Column(db.Boolean, default=True)
-    last_maintenance = db.Column(db.DateTime)
+    functional = db.Column(db.Boolean, default=True)
+    last_maintenance_date = db.Column(db.DateTime)
     created_at = db.Column(db.DateTime, default=datetime.utcnow)
+    updated_at = db.Column(db.DateTime, default=datetime.utcnow, onupdate=datetime.utcnow)
     
     def to_dict(self):
         """Convert resource to dictionary"""
@@ -69,9 +71,8 @@ class ClassroomResource(db.Model):
             'brand': self.brand,
             'model': self.model,
             'specifications': self.specifications,
-            'quantity': self.quantity,
-            'is_functional': self.is_functional,
-            'last_maintenance': self.last_maintenance.isoformat() if self.last_maintenance else None,
+            'functional': self.functional,
+            'last_maintenance_date': self.last_maintenance_date.isoformat() if self.last_maintenance_date else None,
             'created_at': self.created_at.isoformat() if self.created_at else None
         }
     

app/models/subject.py

@@ -6,11 +6,11 @@ class Subject(db.Model):
     
     id = db.Column(db.Integer, primary_key=True)
     code = db.Column(db.String(20), unique=True, nullable=False, index=True)
-    name = db.Column(db.String(100), nullable=False)
+    name = db.Column(db.String(200), nullable=False)
     description = db.Column(db.Text)
     department = db.Column(db.String(100), nullable=False)
-    credits = db.Column(db.Integer)
-    duration_minutes = db.Column(db.Integer, default=90)
+    credits = 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_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
@@ -42,18 +42,24 @@ class Commission(db.Model):
     id = db.Column(db.Integer, primary_key=True)
     subject_id = db.Column(db.Integer, db.ForeignKey('subjects.id'), nullable=False)
     code = db.Column(db.String(50), nullable=False)
-    semester = db.Column(db.String(20), nullable=False)  # Fall, Spring, Summer
+    semester = db.Column(db.String(20), nullable=False)
     year = db.Column(db.Integer, nullable=False)
-    teacher_name = db.Column(db.String(100), nullable=False)
-    max_students = db.Column(db.Integer, default=50)
+    teacher_id = db.Column(db.Integer, db.ForeignKey('users.id'))
+    max_students = db.Column(db.Integer, nullable=False)
     current_students = db.Column(db.Integer, default=0)
-    schedule = db.Column(db.String(255))  # e.g., "MWF 9:00-10:30 AM"
+    schedule = db.Column(db.String(255))
     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)
     
     # Relationships
     reservations = db.relationship('Reservation', backref='commission', lazy=True, cascade='all, delete-orphan')
+    teacher = db.relationship('User', backref='teaching_commissions', foreign_keys=[teacher_id])
+    
+    # Virtual field for teacher_name
+    @property
+    def teacher_name(self):
+        return f"{self.teacher.first_name} {self.teacher.last_name}" if self.teacher else "TBD"
     
     # Unique constraint
     __table_args__ = (db.UniqueConstraint('subject_id', 'code', 'semester', 'year'),)

app/models/user.py

@@ -7,14 +7,24 @@ class User(UserMixin, db.Model):
     __tablename__ = 'users'
     
     id = db.Column(db.Integer, primary_key=True)
-    email = db.Column(db.String(120), unique=True, nullable=False, index=True)
+    email = db.Column(db.String(255), unique=True, nullable=False, index=True)
     password_hash = db.Column(db.String(255), nullable=False)
     name = db.Column(db.String(100), nullable=False)
-    role = db.Column(db.String(20), default='admin', nullable=False)  # admin, staff
+    role = db.Column(db.String(50), nullable=False)
     is_active = db.Column(db.Boolean, default=True, nullable=False)
     created_at = db.Column(db.DateTime, default=datetime.utcnow)
     last_login = db.Column(db.DateTime)
     
+    # Virtual fields for future compatibility
+    @property
+    def first_name(self):
+        return self.name.split()[0] if self.name else ''
+    
+    @property
+    def last_name(self):
+        parts = self.name.split()
+        return ' '.join(parts[1:]) if len(parts) > 1 else ''
+    
     # Relationships
     reservations = db.relationship('Reservation', backref='user', lazy=True, cascade='all, delete-orphan')