Merge pull request #17 from ssciwr/fix_4_full_results_flag_for_use

Add full_results flag to user and display in admin users table
ssciwr · Oct 2, 2024 · bf008fa · bf008fa
2 parents a8a42d8 + 0d94b11
commit bf008fa
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 1 deletion.
diff --git a/backend/src/predicTCR_server/model.py b/backend/src/predicTCR_server/model.py
@@ -71,6 +71,7 @@ class User(db.Model):
     last_submission_timestamp: int = db.Column(db.Integer, nullable=False)
     is_admin: bool = db.Column(db.Boolean, nullable=False)
     is_runner: bool = db.Column(db.Boolean, nullable=False)
+    full_results: bool = db.Column(db.Boolean, nullable=False)
 
     def set_password_nocheck(self, new_password: str):
         self.password_hash = ph.hash(new_password)
@@ -102,6 +103,7 @@ def as_dict(self):
             "last_submission_timestamp": self.last_submission_timestamp,
             "is_admin": self.is_admin,
             "is_runner": self.is_runner,
+            "full_results": self.full_results,
         }
 
 
@@ -238,6 +240,7 @@ def add_new_user(email: str, password: str, is_admin: bool) -> tuple[str, int]:
                 last_submission_timestamp=0,
                 is_admin=is_admin,
                 is_runner=False,
+                full_results=False,
             )
         )
         db.session.commit()
@@ -272,6 +275,7 @@ def add_new_runner_user() -> User | None:
                 last_submission_timestamp=0,
                 is_admin=False,
                 is_runner=True,
+                full_results=False,
             )
         )
         db.session.commit()
@@ -295,7 +299,7 @@ def enable_user(email: str, enabled: bool) -> tuple[str, int]:
     user.activated = True
     user.enabled = enabled
     db.session.commit()
-    return f"Account {email} activated", 200
+    return f"Account {email} activated and enabled", 200
 
 
 def activate_user(token: str) -> tuple[str, int]:

diff --git a/backend/tests/helpers/flask_test_utils.py b/backend/tests/helpers/flask_test_utils.py
@@ -22,6 +22,7 @@ def add_test_users(app):
                     last_submission_timestamp=0,
                     is_admin=is_admin,
                     is_runner=is_runner,
+                    full_results=False,
                 )
             )
             db.session.commit()

diff --git a/frontend/public/splash.png b/frontend/public/splash.png
diff --git a/frontend/src/components/UsersTable.vue b/frontend/src/components/UsersTable.vue
@@ -76,6 +76,7 @@ function disable_user(user_email: string) {
       <fwb-table-head-cell>Email</fwb-table-head-cell>
       <fwb-table-head-cell>Activated</fwb-table-head-cell>
       <fwb-table-head-cell>Enabled</fwb-table-head-cell>
+      <fwb-table-head-cell>Full results</fwb-table-head-cell>
       <fwb-table-head-cell>Quota</fwb-table-head-cell>
       <fwb-table-head-cell>Last submission</fwb-table-head-cell>
       <fwb-table-head-cell>Admin</fwb-table-head-cell>
@@ -91,6 +92,7 @@ function disable_user(user_email: string) {
         <fwb-table-cell>{{ user.email }}</fwb-table-cell>
         <fwb-table-cell>{{ user.activated ? "✓" : "✗" }}</fwb-table-cell>
         <fwb-table-cell>{{ user.enabled ? "✓" : "✗" }}</fwb-table-cell>
+        <fwb-table-cell>{{ user.full_results ? "✓" : "✗" }}</fwb-table-cell>
         <fwb-table-cell>{{ user.quota }}</fwb-table-cell>
         <fwb-table-cell>
           {{

diff --git a/frontend/src/utils/types.ts b/frontend/src/utils/types.ts
@@ -18,4 +18,5 @@ export type User = {
   last_submission_timestamp: number;
   is_admin: boolean;
   is_runner: boolean;
+  full_results: boolean;
 };