fix: critial logic wipe bug fixed | tk UI impr

Author: ZFordDev

requirements.txt

@@ -1,3 +1,4 @@
 # SchedPlus dependencies
 
-PyQt6
+PyQt6
+tkcalendar

src/logic/scheduler.py

@@ -85,7 +85,7 @@ def load_tasks(self, filepath: str = None):
         try:
             from . import storage as _storage
 
-            self.tasks = _storage.load_tasks(filepath)
+            self.tasks = _storage.load_tasks(filepath or _storage.DATA_FILE)
         except Exception:
             self.tasks = []
 

src/logic/storage.py

@@ -1,22 +1,30 @@
 import json
 import os
-from .scheduler import Task  # import the dataclass Task
+from .scheduler import Task
 
 SCHEMA_VERSION = 1
 
-# Absolute / robust path relative to this file
-DATA_FILE = os.path.join(os.path.dirname(__file__), "..", "data", "tasks.json")
+DATA_FILE = os.path.abspath(
+    os.path.join(os.path.dirname(__file__), "..", "data", "tasks.json")
+)
 os.makedirs(os.path.dirname(DATA_FILE), exist_ok=True)
 
 
-
 def save_tasks(tasks, filepath=DATA_FILE):
-    """
-    Save list of Task objects to JSON file
-    """
+    print("\n[SAVE] ----------------------------------------")
+    print("[SAVE] Path:", filepath)
+    print("[SAVE] tasks list:", tasks)
+    print("[SAVE] tasks count:", len(tasks))
+    print("[SAVE] file exists before save:", os.path.exists(filepath))
+
+    # Prevent wiping existing file with empty list
+    if not tasks and os.path.exists(filepath):
+        print("[SAVE] ABORTED — empty task list would overwrite existing file")
+        return
+
     data = {
         "version": SCHEMA_VERSION,
-        "tasks": [t.to_dict() for t in tasks],  # convert each Task → dict
+        "tasks": [t.to_dict() for t in tasks],
     }
 
     try:
@@ -26,23 +34,37 @@ def save_tasks(tasks, filepath=DATA_FILE):
 
         with open(filepath, "w", encoding="utf-8") as f:
             json.dump(data, f, indent=2, ensure_ascii=False)
+
+        print("[SAVE] SUCCESS — wrote JSON")
     except Exception as e:
-        print(f"[ERROR] Failed to save tasks: {e}")
+        print(f"[SAVE] ERROR:", e)
 
 
 def load_tasks(filepath=DATA_FILE):
-    """
-    Load JSON file → return list of Task objects
-    """
+    print("\n[LOAD] ----------------------------------------")
+    print("[LOAD] Path:", filepath)
+    print("[LOAD] file exists:", os.path.exists(filepath))
+
     if not os.path.exists(filepath):
+        print("[LOAD] No file — returning empty list")
         return []
 
     try:
         with open(filepath, "r", encoding="utf-8") as f:
-            data = json.load(f)
+            raw = f.read()
+            print("[LOAD] Raw file contents:", raw)
+
+            data = json.loads(raw)
 
         tasks_data = data.get("tasks", [])
-        return [Task.from_dict(t) for t in tasks_data]  # convert dict → Task
+        print("[LOAD] Parsed tasks:", tasks_data)
+        print("[LOAD] Count:", len(tasks_data))
+
+        tasks = [Task.from_dict(t) for t in tasks_data]
+        print("[LOAD] Converted to Task objects:", tasks)
+
+        return tasks
+
     except Exception as e:
-        print(f"[ERROR] Failed to load tasks: {e}")
-        return []
+        print(f"[LOAD] ERROR:", e)
+        return []

src/main.py

@@ -9,5 +9,6 @@
 
 from startup.controller import boot
 
+
 if __name__ == "__main__":
     boot()

src/ui/tkinter_ui.py

@@ -1,5 +1,5 @@
 """
-tkinter_ui.py (v0.5)
+tkinter_ui.py
 --------------------
 Improved teaching Tkinter UI for SchedPlus.
 
@@ -10,58 +10,130 @@
 import tkinter as tk
 from tkinter import ttk
 from ui.shortcuts import bind_enter_key
+from tkcalendar import Calendar
+from logic.scheduler import Scheduler, Task
+from sys import path
 
 
-def run_ui(scheduler):
+def run_ui(scheduler: Scheduler) -> None:
     root = tk.Tk()
-    root.title("SchedPlus v0.5 (Tkinter)")
+    root.title("SchedPlus - Basic")
 
-    # Center window
-    root.geometry("420x420")
+    # Window sizing
+    root.geometry("530x480")
+    root.minsize(420, 420)
+    root.resizable(True, True)
 
     # --- Main container ---
     container = ttk.Frame(root, padding=15)
     container.grid(row=0, column=0, sticky="nsew")
 
-    root.columnconfigure(0, weight=1)
+    container.columnconfigure(1, weight=1)
+    container.columnconfigure(2, weight=0)
     root.rowconfigure(0, weight=1)
 
     # --- Heading ---
-    heading = ttk.Label(container, text="Add a Task", font=("Segoe UI", 12, "bold"))
-    heading.grid(row=0, column=0, columnspan=2, pady=(0, 10))
+    ttk.Label(container, text="Add a Task", font=("Segoe UI", 12, "bold")).grid(
+        row=0, column=0, columnspan=3, pady=(0, 10)
+    )
 
-    # --- Input fields ---
+    # --- Date ---
     ttk.Label(container, text="Date (YYYY-MM-DD):").grid(row=1, column=0, sticky="w", pady=3)
-    date_entry = ttk.Entry(container, width=25)
+    date_entry = ttk.Entry(container)
     date_entry.grid(row=1, column=1, sticky="ew", pady=3)
 
+    def open_calendar():
+        top = tk.Toplevel(root)
+        top.title("Select Date")
+
+        cal = Calendar(top, selectmode="day", date_pattern="yyyy-mm-dd")
+        cal.pack(padx=10, pady=10)
+
+        def choose():
+            date_entry.delete(0, tk.END)
+            date_entry.insert(0, cal.get_date())
+            top.destroy()
+
+        ttk.Button(top, text="Select", command=choose).pack(pady=5)
+
+    ttk.Button(container, text="📅", width=3, command=open_calendar).grid(
+        row=1, column=2, padx=(5, 0)
+    )
+
+    # --- Time ---
     ttk.Label(container, text="Time (HH:MM):").grid(row=2, column=0, sticky="w", pady=3)
-    time_entry = ttk.Entry(container, width=25)
+    time_entry = ttk.Entry(container)
     time_entry.grid(row=2, column=1, sticky="ew", pady=3)
 
+    def open_time_picker():
+        top = tk.Toplevel(root)
+        top.title("Select Time")
+
+        frame = ttk.Frame(top, padding=10)
+        frame.grid(row=1, column=1)
+
+        ttk.Label(frame, text="Hour:").grid(row=0, column=0, padx=5, pady=5)
+        hour_spin = ttk.Spinbox(frame, from_=0, to=23, width=3, format="%02.0f")
+        hour_spin.grid(row=0, column=1, padx=5, pady=5)
+
+        ttk.Label(frame, text="Minute:").grid(row=1, column=0, padx=5, pady=5)
+        minute_spin = ttk.Spinbox(frame, from_=0, to=59, width=3, format="%02.0f")
+        minute_spin.grid(row=1, column=1, padx=5, pady=5)
+
+        def choose():
+            time_entry.delete(0, tk.END)
+            time_entry.insert(0, f"{hour_spin.get()}:{minute_spin.get()}")
+            top.destroy()
+
+        ttk.Button(top, text="Select", command=choose).grid(row=1, column=0, pady=10)
+
+    ttk.Button(container, text="🕒", width=3, command=open_time_picker).grid(
+        row=2, column=2, padx=(5, 0)
+    )
+
+    # --- Task text ---
     ttk.Label(container, text="Task:").grid(row=3, column=0, sticky="w", pady=3)
-    task_entry = ttk.Entry(container, width=25)
+    task_entry = ttk.Entry(container)
     task_entry.grid(row=3, column=1, sticky="ew", pady=3)
 
     # --- Add Task button ---
     add_button = ttk.Button(container, text="Add Task")
-    add_button.grid(row=4, column=0, columnspan=2, pady=(10, 15))
+    add_button.grid(row=4, column=0, columnspan=3, pady=(10, 15))
 
-    # --- Task list frame ---
+    # --- Task list ---
     list_frame = ttk.LabelFrame(container, text="Tasks", padding=10)
-    list_frame.grid(row=5, column=0, columnspan=2, sticky="nsew")
+    list_frame.grid(row=5, column=0, columnspan=3, sticky="nsew")
 
-    container.rowconfigure(5, weight=1)
-    list_frame.rowconfigure(0, weight=1)
-    list_frame.columnconfigure(0, weight=1)
+     # --- Task list (Treeview) ---
+    columns = ("date", "time", "text")
+
+    task_list = ttk.Treeview(
+        list_frame,
+        columns=columns,
+        show="headings",
+        height=10
+    )
+
+    # Column headings
+    task_list.heading("date", text="Date")
+    task_list.heading("time", text="Time")
+    task_list.heading("text", text="Task")
+
+    # Column widths
+    task_list.column("date", width=100, anchor="center")   # YYYY-MM-DD
+    task_list.column("time", width=60, anchor="center")    # HH:MM
+    task_list.column("text", width=300, anchor="w")        # expands
 
-    # --- Task list ---
-    task_list = tk.Listbox(list_frame, width=50, height=10, borderwidth=1, relief="solid")
     task_list.grid(row=0, column=0, sticky="nsew")
 
-    # Populate existing tasks
-    for task in scheduler.get_tasks():
-        task_list.insert(tk.END, f"{task.date} {task.time} - {task.text}")
+    # Scrollbar
+    scrollbar = ttk.Scrollbar(list_frame, orient="vertical", command=task_list.yview)
+    task_list.configure(yscrollcommand=scrollbar.set)
+    scrollbar.grid(row=0, column=1, sticky="ns")
+
+
+    for task in scheduler.get_tasks():  # type: Task
+        task_list.insert("", "end", values=(task.date, task.time, task.text))
 
     # --- Add Task logic ---
     def add_task():
@@ -72,11 +144,11 @@ def add_task():
         if date and time and text:
             scheduler.add_task(date, time, text)
             new_task = scheduler.get_tasks()[-1]
-
-            task_list.insert(tk.END, f"{new_task.date} {new_task.time} - {new_task.text}")
+            task_list.insert("", "end", values=(new_task.date, new_task.time, new_task.text))
 
             try:
                 scheduler.save_tasks()
+                print("Saving to:", filepath)
             except Exception:
                 pass