Merge pull request #24 from HA2077/Linux

Fixing linux problems with Pillow with removing it and refactoring the code

Author: HA2077

assets/BG.jpg

@@ -3,7 +3,6 @@
 import sys
 import os
 import json
-from PIL import Image, ImageTk 
 sys.path.append(os.path.abspath(os.path.join(os.path.dirname(__file__), '..')))
 from backend.order import load_orders, Order as OrderClass, save_order
 from backend.receipt import Receipt
@@ -13,9 +12,9 @@
 TEXT_WHITE = "#FFFFFF"
 
 # Status Colors
-STATUS_PENDING = "#FFC107"  # Yellow
-STATUS_PREP = "#0D6EFD"     # Blue (Processing)
-STATUS_READY = "#198754"    # Green (Ready to Complete)
+STATUS_PENDING = "#FFC107"  
+STATUS_PREP = "#0D6EFD"     
+STATUS_READY = "#198754"    
 
 class KitchenDashboard(tk.Toplevel):
     def __init__(self, parent=None):
@@ -24,15 +23,13 @@ def __init__(self, parent=None):
         self.geometry("1200x800")
         self.configure(bg=BG_COLOR)
 
-        # --- Background Image Setup ---
-        self.bg_image_original = None
         self.bg_photo = None
         self.bg_label = tk.Label(self, bg=BG_COLOR)
         self.bg_label.place(x=0, y=0, relwidth=1, relheight=1)
         self.load_background()
 
-        self.order_widgets = {}   # Maps order_id -> container_frame
-        self.last_statuses = {}   # Maps order_id -> status (Prevents flickering)
+        self.order_widgets = {}   
+        self.last_statuses = {}   
 
         # Header 
         self.header = tk.Frame(self, bg=BG_COLOR, height=60)
@@ -49,64 +46,51 @@ def __init__(self, parent=None):
         self.load_and_display_orders()
         self.start_refresh_timer()
 
-        self.bind("<Configure>", self.resize_background)
+        # No binding for resizing anymore
 
     def load_background(self):
-        bg_path = "assets/BG.jpg"
+        # CHANGED: Using BG.png and tk.PhotoImage
+        bg_path = ("assets/BG.png")
         if os.path.exists(bg_path):
             try:
-                self.bg_image_original = Image.open(bg_path)
-                self.resize_background(None)
+                self.bg_photo = tk.PhotoImage(file=bg_path)
+                self.bg_label.config(image=self.bg_photo)
+                self.bg_label.lower()
             except Exception as e:
                 print(f"Error loading background: {e}")
 
-    def resize_background(self, event):
-        if self.bg_image_original:
-            w = self.winfo_width()
-            h = self.winfo_height()
-            if w > 0 and h > 0:
-                resized = self.bg_image_original.resize((w, h), Image.Resampling.LANCZOS)
-                self.bg_photo = ImageTk.PhotoImage(resized)
-                self.bg_label.config(image=self.bg_photo)
-                self.bg_label.lower()
+    # No resize_background method needed
 
     def start_refresh_timer(self):
         self.after(1000, self.load_and_display_orders) 
 
     def load_and_display_orders(self):
-        # 1. Load Data (Only show Pending or Processing)
-        # Completed orders are now in the JSON, but we filter them out here so they disappear from the UI.
         orders = [o for o in load_orders() if o.status in [OrderClass.PENDING, OrderClass.PROCESSING]]
         active_ids = set(o.order_id for o in orders)
 
-        # 2. CLEANUP: Remove widgets for orders that are gone (Completed or not in list)
         for order_id in list(self.order_widgets.keys()):
             if order_id not in active_ids:
                 self.order_widgets[order_id].destroy()
                 del self.order_widgets[order_id]
                 if order_id in self.last_statuses:
                     del self.last_statuses[order_id]
 
-        # 3. UPDATE/CREATE: Render active orders
         for i, order in enumerate(orders):
             row, col = divmod(i, 4)
             current_status = order.status
             prev_status = self.last_statuses.get(order.order_id)
 
             if order.order_id not in self.order_widgets:
-                # NEW ORDER
                 self.create_ticket_frame(row, col, order)
                 self.last_statuses[order.order_id] = current_status
 
             elif current_status != prev_status:
-                # STATUS CHANGED (Re-render)
                 container = self.order_widgets[order.order_id]
                 self.render_ticket_content(container, order, is_new=False)
                 self.last_statuses[order.order_id] = current_status
                 container.grid(row=row, column=col, padx=10, pady=10, sticky="nsew")
 
             else:
-                # NO CHANGE (Just Grid)
                 container = self.order_widgets[order.order_id]
                 container.grid(row=row, column=col, padx=10, pady=10, sticky="nsew")
 
@@ -117,24 +101,17 @@ def change_order_status(self, order_id, new_status):
         for i, order in enumerate(orders):
             if order.order_id == order_id:
                 if order.update_status(new_status):
-                    
                     if new_status == OrderClass.COMPLETED:
-                        # 1. Generate Receipt
                         try:
                             receipt = Receipt(order)
                             filename = receipt.save_to_file()
                             print(f"Receipt generated: {filename}")
                         except ValueError as e:
                             print(f"Error generating receipt: {e}")
-                        
-                        # 2. SAVE status as COMPLETED (Do NOT delete from JSON)
-                        # This keeps the order in the file for records/admin view
                         save_order(order)
                     else:
-                        # Update status (e.g. to PROCESSING) and save
                         save_order(order)
 
-                    # Force immediate refresh
                     self.load_and_display_orders()
                     return
         print(f"Error: Could not find order {order_id}")
@@ -165,7 +142,6 @@ def render_ticket_content(self, container, order: OrderClass, is_new: bool):
 
         tk.Label(card, text=f"Order #{order.order_id[-4:]}", font=("Segoe UI", 9), bg=CARD_COLOR, fg="#CCC").place(x=15, y=10)
 
-        # Button Logic
         if order.status == OrderClass.PENDING:
             next_status = OrderClass.PROCESSING
             next_text = "START PREP"

assets/BG.png

@@ -1,6 +1,5 @@
 import tkinter as tk
 from tkinter import messagebox
-from PIL import Image, ImageTk
 import sys
 import os
 sys.path.append(os.path.abspath(os.path.join(os.path.dirname(__file__), '..')))
@@ -11,7 +10,7 @@
 SECTION_BG = "#550a0a"     
 BTN_RED = "#AA3333"       
 TEXT_WHITE = "#FFFFFF"
-HIGHLIGHT_COLOR = "#884444" # Color for selected item
+HIGHLIGHT_COLOR = "#884444" 
 
 class POSDashboard(tk.Toplevel):
     def __init__(self, parent=None):
@@ -24,11 +23,9 @@ def __init__(self, parent=None):
         self.menu_items = load_menu_items() 
         self.menu_data = {} 
         self.organize_menu_data()
-        
-        # Track selected item for removal
         self.selected_product_id = None
 
-        self.bg_image_original = None
+        # --- Background (Static PNG) ---
         self.bg_photo = None
         self.bg_label = tk.Label(self, bg=BG_COLOR)
         self.bg_label.place(x=0, y=0, relwidth=1, relheight=1)
@@ -55,26 +52,17 @@ def __init__(self, parent=None):
         self.frame_checkout.pack(side="right", fill="y", padx=(5, 20), pady=20)
         self.frame_checkout.pack_propagate(False)
         self.build_checkout_section()
-        self.bind("<Configure>", self.resize_background)
+        
 
     def load_background(self):
-        bg_path = "assets/BG.jpg"
+        bg_path = ("assets/BG.png")
         if os.path.exists(bg_path):
             try:
-                self.bg_image_original = Image.open(bg_path)
-                self.resize_background(None)
-            except Exception as e:
-                print(f"Error loading background: {e}")
-
-    def resize_background(self, event):
-        if self.bg_image_original:
-            w = self.winfo_width()
-            h = self.winfo_height()
-            if w > 0 and h > 0:
-                resized = self.bg_image_original.resize((w, h), Image.Resampling.LANCZOS)
-                self.bg_photo = ImageTk.PhotoImage(resized)
+                self.bg_photo = tk.PhotoImage(file=bg_path)
                 self.bg_label.config(image=self.bg_photo)
                 self.bg_label.lower()
+            except Exception as e:
+                print(f"Error loading background: {e}")
 
     def organize_menu_data(self):
         self.menu_data = {}
@@ -156,9 +144,8 @@ def add_item_to_order(self, item):
         self.refresh_order_display()
 
     def select_item(self, product_id):
-        """Selects an item in the order list"""
         if self.selected_product_id == product_id:
-            self.selected_product_id = None # Deselect if clicked again
+            self.selected_product_id = None
         else:
             self.selected_product_id = product_id
         self.refresh_order_display()
@@ -169,7 +156,6 @@ def remove_selected_item(self):
             return
 
         self.current_order.remove_item(self.selected_product_id)
-        # Check if the item is completely gone from the order, if so, clear selection
         still_exists = any(i.product_id == self.selected_product_id for i in self.current_order.items)
         if not still_exists:
             self.selected_product_id = None
@@ -209,7 +195,6 @@ def submit_order_to_kitchen(self):
         self.refresh_order_display()
 
     def build_order_section(self):
-        # -- Table Number Input --
         table_frame = tk.Frame(self.frame_order, bg=SECTION_BG)
         table_frame.pack(fill="x", pady=(0, 10))
 
@@ -219,7 +204,6 @@ def build_order_section(self):
 
         tk.Label(self.frame_order, text="CURRENT ORDER", font=("Segoe UI", 14, "bold"), bg=SECTION_BG, fg="white").pack(pady=(0, 10))
 
-        # Header with Fixed Alignment
         hdr = tk.Frame(self.frame_order, bg=SECTION_BG)
         hdr.pack(fill="x")
 
@@ -242,13 +226,11 @@ def refresh_order_display(self):
             widget.destroy()
 
         for item in self.current_order.items:
-            # Determine background color based on selection
             bg_color = HIGHLIGHT_COLOR if item.product_id == self.selected_product_id else SECTION_BG
 
             row = tk.Frame(self.order_list_frame, bg=bg_color)
             row.pack(fill="x", pady=2)
 
-            # Make the row clickable
             row.bind("<Button-1>", lambda e, pid=item.product_id: self.select_item(pid))
 
             txt_left = f"{item.quantity}x   {item.name}"
@@ -260,7 +242,6 @@ def refresh_order_display(self):
             lbl_right = tk.Label(row, text=txt_right, bg=bg_color, fg="white", font=("Segoe UI", 11))
             lbl_right.pack(side="right", padx=20)
 
-            # Make labels transparent to clicks (pass event to row)
             lbl_left.bind("<Button-1>", lambda e, pid=item.product_id: self.select_item(pid))
             lbl_right.bind("<Button-1>", lambda e, pid=item.product_id: self.select_item(pid))
 
@@ -275,7 +256,6 @@ def update_totals(self):
         self.lbl_tax_val.config(text=f"${tax:.2f}")
         self.lbl_total_val.config(text=f"${total:.2f}")
 
-    # --- Checkout Section ---
     def build_checkout_section(self):
         tk.Label(self.frame_checkout, text="CHECKOUT", font=("Segoe UI", 14, "bold"), bg=SECTION_BG, fg="white").pack(pady=(0, 20))
 
@@ -286,25 +266,19 @@ def build_checkout_section(self):
 
         self.lbl_total_val = self.add_total_row("Total:", "$0.00", 22, bold=True)
 
-        # Buttons
-        
-        # 1. Send to Kitchen (Bottom)
         btn_send = tk.Button(self.frame_checkout, text="SEND TO\nKITCHEN", bg="#CC3333", fg="white",
                          font=("Segoe UI", 16, "bold"), relief="flat", height=3, cursor="hand2",
                          command=self.submit_order_to_kitchen)
         btn_send.pack(side="bottom", fill="x", pady=(10, 0))
 
-        # 2. Control Buttons Container (Above Send)
         ctrl_frame = tk.Frame(self.frame_checkout, bg=SECTION_BG)
         ctrl_frame.pack(side="bottom", fill="x", pady=(0, 10))
 
-        # Cancel Order
         btn_cancel = tk.Button(ctrl_frame, text="CANCEL ORDER", bg="#FF5555", fg="white",
                          font=("Segoe UI", 10, "bold"), relief="flat", height=2, cursor="hand2",
                          command=self.cancel_order)
         btn_cancel.pack(side="left", fill="x", expand=True, padx=(0, 5))
 
-        # Remove Item
         btn_remove = tk.Button(ctrl_frame, text="REMOVE ITEM", bg="#FF8800", fg="white",
                          font=("Segoe UI", 10, "bold"), relief="flat", height=2, cursor="hand2",
                          command=self.remove_selected_item)