CimeyClust/HabitTracker
1
1
Fork 0
Code Issues Pull Requests Packages Projects 2 Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source 
# Conflicts:
#	templates/index.html
This commit is contained in:
nikolaswollenberg 2024-02-14 10:59:24 +01:00
commit 6143f44442
3 changed files with 198 additions and 195 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
models/Habit.py
View File

@ -80,6 +80,9 @@ class Habit:
count = 0
self.checked = False
for tracking in self.get_habitTrackings():
if tracking.created_at.date() == datetime.today().date():
self.checked = True
# day
if self.unit == 0:
if tracking.created_at.date() == datetime.today().date():

11
models/User.py
View File

@ -1,8 +1,8 @@
from datetime import datetime
from flask_login import UserMixin
from db.SQLiteClient import create_user, get_user, get_user_by_email, get_habits, delete_user, update_user, \
get_habitLists
from db.SQLiteClient import create_user, get_user, get_user_by_email, delete_user, update_user, \
get_habitLists, get_heatmap_value
class User(UserMixin):
@ -43,3 +43,10 @@ class User(UserMixin):
habitLists.append(habitList)
return habitLists
def get_heatmap(self):
heatmap = []
for day in range (0, 27):
value = get_heatmap_value(self.id, day)
heatmap.append(value)
return heatmap

39
templates/index.html
View File

@ -1,11 +1,11 @@
{% extends 'layouts/main.html' %}
{% block content %}
<h1>{{ title }}</h1>
<h3>{{ utc_dt }}</h3>
<h1>{{ title }}</h1>
<h3>{{ utc_dt }}</h3>
<style>
<style>
#heatmap {
display: grid;
grid-template-columns: repeat(7, 0fr); /* 7 Tage in einer Woche */
@ -20,15 +20,13 @@
align-items: center;
justify-content: center;
}
</style>
<div class="row">
</style>
<div class="col-md-4 col-12 card bg-light mb-6">
<div class="card-body">
<h5 class="card-title">Heatmap</h5>
<div class="row">
<div class="col-md-5 col-12">
<div id="heatmap"></div>
</div>
</div>
<script>
// Funktion zur Rückgabe des Montagsdatums
@ -80,21 +78,20 @@
// Erstelle die Heatmap mit den simulierten Daten
createHeatmap(activityData);
</script>
<div class="col-md-7 col-12 card gap-3 bg-light p-6 offset-md-1 mb-6">
<div class="row mb-3 ">
<div class="col-md-7 col-12">
<div class="row mb-3">
<h2 class="col-9">Gewohnheiten</h2>
<a class="col-3 btn btn-primary p" role="button" href="/habit-list">Neue Liste erstellen</a>
<a class="col-3 btn btn-primary" role="button" href="/habit-list">Neue Liste erstellen</a>
</div>
{% for habit_list in habit_lists %}
<div class="row mb-3">
<h2 class="col-9">{{ habit_list.name }}</h2>
<a class="col-3 btn btn-primary" role="button" href="/habit?list={{ habit_list.id }}">Gewohnheit
erstellen</a>
<a class="col-3 btn btn-primary" role="button" href="/habit?list={{ habit_list.id }}">Gewohnheit erstellen</a>
</div>
<ul class="task-list row">
@ -113,16 +110,12 @@
{{ habit.name }}
</div>
<div class="col-5 text-black text-opacity-50" style="white-space: nowrap; overflow: hidden; text-overflow: ellipsis">
<div class="col-6" style="white-space: nowrap; overflow: hidden; text-overflow: ellipsis">
{{ habit.note }}
</div>
<div class="col-2" style="white-space: nowrap; overflow: hidden; text-overflow: ellipsis">
{% if habit %}
{% else %}
5 🔥
{% endif %}
@ -243,9 +236,9 @@
});
}
</script>
</div>
</div>
<script>
<script>
document.addEventListener('DOMContentLoaded', (event) => {
var el = document.querySelector('.task-list');
Sortable.create(el, {
@ -269,5 +262,5 @@
}
});
});
</script>
</script>
{% endblock %}