diff --git a/app.py b/app.py index dc0f442..b3398df 100644 --- a/app.py +++ b/app.py @@ -298,6 +298,9 @@ def check_habit(): # Check if habit has been tracked today delete_tracking = None for tracking in trackings: + if tracking.created_at.date() == datetime.date.today(): + delete_tracking = tracking + """ # day if habit.unit == 0: if tracking.created_at.date() == datetime.date.today(): @@ -318,6 +321,7 @@ def check_habit(): if tracking.created_at.date().year == datetime.date.today().year: delete_tracking = tracking break + """ if not delete_tracking: HabitTrackings.create(habit_id, 1) diff --git a/models/Habit.py b/models/Habit.py index 0415599..4b6c65e 100644 --- a/models/Habit.py +++ b/models/Habit.py @@ -81,25 +81,28 @@ class Habit: count = 0 self.checked = False for tracking in self.get_habitTrackings(): + if tracking.created_at.day == datetime.today().day: + self.checked = True + # day if self.unit == 0: - if tracking.created_at == datetime.today(): - self.checked = True + if tracking.created_at.day == datetime.today().day: + # self.checked = True count += 1 # week elif self.unit == 1: if tracking.created_at.isocalendar()[1] == datetime.today().isocalendar()[1]: - self.checked = True + # self.checked = True count += 1 # month elif self.unit == 2: if tracking.created_at.month == datetime.today().month: - self.checked = True + # self.checked = True count += 1 # year elif self.unit == 3: if tracking.created_at.year == datetime.today().year: - self.checked = True + # self.checked = True count += 1 self.percentage = int(count / self.times * 100)