Changeset 0f50a20 in flexograder

Timestamp:

11/09/25 10:24:21 (2 months ago)

Author:

Enrico Schwass <ennoausberlin@…>

Branches:

master

Children:

e77bfb3

Parents:

066f7d9

Message:

simplify id handling

Files:

• builder/exam.py (modified) (3 diffs)
• builder/question_catalog.py (modified) (1 diff)
• gui/gui.py (modified) (7 diffs)
• gui/session_manager.py (modified) (3 diffs)
• tests/test_question_catalog.py (modified) (2 diffs)

builder/exam.py

@@ -82 +82 @@
     def default(cls):
         return cls()
-
-    @staticmethod
-    def _qid_of(q: ExamElement | str) -> str:
-        if isinstance(q, str):
-            return q
-        # prefer flexo_id, fallback to id if needed
-        return str(getattr(q, "flexo_id", getattr(q, "id")))
-
     def add_question(self, question: ExamElement):
         self.questions.append(question)
 
     def remove_question(self, qid: str):
-        qid = str(qid)
-        self.questions = [q for q in self.questions if self._qid_of(q) != qid]
+        self.questions = [q for q in self.questions if q.flexo_id != qid]
         self.layout.purge_question(qid)
 
     def get_question_by_id(self, qid: str) -> Optional[ExamElement]:
         qid = str(qid)
-        return next((q for q in self.questions if self._qid_of(q) == qid), None)
+        return next((q for q in self.questions if q.flexo_id == qid), None)
 
     def __post_init__(self):
@@ -217 +208 @@
     def add_question_to_page(self, page_title: str, question: ExamElement | str):
         """Assign a question to a page (by object or id)."""
-        qid = self._qid_of(question)
-        self.layout.assign(page_title, qid)
+        self.layout.assign(page_title, question.flexo_id)
    
     # FIXME: This needs to be addressed somewhere else now
@@ -307 +297 @@
                     continue
                 # prefer flexo_id as the answer key
-                key = self._qid_of(q)
-                submitted = submission.get_answer_for(key)
+                submitted = submission.get_answer_for(q.flexo_id)
                 score = q.evaluate(submitted)
                 total_score += score

builder/question_catalog.py

@@ -111 +111 @@
             int(q.id.split("_")[-1])
             for q in self.questions
-            if q.id.startswith(f"{abbrev}_") and q.id.split("_")[-1].isdigit()
+            if q.flexo_id.startswith(f"{abbrev}_") and q.flexo_id.split("_")[-1].isdigit()
         ]
         next_num = max(existing_numbers, default=0) + 1

gui/gui.py

@@ -48 +48 @@
         self._recent_actions = []
         self.domain_set = set()
-        self.clipboard = []  # holds copied/cut Question objects
-        self.clipboard_action = None  # "copy" or "cut"
+        self.clipboard = []  # holds copied Question objects
+        self.clipboard_action = None  # "copy"
         self.clipboard_source_catalog = None
         self.create_menu()
@@ -58 +58 @@
         self.session = SessionManager(catalog_manager=self.catalog_manager,
                                       exam_manager=self.exam_manager)
-        self.session.load()
+        geometry = self.session.load()
+        self.geometry(geometry)
         self.refresh_catalog_list()
         self.refresh_exam_list()
@@ -201 +202 @@
         ttk.Button(frame_buttons, text="Copy",
                    command=self.copy_selected_question).grid(row=0, column=1, padx=2, sticky="ew")
-        ttk.Button(frame_buttons, text="Cut",
-                   command=self.cut_selected_question).grid(row=0, column=2, padx=2, sticky="ew")
         ttk.Button(frame_buttons, text="Paste",
                    command=self.paste_selected_question).grid(row=0, column=3, padx=2, sticky="ew")
@@ -236 +235 @@
 
         ttk.Label(frame_right, text="Question Text").grid(row=0, column=0, sticky="w")
-        self.txt_question = tk.Text(frame_right, wrap="word", height=5)
+        self.txt_question = tk.Text(frame_right, wrap="word", height=3)
         self.txt_question.grid(row=1, column=0, sticky="nsew")
 
@@ -352 +351 @@
         # Always provide deterministic order (e.g. by question ID)
         return sorted(self.active_catalog.questions, key=lambda q: q.id)
-
-    def switch_catalog(self):
-        catalogs = self.catalog_manager.list_catalogs()
-        if not catalogs:
-            messagebox.showinfo("No Catalogs", "No catalogs loaded.")
-            return
-
-        selection = simpledialog.askstring(
-            "Switch Catalog",
-            f"Available catalogs:\n{', '.join(catalogs)}\nEnter catalog ID to activate:",
-        )
-        if not selection:
-            return
-
-        try:
-            self.catalog_manager.set_active(selection)
-            self.refresh_question_tree()
-            self.log_action(f"Switched - Active catalog: {selection}")
-        except ValueError:
-            messagebox.showerror("Invalid", f"No catalog with ID '{selection}'")
-        self.refresh_status_bar()
 
     def create_catalog(self):
@@ -653 +631 @@
             text = q.text.strip().replace("\n", " ")
             if len(text) > 100:
-                text = text[:97] + "..."
+                text = text # [:97] + "..."
 
             # Try to display a readable status name
@@ -783 +761 @@
                 target.add_questions([new_q])
                 transferred.append(new_q)
-
-        elif self.clipboard_action == "cut":
-            # Move from source to target
-            source = self.catalog_manager.catalogs[self.clipboard_source_catalog]
-            for q in list(self.clipboard):
-                # Remove from source
-                try:
-                    source.remove(q.id)
-                except ValueError:
-                    pass  # maybe already removed or invalid state
-                # Add to target
-                target.add_questions([q])
-                transferred.append(q)
-
         else:
             messagebox.showwarning("Paste", f"Unknown clipboard action: {self.clipboard_action}")

gui/session_manager.py

@@ -32 +32 @@
             for ex_id, each in self.exam_manager.exams.items():
                 path = self.exam_dir / f"{ex_id}.json"
-                
+
                 if isinstance(each.flexo_id, str):
                     print(f"[WARN] Catalog {each.title} has string flexo_id: {each.flexo_id}")
@@ -51 +51 @@
     def load(self):
         """Restore the previous workspace if available."""
+        geometry = "800x600+50+50"
         if not self.session_file.exists():
             print("[Session] No previous session found.")
-            return
-
-        geometry = "800x600+50+50"
+            return geometry
 
         try:
@@ -62 +61 @@
 
             # 1. Restore window
-
             geometry = data["geometry"]
 

tests/test_question_catalog.py

@@ -31 +31 @@
     qid = sample_question.flexo_id
     assert any(q.flexo_id == qid for q in catalog.questions)
-    assert catalog.remove(sample_question.id)  # removes if DRAFT
+    assert catalog.remove(sample_question.flexo_id)  # removes if DRAFT
     assert not any(q.flexo_id == qid for q in catalog.questions)
 
@@ -38 +38 @@
     sample_question.approve()
     with pytest.raises(ValueError):
-        catalog.remove(sample_question.id)
+        catalog.remove(sample_question.flexo_id)
 
 def test_next_question_id(catalog):