Small Bug Fix

Author: simon-milata

Version 1.0.0/Package/__pycache__/data_management.cpython-312.pyc

@@ -28,7 +28,7 @@ def initialize_new_file_variables(self):
         self.data_amount = 0
         self.monday_duration = self.tuesday_duration = self.wednesday_duration = self.thursday_duration = self.friday_duration = self.saturday_duration = self.sunday_duration = 0
         self.color_name = "Orange"
-        self.save_color(self.color_name)
+        self.save_color()
 
 
     def collect_data(self):
@@ -41,6 +41,8 @@ def collect_data(self):
 
 
     def data_to_variable(self):
+        self.clear_graph_lists()
+
         for data in range(2, self.data_amount + 2):
             if "/" in str(self.worksheet["B" + str(data)].value):
                 self.date_list.append(datetime.datetime.strptime(str(self.worksheet["B" + str(data)].value).split(" ")[0], "%d/%m/%Y").date())
@@ -54,7 +56,7 @@ def data_to_variable(self):
     def save_data(self):
         self.initialize_variables()
         self.save_weekday()
-        self.save_color(self.color_name)
+        self.save_color()
 
         self.data_amount += 1
 
@@ -156,16 +158,15 @@ def clear_graph_lists(self):
 
 
     def collect_day_data(self):
-        monday_duration = int(self.worksheet["W2"].value)
-        tuesday_duration = int(self.worksheet["W3"].value)
-        wednesday_duration = int(self.worksheet["W4"].value)
-        thursday_duration = int(self.worksheet["W5"].value)
-        friday_duration = int(self.worksheet["W6"].value)
-        saturday_duration = int(self.worksheet["W7"].value)
-        sunday_duration = int(self.worksheet["W8"].value)
-
-        day_duration_list = [monday_duration, tuesday_duration, wednesday_duration, thursday_duration, friday_duration, saturday_duration, sunday_duration]
-        return day_duration_list
+        self.monday_duration = int(self.worksheet["W2"].value)
+        self.tuesday_duration = int(self.worksheet["W3"].value)
+        self.wednesday_duration = int(self.worksheet["W4"].value)
+        self.thursday_duration = int(self.worksheet["W5"].value)
+        self.friday_duration = int(self.worksheet["W6"].value)
+        self.saturday_duration = int(self.worksheet["W7"].value)
+        self.sunday_duration = int(self.worksheet["W8"].value)
+
+        self.day_duration_list = [self.monday_duration, self.tuesday_duration, self.wednesday_duration, self.thursday_duration, self.friday_duration, self.saturday_duration, self.sunday_duration]
 
 
     def save_weekday(self):
@@ -200,13 +201,13 @@ def save_weekday(self):
 
 
     def set_color(self, color_dropdown):
-        color_name = color_dropdown.get()
+        self.color_name = color_dropdown.get()
         print("Color set.")
-        self.save_color(color_name)
+        self.save_color()
 
 
-    def save_color(self, color_name):
-        self.worksheet["T2"].value = color_name
+    def save_color(self):
+        self.worksheet["T2"].value = self.color_name
         self.load_color()
 
 
@@ -229,4 +230,7 @@ def change_color(self, color, highlight_color):
         for widget in self.widget_list:
             widget.configure(fg_color=color, hover_color=highlight_color)
         self.app.progressbar.configure(progress_color = color)
+
+        self.app.create_graphs()
+
         print("Color changed.")

Version 1.0.0/Package/__pycache__/styles.cpython-312.pyc

@@ -65,7 +65,7 @@
 #BLUE
 blue_button_color = "#63c2f2"
 blue_highlight_color = "#7bccf4"
-blue_pie_colors = ["#63c2f2", "#6cc0ea", "#74bde2", "#9ed185", "#7dbad9", "#85b6d1", "#8db4c8"]
+blue_pie_colors = ["#63c2f2", "#6cc0ea", "#74bde2", "#7dbad9", "#85b6d1", "#8db4c8", "#96b2c0"]
 
 image_width = 30
 image_height = 30

Version 1.0.0/Package/data_management.py

@@ -23,8 +23,7 @@ def __init__(self):
         self.initialize_variables()
         self.create_gui()
         self._file_setup()
-        self.create_time_spent_graph()
-        self.create_weekday_graph()
+
         self.WINDOW.protocol("WM_DELETE_WINDOW", self.save_on_quit)
 
 
@@ -324,13 +323,17 @@ def _format_func(value, tick_number):
         time_spent_graph.grid(row=0, column=0, padx=10, pady=10)
         time_spent_graph.config(highlightbackground=frame_border_color, highlightthickness=2, background=frame_color)
 
-        self.data_manager.clear_graph_lists()
-
 
     def create_weekday_graph(self):
-        day_duration_list = self.data_manager.collect_day_data()
-        non_zero_durations = [duration for duration in day_duration_list if duration != 0]
-        non_zero_names = [name for name, duration in zip(self.data_manager.day_name_list, day_duration_list) if duration != 0]
+        self.data_manager.collect_day_data()
+
+        if self.data_manager.day_duration_list:
+            non_zero_durations = [duration for duration in self.data_manager.day_duration_list if duration != 0]
+            non_zero_names = [name for name, duration in zip(self.data_manager.day_name_list, self.data_manager.day_duration_list) if duration != 0]
+
+        else:
+            non_zero_durations = [0]
+            non_zero_names = []
 
         def _autopct_format(values):
             def _my_format(pct):
@@ -340,9 +343,8 @@ def _my_format(pct):
             return _my_format
 
         fig, ax = plt.subplots()
-        ax.pie(non_zero_durations, labels=non_zero_names, autopct=_autopct_format(non_zero_durations), 
-            colors=self.data_manager.pie_colors, 
-            textprops={"fontsize": pie_font_size, "family": pie_font_family, "color": font_color}, counterclock=False, startangle=90)
+        ax.pie(non_zero_durations, labels=non_zero_names, autopct=_autopct_format(non_zero_durations), colors=self.data_manager.pie_colors, 
+               textprops={"fontsize": pie_font_size, "family": pie_font_family, "color": font_color}, counterclock=False, startangle=90)
         fig.set_size_inches(graph_width/100, graph_height/100, forward=True)
         fig.set_facecolor(graph_bg_color)
         ax.tick_params(colors="white")
@@ -359,6 +361,11 @@ def _my_format(pct):
         weekday_graph.grid(row=0, column=1, padx=10, pady=10)
         weekday_graph.config(highlightbackground=frame_border_color, highlightthickness=2, background=frame_color)
 
+
+    def create_graphs(self):
+        self.create_time_spent_graph()
+        self.create_weekday_graph()
+
 
     def forget_and_propagate(self, list: list):
         for item in list:
@@ -399,6 +406,7 @@ def reset_gui_values(self):
         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()