From c98d85c8105bbde2f4890c68fd13110b396b978b Mon Sep 17 00:00:00 2001
From: Mo8it <mo8it@proton.me>
Date: Sat, 21 Aug 2021 23:18:55 +0200
Subject: [PATCH] Create Assistant if role was added

---
 advlabdb/adminModelViews.py | 12 +++++++-----
 advlabdb/models.py          |  6 ++----
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/advlabdb/adminModelViews.py b/advlabdb/adminModelViews.py
index 0d7373c..dc4bae4 100644
--- a/advlabdb/adminModelViews.py
+++ b/advlabdb/adminModelViews.py
@@ -138,10 +138,6 @@ class UserView(SecureAdminModelView):
                 active_semester=form.active_semester.data,
             )
 
-            if "assistant" in roles:
-                assistant = Assistant(user=model, semester_experiments=form.semester_experiments.data)
-                self.session.add(assistant)
-
             self.on_model_change(form, model, True)
             self.session.commit()
         except Exception as ex:
@@ -150,7 +146,7 @@ class UserView(SecureAdminModelView):
             self.session.rollback()
         else:
             flash(
-                f"{email} registered with roles: {', '.join([role.name for role in form.roles.data])}.",
+                f"{email} registered with roles: {', '.join([role.name for role in model.roles])}.",
                 category="success",
             )
 
@@ -177,6 +173,12 @@ class UserView(SecureAdminModelView):
                     model, password, notify=False
                 )  # Password is automatically hashed with this method
 
+        if model.has_role("assistant") and not model.assistant:
+            semester_experiments = form.semester_experiments.data if form.semester_experiments else None
+
+            assistant = Assistant(user=model, semester_experiments=semester_experiments)
+            self.session.add(assistant)
+
 
 class RoleView(SecureAdminModelView):
     can_create = False
diff --git a/advlabdb/models.py b/advlabdb/models.py
index d2648d5..23c90e2 100644
--- a/advlabdb/models.py
+++ b/advlabdb/models.py
@@ -117,10 +117,8 @@ class PartStudent(db.Model):
         else:
             if current_user.has_role("admin"):
                 if oldFinalPartMark != self.final_part_mark:
-                    if oldFinalPartMark > self.final_part_mark:
-                        category = "danger"
-                    else:
-                        category = "warning"
+                    category = "danger" if oldFinalPartMark > self.final_part_mark else "info"
+
                     flash(
                         f"Final part mark changed for {self} from {oldFinalPartMark} to {self.final_part_mark}.",
                         category,