User and Assistant harmony

advlabdb/adminModelViews.py

@@ -38,6 +38,10 @@ from advlabdb.utils import (
 )
 
 
+def semesterExperimentQueryFactory():
+    return SemesterExperiment.query.filter(SemesterExperiment.semester == userActiveSemester())
+
+
 class UserView(SecureAdminModelView):
     class CreateForm(Form):
         def roleQueryFactory():
@@ -56,6 +60,22 @@ class UserView(SecureAdminModelView):
             validators=[DataRequired()],
             default=[Role.query.filter(Role.name == "assistant").first()],
         )
+
+        first_name = TextField("First Name", validators=[DataRequired()])
+        last_name = TextField("Last Name", validators=[DataRequired()])
+        phone_number = TextField("Phone Number")
+        mobile_phone_number = TextField("Mobile Phone Number")
+        room = TextField("Room")
+        building = TextField("Building")
+
+        semester_experiments = QuerySelectMultipleField(
+            "Semester Experiments",
+            query_factory=semesterExperimentQueryFactory,
+            allow_blank=True,
+            blank_text="-",
+            description="Only needed if the user has the assistant role",
+        )
+
         active = BooleanField("Active", default=True)
         active_semester = QuerySelectField(
             "Active Semester",
@@ -66,15 +86,25 @@ class UserView(SecureAdminModelView):
         )
 
     class EditForm(CreateForm):
+        semester_experiments = None
+
         generate_new_password = BooleanField("Generate new random password", default=False)
 
     form = EditForm
 
     can_view_details = True
 
-    column_list = ["email", "active", "roles", "assistant", "active_semester"]
+    column_list = ["first_name", "last_name", "email", "active", "roles", "assistant", "active_semester"]
-    column_searchable_list = ["email"]
+    column_details_list = column_list + [
-    column_filters = ["active", "active_semester", "assistant"]
+        "phone_number",
+        "mobile_phone_number",
+        "room",
+        "building",
+        "create_datetime",
+        "update_datetime",
+    ]
+    column_searchable_list = ["first_name", "last_name", "email"]
+    column_filters = ["active", "active_semester"]
     column_editable_list = ["active"]
 
     def create_form(self, obj=None):
@@ -94,9 +124,23 @@ class UserView(SecureAdminModelView):
             roles = [role.name for role in form.roles.data]
 
             model = user_datastore.create_user(
-                email=email, password=hashedPassword, roles=roles, active_semester=form.active_semester.data
+                email=email,
+                password=hashedPassword,
+                roles=roles,
+                first_name=form.first_name.data,
+                last_name=form.last_name.data,
+                phone_number=form.phone_number.data,
+                mobile_phone_number=form.mobile_phone_number.data,
+                room=form.room.data,
+                building=form.building.data,
+                active=form.active.data,
+                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:
@@ -439,18 +483,18 @@ class AssistantView(SecureAdminModelView):
 
     can_view_details = True
 
-    column_list = ["first_name", "last_name", "user", "semester_experiments"]
+    column_list = ["user.first_name", "user.last_name", "user", "semester_experiments"]
     column_details_list = column_list + [
-        "phone_number",
+        "user.phone_number",
-        "mobile_phone_number",
+        "user.mobile_phone_number",
-        "room",
+        "user.room",
-        "building",
+        "user.building",
         "appointments",
         "experiment_marks",
     ]
-    column_searchable_list = ["first_name", "last_name", "user.email"]
+    column_searchable_list = ["user.first_name", "user.last_name", "user.email"]
     column_filters = ["user.active"]
-    form_excluded_columns = ["experiment_marks", "appointments", "semester_experiments", "user"]
+    form_excluded_columns = ["experiment_marks", "appointments"]
 
     form_extra_fields = {
         "user": QuerySelectField(
@@ -459,7 +503,13 @@ class AssistantView(SecureAdminModelView):
             validators=[DataRequired()],
             allow_blank=True,
             blank_text="-",
-        )
+        ),
+        "semester_experiments": QuerySelectMultipleField(
+            "Semester Experiments",
+            query_factory=semesterExperimentQueryFactory,
+            allow_blank=True,
+            blank_text="-",
+        ),
     }
 
 
@@ -468,9 +518,6 @@ assistantBlankText = "Auto assign if experiment has only one assistant"
 
 class GroupExperimentView(SecureAdminModelView):
     class CreateForm(Form):
-        def semesterExperimentQueryFactory():
-            return SemesterExperiment.query.filter(SemesterExperiment.semester == userActiveSemester())
-
         group = QuerySelectField(
             "Group",
             query_factory=groupQueryFactory,
@@ -566,7 +613,7 @@ class AppointmentView(SecureAdminModelView):
         "special",
         "group_experiment.group",
         "group_experiment.semester_experiment.experiment",
-        "assistant",
+        "assistant.user",
     ]
     column_editable_list = ["date", "special"]
 
@@ -648,8 +695,8 @@ class ExperimentMarkView(SecureAdminModelView):
         "group_experiment.group",
         "group_experiment.semester_experiment.semester",
         "group_experiment.semester_experiment.experiment",
-        "assistant",
         "edited_by_admin",
+        "assistant.user",
     ]
     column_default_sort = [("oral_mark", False), ("protocol_mark", False)]
 
@@ -708,11 +755,11 @@ adminSpace.add_view(AppointmentView(Appointment, db.session))
 adminSpace.add_view(ExperimentMarkView(ExperimentMark, db.session))
 adminSpace.add_view(ExperimentView(Experiment, db.session))
 adminSpace.add_view(SemesterExperimentView(SemesterExperiment, db.session))
-adminSpace.add_view(AssistantView(Assistant, db.session))
-adminSpace.add_view(ProgramView(Program, db.session))
-adminSpace.add_view(PartView(Part, db.session))
 adminSpace.add_view(SemesterView(Semester, db.session))
+adminSpace.add_view(PartView(Part, db.session))
+adminSpace.add_view(AssistantView(Assistant, db.session))
 adminSpace.add_view(UserView(User, db.session))
 adminSpace.add_view(RoleView(Role, db.session))
+adminSpace.add_view(ProgramView(Program, db.session))
 
 initActiveSemesterMenuLinks(adminSpace)

advlabdb/models.py

@@ -248,12 +248,6 @@ class SemesterExperiment(db.Model):
 
 class Assistant(db.Model):
     id = db.Column(db.Integer, primary_key=True)
-    first_name = db.Column(db.String(100), nullable=False)
-    last_name = db.Column(db.String(100), nullable=False)
-    phone_number = db.Column(db.String(50), nullable=True)
-    mobile_phone_number = db.Column(db.String(50), nullable=True)
-    room = db.Column(db.String(100), nullable=True)
-    building = db.Column(db.String(100), nullable=True)
 
     user_id = db.Column(db.Integer, db.ForeignKey("user.id"), nullable=False, unique=True)
 
@@ -261,7 +255,7 @@ class Assistant(db.Model):
     experiment_marks = db.relationship("ExperimentMark", backref="assistant", lazy=True)
 
     def repr(self):
-        return f"{self.first_name} {self.last_name}"
+        return f"{self.user.first_name} {self.user.last_name}"
 
     def __repr__(self):
         return f"<ASST: {self.repr()}>"
@@ -411,12 +405,19 @@ class ExperimentMark(db.Model):
 
 
 class User(db.Model, FsUserMixin):
+    first_name = db.Column(db.String(100), nullable=False)
+    last_name = db.Column(db.String(100), nullable=False)
+    phone_number = db.Column(db.String(50), nullable=True)
+    mobile_phone_number = db.Column(db.String(50), nullable=True)
+    room = db.Column(db.String(100), nullable=True)
+    building = db.Column(db.String(100), nullable=True)
+
     active_semester_id = db.Column(db.Integer, db.ForeignKey("semester.id"), nullable=True)
 
     assistant = db.relationship("Assistant", backref="user", lazy=True, uselist=False)
 
     def repr(self):
-        return f"{self.email}"
+        return f"{self.first_name} {self.last_name}"
 
     def __repr__(self):
         return f"<USR {self.repr()}>"

poetry.lock

@@ -538,12 +538,22 @@ jinja2 = [
     {file = "Jinja2-3.0.1.tar.gz", hash = "sha256:703f484b47a6af502e743c9122595cc812b0271f661722403114f71a79d0f5a4"},
 ]
 markupsafe = [
+    {file = "MarkupSafe-2.0.1-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:d8446c54dc28c01e5a2dbac5a25f071f6653e6e40f3a8818e8b45d790fe6ef53"},
+    {file = "MarkupSafe-2.0.1-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:36bc903cbb393720fad60fc28c10de6acf10dc6cc883f3e24ee4012371399a38"},
+    {file = "MarkupSafe-2.0.1-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:2d7d807855b419fc2ed3e631034685db6079889a1f01d5d9dac950f764da3dad"},
+    {file = "MarkupSafe-2.0.1-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:add36cb2dbb8b736611303cd3bfcee00afd96471b09cda130da3581cbdc56a6d"},
+    {file = "MarkupSafe-2.0.1-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:168cd0a3642de83558a5153c8bd34f175a9a6e7f6dc6384b9655d2697312a646"},
+    {file = "MarkupSafe-2.0.1-cp310-cp310-win32.whl", hash = "sha256:99df47edb6bda1249d3e80fdabb1dab8c08ef3975f69aed437cb69d0a5de1e28"},
+    {file = "MarkupSafe-2.0.1-cp310-cp310-win_amd64.whl", hash = "sha256:e0f138900af21926a02425cf736db95be9f4af72ba1bb21453432a07f6082134"},
     {file = "MarkupSafe-2.0.1-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:f9081981fe268bd86831e5c75f7de206ef275defcb82bc70740ae6dc507aee51"},
     {file = "MarkupSafe-2.0.1-cp36-cp36m-manylinux1_i686.whl", hash = "sha256:0955295dd5eec6cb6cc2fe1698f4c6d84af2e92de33fbcac4111913cd100a6ff"},
     {file = "MarkupSafe-2.0.1-cp36-cp36m-manylinux1_x86_64.whl", hash = "sha256:0446679737af14f45767963a1a9ef7620189912317d095f2d9ffa183a4d25d2b"},
     {file = "MarkupSafe-2.0.1-cp36-cp36m-manylinux2010_i686.whl", hash = "sha256:f826e31d18b516f653fe296d967d700fddad5901ae07c622bb3705955e1faa94"},
     {file = "MarkupSafe-2.0.1-cp36-cp36m-manylinux2010_x86_64.whl", hash = "sha256:fa130dd50c57d53368c9d59395cb5526eda596d3ffe36666cd81a44d56e48872"},
     {file = "MarkupSafe-2.0.1-cp36-cp36m-manylinux2014_aarch64.whl", hash = "sha256:905fec760bd2fa1388bb5b489ee8ee5f7291d692638ea5f67982d968366bef9f"},
+    {file = "MarkupSafe-2.0.1-cp36-cp36m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:bf5d821ffabf0ef3533c39c518f3357b171a1651c1ff6827325e4489b0e46c3c"},
+    {file = "MarkupSafe-2.0.1-cp36-cp36m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:0d4b31cc67ab36e3392bbf3862cfbadac3db12bdd8b02a2731f509ed5b829724"},
+    {file = "MarkupSafe-2.0.1-cp36-cp36m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:baa1a4e8f868845af802979fcdbf0bb11f94f1cb7ced4c4b8a351bb60d108145"},
     {file = "MarkupSafe-2.0.1-cp36-cp36m-win32.whl", hash = "sha256:6c4ca60fa24e85fe25b912b01e62cb969d69a23a5d5867682dd3e80b5b02581d"},
     {file = "MarkupSafe-2.0.1-cp36-cp36m-win_amd64.whl", hash = "sha256:b2f4bf27480f5e5e8ce285a8c8fd176c0b03e93dcc6646477d4630e83440c6a9"},
     {file = "MarkupSafe-2.0.1-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:0717a7390a68be14b8c793ba258e075c6f4ca819f15edfc2a3a027c823718567"},
@@ -552,14 +562,21 @@ markupsafe = [
     {file = "MarkupSafe-2.0.1-cp37-cp37m-manylinux2010_i686.whl", hash = "sha256:d7f9850398e85aba693bb640262d3611788b1f29a79f0c93c565694658f4071f"},
     {file = "MarkupSafe-2.0.1-cp37-cp37m-manylinux2010_x86_64.whl", hash = "sha256:6a7fae0dd14cf60ad5ff42baa2e95727c3d81ded453457771d02b7d2b3f9c0c2"},
     {file = "MarkupSafe-2.0.1-cp37-cp37m-manylinux2014_aarch64.whl", hash = "sha256:b7f2d075102dc8c794cbde1947378051c4e5180d52d276987b8d28a3bd58c17d"},
+    {file = "MarkupSafe-2.0.1-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:e9936f0b261d4df76ad22f8fee3ae83b60d7c3e871292cd42f40b81b70afae85"},
+    {file = "MarkupSafe-2.0.1-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:2a7d351cbd8cfeb19ca00de495e224dea7e7d919659c2841bbb7f420ad03e2d6"},
+    {file = "MarkupSafe-2.0.1-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:60bf42e36abfaf9aff1f50f52644b336d4f0a3fd6d8a60ca0d054ac9f713a864"},
     {file = "MarkupSafe-2.0.1-cp37-cp37m-win32.whl", hash = "sha256:a30e67a65b53ea0a5e62fe23682cfe22712e01f453b95233b25502f7c61cb415"},
     {file = "MarkupSafe-2.0.1-cp37-cp37m-win_amd64.whl", hash = "sha256:611d1ad9a4288cf3e3c16014564df047fe08410e628f89805e475368bd304914"},
+    {file = "MarkupSafe-2.0.1-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:5bb28c636d87e840583ee3adeb78172efc47c8b26127267f54a9c0ec251d41a9"},
     {file = "MarkupSafe-2.0.1-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:be98f628055368795d818ebf93da628541e10b75b41c559fdf36d104c5787066"},
     {file = "MarkupSafe-2.0.1-cp38-cp38-manylinux1_i686.whl", hash = "sha256:1d609f577dc6e1aa17d746f8bd3c31aa4d258f4070d61b2aa5c4166c1539de35"},
     {file = "MarkupSafe-2.0.1-cp38-cp38-manylinux1_x86_64.whl", hash = "sha256:7d91275b0245b1da4d4cfa07e0faedd5b0812efc15b702576d103293e252af1b"},
     {file = "MarkupSafe-2.0.1-cp38-cp38-manylinux2010_i686.whl", hash = "sha256:01a9b8ea66f1658938f65b93a85ebe8bc016e6769611be228d797c9d998dd298"},
     {file = "MarkupSafe-2.0.1-cp38-cp38-manylinux2010_x86_64.whl", hash = "sha256:47ab1e7b91c098ab893b828deafa1203de86d0bc6ab587b160f78fe6c4011f75"},
     {file = "MarkupSafe-2.0.1-cp38-cp38-manylinux2014_aarch64.whl", hash = "sha256:97383d78eb34da7e1fa37dd273c20ad4320929af65d156e35a5e2d89566d9dfb"},
+    {file = "MarkupSafe-2.0.1-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:6fcf051089389abe060c9cd7caa212c707e58153afa2c649f00346ce6d260f1b"},
+    {file = "MarkupSafe-2.0.1-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:5855f8438a7d1d458206a2466bf82b0f104a3724bf96a1c781ab731e4201731a"},
+    {file = "MarkupSafe-2.0.1-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:3dd007d54ee88b46be476e293f48c85048603f5f516008bee124ddd891398ed6"},
     {file = "MarkupSafe-2.0.1-cp38-cp38-win32.whl", hash = "sha256:023cb26ec21ece8dc3907c0e8320058b2e0cb3c55cf9564da612bc325bed5e64"},
     {file = "MarkupSafe-2.0.1-cp38-cp38-win_amd64.whl", hash = "sha256:984d76483eb32f1bcb536dc27e4ad56bba4baa70be32fa87152832cdd9db0833"},
     {file = "MarkupSafe-2.0.1-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:2ef54abee730b502252bcdf31b10dacb0a416229b72c18b19e24a4509f273d26"},
@@ -569,6 +586,9 @@ markupsafe = [
     {file = "MarkupSafe-2.0.1-cp39-cp39-manylinux2010_i686.whl", hash = "sha256:4efca8f86c54b22348a5467704e3fec767b2db12fc39c6d963168ab1d3fc9135"},
     {file = "MarkupSafe-2.0.1-cp39-cp39-manylinux2010_x86_64.whl", hash = "sha256:ab3ef638ace319fa26553db0624c4699e31a28bb2a835c5faca8f8acf6a5a902"},
     {file = "MarkupSafe-2.0.1-cp39-cp39-manylinux2014_aarch64.whl", hash = "sha256:f8ba0e8349a38d3001fae7eadded3f6606f0da5d748ee53cc1dab1d6527b9509"},
+    {file = "MarkupSafe-2.0.1-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:c47adbc92fc1bb2b3274c4b3a43ae0e4573d9fbff4f54cd484555edbf030baf1"},
+    {file = "MarkupSafe-2.0.1-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:37205cac2a79194e3750b0af2a5720d95f786a55ce7df90c3af697bfa100eaac"},
+    {file = "MarkupSafe-2.0.1-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:1f2ade76b9903f39aa442b4aadd2177decb66525062db244b35d71d0ee8599b6"},
     {file = "MarkupSafe-2.0.1-cp39-cp39-win32.whl", hash = "sha256:10f82115e21dc0dfec9ab5c0223652f7197feb168c940f3ef61563fc2d6beb74"},
     {file = "MarkupSafe-2.0.1-cp39-cp39-win_amd64.whl", hash = "sha256:693ce3f9e70a6cf7d2fb9e6c9d8b204b6b39897a2c4a1aa65728d5ac97dcc1d8"},
     {file = "MarkupSafe-2.0.1.tar.gz", hash = "sha256:594c67807fb16238b30c44bdf74f36c02cdf22d1c8cda91ef8a0ed8dabf5620a"},

testDB.py

@@ -104,19 +104,35 @@ with app.app_context():
     user_datastore.create_role(name="admin")
     user_datastore.create_role(name="assistant")
 
-    user_datastore.create_user(email="admin@protonmail.com", password=hash_password("admin"), roles=["admin"])
+    user_datastore.create_user(
+        email="admin@protonmail.com",
+        password=hash_password("admin"),
+        roles=["admin"],
+        first_name="Peter",
+        last_name="Blümler",
+    )
 
-    us1 = user_datastore.create_user(email="test@protonmail.com", password=hash_password("h1"), roles=["assistant"])
+    us1 = user_datastore.create_user(
-    us2 = user_datastore.create_user(email="test2@protonmail.com", password=hash_password("h2"), roles=["assistant"])
+        email="test@protonmail.com",
-
+        password=hash_password("h1"),
-    as1 = Assistant(
+        roles=["assistant"],
         first_name="As1",
         last_name="l",
         phone_number="012333212",
         mobile_phone_number="012334123",
+    )
+    us2 = user_datastore.create_user(
+        email="test2@protonmail.com",
+        password=hash_password("h2"),
+        roles=["assistant"],
+        first_name="As2",
+        last_name="l",
+    )
+
+    as1 = Assistant(
         user=us1,
     )
-    as2 = Assistant(first_name="As2", last_name="l", user=us2)
+    as2 = Assistant(user=us2)
 
     as1.semester_experiments.append(sx1)
     as2.semester_experiments.append(sx2)