excel2moodle 0.6.0__tar.gz → 0.6.2__tar.gz

{excel2moodle-0.6.0/excel2moodle.egg-info → excel2moodle-0.6.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: excel2moodle
-Version: 0.6.0
+Version: 0.6.2
 Summary: A package for converting questions from a spreadsheet, to valid moodle-xml
 Author: Jakob Bosse
 License-Expression: GPL-3.0-or-later
@@ -17,16 +17,20 @@ Requires-Dist: lxml>=5.4.0
 Requires-Dist: asteval>=1.0.6
 Requires-Dist: python-calamine>=0.3.2
 Requires-Dist: pyside6-essentials>=6.8.0
+Requires-Dist: pyyaml>=6.0.2
 Dynamic: license-file
 
 # excel 2 Moodle
-![Logo](excel2moodleLogo.png "Logo excel2moodle"){width=35%}
+![Logo](https://gitlab.com/jbosse3/-/blob/master/excel2moodleLogo.png "Logo excel2moodle"){width=35%}
 
-This Python program helps to create Moodle questions in less time.
-The idea is to write the questions data into a spreadsheet file, from which the program generates the moodle compliant xml Files. 
-All questions or a selection of questions can be exported into one xml file to be imported into moodle.
+*excel2moodle* helps to create Moodle questions in less time.
+The idea is to write the questions data into a spreadsheet file, from which the *excel2moodle* generates moodle compliant xml Files. 
+All questions or a selection of questions can then be imported into moodle.
 
 ## Concept
+At the heart the *excel2moodle* is a simple key-value-pair "syntax", where the key is set once in the first spreadsheet column.
+Each key can be provided with a value for each question in its column
+To enhance reusability, key values which are correct for more than one question can be set per category or for all questions.
 The concept is, to store the different questions into categories of similar types and difficulties of questions, for each of which, a separated sheet in the Spreadsheet document should be created.
 
 A `settings` sheet contains global settings to be used for all questions and categories.
@@ -41,33 +45,38 @@ If you already have python and uv installed, it is as easy as running `uv tool i
 
 ### [ Documentation ](https://jbosse3.gitlab.io/excel2moodle/index.html)
 Once excel2moodle is installed you can checkout the [example question sheet](https://gitlab.com/jbosse3/excel2moodle/-/tree/master/example?ref_type=heads) 
-in the repository.
+in the repository. You need to download all Files in the `example` directory and save them together.
 
-Some steps are already documented as [ tutorials ](https://jbosse3.gitlab.io/excel2moodle/howto.html)
+Most steps are already documented as [ tutorials ](https://jbosse3.gitlab.io/excel2moodle/howto.html)
 you can follow along.
 
 And please have a look into the [**user Reference**](https://jbosse3.gitlab.io/excel2moodle/userReference.html)
 of the documentation. 
-That part explains each part of defining a question.
+That part explains in more detail each part of defining a question.
 
 
-## Functionality
-* Equation Verification:
-    + this tool helps you to validate the correct equation for the parametrized Questions.
-* Question Preview:
+## Features
+- Fully parametrized numeric questions:
+    * Formulas for the calculated results can be coded into extensive python modules, which can be loaded.
+- Question Preview:
     + This helps you when selecting the correct questions for the export.
-* Export Options:
+- Equation Verification:
+    + this tool helps you to validate the correct equation for the parametrized Questions.
+- Variable Generation:
+    + You can generate variables for the parametric Question to easily create hundreds of different variants of the same question.
+- Export Options:
     + you can export the questions preserving the categories in moodle
 
 ### Question Types
-* Generate multiple Choice Questions:
-    + The answers can be pictures or normal text
-* Generate Numeric Questions
-* Generate parametrized numeric Questions
-* Generate parametrized cloze Questions
+- Generate multiple Choice Questions:
+    * The answers can be pictures or normal text
+- Generate Numeric Questions
+- Generate parametrized numeric Questions:
+    * With the parametrization *excel2moodle* calculats the numeric answer from a given formula based on a set of variables.
+- Generate parametrized cloze Questions
 
 
-![MainWindow](mainWindow.png "Logo excel2moodle"){width=80%}
+![MainWindow](https://gitlab.com/jbosse3/-/blob/master/mainWindow.png "Logo excel2moodle"){width=80%}
 
 ## Licensing and authorship
 excel2moodle is lincensed under the latest [GNU GPL license](https://gitlab.com/jbosse3/excel2moodle/-/blob/master/LICENSE)
@@ -81,6 +90,31 @@ If You want to support my work as well, you can by me a [coffee](https://ko-fi.c
 
 # Changelogs
 
+## 0.6.2 (2025-08-02)
+Adding export options and fixing cloze points bug
+
+### feature (4 changes)
+
+- [Added export options to include all Question Variants and generate report](https://gitlab.com/jbosse3/excel2moodle/-/commit/6433615de23174451748b69669a9dce748dd5b4d)
+- [Implemented export dialog generator method](https://gitlab.com/jbosse3/excel2moodle/-/commit/a8eda982309bf9a6dae7ef2b261a59654f2c8910)
+- [Answer Feedback strings settable in sheet](https://gitlab.com/jbosse3/excel2moodle/-/commit/ad90da49ac60e429ad3243f54846b08f0caf5bc7)
+- [Inverted result and feedback for NFM & Cloze questions](https://gitlab.com/jbosse3/excel2moodle/-/commit/57d77c83a661398b0082f84d25e5447000df9096)
+
+### improvement (1 change)
+
+- [Missing `settings` sheet raises an error](https://gitlab.com/jbosse3/excel2moodle/-/commit/e1cc42c1d31981bf74582b23c24c6ac378e9256d)
+
+### bugfix (1 change)
+
+- [resolve cloze moodle import error due to float points](https://gitlab.com/jbosse3/excel2moodle/-/commit/f13b7b9df39df55d65b6063a9deb1fc1c72f5ebb)
+
+## 0.6.1 (2025-07-12)
+Fixing import error caused by dumping pyside meta package
+
+### bugfix (1 change)
+
+- [fixing pyside import error](https://gitlab.com/jbosse3/excel2moodle/-/commit/e5e0fc7695caa1a6864785828ff7311fa9624ad4)
+
 ## 0.6.0 (2025-07-12)
 Added variable generator and other architechtural improvements
 

{excel2moodle-0.6.0 → excel2moodle-0.6.2}/README.md

@@ -1,11 +1,14 @@
 # excel 2 Moodle
-![Logo](excel2moodleLogo.png "Logo excel2moodle"){width=35%}
+![Logo](https://gitlab.com/jbosse3/-/blob/master/excel2moodleLogo.png "Logo excel2moodle"){width=35%}
 
-This Python program helps to create Moodle questions in less time.
-The idea is to write the questions data into a spreadsheet file, from which the program generates the moodle compliant xml Files. 
-All questions or a selection of questions can be exported into one xml file to be imported into moodle.
+*excel2moodle* helps to create Moodle questions in less time.
+The idea is to write the questions data into a spreadsheet file, from which the *excel2moodle* generates moodle compliant xml Files. 
+All questions or a selection of questions can then be imported into moodle.
 
 ## Concept
+At the heart the *excel2moodle* is a simple key-value-pair "syntax", where the key is set once in the first spreadsheet column.
+Each key can be provided with a value for each question in its column
+To enhance reusability, key values which are correct for more than one question can be set per category or for all questions.
 The concept is, to store the different questions into categories of similar types and difficulties of questions, for each of which, a separated sheet in the Spreadsheet document should be created.
 
 A `settings` sheet contains global settings to be used for all questions and categories.
@@ -20,33 +23,38 @@ If you already have python and uv installed, it is as easy as running `uv tool i
 
 ### [ Documentation ](https://jbosse3.gitlab.io/excel2moodle/index.html)
 Once excel2moodle is installed you can checkout the [example question sheet](https://gitlab.com/jbosse3/excel2moodle/-/tree/master/example?ref_type=heads) 
-in the repository.
+in the repository. You need to download all Files in the `example` directory and save them together.
 
-Some steps are already documented as [ tutorials ](https://jbosse3.gitlab.io/excel2moodle/howto.html)
+Most steps are already documented as [ tutorials ](https://jbosse3.gitlab.io/excel2moodle/howto.html)
 you can follow along.
 
 And please have a look into the [**user Reference**](https://jbosse3.gitlab.io/excel2moodle/userReference.html)
 of the documentation. 
-That part explains each part of defining a question.
+That part explains in more detail each part of defining a question.
 
 
-## Functionality
-* Equation Verification:
-    + this tool helps you to validate the correct equation for the parametrized Questions.
-* Question Preview:
+## Features
+- Fully parametrized numeric questions:
+    * Formulas for the calculated results can be coded into extensive python modules, which can be loaded.
+- Question Preview:
     + This helps you when selecting the correct questions for the export.
-* Export Options:
+- Equation Verification:
+    + this tool helps you to validate the correct equation for the parametrized Questions.
+- Variable Generation:
+    + You can generate variables for the parametric Question to easily create hundreds of different variants of the same question.
+- Export Options:
     + you can export the questions preserving the categories in moodle
 
 ### Question Types
-* Generate multiple Choice Questions:
-    + The answers can be pictures or normal text
-* Generate Numeric Questions
-* Generate parametrized numeric Questions
-* Generate parametrized cloze Questions
+- Generate multiple Choice Questions:
+    * The answers can be pictures or normal text
+- Generate Numeric Questions
+- Generate parametrized numeric Questions:
+    * With the parametrization *excel2moodle* calculats the numeric answer from a given formula based on a set of variables.
+- Generate parametrized cloze Questions
 
 
-![MainWindow](mainWindow.png "Logo excel2moodle"){width=80%}
+![MainWindow](https://gitlab.com/jbosse3/-/blob/master/mainWindow.png "Logo excel2moodle"){width=80%}
 
 ## Licensing and authorship
 excel2moodle is lincensed under the latest [GNU GPL license](https://gitlab.com/jbosse3/excel2moodle/-/blob/master/LICENSE)
@@ -60,6 +68,31 @@ If You want to support my work as well, you can by me a [coffee](https://ko-fi.c
 
 # Changelogs
 
+## 0.6.2 (2025-08-02)
+Adding export options and fixing cloze points bug
+
+### feature (4 changes)
+
+- [Added export options to include all Question Variants and generate report](https://gitlab.com/jbosse3/excel2moodle/-/commit/6433615de23174451748b69669a9dce748dd5b4d)
+- [Implemented export dialog generator method](https://gitlab.com/jbosse3/excel2moodle/-/commit/a8eda982309bf9a6dae7ef2b261a59654f2c8910)
+- [Answer Feedback strings settable in sheet](https://gitlab.com/jbosse3/excel2moodle/-/commit/ad90da49ac60e429ad3243f54846b08f0caf5bc7)
+- [Inverted result and feedback for NFM & Cloze questions](https://gitlab.com/jbosse3/excel2moodle/-/commit/57d77c83a661398b0082f84d25e5447000df9096)
+
+### improvement (1 change)
+
+- [Missing `settings` sheet raises an error](https://gitlab.com/jbosse3/excel2moodle/-/commit/e1cc42c1d31981bf74582b23c24c6ac378e9256d)
+
+### bugfix (1 change)
+
+- [resolve cloze moodle import error due to float points](https://gitlab.com/jbosse3/excel2moodle/-/commit/f13b7b9df39df55d65b6063a9deb1fc1c72f5ebb)
+
+## 0.6.1 (2025-07-12)
+Fixing import error caused by dumping pyside meta package
+
+### bugfix (1 change)
+
+- [fixing pyside import error](https://gitlab.com/jbosse3/excel2moodle/-/commit/e5e0fc7695caa1a6864785828ff7311fa9624ad4)
+
 ## 0.6.0 (2025-07-12)
 Added variable generator and other architechtural improvements
 

{excel2moodle-0.6.0 → excel2moodle-0.6.2}/excel2moodle/__main__.py

@@ -2,9 +2,10 @@
 
 import logging.config as logConfig
 import signal
+import sys
 from pathlib import Path
 
-from PySide6 import QtWidgets, sys
+from PySide6.QtWidgets import QApplication
 
 import excel2moodle
 from excel2moodle import e2mMetadata, mainLogger
@@ -23,7 +24,7 @@ def main() -> None:
         logfile.replace(f"{logfile}.old")
     logConfig.dictConfig(config=loggerConfig)
     signal.signal(signal.SIGINT, signal.SIG_DFL)
-    app = QtWidgets.QApplication(sys.argv)
+    app = QApplication(sys.argv)
     settings = Settings()
     database: dataStructure.QuestionDB = dataStructure.QuestionDB(settings)
     window = ui.MainWindow(settings, database)

{excel2moodle-0.6.0 → excel2moodle-0.6.2}/excel2moodle/core/category.py

@@ -5,10 +5,9 @@ from typing import TYPE_CHECKING
 import lxml.etree as ET
 import pandas as pd
 
-from excel2moodle.core.settings import Tags
-
 if TYPE_CHECKING:
     from excel2moodle.core.question import Question
+from excel2moodle.core.settings import Tags
 
 loggerObj = logging.getLogger(__name__)
 
@@ -30,7 +29,7 @@ class Category:
         self.desc = str(description)
         self.dataframe: pd.DataFrame = dataframe
         self.settings: dict[str, float | str] = settings if settings else {}
-        self.questions: dict[int, Question] = {}
+        self._questions: dict[int, Question]
         self.maxVariants: int | None = None
         loggerObj.info("initializing Category %s", self.NAME)
 
@@ -50,6 +49,18 @@ class Category:
     def id(self) -> str:
         return f"{self.n:02d}"
 
+    @property
+    def questions(self) -> dict:
+        if not hasattr(self, "_questions"):
+            msg = "Category question are not yet initialized"
+            raise ValueError(msg)
+        return self._questions
+
+    def appendQuestion(self, questionNumber: int, question) -> None:
+        if not hasattr(self, "_questions"):
+            self._questions: dict[int, Question] = {}
+        self._questions[questionNumber] = question
+
     def __hash__(self) -> int:
         return hash(self.NAME)
 
@@ -58,13 +69,20 @@ class Category:
             return self.NAME == other.NAME
         return False
 
-    def getCategoryHeader(self) -> ET.Element:
+    def getCategoryHeader(self, subCategory: str | None = None) -> ET.Element:
         """Insert an <question type='category'> before all Questions of this Category."""
         header = ET.Element("question", type="category")
         cat = ET.SubElement(header, "category")
         info = ET.SubElement(header, "info", format="html")
-        ET.SubElement(cat, "text").text = f"$module$/top/{self.NAME}"
+        catStr = (
+            f"$module$/top/{self.NAME}"
+            if subCategory is None
+            else f"$module$/top/{self.NAME}/Question-{subCategory[2:]}_Variants"
+        )
+        ET.SubElement(cat, "text").text = catStr
         ET.SubElement(info, "text").text = str(self.desc)
-        ET.SubElement(header, "idnumber").text = self.id
+        ET.SubElement(header, "idnumber").text = (
+            f"cat-{self.id}" if subCategory is None else f"variants-{subCategory}"
+        )
         ET.indent(header)
         return header

{excel2moodle-0.6.0 → excel2moodle-0.6.2}/excel2moodle/core/dataStructure.py

@@ -3,6 +3,7 @@
 At the heart is the class ``xmlTest``
 """
 
+import datetime as dt
 import logging
 import sys
 from concurrent.futures import ProcessPoolExecutor, as_completed
@@ -11,14 +12,16 @@ from typing import TYPE_CHECKING
 
 import lxml.etree as ET  # noqa: N812
 import pandas as pd
+import yaml
 from PySide6.QtCore import QObject, Signal
 from PySide6.QtWidgets import QDialog
 
+from excel2moodle import __version__
 from excel2moodle.core import stringHelpers
 from excel2moodle.core.category import Category
 from excel2moodle.core.exceptions import InvalidFieldException, QNotParsedException
 from excel2moodle.core.globals import Tags
-from excel2moodle.core.question import Question
+from excel2moodle.core.question import ParametricQuestion, Question
 from excel2moodle.core.settings import Settings
 from excel2moodle.core.validator import Validator
 from excel2moodle.logger import LogAdapterQuestionID
@@ -72,9 +75,10 @@ class QuestionDB:
     def __init__(self, settings: Settings) -> None:
         self.settings = settings
         self.window: QMainWindow | None = None
-        self.version = None
         self.categoriesMetaData: pd.DataFrame
         self.categories: dict[str, Category]
+        self._exportedQuestions: list[Question] = []
+        self._exportedAll: bool = False
 
     @property
     def spreadsheet(self) -> Path:
@@ -94,22 +98,39 @@ class QuestionDB:
         ``categoriesMetaData`` dataframe
         Setup the categories and store them  in ``self.categories = {}``
         Pass the question data to the categories.
+
+        Raises
+        ------
+        ValueError
+            When there is no 'seetings' worksheet in the file.
+        InvalidFieldException
+            When the settings are invalid
+
+        Before raising it logges the exceptions with a meaningful message.
+
         """
         sheetPath = sheetPath if sheetPath else self.spreadsheet
         logger.info("Start Parsing the Excel Metadata Sheet\n")
-        with Path(sheetPath).open("rb") as f:
-            settingDf = pd.read_excel(
-                f,
-                sheet_name="settings",
-                index_col=0,
-                engine="calamine",
+        try:
+            with Path(sheetPath).open("rb") as f:
+                settingDf = pd.read_excel(
+                    f,
+                    sheet_name="settings",
+                    index_col=0,
+                    engine="calamine",
+                )
+        except ValueError:
+            logger.exception(
+                "Did you forget to specify a 'settings' sheet in the file?"
             )
-            logger.debug("Found the settings: \n\t%s", settingDf)
-            settingDf = self.harmonizeDFIndex(settingDf)
-            for tag, value in settingDf.iterrows():
-                val = value.iloc[0]
-                if pd.notna(val):
-                    self.settings.set(tag, val)
+            raise
+        logger.debug("Found the settings: \n\t%s", settingDf)
+        settingDf = self.harmonizeDFIndex(settingDf)
+        for tag, value in settingDf.iterrows():
+            val = value.iloc[0]
+            if pd.notna(val):
+                self.settings.set(tag, val)
+
         try:
             self._validateProjectSettings(sheetPath=sheetPath)
         except InvalidFieldException:
@@ -342,13 +363,18 @@ class QuestionDB:
         else:
             msg = "couldn't setup Parser"
             raise QNotParsedException(msg, question.id)
-        category.questions[qNumber] = question
+        category.appendQuestion(qNumber, question)
         return question
 
     def appendQuestions(
-        self, questions: list[QuestionItem], file: Path | None = None
+        self,
+        questions: list[QuestionItem],
+        file: Path | None = None,
+        pCount: int = 0,
+        qCount: int = 0,
     ) -> None:
         """Append selected question Elements to the tree."""
+        self._exportedQuestions.clear()
         tree = ET.Element("quiz")
         catdict: dict[Category, list[Question]] = {}
         for q in questions:
@@ -365,6 +391,8 @@ class QuestionDB:
                 includeHeader=self.settings.get(Tags.INCLUDEINCATS),
             )
         stringHelpers.printDom(tree, file=file)
+        if self.settings.get(Tags.GENEXPORTREPORT):
+            self.generateExportReport(file, pCount=pCount, qCount=qCount)
 
     def _appendQElements(
         self,
@@ -373,17 +401,78 @@ class QuestionDB:
         tree: ET.Element,
         includeHeader: bool = True,
     ) -> None:
-        if includeHeader:
+        variant: int = self.settings.get(Tags.QUESTIONVARIANT)
+        if includeHeader or variant == -1:
             tree.append(cat.getCategoryHeader())
             logger.debug(f"Appended a new category item {cat=}")
-        variant: int = self.settings.get(Tags.QUESTIONVARIANT)
+            self._exportedAll: bool = True
         for q in qList:
-            if hasattr(q, "variants") and q.variants is not None:
-                if variant == 0 or variant > q.variants:
-                    dialog = QuestionVariantDialog(self.window, q)
-                    if dialog.exec() == QDialog.Accepted:
-                        variant = dialog.variant
-                        logger.debug("Die Fragen-Variante %s wurde gewählt", variant)
-                    else:
-                        logger.warning("Keine Fragenvariante wurde gewählt.")
-            tree.append(q.getUpdatedElement(variant=variant))
+            if not isinstance(q, ParametricQuestion):
+                tree.append(q.getUpdatedElement())
+                self._exportedQuestions.append(q)
+                continue
+            if variant == -1:
+                tree.append(cat.getCategoryHeader(subCategory=q.id))
+                for var in range(q.parametrics.variants):
+                    tree.append(q.getUpdatedElement(variant=var))
+            elif variant == 0 or variant > q.parametrics.variants:
+                dialog = QuestionVariantDialog(self.window, q)
+                if dialog.exec() == QDialog.Accepted:
+                    variant = dialog.variant
+                    logger.debug("Die Fragen-Variante %s wurde gewählt", variant)
+                else:
+                    logger.warning("Keine Fragenvariante wurde gewählt.")
+                tree.append(q.getUpdatedElement(variant=variant))
+            self._exportedQuestions.append(q)
+
+    def generateExportReport(
+        self, file: Path | None = None, pCount: int = 0, qCount: int = 0
+    ) -> None:
+        """Generate a YAML report of the exported questions."""
+        if not self._exportedQuestions:
+            return
+        if file:
+            base_path = file.with_name(f"{file.stem}_export_report.yaml")
+        else:
+            base_path = self.spreadsheet.parent / "export_report.yaml"
+
+        for i in range(99):
+            report_path = base_path.with_name(f"{base_path.stem}-{i:02d}.yaml")
+            if not report_path.resolve().exists():
+                break
+
+        report_data = {
+            "export_metadata": {
+                "export_time": dt.datetime.now(tz=None).strftime("%Y-%m-%d %H:%M:%S"),
+                "excel2moodle_version": __version__,
+            },
+            "categories": {},
+        }
+        if qCount != 0:
+            report_data["export_metadata"]["question_count"] = qCount
+        if pCount != 0:
+            report_data["export_metadata"]["total_point_count"] = pCount
+
+        sorted_questions = sorted(
+            self._exportedQuestions, key=lambda q: (q.category.name, q.id)
+        )
+
+        for question in sorted_questions:
+            category_name = question.category.name
+            if category_name not in report_data["categories"]:
+                report_data["categories"][category_name] = {
+                    "description": question.category.desc,
+                    "questions": [],
+                }
+
+            question_data = {"id": question.id, "name": question.name}
+            if isinstance(question, ParametricQuestion) and question.currentVariant > 0:
+                if self._exportedAll:
+                    question_data["exported_variant"] = "all"
+                else:
+                    question_data["exported_variant"] = question.currentVariant + 1
+
+            report_data["categories"][category_name]["questions"].append(question_data)
+
+        with report_path.open("w") as f:
+            yaml.dump(report_data, f, sort_keys=False)

{excel2moodle-0.6.0 → excel2moodle-0.6.2}/excel2moodle/core/etHelpers.py

@@ -5,9 +5,6 @@ This module host different functions. All of them will return an ``lxml.etree.El
 
 import lxml.etree as ET
 
-import excel2moodle.core.etHelpers as eth
-from excel2moodle.core.globals import TextElements, feedbackStr, feedBElements
-
 from .globals import Tags, XMLTags
 
 
@@ -48,20 +45,3 @@ def getCdatTxtElement(subEle: ET._Element | list[ET._Element]) -> ET.Element:
         ET.tostring(subEle, encoding="unicode", pretty_print=True),
     )
     return textEle
-
-
-def getFeedBEle(
-    feedback: XMLTags,
-    text: str | None = None,
-    style: TextElements | None = None,
-) -> ET.Element:
-    """Gets ET Elements with the feedback for the question."""
-    span = feedBElements[feedback] if style is None else style.create()
-    if text is None:
-        text = feedbackStr[feedback]
-    ele = ET.Element(feedback, format="html")
-    par = TextElements.PLEFT.create()
-    span.text = text
-    par.append(span)
-    ele.append(eth.getCdatTxtElement(par))
-    return ele

{excel2moodle-0.6.0 → excel2moodle-0.6.2}/excel2moodle/core/globals.py

@@ -89,12 +89,3 @@ feedBElements = {
     XMLTags.ANSFEEDBACK: TextElements.SPANGREEN.create(),
     XMLTags.GENFEEDB: TextElements.SPANGREEN.create(),
 }
-feedbackStr = {
-    XMLTags.CORFEEDB: "Die Frage wurde richtig beantwortet",
-    XMLTags.PCORFEEDB: "Die Frage wurde teilweise richtig beantwortet",
-    XMLTags.INCORFEEDB: "Die Frage wurde Falsch beantwortet",
-    XMLTags.GENFEEDB: "Sie haben eine Antwort abgegeben",
-    "right": "richtig",
-    "wrong": "falsch",
-    "right1Percent": "Gratultaion, die Frage wurde im Rahmen der Toleranz richtig beantwortet",
-}

{excel2moodle-0.6.0 → excel2moodle-0.6.2}/excel2moodle/core/parser.py

@@ -9,7 +9,6 @@ from excel2moodle.core.globals import (
     Tags,
     TextElements,
     XMLTags,
-    feedbackStr,
     feedBElements,
 )
 from excel2moodle.core.question import Picture, Question
@@ -30,7 +29,6 @@ class QuestionParser:
 
     def __init__(self) -> None:
         """Initialize the general Question parser."""
-        self.genFeedbacks: list[XMLTags] = []
         self.logger: logging.LoggerAdapter
 
     def setup(self, question: Question) -> None:
@@ -84,7 +82,7 @@ class QuestionParser:
         It uses the data from ``self.rawInput`` if ``text`` is type``DFIndex``
         Otherwise the value of ``text`` will be inserted.
         """
-        t = self.rawInput[text] if isinstance(text, Tags) else text
+        t = self.rawInput.get(text) if isinstance(text, Tags) else text
         if txtEle is False:
             self.tmpEle.append(eth.getElement(eleName, t, **attribs))
         elif txtEle is True:
@@ -111,12 +109,11 @@ class QuestionParser:
         self.appendToTmpEle(XMLTags.NAME, text=Tags.NAME, txtEle=True)
         self.appendToTmpEle(XMLTags.ID, text=self.question.id)
         textRootElem = ET.Element(XMLTags.QTEXT, format="html")
-        mainTextEle = ET.SubElement(textRootElem, "text")
+        self.mainTextEle = ET.SubElement(textRootElem, "text")
         self.tmpEle.append(textRootElem)
-        self.appendToTmpEle(XMLTags.POINTS, text=str(self.question.points))
+        if self.question.qtype != "CLOZE":
+            self.appendToTmpEle(XMLTags.POINTS, text=str(self.question.points))
         self._appendStandardTags()
-        for feedb in self.genFeedbacks:
-            self.tmpEle.append(eth.getFeedBEle(feedb))
 
         self.htmlRoot = ET.Element("div")
         self.htmlRoot.append(self.getMainTextElement())
@@ -139,10 +136,17 @@ class QuestionParser:
         if ansList is not None:
             for ele in ansList:
                 self.tmpEle.append(ele)
+        self._finalizeParsing()
+
+    def _finalizeParsing(self) -> None:
+        """Pass the parsed element trees to the question.
+
+        Intended for the subclasses to do extra stuff.
+        """
         self.question._element = self.tmpEle
         self.question.htmlRoot = self.htmlRoot
         self.question.isParsed = True
-        self.question.textElement = mainTextEle
+        self.question.textElement = self.mainTextEle
         self.logger.info("Sucessfully parsed")
 
     def getFeedBEle(
@@ -153,7 +157,8 @@ class QuestionParser:
     ) -> ET.Element:
         span = feedBElements[feedback] if style is None else style.create()
         if text is None:
-            text = feedbackStr[feedback]
+            self.logger.error("Giving a feedback without providing text is nonsens")
+            text = self.rawInput.get(Tags.GENERALFB)
         ele = ET.Element(feedback, format="html")
         par = TextElements.PLEFT.create()
         span.text = text
@@ -169,6 +174,7 @@ class QuestionParser:
         self,
         result: float = 0.0,
         fraction: float = 100,
+        feedback: str | None = None,
         format: str = "moodle_auto_format",
     ) -> ET.Element:
         """Get ``<answer/>`` Element specific for the numerical Question.
@@ -184,11 +190,13 @@ class QuestionParser:
             fraction=str(fraction),
             format=format,
         )
+        if feedback is None:
+            feedback = self.rawInput.get(Tags.TRUEFB)
         ansEle.append(
-            eth.getFeedBEle(
-                XMLTags.ANSFEEDBACK,
-                feedbackStr["right1Percent"],
-                TextElements.SPANGREEN,
+            self.getFeedBEle(
+                feedback=XMLTags.ANSFEEDBACK,
+                text=feedback,
+                style=TextElements.SPANGREEN,
             ),
         )
         absTolerance = round(result * self.rawInput.get(Tags.TOLERANCE), 4)