From 2e1a2bc3991db59727c5e1fc0a549cfb19b87a0e Mon Sep 17 00:00:00 2001
From: janphilippweinsheimer <janorga.weinsheimer@web.de>
Date: Fri, 19 Jan 2024 10:27:08 +0100
Subject: [PATCH] liste verbessert

---
 app.py               | 13 ++++++-------
 models/User.py       |  2 +-
 templates/index.html | 43 +++++++++++++++++++++++--------------------
 3 files changed, 30 insertions(+), 28 deletions(-)

diff --git a/app.py b/app.py
index 006dbaf..3fe5821 100644
--- a/app.py
+++ b/app.py
@@ -5,7 +5,6 @@ from flask import Flask, render_template, redirect, url_for, request
 from flask_login import login_required, LoginManager, login_user, logout_user, current_user
 
 from models.User import User
-from models.Habit import Habit
 from utils import anonymous_required
 
 # Create a new Flask instance
@@ -32,18 +31,18 @@ def inject_user():
 @app.route('/')
 def index():
     # return 'Hello World'
-    """
+
     if current_user.is_authenticated:
-        habits = Habit.get_all(current_user.id)
+        habits = current_user.get_habits()
     else:
         habits = []
-    """
+
     # habits = [("lesen", "eine Seite vor dem schlafen gehen"), ("sport", "3x Gym")]
     return render_template(
         'index.html',
-        title='Home',
-        utc_dt=datetime.datetime.now().strftime("%d.%m.%Y %H:%M:%S"),
-        #habits=habits
+        title='Hallo ' + current_user.name,
+        utc_dt=datetime.datetime.now().strftime("%d.%m.%Y %H:%M %A"),
+        habits=habits
     )
 
 
diff --git a/models/User.py b/models/User.py
index 6ac4891..61d1681 100644
--- a/models/User.py
+++ b/models/User.py
@@ -35,4 +35,4 @@ class User(UserMixin):
         for habit in raw_habits:
             habit = Habit(habit[0], habit[1], habit[2], habit[3], habit[4], habit[5], habit[6])
             habits.append(habit)
-        return habits if habits else None
\ No newline at end of file
+        return habits
\ No newline at end of file
diff --git a/templates/index.html b/templates/index.html
index 6bf4b2a..93bd9a8 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -26,29 +26,32 @@
 
     // Erstelle die Heatmap mit den simulierten Daten
     createHeatmap(activityData);
+
+
+
+
 </script>
 
-<div class="row">
-    <div class="col-md-5">eins</div>
-    <div class="col-md-4">zwei
-        <h2>Task List</h2>
-        <ul class="task-list">
-            <li class="task-item">
-                <input type="checkbox" class="task-checkbox">
-                <span class="task-text">Task 1</span>
-            </li>
-            <li class="task-item">
-                <input type="checkbox" class="task-checkbox">
-                <span class="task-text">Task 2</span>
-            </li>
-            <li class="task-item">
-                <input type="checkbox" class="task-checkbox">
-                <span class="task-text">Task 3</span>
-            </li>
-            <!-- Add more tasks as needed -->
-        </ul>
+<h2>Task List</h2>
+<ul class="task-list row">
+    {% for habit in habits %}
+    <li class="row col-md-4">
+        <div class="col-auto">
+            <input type="checkbox" class="task-checkbox">
+        </div>
+
+        <div class="col" style="white-space: nowrap; overflow: hidden; text-overflow: ellipsis">
+            {{ habit.name }} hhhbhghbhjndjksbeujsdkfheuwaihgkjfgfjnsidkgjnkdghujds
+        </div>
+
+    </li>
+
+    <div class="col-md-8" style="white-space: nowrap; overflow: hidden; text-overflow: ellipsis">
+        {{ habit.note }}
     </div>
-</div>
+
+    {% endfor %}
+</ul>
 
 
 {% endblock %}
\ No newline at end of file