From e5d61abad3e66c5936fa6b8d2ae8ac147d17015e Mon Sep 17 00:00:00 2001 From: Verox001 Date: Tue, 30 Jan 2024 10:41:05 +0100 Subject: [PATCH 1/5] Return percentage on habit checking --- app.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app.py b/app.py index 790685c..dc0f442 100644 --- a/app.py +++ b/app.py @@ -329,7 +329,8 @@ def check_habit(): return { "habitId": habit_id, - "unchecked": not delete_tracking + "unchecked": not delete_tracking, + "percentage": habit.percentage, } @app.route('/delete', methods=['POST']) From 67ee3fe4c7bb77b35a55f28d4623cbca28d2c493 Mon Sep 17 00:00:00 2001 From: nikolaswollenberg Date: Tue, 30 Jan 2024 10:46:16 +0100 Subject: [PATCH 2/5] Porgressbar --- templates/index.html | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/templates/index.html b/templates/index.html index 10c55d9..e360724 100644 --- a/templates/index.html +++ b/templates/index.html @@ -34,7 +34,7 @@ } // Simulierte Aktivitätsdaten (ersetze dies durch deine echten Daten) - const activityData = [9, 5, 11, 39, 24, 2, 10, 47, 32, 45, 9, 5, 11, 39, 24, 2, 10, 47, 32, 45]; + const activityData = [5, 3, 10, 5, 24, 2, 10, 47, 32, 45, 9, 5, 11, 39, 24, 2, 10, 47, 32, 45]; // Funktion zum Erstellen der Heatmap function createHeatmap(data) { @@ -74,6 +74,8 @@ // Erstelle die Heatmap mit den simulierten Daten createHeatmap(activityData); + +
@@ -102,11 +104,17 @@ +
+
+
+
+
{% endfor %}
+ -
+

Task List

From 074be3fac7327453cde29c78c615a7cf681d572f Mon Sep 17 00:00:00 2001 From: Verox001 Date: Tue, 30 Jan 2024 10:53:21 +0100 Subject: [PATCH 4/5] Added dynamic update of progress bar --- templates/index.html | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/templates/index.html b/templates/index.html index e767f0c..a2acf8a 100644 --- a/templates/index.html +++ b/templates/index.html @@ -109,7 +109,7 @@
-
+
@@ -135,6 +135,11 @@ }).then(function (response) { // Handle the success response if needed console.log(response.data); + + // Set the percentage of the habit. percentage received as integer + var percentage = response.data.percentage; + var progressBar = document.getElementById("progress-bar-" + habitId); + progressBar.style.width = percentage + "%"; }).catch(function (error) { // Handle the error if needed console.error('Error:', error); From 64275725865d5e769af88bac7afabcab9429ede0 Mon Sep 17 00:00:00 2001 From: nikolaswollenberg Date: Tue, 30 Jan 2024 11:15:22 +0100 Subject: [PATCH 5/5] =?UTF-8?q?Porgressbar=20und=20L=C3=B6schen=20is=20kap?= =?UTF-8?q?put?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- templates/index.html | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/templates/index.html b/templates/index.html index a2acf8a..2c391df 100644 --- a/templates/index.html +++ b/templates/index.html @@ -104,7 +104,7 @@ {{ habit.note }}
-
@@ -118,6 +118,26 @@
+ + + +