Changeset 7cc3672 in flexograder

Timestamp:

11/12/25 20:42:55 (5 months ago)

Author:

Enrico Schwass <ennoausberlin@…>

Branches:

fake-data, main, master

Children:

aaaa4b8

Parents:

f8e1cf8

Message:

close_catalog added

Files:

• builder/catalog_manager.py (modified) (1 diff)
• gui/gui.py (modified) (8 diffs)
• gui/menu.py (modified) (1 diff)
• gui/session_manager.py (modified) (2 diffs)

builder/catalog_manager.py

@@ -165 +165 @@
             # Delete files matching pattern
             for file in self._base_path.glob(f"*{catalog_id}*.json"):
+                print(file)
                 try:
                     file.unlink()

gui/gui.py

@@ -5 +5 @@
 from pathlib import Path
 from datetime import datetime
-from flexoentity import FlexOID
+from flexoentity import FlexOID, logger
 from builder.exam import Exam
 from builder.question_catalog import QuestionCatalog
@@ -65 +65 @@
 
     def refresh_all(self):
+
         self.refresh_catalog_list()
         self.refresh_exam_list()
@@ -72 +73 @@
             self.detail_panel.refresh_details(self.require_selected_question(),
                                               self.require_active_catalog())
-    @property
-    def active_catalog(self):
-        """Return the currently active catalog, or None if none is set."""
-        return self.catalog_manager.get_active()
-
-    def require_active_catalog(self):
-        """Return the active catalog, or show a message and return None."""
-        active = self.active_catalog
-        if not active:
-            messagebox.showinfo("No Catalog", "Please create or open a catalog first.")
-        return active
-
     def create_widgets(self):
         self.columnconfigure(0, weight=2, uniform="columns")
@@ -126 +115 @@
         self.recent_actions_var.set(" | ".join(self._recent_actions))
 
-    def export_catalog(self):
-        """Export the currently active catalog to a JSON file."""
-        catalog = self.catalog_manager.get_active()
-        if not catalog:
-            messagebox.showwarning("No Catalog", "No active catalog to export.")
-            return
-
-        # Ask for a file location
-        file_path = filedialog.asksaveasfilename(
-            defaultextension=".json",
-            file_types=[("JSON files", "*.json"), ("All files", "*.*")],
-            title="Export Catalog As"
-        )
-        if not file_path:
-            return  # user cancelled
-
-        try:
-            # Get catalog data as dict or JSON string
-            data = catalog.to_dict() if hasattr(catalog, "to_dict") else catalog
-            Path(file_path).write_text(json.dumps(data, indent=2, ensure_ascii=False))
-            messagebox.showinfo("Export Successful", f"Catalog exported to:\n{file_path}")
-        except Exception as e:
-            messagebox.showerror("Export Failed", f"Error exporting catalog:\n{e}")
-
-    def open_catalog(self):
-        path = filedialog.askopenfilename(filetypes=[("Catalog JSON", "*.json")])
-        if not path:
-            return
-
-        with open(path, "r", encoding="utf-8") as f:
-            data = json.load(f)
-
-        catalog = QuestionCatalog.from_dict(data)
-        title = simpledialog.askstring("New Catalog", "Enter title:", parent=self)
-        catalog.title = title
-        self.catalog_manager.add_catalog(catalog)
-        self.catalog_manager.set_active(catalog.flexo_id)
-        self.refresh_all()
-
-    def refresh_catalog_list(self):
-        self.catalog_dropdown["values"] = self.catalog_manager.list_titles()
-        self.catalog_var.set(self.catalog_manager.get_active_display_title())
-
-    def refresh_status_bar(self):
-        current_catalog = self.active_catalog
-        if not current_catalog:
-            self.status_var.set("No catalog loaded")
-            return
-        q_count = len(current_catalog.questions)
-        title = current_catalog.title
-        version = current_catalog.version
-        status = (
-            f"Catalog: {title} | Version: {version} | Questions: {q_count} | "
-            f"Status: {current_catalog.status_text}"
-        )
-        self.status_var.set(status)
+    def on_catalog_selected(self, event=None):
+        """Called when the user selects a catalog from the dropdown."""
+        title = self.catalog_var.get()
+        if not title:
+            return
+        self.catalog_manager.set_active_by_title(title)
+
+        self.refresh_all()
+        self.log_action(f"Catalog Switched - Active catalog: {title}")
 
     @property
-    def questions(self):
-        if not self.active_catalog:
-            return []
-        # Always provide deterministic order (e.g. by question ID)
-        return sorted(self.active_catalog.questions, key=lambda q: q.id)
+    def active_catalog(self):
+        """Return the currently active catalog, or None if none is set."""
+        return self.catalog_manager.get_active()
+
+    def require_active_catalog(self):
+        """Return the active catalog, or show a message and return None."""
+        active = self.active_catalog
+        if not active:
+            messagebox.showinfo("No Catalog", "Please create or open a catalog first.")
+        return active
 
     def create_catalog(self):
@@ -214 +161 @@
         self.refresh_all()
 
+    def export_catalog(self):
+        """Export the currently active catalog to a JSON file."""
+        catalog = self.catalog_manager.get_active()
+        if not catalog:
+            messagebox.showwarning("No Catalog", "No active catalog to export.")
+            return
+
+        # Ask for a file location
+        file_path = filedialog.asksaveasfilename(
+            defaultextension=".json",
+            file_types=[("JSON files", "*.json"), ("All files", "*.*")],
+            title="Export Catalog As"
+        )
+        if not file_path:
+            return  # user cancelled
+
+        try:
+            # Get catalog data as dict or JSON string
+            data = catalog.to_dict() if hasattr(catalog, "to_dict") else catalog
+            Path(file_path).write_text(json.dumps(data, indent=2,
+                                                  encoding="utf-8",
+                                                  ensure_ascii=False))
+            messagebox.showinfo("Export Successful", f"Catalog exported to:\n{file_path}")
+        except Exception as e:
+            messagebox.showerror("Export Failed", f"Error exporting catalog:\n{e}")
+
+    def open_catalog(self):
+        path = filedialog.askopenfilename(filetypes=[("Catalog JSON", "*.json")])
+        if not path:
+            return
+
+        with open(path, "r", encoding="utf-8") as f:
+            data = json.load(f)
+
+        catalog = QuestionCatalog.from_dict(data)
+        title = simpledialog.askstring("New Catalog", "Enter title:", parent=self)
+        catalog.title = title
+        self.catalog_manager.add_catalog(catalog)
+        self.catalog_manager.set_active(catalog.flexo_id)
+        self.refresh_all()
+
+    def close_catalog(self):
+        if not self.catalog_manager.catalogs:
+            messagebox.showerror("Catalog not found", "No catalog left")   
+            return
+        self.catalog_manager.delete(self.active_catalog.flexo_id)
+        titles = self.catalog_manager.list_titles()
+        if len(titles) == 0:
+            logger.info("No catalog left")
+            self.catalog_dropdown["values"] = []
+            self.catalog_var.set("")
+        else:
+            self.catalog_dropdown["values"] = self.catalog_manager.list_titles()
+            self.catalog_var.set(titles[0])
+            self.catalog_manager.set_active_by_title(titles[0])
+        self.question_tree.selection_remove(self.question_tree.selection())
+        self.refresh_all()
+
+    def refresh_catalog_list(self):
+        self.catalog_dropdown["values"] = self.catalog_manager.list_titles()
+        self.catalog_var.set(self.catalog_manager.get_active_display_title())
+
+    def refresh_status_bar(self):
+        current_catalog = self.active_catalog
+        if not current_catalog:
+            self.status_var.set("No catalog loaded")
+            return
+        q_count = len(current_catalog.questions)
+        title = current_catalog.title
+        version = current_catalog.version
+        status = (
+            f"Catalog: {title} | Version: {version} | Questions: {q_count} | "
+            f"Status: {current_catalog.status_text}"
+        )
+        self.status_var.set(status)
+
+    @property
+    def questions(self):
+        if not self.active_catalog:
+            return []
+        # Always provide deterministic order (e.g. by question ID)
+        return sorted(self.active_catalog.questions, key=lambda q: q.id)
+
     def create_exam_dialog(self):
         dialog = ExamDialog(self)
@@ -222 +252 @@
             )
             self.refresh_all()
-
-    def on_catalog_selected(self, event=None):
-        """Called when the user selects a catalog from the dropdown."""
-        title = self.catalog_var.get()
-        if not title:
-            return
-        self.catalog_manager.set_active_by_title(title)
-
-        self.refresh_all()
-        self.log_action(f"Catalog Switched - Active catalog: {title}")
 
     def on_exam_selected(self, event):
@@ -379 +399 @@
         dlg = ExamLayoutDialog(self, exam)
         self.wait_window(dlg)
-        print(exam)
         self.session.save(self.geometry())
 
@@ -430 +449 @@
         self.question_tree.delete(*self.question_tree.get_children())
 
-        active = self.require_active_catalog()
+        active = self.active_catalog
         if not active:
             self.question_tree.insert("", "end", iid="__none__",

gui/menu.py

@@ -18 +18 @@
         catalog_menu.add_command(label="Create Catalog", command=parent.create_catalog)
         catalog_menu.add_command(label="Open Catalog", command=parent.open_catalog)
+        catalog_menu.add_command(label="Close Catalog", command=parent.close_catalog)
         self.add_cascade(label="Catalogs", menu=catalog_menu)
 

gui/session_manager.py

@@ -35 +35 @@
                 if isinstance(each.flexo_id, str):
                     print(f"[WARN] Catalog {each.title} has string flexo_id: {each.flexo_id}")
-                path.write_text(json.dumps(each.to_dict(), indent=2, ensure_ascii=False))
+                path.write_text(json.dumps(each.to_dict(), indent=2, ensure_ascii=False),
+                                encoding="utf-8")
 
             # 3. Save metadata
@@ -44 +45 @@
                 "timestamp": timestamp,
             }
-            self.session_file.write_text(json.dumps(data, encoding="utf-8", indent=2))
+            self.session_file.write_text(json.dumps(data, indent=2), encoding="utf-8")
             print(f"[Session] Saved at {timestamp}")
         except Exception as e: