Changeset 11cf70d in flexograder

Timestamp:

01/19/26 15:41:09 (2 months ago)

Author:

Enrico Schwass <ennoausberlin@…>

Branches:

fake-data, main, master

Children:

e92c42d

Parents:

891e658

Message:

fix a type vs mtype regression in media_factory and question_ids vs element_ids in some older jsons

Files:

• examples/demo/example_exam.json (deleted)
• examples/demo/new_export.json (added)
• flexograder/core_entities/media_items.py (modified) (3 diffs)
• flexograder/generator/exam_generator.py (modified) (1 diff)
• org/acceptance_tests.org (modified) (5 diffs)
• scripts/generate_exam.py (modified) (2 diffs)

flexograder/core_entities/media_items.py

@@ -34 +34 @@
             return "video"
         return "file"
-
-    @property
-    def mtype(self) -> str:
-        # logical type used for JSON, defaults to mtype
-        return self.mtype
 
     @classmethod
@@ -90 +85 @@
 
     def to_html(self, prefix=MediaItem.ExportPrefix) -> str:
-        return f'<img src="{prefix + self.src}" alt="{"Bild zur Frage"}">'
+        return f'<img src="{prefix + self.src}" alt="{"Bild zur Frage"}" />'
 
 @dataclass
@@ -144 +139 @@
 
     def to_html(self, prefix=""):
-        return prefix
+        return ""
 
 def media_factory(m: dict) -> MediaItem:
-    mtype = m.get("mtype", "").lower()
+    mtype = m.get("type", "").lower()
 
     cls = {

flexograder/generator/exam_generator.py

@@ -26 +26 @@
                     if not (self.media_dir / each_item.src).exists():
                         raise FileNotFoundError(f"Missing file: {self.media_dir / each.media}")
-        print(exam.to_html())
         html = exam.to_html()
         return self.write_exam(exam, html)

org/acceptance_tests.org

@@ -17 +17 @@
 #+END_SRC
 
+*** Mac OS
+
+- Install flexoentity and flexograder with
+
+#+BEGIN_SRC shell
+  python3 -m pip install .
+#+END_SRC
+
+- Copy permanent remote db
+
+#+BEGIN_SRC shell
+  cp ./examples/remote.db /Users/Shared/flexograder
+#+END_SRC
+
+*** Windows 10 (Classified area)
+
+- Install flexoentity and flexograder by copying the sources to site-packages 
+
+- Copy permanent db to shared network drive
+  
+#+BEGIN_SRC shell
+  cp ./examples/remote.db whatever_drive_it_is
+#+END_SRC
+
 ** Startup
+
+*** Linux and MacOS
+
+Run the software from shell by typing
+
+#+BEGIN_SRC shell
+flexograder
+#+END_SRC
+
+*** Windows
+
+tbd
 
 |------------------------------------------------------------+-------------------------------------+----------------------------------------------------|
@@ -30 +66 @@
 ** Catalogs
 
-BEWARE: Always use export current catalog (to json) if you want persistance. Right now we do not update the sqlite database. Changes are LOST otherwise
+BEWARE: Always use export current catalog (to json) if you want persistance. Right now we do not update the sqlite database. Changes are LOST otherwise.
+This is postponed to version 1.3
 
 |----------------------------------------------------+----------------------------+-----------------------------------------------------------------|
@@ -40 +77 @@
 | Export current catalog as json                     | Working                    |                                                                 |
 | Switch catalogs by catalog switcher                | Working                    |                                                                 |
-| Catalog metadata in details pane                   | Not implemented            |                                                                 |
+| Catalog metadata in details pane                   | Not implemented yet        |                                                                 |
 | Copy / paste question between catalogs             | Working                    |                                                                 |
 | Open same catalog a second time                    | Working                    | Duplicate warning and abort due to duplicate keys in dictionary |
@@ -57 +94 @@
 | Delete media from question  | Working                              |
 | Promote question            | Working                              |
-| Edit answers and set points |                                      |
+| Edit answers and set points | Working                              |
+| Add topic or subtopic       | Not implemented yet                  |
 |-----------------------------+--------------------------------------|
 
 ** Exams
 
-|------------------------+---------|
-| Test case              | Outcome |
-|------------------------+---------|
-| Import serialized exam | Working |
-|------------------------+---------|
+|----------------------------+---------|
+| Test case                  | Outcome |
+|----------------------------+---------|
+| Import serialized exam     | Working |
+| Export serialized exam     | Working |
+| Edit / layout current exam | Working |
+|----------------------------+---------|
 
 ** Help browser
@@ -76 +116 @@
 
 ** Domain management
+
+|-----------+---------|
+| Test case | Outcome |
+|-----------+---------|
+|           |         |

scripts/generate_exam.py

@@ -4 +4 @@
 
 import sys
+import os
 from pathlib import Path
 from flexograder.generator.exam_generator import ExamGenerator
@@ -27 +28 @@
     generator_dir = project_root / "flexograder" / "generator"
     static_dir = generator_dir / "static"
-    media_root_dir = project_root / "media"
+    media_root_dir = Path(os.environ.get('FLEXO_MEDIA', project_root / "media"))
     output_dir = project_root / "out"  # collect all generated artifacts here