Changeset 20b84df in flexograder

Timestamp:

11/22/25 22:44:06 (8 weeks ago)

Author:

Enrico Schwass <ennoausberlin@…>

Branches:

master

Children:

36bee44

Parents:

858a4dc

Message:

convert example catalog to new format

Signed-off-by: Enrico Schwass <ennoausberlin@…>

Files:

• examples/python/beginner.json (modified) (55 diffs)
• examples/python/new.json (added)
• gui/exam_layout_editor.py (modified) (6 diffs)
• gui/gui.py (modified) (1 diff)
• gui/menu.py (modified) (1 diff)

examples/python/beginner.json

@@ -5 +5 @@
   "questions": [
     {
-      "domain": "PY_ARITHM",
+      "domain_id": "PY_ARITHM",
       "qtype": "single_choice",
       "text": "Welcher Operator führt die Ganzzahl-Division aus (abrunden Richtung −∞)?",
@@ -27 +27 @@
     },
     {
-      "domain": "PY_ARITHM",
+      "domain_id": "PY_ARITHM",
       "qtype": "multiple_choice",
       "text": "Welche Aussagen zu int und float sind richtig?",
@@ -54 +54 @@
     },
     {
-      "domain": "PY_ARITHM",
+      "domain_id": "PY_ARITHM",
       "qtype": "single_choice",
       "text": "Welches Ergebnis hat 2 ** 3 ** 2 in Python?",
@@ -76 +76 @@
     },
     {
-      "domain": "PY_ARITHM",
+      "domain_id": "PY_ARITHM",
       "qtype": "multiple_choice",
       "text": "Welche Funktionen wandeln Zahlen oder runden sinnvoll?",
@@ -103 +103 @@
     },
     {
-      "domain": "PY_ARITHM",
+      "domain_id": "PY_ARITHM",
       "qtype": "single_choice",
       "text": "Welches Paar gibt Quotient und Rest gemeinsam zurück?",
@@ -125 +125 @@
     },
     {
-      "domain": "PY_CNTRLSTRCT",
+      "domain_id": "PY_CNTRLSTRCT",
       "qtype": "single_choice",
       "text": "Welche Schleife wiederholt Code, solange eine Bedingung wahr ist?",
@@ -147 +147 @@
     },
     {
-      "domain": "PY_CNTRLSTRCT",
+      "domain_id": "PY_CNTRLSTRCT",
       "qtype": "multiple_choice",
       "text": "Welche Schlüsselwörter passen zu Schleifen?",
@@ -174 +174 @@
     },
     {
-      "domain": "PY_CNTRLSTRCT",
+      "domain_id": "PY_CNTRLSTRCT",
       "qtype": "single_choice",
       "text": "Wie iteriert man idiomatisch über Index UND Wert?",
@@ -196 +196 @@
     },
     {
-      "domain": "PY_CNTRLSTRCT",
+      "domain_id": "PY_CNTRLSTRCT",
       "qtype": "multiple_choice",
       "text": "Welche gehören zur if-Syntax?",
@@ -223 +223 @@
     },
     {
-      "domain": "PY_CNTRLSTRCT",
+      "domain_id": "PY_CNTRLSTRCT",
       "qtype": "single_choice",
       "text": "Wofür steht der Walrus-Operator (:=) auf Einsteiger-Niveau?",
@@ -245 +245 @@
     },
     {
-      "domain": "PY_FILES",
+      "domain_id": "PY_FILES",
       "qtype": "single_choice",
       "text": "Wie öffnet man eine Textdatei sicher zum Lesen in UTF-8?",
@@ -267 +267 @@
     },
     {
-      "domain": "PY_FILES",
+      "domain_id": "PY_FILES",
       "qtype": "multiple_choice",
       "text": "Warum with beim Datei-I/O nutzen?",
@@ -294 +294 @@
     },
     {
-      "domain": "PY_FILES",
+      "domain_id": "PY_FILES",
       "qtype": "single_choice",
       "text": "Welcher Modus hängt Text an (ohne zu überschreiben)?",
@@ -316 +316 @@
     },
     {
-      "domain": "PY_FILES",
+      "domain_id": "PY_FILES",
       "qtype": "multiple_choice",
       "text": "Welche Pfad-Utilities aus der Stdlib sind nützlich?",
@@ -343 +343 @@
     },
     {
-      "domain": "PY_FILES",
+      "domain_id": "PY_FILES",
       "qtype": "single_choice",
       "text": "Wie liest man große Textdateien speicherschonend?",
@@ -365 +365 @@
     },
     {
-      "domain": "PY_TYPES",
+      "domain_id": "PY_TYPES",
       "qtype": "single_choice",
       "text": "Wozu dienen Typannotationen in Python?",
@@ -387 +387 @@
     },
     {
-      "domain": "PY_TYPES",
+      "domain_id": "PY_TYPES",
       "qtype": "multiple_choice",
       "text": "Welche sind gültige Container-Annotationen (>=3.9)?",
@@ -414 +414 @@
     },
     {
-      "domain": "PY_TYPES",
+      "domain_id": "PY_TYPES",
       "qtype": "single_choice",
       "text": "Wie annotiert man 'oder None' präzise?",
@@ -436 +436 @@
     },
     {
-      "domain": "PY_TYPES",
+      "domain_id": "PY_TYPES",
       "qtype": "multiple_choice",
       "text": "Welche Stdlib-Hilfen definieren einfache Datenobjekte?",
@@ -463 +463 @@
     },
     {
-      "domain": "PY_TYPES",
+      "domain_id": "PY_TYPES",
       "qtype": "single_choice",
       "text": "Welche Annotation beschreibt eine Funktion 'nimmt int, gibt bool'?",
@@ -485 +485 @@
     },
     {
-      "domain": "PY_STREAMS",
+      "domain_id": "PY_STREAMS",
       "qtype": "single_choice",
       "text": "Was liefert eine Listen-Comprehension?",
@@ -507 +507 @@
     },
     {
-      "domain": "PY_STREAMS",
+      "domain_id": "PY_STREAMS",
       "qtype": "multiple_choice",
       "text": "Welche Konstrukte sind lazy (werten Elemente erst bei Bedarf aus)?",
@@ -534 +534 @@
     },
     {
-      "domain": "PY_STREAMS",
+      "domain_id": "PY_STREAMS",
       "qtype": "single_choice",
       "text": "Wofür steht yield in einer Funktion?",
@@ -556 +556 @@
     },
     {
-      "domain": "PY_STREAMS",
+      "domain_id": "PY_STREAMS",
       "qtype": "multiple_choice",
       "text": "Welche Tools sind nützlich für Iterables?",
@@ -583 +583 @@
     },
     {
-      "domain": "PY_STREAMS",
+      "domain_id": "PY_STREAMS",
       "qtype": "single_choice",
       "text": "Welcher Ausdruck ist am speicherschonendsten?",
@@ -605 +605 @@
     },
     {
-      "domain": "PY_COLLECTIONS",
+      "domain_id": "PY_COLLECTIONS",
       "qtype": "single_choice",
       "text": "Welche Struktur eignet sich für schnelles Anhängen am Ende?",
@@ -627 +627 @@
     },
     {
-      "domain": "PY_COLLECTIONS",
+      "domain_id": "PY_COLLECTIONS",
       "qtype": "multiple_choice",
       "text": "Welche Aussagen zu set sind korrekt?",
@@ -654 +654 @@
     },
     {
-      "domain": "PY_COLLECTIONS",
+      "domain_id": "PY_COLLECTIONS",
       "qtype": "single_choice",
       "text": "Wofür steht collections.Counter?",
@@ -676 +676 @@
     },
     {
-      "domain": "PY_COLLECTIONS",
+      "domain_id": "PY_COLLECTIONS",
       "qtype": "multiple_choice",
       "text": "Welche Strukturen sind unveränderlich (immutable)?",
@@ -703 +703 @@
     },
     {
-      "domain": "PY_COLLECTIONS",
+      "domain_id": "PY_COLLECTIONS",
       "qtype": "single_choice",
       "text": "Was bewirkt defaultdict(list)?",
@@ -725 +725 @@
     },
     {
-      "domain": "PY_DATETIME",
+      "domain_id": "PY_DATETIME",
       "qtype": "single_choice",
       "text": "Welche Stdlib liefert Zeitzonen (ab 3.9)?",
@@ -747 +747 @@
     },
     {
-      "domain": "PY_DATETIME",
+      "domain_id": "PY_DATETIME",
       "qtype": "multiple_choice",
       "text": "Welche Aussagen sind korrekt?",
@@ -774 +774 @@
     },
     {
-      "domain": "PY_DATETIME",
+      "domain_id": "PY_DATETIME",
       "qtype": "single_choice",
       "text": "Wie misst man kurze Zeitdauern zuverlässig?",
@@ -796 +796 @@
     },
     {
-      "domain": "PY_DATETIME",
+      "domain_id": "PY_DATETIME",
       "qtype": "multiple_choice",
       "text": "Welche Formate sind für Logs/Datenaustausch robust?",
@@ -823 +823 @@
     },
     {
-      "domain": "PY_DATETIME",
+      "domain_id": "PY_DATETIME",
       "qtype": "single_choice",
       "text": "Wie erhält man 'jetzt in UTC' als aware datetime?",
@@ -845 +845 @@
     },
     {
-      "domain": "PY_NAMESPACES",
+      "domain_id": "PY_NAMESPACES",
       "qtype": "single_choice",
       "text": "Wofür steht LEGB?",
@@ -867 +867 @@
     },
     {
-      "domain": "PY_NAMESPACES",
+      "domain_id": "PY_NAMESPACES",
       "qtype": "multiple_choice",
       "text": "Welche Aussagen zu global/nonlocal sind korrekt?",
@@ -894 +894 @@
     },
     {
-      "domain": "PY_NAMESPACES",
+      "domain_id": "PY_NAMESPACES",
       "qtype": "single_choice",
       "text": "Wie markiert man interne Modulnamen konventionell?",
@@ -916 +916 @@
     },
     {
-      "domain": "PY_NAMESPACES",
+      "domain_id": "PY_NAMESPACES",
       "qtype": "multiple_choice",
       "text": "Gute Praktiken gegen Namenskonflikte:",
@@ -943 +943 @@
     },
     {
-      "domain": "PY_NAMESPACES",
+      "domain_id": "PY_NAMESPACES",
       "qtype": "single_choice",
       "text": "Wozu dient __all__ in einem Modul?",
@@ -965 +965 @@
     },
     {
-      "domain": "PY_MODULES",
+      "domain_id": "PY_MODULES",
       "qtype": "single_choice",
       "text": "Was passiert mit Top-Level-Code beim Import?",
@@ -987 +987 @@
     },
     {
-      "domain": "PY_MODULES",
+      "domain_id": "PY_MODULES",
       "qtype": "multiple_choice",
       "text": "Welche Aussagen zu Imports stimmen?",
@@ -1014 +1014 @@
     },
     {
-      "domain": "PY_MODULES",
+      "domain_id": "PY_MODULES",
       "qtype": "single_choice",
       "text": "Wie führt man ein Modul als Skript aus?",
@@ -1036 +1036 @@
     },
     {
-      "domain": "PY_MODULES",
+      "domain_id": "PY_MODULES",
       "qtype": "multiple_choice",
       "text": "Welche Werkzeuge sind für Paket-Ressourcen nützlich?",
@@ -1063 +1063 @@
     },
     {
-      "domain": "PY_MODULES",
+      "domain_id": "PY_MODULES",
       "qtype": "single_choice",
       "text": "Wie bindet man einen Modul-Logger korrekt?",
@@ -1085 +1085 @@
     },
     {
-      "domain": "PY_OOP",
+      "domain_id": "PY_OOP",
       "qtype": "single_choice",
       "text": "Wofür steht @property?",
@@ -1107 +1107 @@
     },
     {
-      "domain": "PY_OOP",
+      "domain_id": "PY_OOP",
       "qtype": "multiple_choice",
       "text": "Welche Aussagen zu Klassen-/staticmethods sind korrekt?",
@@ -1134 +1134 @@
     },
     {
-      "domain": "PY_OOP",
+      "domain_id": "PY_OOP",
       "qtype": "single_choice",
       "text": "Wie vergleicht man zwei Instanzen auf Wertgleichheit sinnvoll?",
@@ -1156 +1156 @@
     },
     {
-      "domain": "PY_OOP",
+      "domain_id": "PY_OOP",
       "qtype": "multiple_choice",
       "text": "Welche Methoden sind für Containerklassen nützlich?",
@@ -1183 +1183 @@
     },
     {
-      "domain": "PY_OOP",
+      "domain_id": "PY_OOP",
       "qtype": "single_choice",
       "text": "Welche Basisklasse nutzt man für abstrakte Klassen?",
@@ -1205 +1205 @@
     },
     {
-      "domain": "PY_EXCEPTIONS",
+      "domain_id": "PY_EXCEPTIONS",
       "qtype": "single_choice",
       "text": "Wie fängt man eine konkrete Exception?",
@@ -1227 +1227 @@
     },
     {
-      "domain": "PY_EXCEPTIONS",
+      "domain_id": "PY_EXCEPTIONS",
       "qtype": "multiple_choice",
       "text": "Welche Blöcke kann ein try-Statement enthalten?",
@@ -1254 +1254 @@
     },
     {
-      "domain": "PY_EXCEPTIONS",
+      "domain_id": "PY_EXCEPTIONS",
       "qtype": "single_choice",
       "text": "Wie re-raiset man dieselbe Exception innerhalb des except-Blocks unverändert?",
@@ -1276 +1276 @@
     },
     {
-      "domain": "PY_EXCEPTIONS",
+      "domain_id": "PY_EXCEPTIONS",
       "qtype": "multiple_choice",
       "text": "Gute Praktiken beim Fehler-Handling:",
@@ -1303 +1303 @@
     },
     {
-      "domain": "PY_EXCEPTIONS",
+      "domain_id": "PY_EXCEPTIONS",
       "qtype": "single_choice",
       "text": "Welche Ausnahmen sind KEINE Unterklassen von Exception?",

gui/exam_layout_editor.py

@@ -2 +2 @@
 import tkinter as tk
 from tkinter import ttk, messagebox, simpledialog
+
+from builder.exam import ExamLayout
 
 
@@ -15 +17 @@
         self.layout = getattr(exam, "layout", None)
         if self.layout is None:
-            from builder.exam import ExamLayout
+            print("No layout")
             self.layout = ExamLayout()
 
@@ -23 +25 @@
 
         self.create_widgets()
+        print("DEBUG pages:", self.layout.pages)
+
         self.refresh_all()
 
@@ -55 +59 @@
         self.questions_list = tk.Listbox(top, selectmode="extended", exportselection=False)
         self.questions_list.grid(row=1, column=0, sticky="nsew", padx=(0, 6))
+
+        # Filter — show only unassigned questions
+        self.var_unassigned = tk.BooleanVar(value=False)
+        self.chk_unassigned = ttk.Checkbutton(
+            top,
+            text="Show unassigned only",
+            variable=self.var_unassigned,
+            command=self.refresh_questions_list
+        )
+        self.chk_unassigned.grid(row=2, column=0, sticky="w", padx=(0, 6), pady=(4, 0))
+
         qbtns = ttk.Frame(top)
-        qbtns.grid(row=2, column=0, sticky="ew", pady=(5, 0))
+        qbtns.grid(row=3, column=0, sticky="ew", pady=(5, 0))
         ttk.Button(qbtns, text="Add Question", command=self.add_question).pack(side="left")
         ttk.Button(qbtns, text="Delete", command=self.delete_question).pack(side="left")
@@ -108 +123 @@
     # ─────────────────────────────────────────────────────────────
     def refresh_all(self):
-        self.pages_list.delete(0, tk.END)
-        for p in self.layout.pages:
-            self.pages_list.insert(tk.END, p.title)
-
-        self.questions_list.delete(0, tk.END)
-        for q in self.exam.questions:
-            self.questions_list.insert(tk.END, q.text[:50])
-
-        self.page_questions.delete(0, tk.END)
+
+        self.refresh_pages_list()
+        self.refresh_questions_list()
 
     def refresh_page_questions(self, page):
@@ -123 +132 @@
             q = self.exam.get_question_by_id(qid)
             if q:
-                self.page_questions.insert(tk.END, f"{qid} — {q.text[:50]}")
-
+                self.page_questions.insert(tk.END, q.text[:50])
+
+    def refresh_pages_list(self):
+        """Refresh the right-side pages list."""
+        self.pages_list.delete(0, tk.END)
+        for p in self.layout.pages:
+            self.pages_list.insert(tk.END, str(p.title))
+
+    def refresh_questions_list(self):
+        """Refresh left-side question pool, considering the 'unassigned only' filter."""
+        self.questions_list.delete(0, tk.END)
+
+        # Collect all question IDs currently placed on pages
+        assigned = set()
+        for page in self.layout.pages:
+            for qid in page.question_ids:
+                assigned.add(qid)
+
+        for q in self.exam.questions:
+            if self.var_unassigned.get() and q.flexo_id in assigned:
+                continue
+            self.questions_list.insert(tk.END, q.text[:50])
     # ─────────────────────────────────────────────────────────────
     # Page operations

gui/gui.py

@@ -386 +386 @@
             messagebox.showerror("Error", f"Could not load exam:\n{e}")
             return
+        self.refresh_all()
 
     def import_exam_as_temp_catalog(self, exam_path: str):

gui/menu.py

@@ -28 +28 @@
         exam_menu = tk.Menu(self, tearoff=0)
         exam_menu.add_command(label="Create new exam", command=parent.create_exam_dialog)
-        exam_menu.add_command(label="Layout existing exam", command=parent.layout_exam)
+        exam_menu.add_command(label="Layout current exam", command=parent.layout_exam)
         self.add_cascade(label="Exams", menu=exam_menu)