Implemented User Display on Habitlist

app.py

@@ -543,6 +543,16 @@ def add_user():
     if user.id == current_user.id:
         errors['email'] = 'Du kannst dich nicht selbst hinzufügen.'
 
+    # Check if user is already in the habit list
+    already = False
+    for u in habit_list.get_users():
+        if u.id == user.id:
+            already = True
+            break
+
+    if already:
+        errors['email'] = 'Teilnehmer ist bereits in der Liste.'
+
     if errors:
         return render_template(
             'users.html',
@@ -557,14 +567,7 @@ def add_user():
     habit_list = HabitList.get(int(habit_list_id))
     habit_list.add_user(user)
 
-    return render_template(
-        'users.html',
-        title='Teilnehmer',
-        habit_list=habit_list,
-        users=habit_list.get_users(),
-        errors={},
-        email=email,
-    )
+    return redirect(url_for('index', habit_list=habit_list.id))
 
 
 # Run the application

models/HabitList.py

@@ -53,15 +53,14 @@ class HabitList:
         raw_users = get_users(self.id)
         users = []
         for user in raw_users:
-            user = User(user[0], user[1], user[2], user[3])
+            user = User(user[0], user[1], user[2], user[3], user[4])
             users.append(user)
 
         return users
 
 
     # Adds a User by email to the HabitList
-    def add_user(self, email: str):
-        user = User.get_by_email(email)
+    def add_user(self, user: User):
         if user:
             add_user(self.id, user.id)
         else:

templates/components/habit_lists.html

@@ -66,17 +66,18 @@
             <div class="row mb-3 align-items-center">
 
                 <!-- Personen die zur Liste gehören -->
-                <div class="col-2">
+                <div class="col">
                     <div class="avatar-stack">
-                        <img class="avatar" src="/images/avatar/1.jpg"/>
-                        <img class="avatar" src="/images/avatar/2.jpg"/>
-                        <img class="avatar" src="/images/avatar/4.jpg"/>
-                        <img class="avatar" src="/images/avatar/5.jpg"/>
+                        {% for user in habit_list.get_users() %}
+                        {% if current_user.id != user.id %}
+                        <img class="avatar" src="/{{user.profile_image}}" data-toggle="tooltip" data-placement="top" title="{{user.name}}"/>
+                        {% endif %}
+                        {% endfor %}
                     </div>
                 </div>
 
                 <!-- Knopf für das Hinzufügen einer Person zur gemeinsamen Liste -->
-                <div class="col-1">
+                <div class="col">
                     <a href="/users?habit_list={{habit_list.id}}" style="width: 40px; height: 40px; min-height: 3em;">
 
                         <i class="bi bi-plus-circle"></i>

templates/components/scripts.html

@@ -1,4 +1,3 @@
-
 <script>
     function checkCompletionAndAnimate(habitId, percentage) {
         var progressBar = document.getElementById("progress-bar-" + habitId);
@@ -106,6 +105,7 @@
         }
     });
 
-
-
+    $(function () {
+        $('[data-toggle="tooltip"]').tooltip()
+    })
 </script>