Eye Care Functionality + UI Improvements + Bug Fixes

Author: simon-milata

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

@@ -14,24 +14,25 @@ def __init__(self, App, timer_manager, workbook, worksheet):
         self.initialize_variables()
 
 
-    def initialize_variables(self):
+    def initialize_variables(self) -> None:
         self.day_name_list = ["Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday", "Sunday"]
         self.date_list = []
         self.duration_list = []
         self.total_duration = 0
         self.graph_color = "#f38064"
-        self.widget_list = []
 
 
-    def initialize_new_file_variables(self):
+    def initialize_new_file_variables(self) -> None:
         self.goal_amount = 0
         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.customize_excel()
         self.save_color()
 
 
-    def collect_data(self):
+    def collect_data(self) -> None:
         self.data_amount = int(self.worksheet["Z2"].value)
         self.goal_amount = int(self.worksheet["R2"].value)
 
@@ -40,7 +41,7 @@ def collect_data(self):
         print("Data collected.")
 
 
-    def data_to_variable(self):
+    def data_to_variable(self) -> None:
         self.clear_graph_lists()
 
         for data in range(2, self.data_amount + 2):
@@ -53,9 +54,9 @@ def data_to_variable(self):
         self.total_duration = sum(self.duration_list)
 
 
-    def save_data(self):
+    def save_data(self) -> None:
         self.initialize_variables()
-        self.save_weekday()
+        self.set_weekday()
         self.save_color()
 
         self.data_amount += 1
@@ -74,60 +75,62 @@ def save_data(self):
         self.app.reset_timers()
 
 
-    def write_to_excel(self):
+    def write_to_excel(self) -> None:
         self.worksheet["A" + str((self.data_amount + 1))].value = self.start_time.strftime("%d/%m/%Y %H:%M")
         self.worksheet["B" + str((self.data_amount + 1))].value = self.stop_time.strftime("%d/%m/%Y %H:%M")
         self.worksheet["C" + str((self.data_amount + 1))].value = self.duration
         self.worksheet["D" + str((self.data_amount + 1))].value = self.timer_manager.break_time/60
+        self.worksheet["E" + str((self.data_amount + 1))].value = self.app.subject_selection.get()
 
         self.worksheet["R2"].value = self.goal_amount
 
         self.worksheet["Z2"].value = self.data_amount
         self.workbook.save(self.app.data_file)
 
 
-    def customize_excel(self):
+    def customize_excel(self) -> None:
         self.worksheet["A1"].value = "Start:"
         self.worksheet["B1"].value = "End:"
         self.worksheet["C1"].value = "Duration:"
         self.worksheet["D1"].value = "Break:"
+        self.worksheet["E1"].value = "Subject:"
+
+        self.worksheet["Q1"].value = "Eye care:"
 
         self.worksheet["R1"].value = "Goals reached:"
         self.worksheet["R2"].value = self.goal_amount
 
+        self.worksheet["S1"].value = "Subject:"
+
+        self.worksheet["T1"].value = "Color:"
         self.worksheet["T2"].value = self.color_name
 
-        self.worksheet["W2"].value = self.monday_duration
-        self.worksheet["W3"].value = self.tuesday_duration
-        self.worksheet["W4"].value = self.wednesday_duration
-        self.worksheet["W5"].value = self.thursday_duration
-        self.worksheet["W6"].value = self.friday_duration
-        self.worksheet["W7"].value = self.saturday_duration
-        self.worksheet["W8"].value = self.sunday_duration
+        self.worksheet["W1"].value = "Weekday duration:"
 
         self.worksheet["Z1"].value = "Data amount: "
         self.worksheet["Z1"].font = Font(bold=True, size=14)
         self.worksheet["Z2"].value = self.data_amount
 
+        self.save_weekday_data()
         self.style_excel()
 
         self.workbook.save(self.app.data_file)
         print("Excel customized.")
 
 
-    def style_excel(self):
+    def style_excel(self) -> None:
         self.worksheet["A1"].font = Font(bold=True, size=14)
         self.worksheet["B1"].font = Font(bold=True, size=14)
         self.worksheet["C1"].font = Font(bold=True, size=14)
         self.worksheet["D1"].font = Font(bold=True, size=14)
         self.worksheet["E1"].font = Font(bold=True, size=14)
 
 
-    def get_start_time(self):
+    def get_start_time(self) -> None:
         self.start_time = datetime.datetime.now()
 
 
-    def calculate_duration(self):
+    def calculate_duration(self) -> float:
         duration = self.timer_manager.timer_time - self.timer_manager.break_time
         if duration < 0: 
             duration = 0
@@ -136,11 +139,11 @@ def calculate_duration(self):
         return duration
 
 
-    def increase_goal_streak(self):
+    def increase_goal_streak(self) -> None:
         self.goal_amount += 1
 
 
-    def reset_data(self, workbook, worksheet):
+    def reset_data(self, workbook, worksheet) -> None:
         self.workbook = workbook
         self.worksheet = worksheet
 
@@ -152,12 +155,12 @@ def reset_data(self, workbook, worksheet):
         print("Data reset.")
 
 
-    def clear_graph_lists(self):
+    def clear_graph_lists(self) -> None:
         self.date_list.clear()
         self.duration_list.clear()
 
 
-    def collect_day_data(self):
+    def collect_day_data(self) -> None:
         self.monday_duration = int(self.worksheet["W2"].value)
         self.tuesday_duration = int(self.worksheet["W3"].value)
         self.wednesday_duration = int(self.worksheet["W4"].value)
@@ -169,68 +172,105 @@ def collect_day_data(self):
         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):
+    def set_weekday(self) -> None:
         duration = self.calculate_duration()
         weekday_today = datetime.datetime.now().weekday()
 
         match weekday_today:
             case 0:
                 self.monday_duration += duration
-                self.worksheet["W2"].value = self.monday_duration
             case 1:
                 self.tuesday_duration += duration
-                self.worksheet["W3"].value = self.tuesday_duration
             case 2:
                 self.wednesday_duration += duration
-                self.worksheet["W4"].value = self.wednesday_duration
             case 3:
                 self.thursday_duration += duration
-                self.worksheet["W5"].value = self.thursday_duration
             case 4:
                 self.friday_duration += duration
-                self.worksheet["W6"].value = self.friday_duration
             case 5:
                 self.saturday_duration += duration
-                self.worksheet["W7"].value = self.saturday_duration
             case 6:
                 self.sunday_duration += duration
-                self.worksheet["W8"].value = self.sunday_duration
+
+        self.save_weekday_data()
 
         self.workbook.save(self.app.data_file)
         print("Weekday saved.")
 
 
-    def set_color(self, color_dropdown):
+    def save_weekday_data(self) -> None:
+        self.worksheet["W2"].value = self.monday_duration
+        self.worksheet["W3"].value = self.tuesday_duration
+        self.worksheet["W4"].value = self.wednesday_duration
+        self.worksheet["W5"].value = self.thursday_duration
+        self.worksheet["W6"].value = self.friday_duration
+        self.worksheet["W7"].value = self.saturday_duration
+        self.worksheet["W8"].value = self.sunday_duration
+
+
+    def set_color(self, color_dropdown) -> None:
         self.color_name = color_dropdown.get()
         print("Color set.")
         self.save_color()
 
 
-    def save_color(self):
+    def save_color(self) -> None:
         self.worksheet["T2"].value = self.color_name
         self.load_color()
 
 
-    def load_color(self):
-        color_name = self.worksheet["T2"].value
-        self.app.color_dropdown.configure(variable=ctk.StringVar(value=color_name))
+    def load_color(self) -> None:
+        self.color_name = self.worksheet["T2"].value
+        self.app.color_dropdown.configure(variable=ctk.StringVar(value=self.color_name))
         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]}
 
-        self.color = colors[color_name][0]
-        self.highlight_color = colors[color_name][1]
-        self.pie_colors = colors[color_name][2]
+        self.color = colors[self.color_name][0]
+        self.highlight_color = colors[self.color_name][1]
+        self.pie_colors = colors[self.color_name][2]
         self.graph_color = self.color
         print("Color loaded.")
-        self.change_color(self.color, self.highlight_color)
+        self.change_color()
 
 
-    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)
+    def change_color(self) -> None:
+        for widget in self.app.widget_list:
+            widget.configure(fg_color=self.color, hover_color=self.highlight_color)
+        self.app.progressbar.configure(progress_color = self.color)
 
         self.app.create_graphs()
 
-        print("Color changed.")
+        print("Color changed.")
+
+
+    def save_subject(self, subject: str) -> None:
+        self.worksheet["S2"].value = subject
+        print("Subject saved.")
+
+
+    def load_subject(self) -> None:
+        if self.worksheet["S2"].value != None:
+            subject = self.worksheet["S2"].value
+        else:
+            subject = "Other"
+
+        self.app.subject_selection.configure(variable=ctk.StringVar(value=subject))
+
+        return subject
+    
+
+    def save_eye_care(self, eye_care: str) -> None:
+        self.worksheet["Q2"].value = eye_care
+        print("Eye care saved.")
+
+
+    def load_eye_care(self) -> None:
+        if self.worksheet["Q2"].value != None:
+            eye_care = self.worksheet["Q2"].value
+        else:
+            eye_care = "Off"
+
+        self.app.eye_care_selection.configure(variable=ctk.StringVar(value=eye_care))
+
+        self.app.t1.start()

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

@@ -0,0 +1,10 @@
+import time
+
+class EyeCare:
+    def __init__(self, app):
+        self.app = app
+    def eye_protection(self):
+        time_between = 1000 * 60 * 20
+        if self.app.eye_care_selection.get() == "On":
+            time.sleep(time_between)
+            self.eye_protection()

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

@@ -23,9 +23,10 @@
 button_highlight_color = "#f5937a"
 button_font_color = "black"
 
-tab_frame_color = "#1f1f1f"
+tab_frame_color = "#222222"
 tab_frame_width = 200
-tab_highlight_color = "#262626"
+tab_highlight_color = "#333333"
+tab_selected_color = "#343434"
 tab_color = tab_frame_color
 tab_font_weight = "normal"
 tab_font_family = "Calibri"