Bug Fixes

- Fixed a bug where if you pressed start/stop timer or break buttons in a rapid succession the timer would go up really fast
- Fixed a bug where most productive day would show as a 0 if there wasn't any data
- Fixed a bug where history wouldn't reset after resetting data

Author: simon-milata

Package/data_management.py

@@ -106,7 +106,10 @@ def get_weekday():
             for i in range(2, 9):
                 if self.worksheet["W" + str(i)].value != 0:
                     weekdays_dict[self.worksheet["W" + str(i)].value] = self.day_name_list[i-2]
-            self.best_weekday = weekdays_dict[max(weekdays_dict)]
+            if weekdays_dict:
+                self.best_weekday = weekdays_dict[max(weekdays_dict)]
+            else:
+                self.best_weekday = ""
         get_weekday()
 
 
@@ -215,18 +218,6 @@ def calculate_duration(self) -> float:
     def increase_goal_streak(self) -> None:
         self.goal_amount += 1
 
-    
-    def reset_data(self, workbook, worksheet) -> None:
-        self.workbook = workbook
-        self.worksheet = worksheet
-
-        self.initialize_new_file_variables()
-        self.customize_excel()
-
-        self.workbook.save(self.app.data_file)
-
-        print("Data reset.")
-
 
     def clear_graph_lists(self) -> None:
         self.date_list.clear()

Package/timer_management.py

@@ -8,13 +8,21 @@ def __init__(self, App, window):
 
 
     def initialize_variables(self):
+        self.timer_start_cooldown = False
+        self.break_start_cooldown = False
         self.timer_running = False
         self.break_running = False
         self.timer_time = 0
         self.break_time = 0
 
 
     def timer_mechanism(self, timer_button, break_button, time_display_label):
+        if self.timer_start_cooldown:
+            return
+        self.timer_start_cooldown = True
+
+        self.window.after(1000, self.enable_timer_start)
+
         self.time_display_label = time_display_label
         if not self.timer_running:
             self.app.lock_widgets()
@@ -40,6 +48,13 @@ def _update_time(self):
 
 
     def break_mechanism(self, break_button, timer_button, break_display_label):
+        if self.timer_time < 1 or self.break_start_cooldown:
+            return
+
+        self.break_start_cooldown = True
+
+        self.window.after(1000, self.enable_break_start)
+
         self.break_display_label = break_display_label
         if not self.break_running:
             self.break_running = True
@@ -49,11 +64,19 @@ def break_mechanism(self, break_button, timer_button, break_display_label):
             self._update_break_time()
         elif self.break_running:
             self.break_running = False
-            self.break_button.configure(text="Start")
+            break_button.configure(text="Start")
 
 
     def _update_break_time(self):
         if self.break_running:
             self.break_time += 1
             self.break_display_label.configure(text=str(datetime.timedelta(seconds=self.break_time)))
-            self.window.after(1000, self._update_break_time)
+            self.window.after(1000, self._update_break_time)
+
+
+    def enable_timer_start(self):
+        self.timer_start_cooldown = False
+
+
+    def enable_break_start(self):
+        self.break_start_cooldown = False

README.md

@@ -10,7 +10,8 @@ Welcome to Study Time Tracker, an application designed to help you manage your s
 - **History**: Review past study sessions in the history tab to track your productivity.
 - **Eye Care Setting**: Enable the 20/20/20 setting to take breaks and care for your eyes during long study sessions.
 - **Color Settings**: Customize the app's color theme to suit your preferences.
-
+- **Notes**: Keep track of important information, ideas, or reminders related to your study sessions.
+- **And More**
 ## Installation
 
 1. Clone the repository:
@@ -44,8 +45,6 @@ Welcome to Study Time Tracker, an application designed to help you manage your s
 
 ## Upcoming Features
 
-- **Pomodoro Timer**: Introduce a Pomodoro technique timer to help users study with intervals of focused work and short breaks.
-- **Notes**: Allow users to take notes during their study sessions to jot down important points or ideas.
 - **Achievements**: Implement an achievement system to reward users for meeting study goals and maintaining consistent study habits.
 
 ## Contributing

main.py

@@ -218,7 +218,7 @@ def _goal_gui_setup(self) -> None:
         goal_label = ctk.CTkLabel(goal_frame, text="Goal", font=(font_family, font_size), text_color=(light_font_color, font_color))
         goal_label.place(anchor="nw", relx=0.05, rely=0.05)
 
-        self.goal_dropdown = ctk.CTkComboBox(goal_frame, values=["1 minutes", "30 minutes", "1 hour", "1 hour, 30 minutes", "2 hours", "2 hours, 30 minutes", "3 hours", "3 hours, 30 minutes",
+        self.goal_dropdown = ctk.CTkComboBox(goal_frame, values=["30 minutes", "1 hour", "1 hour, 30 minutes", "2 hours", "2 hours, 30 minutes", "3 hours", "3 hours, 30 minutes",
                                                             "4 hours", "4 hours, 30 minutes", "5 hours", "5 hours, 30 minutes", "6 hours"], variable=self.default_choice, 
                                                             state="readonly", width=200, height=30, dropdown_font=(font_family, int(font_size*0.75)), border_color=(light_border_frame_color, border_frame_color),
                                                             font=(font_family, int(font_size)), fg_color=(light_border_frame_color, border_frame_color), button_color=(light_border_frame_color, border_frame_color))
@@ -339,8 +339,8 @@ def _history_gui_setup(self) -> None:
         history_label_frame.pack(pady=(frame_padding*1.2, frame_padding))
         history_label_frame.grid_propagate(False)
 
-        history_data_frame = ctk.CTkScrollableFrame(history_frame_frame, fg_color=(light_frame_color, frame_color), width=WIDTH-(frame_padding*4), height=500+frame_padding*4, corner_radius=10)
-        history_data_frame.pack(padx=frame_padding)
+        self.history_data_frame = ctk.CTkScrollableFrame(history_frame_frame, fg_color=(light_frame_color, frame_color), width=WIDTH-(frame_padding*4), height=500+frame_padding*4, corner_radius=10)
+        self.history_data_frame.pack(padx=frame_padding)
 
         start_label = ctk.CTkLabel(history_label_frame, text="Start", font=(font_family, int(font_size*1.25)), text_color=(light_font_color, font_color), fg_color="transparent", width=(WIDTH-(frame_padding*4))/5, height=30)
         start_label.grid(row=0, column=0, pady=widget_padding_y)
@@ -353,31 +353,31 @@ def _history_gui_setup(self) -> None:
         subject_label = ctk.CTkLabel(history_label_frame, text="Subject", font=(font_family, int(font_size*1.25)), text_color=(light_font_color, font_color), fg_color="transparent", width=(WIDTH-(frame_padding*4))/5, height=30)
         subject_label.grid(row=0, column=4, pady=widget_padding_y)
 
-        start_frame = ctk.CTkFrame(history_data_frame, fg_color="transparent", width=(WIDTH-(frame_padding*4))/5)
+        start_frame = ctk.CTkFrame(self.history_data_frame, fg_color="transparent", width=(WIDTH-(frame_padding*4))/5)
         start_frame.grid(row=1, column=0)
         start_frame.pack_propagate(False)
         self.start_text = ctk.CTkLabel(start_frame, font=(font_family, font_size), text_color=(light_font_color, font_color), text="-")
         self.start_text.pack()
 
-        end_frame = ctk.CTkFrame(history_data_frame, fg_color="transparent", width=(WIDTH-(frame_padding*4))/5)
+        end_frame = ctk.CTkFrame(self.history_data_frame, fg_color="transparent", width=(WIDTH-(frame_padding*4))/5)
         end_frame.grid(row=1, column=1)
         end_frame.pack_propagate(False)
         self.end_text = ctk.CTkLabel(end_frame, font=(font_family, font_size), text_color=(light_font_color, font_color), text="-")
         self.end_text.pack()
 
-        duration_frame = ctk.CTkFrame(history_data_frame, fg_color="transparent", width=(WIDTH-(frame_padding*4))/5)
+        duration_frame = ctk.CTkFrame(self.history_data_frame, fg_color="transparent", width=(WIDTH-(frame_padding*4))/5)
         duration_frame.grid(row=1, column=2)
         duration_frame.pack_propagate(False)
         self.duration_text = ctk.CTkLabel(duration_frame, font=(font_family, font_size), text_color=(light_font_color, font_color), text="-")
         self.duration_text.pack()
 
-        break_frame = ctk.CTkFrame(history_data_frame, fg_color="transparent", width=(WIDTH-(frame_padding*4))/5)
+        break_frame = ctk.CTkFrame(self.history_data_frame, fg_color="transparent", width=(WIDTH-(frame_padding*4))/5)
         break_frame.grid(row=1, column=3)
         break_frame.pack_propagate(False)
         self.break_text = ctk.CTkLabel(break_frame, font=(font_family, font_size), text_color=(light_font_color, font_color), text="-")
         self.break_text.pack()
 
-        subject_frame = ctk.CTkFrame(history_data_frame, fg_color="transparent", width=(WIDTH-(frame_padding*4))/5)
+        subject_frame = ctk.CTkFrame(self.history_data_frame, fg_color="transparent", width=(WIDTH-(frame_padding*4))/5)
         subject_frame.grid(row=1, column=4)
         subject_frame.pack_propagate(False)
         self.subject_text = ctk.CTkLabel(subject_frame, font=(font_family, font_size), text_color=(light_font_color, font_color), text="-")
@@ -640,7 +640,7 @@ def create_total_time_graph(self, frame):
         fig, ax = plt.subplots(figsize=(5, 5))
 
         # Plot
-        ax.plot(dates, cumulative_times, marker='o', color=self.data_manager.color)
+        ax.plot(dates, cumulative_times, color=self.data_manager.color)
 
         fig, ax = plt.subplots()
         ax.plot(dates, cumulative_times, color=self.data_manager.graph_color)
@@ -677,9 +677,9 @@ def clear_frame(self, frame):
 
     def create_graphs(self) -> None:
         self.statistics_frame.grid_propagate(False)
+        plt.close("all")
         self.clear_frame(self.statistics_facts_frame)
         self.clear_frame(self.statistics_graph_frame)
-        #self.WINDOW.after(10, self.statistics_scroll_frame._parent_canvas.yview_moveto, 1.0)
 
         self.create_time_spent_graph(self._graph_gui_frame(0, 0))
         self.create_weekday_graph(self._graph_gui_frame(0, 1))
@@ -697,7 +697,7 @@ def create_graphs(self) -> None:
             self.create_funfact(0, 2, "Average study Start Time", "00:00")
             self.create_funfact(0, 3, "Goal Met in", "0%", "of Sessions")
             self.create_funfact(0, 4, "Favorite subject", "")
-            self.create_funfact(0, 5, "Most Productive Day", "0")
+            self.create_funfact(0, 5, "Most Productive Day", "")
 
         else:
             self.create_funfact(0, 0, "Average Study Duration", round(self.data_manager.total_duration/self.data_manager.data_amount, 1), "Minutes")
@@ -871,17 +871,7 @@ def save_data(self) -> None:
 
         #Only be able to save if time is higher than 1m
         if time_in_minutes >= 1:
-            self.frequency_input.configure(state="normal")
-            self.frequency_input.delete("end")
-            self.duration_input.configure(state="normal")
-            self.duration_input.delete("end")
-            self.autobreak_button.configure(state="normal", fg_color=button_color)
-            self.break_button.configure(state="normal", fg_color=button_color, command=lambda: self.timer_manager.break_mechanism(self.break_button, self.timer_button, self.break_display_label), hover=True)
-            self.subject_button.configure(state="normal", fg_color=button_color)
-            self.goal_button.configure(state="normal", fg_color=button_color)
-            self.goal_dropdown.configure(state="normal")
-            self.subject_selection.configure(state="normal")
-            self.autobreak_switch.configure(state="normal")
+            self.unlock_widgets()
 
             if time_in_minutes >= self.goal:
                 self.data_manager.increase_goal_streak()
@@ -905,7 +895,7 @@ def save_autobreak(self) -> None:
         if "." in frequency_input:
             frequency_input = (frequency_input.split(".")[0]).replace(".", "")
 
-        if len(frequency_input) == 0:
+        if len(frequency_input) == 0 or int(frequency_input) == 0:
             frequency_input = self.data_manager.autobreak_frequency
         else:
             if self.data_manager.autobreak_frequency != self.frequency_input.cget("placeholder_text"):
@@ -918,7 +908,7 @@ def save_autobreak(self) -> None:
         if "." in duration_input:
             duration_input = (duration_input.split(".")[0]).replace(".", "")
 
-        if len(duration_input) == 0:
+        if len(duration_input) == 0 or int(duration_input) == 0:
             duration_input = self.data_manager.autobreak_duration
         else:
             if self.data_manager.autobreak_duration != self.duration_input.cget("placeholder_text"):
@@ -1039,9 +1029,17 @@ def reset_data(self) -> None:
             self.timer_manager.timer_running = False
             self.timer_manager.break_running = False
             self.reset_gui_values()
+            self.clear_hisotry()
 
             self._file_setup()
 
+            print("Data reset.")
+
+
+    def clear_hisotry(self):
+        for widget in self.history_data_frame.winfo_children():
+            widget.destroy()
+
 
     def scroll(self, direction: str) -> None:
         if self.scrolling:
@@ -1132,6 +1130,20 @@ def lock_widgets(self):
             self.break_button.configure(state="disabled", fg_color = "grey", command=None, hover=False)
 
 
+    def unlock_widgets(self):
+        self.frequency_input.configure(state="normal")
+        self.frequency_input.delete("end")
+        self.duration_input.configure(state="normal")
+        self.duration_input.delete("end")
+        self.autobreak_button.configure(state="normal", fg_color=button_color)
+        self.break_button.configure(state="normal", fg_color=button_color, command=lambda: self.timer_manager.break_mechanism(self.break_button, self.timer_button, self.break_display_label), hover=True)
+        self.subject_button.configure(state="normal", fg_color=button_color)
+        self.goal_button.configure(state="normal", fg_color=button_color)
+        self.goal_dropdown.configure(state="normal")
+        self.subject_selection.configure(state="normal")
+        self.autobreak_switch.configure(state="normal")
+
+
     def save_on_quit(self) -> None:
         self.save_data()
         print("Data saved on exit.")

requirements.txt

@@ -1,6 +1,8 @@
+CTkMessagebox==2.5
 customtkinter==5.2.2
+darkdetect==0.8.0
 DateTime==5.4
 matplotlib==3.8.2
 openpyxl==3.1.2
 pandas==2.1.4
-winotify==1.1.0
+winotify==1.1.0