update

Author: simon-milata

.gitignore

@@ -1,3 +1,4 @@
 
 __pycache__/styles.cpython-312.pyc
 test.py
+*.pyc

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

@@ -1,8 +1,9 @@
-import os
 import datetime
 
-import openpyxl as op
 from openpyxl.styles import Font
+from .styles import *
+
+import customtkinter as ctk
 
 class DataManager:
     def __init__(self, App, timer_manager, workbook, worksheet):
@@ -14,20 +15,28 @@ def __init__(self, App, timer_manager, workbook, worksheet):
 
 
     def initialize_variables(self):
+        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):
         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.save_color(self.color_name)
 
 
     def collect_data(self):
         self.data_amount = int(self.worksheet["Z2"].value)
         self.goal_amount = int(self.worksheet["R2"].value)
 
+        self.collect_day_data()
+
         print("Data collected.")
 
 
@@ -44,11 +53,10 @@ def data_to_variable(self):
 
     def save_data(self):
         self.initialize_variables()
+        self.save_weekday()
+        self.save_color(self.color_name)
 
         self.data_amount += 1
-        
-        self.timer_time = self.timer_manager.timer_time
-        self.break_time = self.timer_manager.break_time
 
         self.stop_time = datetime.datetime.now()
 
@@ -68,8 +76,10 @@ def write_to_excel(self):
         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.break_time/60
+        self.worksheet["D" + str((self.data_amount + 1))].value = self.timer_manager.break_time/60
+
         self.worksheet["R2"].value = self.goal_amount
+
         self.worksheet["Z2"].value = self.data_amount
         self.workbook.save(self.app.data_file)
 
@@ -83,25 +93,40 @@ def customize_excel(self):
         self.worksheet["R1"].value = "Goals reached:"
         self.worksheet["R2"].value = self.goal_amount
 
-        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)
+        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["Z1"].value = "Data amount: "
         self.worksheet["Z1"].font = Font(bold=True, size=14)
         self.worksheet["Z2"].value = self.data_amount
+
+        self.style_excel()
+
         self.workbook.save(self.app.data_file)
         print("Excel customized.")
 
 
+    def style_excel(self):
+        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):
         self.start_time = datetime.datetime.now()
 
 
     def calculate_duration(self):
-        duration = self.timer_time - self.break_time
+        duration = self.timer_manager.timer_time - self.timer_manager.break_time
         if duration < 0: 
             duration = 0
         else:
@@ -110,9 +135,7 @@ def calculate_duration(self):
 
 
     def increase_goal_streak(self):
-        print("AAA")
         self.goal_amount += 1
-        print(self.goal_amount)
 
 
     def reset_data(self, workbook, worksheet):
@@ -124,4 +147,86 @@ def reset_data(self, workbook, worksheet):
 
         self.workbook.save(self.app.data_file)
 
-        print("Data reset.")
+        print("Data reset.")
+
+
+    def clear_graph_lists(self):
+        self.date_list.clear()
+        self.duration_list.clear()
+
+
+    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
+    
+
+    def save_weekday(self):
+        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.workbook.save(self.app.data_file)
+        print("Weekday saved.")
+
+
+    def set_color(self, color_dropdown):
+        color_name = color_dropdown.get()
+        print("Color set.")
+        self.save_color(color_name)
+
+
+    def save_color(self, color_name):
+        self.worksheet["T2"].value = 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))
+        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.graph_color = self.color
+        print("Color loaded.")
+        self.change_color(self.color, self.highlight_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)
+        print("Color changed.")

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

@@ -53,35 +53,19 @@
 #ORANGE
 orange_button_color = "#f38064"
 orange_highlight_color = "#f5937a"
-pie_color_orange_1 = "#f38064"
-pie_color_orange_2 = "#eb856b"
-pie_color_orange_3 = "#e28a73"
-pie_color_orange_4 = "#da8f7c"
-pie_color_orange_5 = "#d29484"
-pie_color_orange_6 = "#c9998d"
-pie_color_orange_7 = "#c19e95"
+orange_pie_colors = ["#f38064", "#eb856b", "#e28a73", "#da8f7c", "#d29484", "#c9998d", "#c19e95"]
+
 
 #GREEN
 green_button_color = "#93f263"
 green_highlight_color = "#a3f47b"
-pie_color_green_1 = "#96ea6c"
-pie_color_green_2 = "#99e274"
-pie_color_green_3 = "#9cd97d"
-pie_color_green_4 = "#9ed185"
-pie_color_green_5 = "#a1c88d"
-pie_color_green_6 = "#a4c096"
-pie_color_green_7 = "#a7b79e"
+green_pie_colors = ["#96ea6c", "#99e274", "#9cd97d", "#9ed185", "#a1c88d", "#a4c096", "#a7b79e"]
+
 
 #BLUE
 blue_button_color = "#63c2f2"
 blue_highlight_color = "#7bccf4"
-pie_color_blue_1 = "#63c2f2"
-pie_color_blue_2 = "#6cc0ea"
-pie_color_blue_3 = "#74bde2"
-pie_color_blue_4 = "#9ed185"
-pie_color_blue_5 = "#7dbad9"
-pie_color_blue_6 = "#85b6d1"
-pie_color_blue_7 = "#8db4c8"
+blue_pie_colors = ["#63c2f2", "#6cc0ea", "#74bde2", "#9ed185", "#7dbad9", "#85b6d1", "#8db4c8"]
 
 image_width = 30
-image_height = 30
+image_height = 30

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

@@ -21,19 +21,19 @@ def timer_mechanism(self, timer_button, break_button, time_display_label):
             self.break_running = False
             timer_button.configure(text="Stop")
             break_button.configure(text="Start")
-            self.update_time()
+            self._update_time()
 
         elif self.timer_running:
             self.timer_running = False
             timer_button.configure(text="Start")
 
 
-    def update_time(self):
+    def _update_time(self):
         if self.timer_running:
             self.timer_time += 1
             self.time_display_label.configure(text=str(datetime.timedelta(seconds=self.timer_time)))
             self.app.reach_goal(self.timer_time)
-            self.window.after(1000, self.update_time)
+            self.window.after(1000, self._update_time)
 
 
     def break_mechanism(self, break_button, timer_button, break_display_label):
@@ -43,14 +43,14 @@ def break_mechanism(self, break_button, timer_button, break_display_label):
             self.timer_running = False
             break_button.configure(text="Stop")
             timer_button.configure(text="Start")
-            self.update_break_time()
+            self._update_break_time()
         elif self.break_running:
             self.break_running = False
             self.break_button.configure(text="Start")
 
 
-    def update_break_time(self):
+    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)