Minor Changes

Minor UI updates, bug fixes and optimizations

Author: simon-milata

.gitignore

@@ -1,3 +1,4 @@
 
 test.py
 *.pyc
+*.prof

Package/data_management.py

@@ -1,5 +1,6 @@
 from collections import Counter
 import os
+import cProfile
 
 import datetime
 import openpyxl as op
@@ -19,9 +20,20 @@ def __init__(self, App, timer_manager, workbook, worksheet):
         self.workbook = workbook
         self.worksheet = worksheet
         self.initialize_variables()
+        self._initialize_once()
 
         self.notes_manager = NotesManager(self.app, self)
 
+    
+    def _initialize_once(self) -> None:
+        self.theme_changed = True
+        self.color_changed = True
+        self.graph_color = "#f38064"
+        self.graph_bg_color = graph_bg_color
+        self.graph_fg_color = graph_fg_color
+        self.font_color = font_color
+        self.spine_color = border_frame_color
+
 
     def initialize_variables(self) -> None:
         self.day_name_list = ["Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday", "Sunday"]
@@ -31,11 +43,6 @@ def initialize_variables(self) -> None:
         self.total_break_duration = 0
         self.best_weekday = ""
         self.average_time = "00:00"
-        self.graph_color = "#f38064"
-        self.graph_bg_color = graph_bg_color
-        self.graph_fg_color = graph_fg_color
-        self.font_color = font_color
-        self.spine_color = border_frame_color
 
 
     def initialize_new_file_variables(self) -> None:
@@ -328,9 +335,12 @@ def load_autobreak(self):
 
 
     def set_color(self, color_dropdown) -> None:
+        self.color_changed = True
         self.color_name = color_dropdown.get()
         if self.color_name != self.worksheet["T2"].value:
+
             print("Color set.")
+
             self.save_color()
 
 
@@ -342,6 +352,10 @@ def save_color(self) -> None:
     def load_color(self) -> None:
         self.color_name = self.worksheet["T2"].value
         self.app.color_dropdown.configure(variable=ctk.StringVar(value=self.color_name))
+
+        if self.color_changed == False:
+            return
+
         colors = {"Orange": [orange_button_color, orange_highlight_color, orange_pie_colors], 
                     "Green": [green_button_color, green_highlight_color, green_pie_colors], 
                     "Blue": [blue_button_color, blue_highlight_color, blue_pie_colors],
@@ -352,8 +366,11 @@ def load_color(self) -> None:
         self.pie_colors = colors[self.color_name][2]
         self.graph_color = self.color
         print("Color loaded.")
+
         self.change_color()
 
+        self.color_changed = False
+
 
     def change_color(self) -> None:
         for widget in self.app.widget_list:
@@ -364,8 +381,10 @@ def change_color(self) -> None:
                     widget.configure(progress_color = self.color)
                 else:
                     widget.configure(progress_color=(light_border_frame_color, border_frame_color))
-        #self.app.progressbar.configure(progress_color = self.color)
+
         self.app.eye_care_checkbox.configure(fg_color=self.color)
+        if self.app.progressbar.get() != 0:
+            self.app.progressbar.configure(progress_color = self.color)
         self.app.create_graphs()
 
         self.app.create_achievements()
@@ -375,6 +394,7 @@ def change_color(self) -> None:
 
 
     def set_theme(self, theme_dropdown) -> None:
+        self.theme_changed = True
         self.theme_name = theme_dropdown.get()
         if self.theme_name != self.worksheet["U2"].value:
             print("Theme set.")
@@ -390,6 +410,9 @@ def load_theme(self) -> None:
         self.theme_name = self.worksheet["U2"].value
         self.app.theme_dropdown.configure(variable=ctk.StringVar(value=self.theme_name))
 
+        if self.theme_changed == False:
+            return
+
         if self.theme_name == "Dark":
             ctk.set_appearance_mode("dark")
             self.graph_bg_color = graph_bg_color
@@ -405,6 +428,8 @@ def load_theme(self) -> None:
 
         self.app.create_graphs()
 
+        self.theme_changed = False
+
         print("Theme loaded.")
 
 

main.py

@@ -2,6 +2,7 @@
 import random
 from PIL import Image
 import sys
+import pstats
 
 import openpyxl as op
 import pandas as pd
@@ -12,6 +13,7 @@
 import customtkinter as ctk
 from winotify import Notification
 from CTkMessagebox import CTkMessagebox
+import datetime
 
 from Package import *
 
@@ -96,6 +98,9 @@ def _file_setup(self) -> None:
             self.data_manager.load_autobreak()
             self.data_manager.save_eye_care("Off", "Off")
 
+            self.data_manager.create_total_data()
+            self.create_achievements()
+
 
     def initialize_variables(self) -> None:
         self.statistics_scroll_position = "left"
@@ -239,7 +244,7 @@ def _progress_gui_setup(self) -> None:
         progress_label = ctk.CTkLabel(progress_frame, text="Progress", font=(font_family, int(font_size)), text_color=(light_font_color, font_color))
         progress_label.place(anchor="nw", relx=0.05, rely=0.05)
 
-        self.progressbar = ctk.CTkProgressBar(progress_frame, height=20, width=220, progress_color=button_color, fg_color=(light_border_frame_color, border_frame_color), corner_radius=10)
+        self.progressbar = ctk.CTkProgressBar(progress_frame, height=20, width=220, progress_color=(light_border_frame_color, border_frame_color), fg_color=(light_border_frame_color, border_frame_color), corner_radius=10)
         self.progressbar.place(anchor="center", relx=0.5, rely=0.65)
         self.progressbar.set(0)
 
@@ -695,8 +700,13 @@ def _my_format(pct):
 
 
     def create_total_time_graph(self, frame):
-        dates = self.data_manager.date_list
-        times = self.data_manager.duration_list
+        dates = self.data_manager.date_list.copy()
+        times = self.data_manager.duration_list.copy()
+
+        if times:
+            dates.insert(0, (dates[0] - datetime.timedelta(days=1)))
+            times.insert(0, 0)
+
 
         # Calculate cumulative time
         cumulative_times = [sum(times[:i+1]) for i in range(len(times))]
@@ -765,8 +775,8 @@ def create_graphs(self) -> None:
             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")
-            self.create_funfact(0, 1, "Average Break Duration", round(self.data_manager.total_break_duration/self.data_manager.data_amount, 1), "Minutes")
+            self.create_funfact(0, 0, "Average Study Duration", round(self.data_manager.total_duration/self.data_manager.data_amount), "Minutes")
+            self.create_funfact(0, 1, "Average Break Duration", round(self.data_manager.total_break_duration/self.data_manager.data_amount), "Minutes")
             self.create_funfact(0, 2, "Average Study Start Time", self.data_manager.average_time)
             self.create_funfact(0, 4, "Favorite Subject", self.data_manager.most_common_subject, None, 3)
             self.create_funfact(0, 5, "Most Productive Day", self.data_manager.best_weekday, None, 2.7)
@@ -859,7 +869,6 @@ def reset_gui_values(self) -> None:
         self.times_goal_reached.configure(text=0)
         self.streak_duration.configure(text=0)
         self.progressbar.set(0)
-        self.progressbar.configure(progress_color = self.data_manager.color)
         self.reset_timers()
 
 
@@ -948,7 +957,7 @@ def save_data(self) -> None:
             self.update_streak_values()
             self.load_history()
 
-            self.data_manager.load_theme()
+            self.create_graphs()
 
             self.notification_limit_on = False
 
@@ -1186,6 +1195,8 @@ def _get_widgets(frame):
             if isinstance(widget, ctk.CTkButton) or isinstance(widget, ctk.CTkProgressBar):
                 if ".!ctkframe5" in str(widget) and isinstance(widget, ctk.CTkButton):
                     pass
+                elif ".!ctkframe2" in str(widget) and isinstance(widget, ctk.CTkProgressBar):
+                    pass
                 else:
                     self.widget_list.append(widget)
 
@@ -1214,13 +1225,13 @@ def unlock_widgets(self):
         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.autobreak_button.configure(state="normal", fg_color=self.data_manager.color)
+        self.break_button.configure(state="normal", fg_color=self.data_manager.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=self.data_manager.color)
+        self.goal_button.configure(state="normal", fg_color=self.data_manager.color)
+        self.goal_dropdown.configure(state="readonly")
+        self.subject_selection.configure(state="readonly")
+        self.autobreak_switch.configure(state="readonly")
 
 
     def save_on_quit(self) -> None:
@@ -1229,21 +1240,24 @@ def save_on_quit(self) -> None:
 
         self.workbook.save(self.data_file)
 
-        self.WINDOW.destroy()
+        self.WINDOW.quit()
 
 
     def change_focus(self, event) -> None:
-        event.widget.focus_set()
+        try:
+            event.widget.focus_set()
+        except AttributeError:
+            pass
 
 
     def run(self) -> None:
         self.WINDOW.mainloop()
 
-    
+
     def restart_program(self) -> None:
         python = sys.executable
         os.execl(python, python, *sys.argv)
 
 
 if __name__ == "__main__":
-    App().run()
+    App().run()