Update

Author: simon-milata

Package/data_management.py

@@ -1,9 +1,10 @@
+from collections import Counter
+
 import datetime
 from openpyxl.styles import Font
 
 import customtkinter as ctk
 import darkdetect
-
 from .styles import *
 from .note_management import NotesManager
 
@@ -23,6 +24,11 @@ def initialize_variables(self) -> None:
         self.date_list = []
         self.duration_list = []
         self.total_duration = 0
+        self.break_list = []
+        self.total_break_duration = 0
+        self.hours_list = []
+        self.subject_list = []
+        self.average_time = "00:00"
         self.graph_color = "#f38064"
         self.graph_bg_color = graph_bg_color
         self.graph_fg_color = graph_fg_color
@@ -67,6 +73,24 @@ def data_to_variable(self) -> None:
             self.duration_list.append(round(self.worksheet["C" + str(data)].value))
 
         self.total_duration = sum(self.duration_list)
+        
+        self.create_total_data()
+
+
+    def create_total_data(self):
+        def get_sec(time: str) -> int:
+            """Get seconds from time."""
+            h, m = time.split(':')
+            return int(h) * 3600 + int(m) * 60
+        
+        for data in range(2, self.data_amount + 2):
+            self.break_list.append(float(self.worksheet["D" + str(data)].value))
+            self.hours_list.append(get_sec((self.worksheet["A" + str(data)].value.split(" ")[1])))
+            self.subject_list.append(self.worksheet["E" + str(data)].value)
+                                   
+        self.total_break_duration = sum(self.break_list)
+        self.average_time = str(datetime.timedelta(seconds=(round(sum(self.hours_list) / len(self.hours_list)))))[:5]
+        self.most_common_subject = Counter(self.subject_list).most_common(1)[0][0]
 
 
     def save_data(self) -> None:
@@ -162,7 +186,7 @@ def get_start_time(self) -> None:
 
 
     def calculate_duration(self) -> float:
-        duration = self.timer_manager.timer_time - self.timer_manager.break_time
+        duration = self.timer_manager.timer_time
         if duration < 0: 
             duration = 0
         else:
@@ -246,6 +270,8 @@ def save_autobreak(self, frequency: str, duration: str, switch: str) -> None:
 
         self.workbook.save(self.app.data_file)
 
+        print("Autobreak saved.")
+
         self.load_autobreak()
 
 
@@ -269,6 +295,8 @@ def load_autobreak(self):
 
         self.app.WINDOW.after(0, self.app.auto_break)
 
+        print("Autobreak loaded.")
+
 
     def set_color(self, color_dropdown) -> None:
         self.color_name = color_dropdown.get()

Package/note_management.py

@@ -8,7 +8,7 @@ def __init__(self, app, data_manager):
         self.data_manager = data_manager
 
     def create_task(self, index):
-        self.frame = ctk.CTkFrame(self.app.notes_data_frame, width=WIDTH + frame_padding, fg_color=(light_frame_color, frame_color), height=button_height + frame_padding * 2)
+        self.frame = ctk.CTkFrame(self.app.notes_data_frame, width=WIDTH + frame_padding * 2, fg_color=(light_frame_color, frame_color), height=button_height + frame_padding * 2)
         self.frame.pack(pady=frame_padding/2)
         self.frame.grid_propagate(False)
 
@@ -27,16 +27,17 @@ def title_text(title: str) -> str:
         title.grid(row=0, column=0, padx=widget_padding_x)
         date = ctk.CTkLabel(self.frame, text=str(self.data_manager.worksheet["N" + str(index)].value), font=(font_family, font_size*1.25),
                             text_color=(light_font_color, font_color), anchor="center", height=button_height + frame_padding * 2)
-        date.place(anchor="center", relx=0.75, rely=0.5)
+        date.place(anchor="center", relx=0.5, rely=0.5)
 
         button_frame = ctk.CTkFrame(self.frame, fg_color="transparent")
-        button_frame.place(anchor="center", rely=0.5, relx=0.925)
+        button_frame.place(anchor="center", rely=0.5, relx=0.825)
 
-        open_button = ctk.CTkButton(button_frame, image=self.app.open_icon, text="", height=button_height, fg_color=self.data_manager.color, hover_color=self.data_manager.highlight_color, font=(font_family, font_size), text_color=button_font_color, width=button_height, 
-                                   command=lambda: self._open_notes_text(str(self.data_manager.worksheet["N" + str(index)].value), str(self.data_manager.worksheet["O" + str(index)].value), str(self.data_manager.worksheet["P" + str(index)].value), index))
+        open_button = ctk.CTkButton(button_frame, text="Open", height=button_height, fg_color=self.data_manager.color, hover_color=self.data_manager.highlight_color, font=(font_family, font_size), text_color=button_font_color, 
+                                   command=lambda: self._open_notes_text(str(self.data_manager.worksheet["N" + str(index)].value), str(self.data_manager.worksheet["O" + str(index)].value), str(self.data_manager.worksheet["P" + str(index)].value), index)
+                                   ,anchor="center")
         open_button.grid(row=0, column=0, padx=widget_padding_x)
-        delete_button = ctk.CTkButton(button_frame, image=self.app.delete_icon, text="", height=button_height, fg_color=self.data_manager.color, hover_color=self.data_manager.highlight_color, font=(font_family, font_size), text_color=button_font_color,
-                                          command=lambda: self.delete_task(index), width=button_height)
+        delete_button = ctk.CTkButton(button_frame, text="Delete", height=button_height, fg_color=self.data_manager.color, hover_color=self.data_manager.highlight_color, font=(font_family, font_size), text_color=button_font_color,
+                                          command=lambda: self.delete_task(index), anchor="center")
         delete_button.grid(row=0, column=1)
 
 
@@ -65,18 +66,18 @@ def _open_notes_text(self, date, title, text, index):
         #date_label.grid(row=0, column=0, padx=widget_padding_x, pady=widget_padding_y)
 
         button_frame = ctk.CTkFrame(header_frame, fg_color="transparent")
-        button_frame.place(anchor="center", rely=0.5, relx=0.95)
+        button_frame.place(anchor="center", rely=0.5, relx=0.825)
 
         textbox = ctk.CTkTextbox(frame, font=(font_family, font_size), text_color=(light_font_color, font_color), fg_color="transparent", width=WIDTH - frame_padding * 2, height=HEIGHT + frame_padding * 2 - 60)
         textbox.grid(row=1, column=0)
         textbox.insert("0.0", text)
         textbox.configure(state="disabled")
 
-        edit_button = ctk.CTkButton(button_frame, height=button_height, image=self.app.edit_icon, text="", fg_color=self.data_manager.color, width=button_height, 
+        edit_button = ctk.CTkButton(button_frame, height=button_height, text="Edit", fg_color=self.data_manager.color, anchor="center",
                                                 hover_color=self.data_manager.highlight_color, font=(font_family, font_size), text_color=button_font_color, command=lambda: self.edit_note(index, textbox, edit_button, frame))
         edit_button.grid(row=0, column=1)
-        exit_button = ctk.CTkButton(button_frame, height=button_height, image=self.app.back_icon, text="", fg_color=self.data_manager.color, command=lambda: self._exit_note(frame), 
-                                                hover_color=self.data_manager.highlight_color, font=(font_family, font_size), text_color=button_font_color, width=button_height)
+        exit_button = ctk.CTkButton(button_frame, height=button_height, text="Exit", fg_color=self.data_manager.color, command=lambda: self._exit_note(frame), 
+                                                hover_color=self.data_manager.highlight_color, font=(font_family, font_size), text_color=button_font_color, anchor="center")
         exit_button.grid(row=0, column=2, padx=widget_padding_x, pady=widget_padding_y)
 
 
@@ -92,7 +93,7 @@ def save_note(index, frame):
             self.data_manager.workbook.save(self.app.data_file)
 
         textbox.configure(state="normal", fg_color=(light_frame_color, frame_color))
-        edit_button.configure(text="", image=self.app.save_icon, command=lambda: save_note(index, frame), width=button_height)
+        edit_button.configure(command=lambda: save_note(index, frame), text="Save")
 
 
     def clear_notes(self):

Package/styles.py

@@ -65,8 +65,8 @@
 main_frame_color = "#2b2b2b"
 light_main_frame_color = "#d4d4d4"
 
-graph_height = HEIGHT / 2
-graph_width = (WIDTH / 2) - frame_padding * 4
+graph_height = (HEIGHT+((widget_padding_x+frame_padding)))/1.6 - frame_padding
+graph_width = int(WIDTH/1.7 - frame_padding)
 
 graph_bg_color = frame_color
 light_graph_bg_color = light_frame_color
@@ -101,5 +101,5 @@
 pink_pie_colors = ["#f263d5", "#ea6cd1", "#e274cc", "#d97dc7", "#d185c2", "#c88dbd", "#c096b8"]
 
 
-icon_size = 24
+icon_size = 20
 tab_icon_size = 20

Package/timer_management.py

@@ -21,7 +21,9 @@ def timer_mechanism(self, timer_button, break_button, time_display_label):
             self.app.frequency_input.insert("end", self.app.data_manager.autobreak_frequency)
             self.app.duration_input.configure(state="disabled")
             self.app.duration_input.insert("end", self.app.data_manager.autobreak_duration)
-            self.app.autobreak_button.configure(state="readonly")
+            self.app.autobreak_button.configure(state="disabled", fg_color="grey")
+            if self.app.autobreak_switch.get() == "On":
+                break_button.configure(state="disabled", fg_color = "grey", command=None, hover=False)
 
             self.timer_running = True
             self.break_running = False