04/27 Fixed some issues

app/models/user.py

@@ -5,7 +5,8 @@ from app.utils.time_utils import now_eastern
 
 @login_manager.user_loader
 def load_user(user_id):
-    return User.query.get(int(user_id))
+    from app import db
+    return db.session.get(User, int(user_id))
 
 class User(UserMixin, db.Model):
     __tablename__ = 'users'
@@ -16,10 +17,9 @@ class User(UserMixin, db.Model):
     email         = db.Column(db.String(255), unique=True, nullable=False, index=True)
     password_hash = db.Column(db.String(255), nullable=False)
     role          = db.Column(
-        # 'supervisor' retained temporarily so the Enum is valid before the
-        # migration UPDATE runs.  The migration removes it after all rows are
-        # updated to 'director'.
-        db.Enum('admin', 'supervisor', 'director', 'inspector', 'project_manager', 'customer'),
+        # Phase 11 migration complete — 'supervisor' removed from both the DB
+        # ENUM and this Python-side declaration.  Director is the canonical role.
+        db.Enum('admin', 'director', 'inspector', 'project_manager', 'customer'),
         nullable=False
     )
     created_at    = db.Column(db.DateTime, default=now_eastern)