excel2moodle 0.7.0__py3-none-any.whl → 0.7.2__py3-none-any.whl

excel2moodle/core/bullets.py

@@ -57,18 +57,33 @@ class BulletList:
 
     def _setupBullets(self, bps: list[str]) -> ET.Element:
         self.logger.debug("Formatting the bulletpoint list")
-        varFinder = re.compile(r"=\s*\{(\w+)\}")
+        varFinder = re.compile(r"\{(\w+)\}")
+        bulletFinder = re.compile(
+            r"^\s?(?P<desc>.*?)"
+            r"(?:\s+(?P<var>[\w+\{\\/\}^_-]+)\s*=\s*)"
+            r"(?P<val>[.,\{\w+\}]+)"
+            r"(?:\s+(?P<unit>[\w/\\^²³⁴⁵⁶]+)\s*$)"
+        )
         for i, item in enumerate(bps):
-            sc_split = item.split()
-            name = sc_split[0]
-            var = sc_split[1]
-            quant = sc_split[3]
-            unit = sc_split[4]
-
-            match = re.search(varFinder, item)
+            match = re.search(bulletFinder, item)
             if match is None:
+                self.logger.error("Couldn't find any bullets")
+                msg = f"Couldn't decode the bullet point: {item}"
+                raise ValueError(msg)
+            name = match.group("desc")
+            var = match.group("var")
+            unit = match.group("unit")
+            value = match.group("val")
+            self.logger.info(
+                "Decoded bulletPoint: name: %s, var: %s, - value: %s, - unit: %s.",
+                name,
+                var,
+                value,
+                unit,
+            )
+            if (match := re.search(varFinder, value)) is None:
                 self.logger.debug("Got a normal bulletItem")
-                num: float = float(quant.replace(",", "."))
+                num: float = float(value.replace(",", "."))
                 bulletName = i + 1
             else:
                 bulletName = match.group(1)
@@ -86,6 +101,7 @@ class BulletP:
         self.var: str = var
         self.unit: str = unit
         self.element: ET.Element
+        self.value: float = value
         self.update(value=value)
 
     def update(self, value: float = 1) -> None:

excel2moodle/core/globals.py

@@ -1,8 +1,11 @@
+import logging
 from enum import Enum, StrEnum
+from pathlib import Path
 
 import lxml.etree as ET
 
-from excel2moodle.core.settings import Tags
+logger = logging.getLogger(__name__)
+
 
 QUESTION_TYPES = {
     "NF": "numerical",
@@ -12,6 +15,100 @@ QUESTION_TYPES = {
 }
 
 
+class Tags(StrEnum):
+    """Tags and Settings Keys are needed to always acess the correct Value.
+
+    The Tags can be used to acess the settings or the QuestionData respectively.
+    As the QSettings settings are accesed via strings, which could easily gotten wrong.
+    Further, this Enum defines, which type a setting has to be.
+    """
+
+    QUESTIONVARIANT = "defaultquestionvariant", int, 1, "testgen"
+    INCLUDEINCATS = "includecats", bool, False, "testgen"
+    GENEXPORTREPORT = "exportreport", bool, False, "testgen"
+    TOLERANCE = "tolerance", float, 0.01, "parser/nf"
+    PICTUREFOLDER = "pictureFolder", Path, None, "core"
+    PICTURESUBFOLDER = "imgfolder", str, "Abbildungen", "project"
+    SPREADSHEETPATH = "spreadsheetFolder", Path, None, "core"
+    LOGLEVEL = "loglevel", str, "INFO", "core"
+    LOGFILE = "logfile", str, "excel2moodleLogFile.log", "core"
+    CATEGORIESSHEET = "categoriessheet", str, "Kategorien", "core"
+
+    IMPORTMODULE = "importmodule", str, None
+    TEXT = "text", list, None
+    BPOINTS = "bulletpoint", list, None
+    TRUE = "true", list, None
+    FALSE = "false", list, None
+    TYPE = "type", str, None
+    NAME = "name", str, None
+    RESULT = "result", float, None
+    EQUATION = "formula", str, None
+    PICTURE = "picture", str, None
+    NUMBER = "number", int, None
+    ANSTYPE = "answertype", str, None
+    QUESTIONPART = "part", list, None
+    PARTTYPE = "parttype", str, None
+    POINTS = "points", float, 1.0
+    PICTUREWIDTH = "imgwidth", int, 500
+    ANSPICWIDTH = "answerimgwidth", int, 120
+    FIRSTRESULT = "firstresult", float, 0
+    WRONGSIGNPERCENT = "wrongsignpercent", int, 50
+    WRONGSIGNFB = "wrongsignfeedback", str, "your result has the wrong sign (+-)"
+    TRUEFB = "truefeedback", str, "congratulations!!! your answer is right."
+    FALSEFB = "falsefeedback", str, "Your answer is sadly wrong, try again!!!"
+    PCORRECFB = "partialcorrectfeedback", str, "Your answer is partially right."
+    GENERALFB = "feedback", str, "You answered this question."
+    TRUEANSFB = "trueanswerfeedback", list, None
+    FALSEANSFB = "falseanswerfeedback", list, None
+
+    MEDIASCRIPTS = "mediascripts", list, None
+    MEDIACALL = "parametricmedia", str, None
+
+    def __new__(
+        cls,
+        key: str,
+        typ: type,
+        default: str | float | Path | bool | None,
+        place: str = "project",
+    ) -> object:
+        """Define new settings class."""
+        obj = str.__new__(cls, key)
+        obj._value_ = key
+        obj._typ_ = typ
+        obj._default_ = default
+        obj._place_ = place
+        return obj
+
+    def __init__(
+        self,
+        _,
+        typ: type,
+        default: str | float | Path | None,
+        place: str = "project",
+    ) -> None:
+        self._typ_: type = typ
+        self._place_: str = place
+        self._default_ = default
+        self._full_ = f"{self._place_}/{self._value_}"
+
+    @property
+    def default(self) -> str | int | float | Path | bool | None:
+        """Get default value for the key."""
+        return self._default_
+
+    @property
+    def place(self) -> str:
+        return self._place_
+
+    @property
+    def full(self) -> str:
+        return self._full_
+
+    def typ(self) -> type:
+        """Get type of the keys data."""
+        return self._typ_
+
+
 class TextElements(Enum):
     PLEFT = "p", "text-align: left;"
     SPANRED = "span", "color: rgb(239, 69, 64)"
@@ -36,38 +133,11 @@ class TextElements(Enum):
 
 
 class XMLTags(StrEnum):
-    def __new__(cls, value: str, dfkey: Tags | None = None):
-        obj = str.__new__(cls, value)
-        obj._value_ = value
-        if dfkey is not None:
-            obj._dfkey_ = dfkey
-        return obj
-
-    def __init__(self, _: str, dfkey: Tags | None = None, getEle=None) -> None:
-        if isinstance(dfkey, Tags):
-            self._dfkey_: str = dfkey
-        if getEle:
-            self._getEle_: object = getEle
-
-    @property
-    def dfkey(self) -> str:
-        return self._dfkey_
-
-    def set(self, getEle) -> None:
-        self._getEle_ = getEle
-
-    def __repr__(self) -> str:
-        msg = []
-        msg.append(f"XML Tag {self.value=}")
-        if hasattr(self, "_dfkey_"):
-            msg.append(f"Df Key {self.dfkey=}")
-        return "\n".join(msg)
-
-    NAME = "name", Tags.NAME
-    QTEXT = "questiontext", Tags.TEXT
+    NAME = "name"
+    QTEXT = "questiontext"
     QUESTION = "question"
     TEXT = "text"
-    PICTURE = "file", Tags.PICTURE
+    PICTURE = "file"
     GENFEEDB = "generalfeedback"
     CORFEEDB = "correctfeedback"
     PCORFEEDB = "partialcorrectfeedback"

excel2moodle/core/parser.py

@@ -34,18 +34,18 @@ class QuestionParser:
 
     def setup(self, question: Question) -> None:
         self.question: Question = question
-        self.rawInput = question.rawData
+        self.rawData = question.rawData
         self.logger = LogAdapterQuestionID(loggerObj, {"qID": self.question.id})
         self.logger.debug(
             "The following Data was provided: %s",
-            self.rawInput,
+            self.rawData,
         )
 
     def hasPicture(self) -> bool:
         """Create a ``Picture`` object ``question``if the question needs a pic."""
         if hasattr(self, "picture") and self.question.picture.ready:
             return True
-        picKey = self.rawInput.get(Tags.PICTURE)
+        picKey = self.rawData.get(Tags.PICTURE)
         f = self.settings.get(Tags.PICTUREFOLDER)
         svgFolder = (f / self.question.katName).resolve()
         if not hasattr(self.question, "picture"):
@@ -53,7 +53,7 @@ class QuestionParser:
                 picKey,
                 svgFolder,
                 self.question.id,
-                width=self.rawInput.get(Tags.PICTUREWIDTH),
+                width=self.rawData.get(Tags.PICTUREWIDTH),
             )
         return bool(self.question.picture.ready)
 
@@ -63,7 +63,7 @@ class QuestionParser:
         ET.SubElement(
             ET.SubElement(textHTMLroot, "p"), "b"
         ).text = f"ID {self.question.id}"
-        text = self.rawInput[Tags.TEXT]
+        text = self.rawData[Tags.TEXT]
         for t in text:
             par = TextElements.PLEFT.create()
             par.text = t
@@ -83,7 +83,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.get(text) if isinstance(text, Tags) else text
+        t = self.rawData.get(text) if isinstance(text, Tags) else text
         if txtEle is False:
             self.tmpEle.append(eth.getElement(eleName, t, **attribs))
         elif txtEle is True:
@@ -118,8 +118,8 @@ class QuestionParser:
 
         self.htmlRoot = ET.Element("div")
         self.htmlRoot.append(self.getMainTextElement())
-        if Tags.BPOINTS in self.rawInput:
-            bps: list[str] = self.rawInput[Tags.BPOINTS]
+        if Tags.BPOINTS in self.rawData:
+            bps: list[str] = self.rawData[Tags.BPOINTS]
             try:
                 bullets: BulletList = BulletList(bps, self.question.id)
             except IndexError:
@@ -135,7 +135,7 @@ class QuestionParser:
         if self.hasPicture():
             self.htmlRoot.append(self.question.picture.htmlTag)
             textRootElem.append(self.question.picture.element)
-        if Tags.MEDIACALL in self.rawInput:
+        if Tags.MEDIACALL in self.rawData:
             self.insertScriptedMedia()
         ansList = self._parseAnswers()
         if ansList is not None:
@@ -163,7 +163,7 @@ class QuestionParser:
         span = feedBElements[feedback] if style is None else style.create()
         if text is None:
             self.logger.error("Giving a feedback without providing text is nonsens")
-            text = self.rawInput.get(Tags.GENERALFB)
+            text = self.rawData.get(Tags.GENERALFB)
         ele = ET.Element(feedback, format="html")
         par = TextElements.PLEFT.create()
         span.text = text
@@ -173,13 +173,13 @@ class QuestionParser:
 
     def insertScriptedMedia(self) -> None:
         """Load the scripts, insert the div and call a Function."""
-        for script in self.rawInput.get(Tags.MEDIASCRIPTS):
+        for script in self.rawData.get(Tags.MEDIASCRIPTS):
             ET.SubElement(
                 self.htmlRoot, "script", type="text/javascript", src=script
             ).text = ""
         divId = f"scriptedMedia-{self.question.id}"
         ET.SubElement(self.htmlRoot, "div", id=divId).text = ""
-        scriptCall = MediaCall(self.rawInput.get(Tags.MEDIACALL), divId=divId)
+        scriptCall = MediaCall(self.rawData.get(Tags.MEDIACALL), divId=divId)
         self.htmlRoot.append(scriptCall.element)
         if isinstance(self.question, ParametricQuestion):
             self.question.updateQue.append(scriptCall)
@@ -209,7 +209,7 @@ class QuestionParser:
             format=format,
         )
         if feedback is None:
-            feedback = self.rawInput.get(Tags.TRUEFB)
+            feedback = self.rawData.get(Tags.TRUEFB)
         ansEle.append(
             self.getFeedBEle(
                 feedback=XMLTags.ANSFEEDBACK,
@@ -217,6 +217,6 @@ class QuestionParser:
                 style=TextElements.SPANGREEN,
             ),
         )
-        absTolerance = round(result * self.rawInput.get(Tags.TOLERANCE), 4)
+        absTolerance = round(result * self.rawData.get(Tags.TOLERANCE), 4)
         ansEle.append(eth.getElement(XMLTags.TOLERANCE, text=str(absTolerance)))
         return ansEle

excel2moodle/core/question.py

@@ -60,6 +60,8 @@ class QuestionData(dict):
             Tags.QUESTIONPART,
             Tags.TEXT,
             Tags.MEDIASCRIPTS,
+            Tags.TRUEANSFB,
+            Tags.FALSEANSFB,
         ],
         default: object = None,
     ) -> list: ...
@@ -118,6 +120,7 @@ class Question:
     mandatoryTags: ClassVar[dict[Tags, type | UnionType]] = {
         Tags.TEXT: str,
         Tags.NAME: str,
+        Tags.NUMBER: int,
         Tags.TYPE: str,
     }
     optionalTags: ClassVar[dict[Tags, type | UnionType]] = {

excel2moodle/core/settings.py

@@ -1,103 +1,12 @@
 """Settings module provides the adjusted subclass of ``PySide6.QtCore.QSettings``."""
 
 import logging
-from enum import StrEnum
 from pathlib import Path
 from typing import ClassVar, Literal, overload
 
-logger = logging.getLogger(__name__)
-
-
-class Tags(StrEnum):
-    """Tags and Settings Keys are needed to always acess the correct Value.
-
-    The Tags can be used to acess the settings or the QuestionData respectively.
-    As the QSettings settings are accesed via strings, which could easily gotten wrong.
-    Further, this Enum defines, which type a setting has to be.
-    """
-
-    def __new__(
-        cls,
-        key: str,
-        typ: type,
-        default: str | float | Path | bool | None,
-        place: str = "project",
-    ) -> object:
-        """Define new settings class."""
-        obj = str.__new__(cls, key)
-        obj._value_ = key
-        obj._typ_ = typ
-        obj._default_ = default
-        obj._place_ = place
-        return obj
-
-    def __init__(
-        self,
-        _,
-        typ: type,
-        default: str | float | Path | None,
-        place: str = "project",
-    ) -> None:
-        self._typ_: type = typ
-        self._place_: str = place
-        self._default_ = default
-        self._full_ = f"{self._place_}/{self._value_}"
+from excel2moodle.core.globals import Tags
 
-    @property
-    def default(self) -> str | int | float | Path | bool | None:
-        """Get default value for the key."""
-        return self._default_
-
-    @property
-    def place(self) -> str:
-        return self._place_
-
-    @property
-    def full(self) -> str:
-        return self._full_
-
-    def typ(self) -> type:
-        """Get type of the keys data."""
-        return self._typ_
-
-    QUESTIONVARIANT = "defaultquestionvariant", int, 1, "testgen"
-    INCLUDEINCATS = "includecats", bool, False, "testgen"
-    GENEXPORTREPORT = "exportreport", bool, False, "testgen"
-    TOLERANCE = "tolerance", float, 0.01, "parser/nf"
-    PICTUREFOLDER = "pictureFolder", Path, None, "core"
-    PICTURESUBFOLDER = "imgfolder", str, "Abbildungen", "project"
-    SPREADSHEETPATH = "spreadsheetFolder", Path, None, "core"
-    LOGLEVEL = "loglevel", str, "INFO", "core"
-    LOGFILE = "logfile", str, "excel2moodleLogFile.log", "core"
-    CATEGORIESSHEET = "categoriessheet", str, "Kategorien", "core"
-
-    IMPORTMODULE = "importmodule", str, None
-    TEXT = "text", list, None
-    BPOINTS = "bulletpoint", list, None
-    TRUE = "true", list, None
-    FALSE = "false", list, None
-    TYPE = "type", str, None
-    NAME = "name", str, None
-    RESULT = "result", float, None
-    EQUATION = "formula", str, None
-    PICTURE = "picture", str, None
-    NUMBER = "number", int, None
-    ANSTYPE = "answertype", str, None
-    QUESTIONPART = "part", list, None
-    PARTTYPE = "parttype", str, None
-    POINTS = "points", float, 1.0
-    PICTUREWIDTH = "imgwidth", int, 500
-    ANSPICWIDTH = "answerimgwidth", int, 120
-    FIRSTRESULT = "firstresult", float, 0
-    WRONGSIGNPERCENT = "wrongsignpercent", int, 50
-    WRONGSIGNFB = "wrongsignfeedback", str, "your result has the wrong sign (+-)"
-    TRUEFB = "truefeedback", str, "congratulations!!! your answer is right."
-    FALSEFB = "falsefeedback", str, "Your answer is sadly wrong, try again!!!"
-    PCORRECFB = "partialcorrectfeedback", str, "Your answer is partially right."
-    GENERALFB = "feedback", str, "You answered this question."
-
-    MEDIASCRIPTS = "mediascripts", list, None
-    MEDIACALL = "parametricmedia", str, None
+logger = logging.getLogger(__name__)
 
 
 class Settings:

excel2moodle/question_types/cloze.py

@@ -1,4 +1,4 @@
-"""Implementation of tde cloze question type.
+"""Implementation of the cloze question type.
 
 This question type is like the NFM but supports multiple fields of answers.
 All Answers are calculated off an equation using the same variables.
@@ -68,7 +68,7 @@ class ClozePart:
             self.logger.debug("MC Answer Part already up to date.")
             return
         if self.typ == "NFM":
-            result = self.result.getResult(variant)
+            result = self.result.getResult(number=variant, equation=self.num)
             self._element.text = self.getNumericAnsStr(
                 self.question.rawData,
                 result,
@@ -263,11 +263,11 @@ class ClozeQuestionParser(NFMQuestionParser):
 
     def _setupParts(self) -> None:
         parts: dict[int, ClozePart] = {}
-        for key in self.rawInput:
+        for key in self.rawData:
             if key.startswith(Tags.QUESTIONPART):
                 partNumber = self.getPartNumber(key)
                 parts[partNumber] = ClozePart(
-                    self.question, self.rawInput[key], partNumber
+                    self.question, self.rawData[key], partNumber
                 )
         partsNum = len(parts)
         equations: dict[int, str] = self._getPartValues(Tags.RESULT)
@@ -310,7 +310,7 @@ class ClozeQuestionParser(NFMQuestionParser):
                 msg = f"Unclear Parts are defined. Either define `true:{num}` and `false:{num}` or `result:{num}` "
                 raise QNotParsedException(msg, self.question.id)
         if len(points) == 0:
-            pts = round(self.rawInput.get(Tags.POINTS) / partsNum, 3)
+            pts = round(self.rawData.get(Tags.POINTS) / partsNum, 3)
             point = self._roundClozePartPoints(pts)
             for part in parts.values():
                 part.points = point
@@ -325,7 +325,7 @@ class ClozeQuestionParser(NFMQuestionParser):
     def _roundClozePartPoints(self, points: float | None = None) -> int:
         """Get the integer points for the cloze part."""
         if points is None:
-            points = self.rawInput.get(Tags.POINTS)
+            points = self.rawData.get(Tags.POINTS)
         corrPoints: int = round(points)
         if not math.isclose(corrPoints, points):
             self.logger.warning(
@@ -347,8 +347,8 @@ class ClozeQuestionParser(NFMQuestionParser):
     ) -> dict[int, list[str]]: ...
     def _getPartValues(self, Tag):
         tagValues: dict = {
-            self.getPartNumber(key): self.rawInput[key]
-            for key in self.rawInput
+            self.getPartNumber(key): self.rawData[key]
+            for key in self.rawData
             if key.startswith(Tag)
         }
         return tagValues
@@ -363,7 +363,7 @@ class ClozeQuestionParser(NFMQuestionParser):
             if part.typ == "NFM":
                 result = self.question.parametrics.getResult(1, partNum)
                 ansStr = ClozePart.getNumericAnsStr(
-                    self.rawInput,
+                    self.rawData,
                     result=result,
                     points=part.points,
                 )

excel2moodle/question_types/mc.py

@@ -28,8 +28,8 @@ class MCQuestion(Question):
         "showstandardinstruction": "0",
         "shownumcorrect": "",
     }
-    mcOpt: ClassVar[dict[Tags, type | UnionType]] = {}
-    mcMand: ClassVar[dict[Tags, type | UnionType]] = {
+    optionalTags: ClassVar[dict[Tags, type | UnionType]] = {}
+    mandatoryTags: ClassVar[dict[Tags, type | UnionType]] = {
         Tags.TRUE: str,
         Tags.FALSE: str,
         Tags.ANSTYPE: str,
@@ -52,11 +52,21 @@ class MCQuestionParser(QuestionParser):
 
     def getAnsElementsList(
         self,
-        answerList: list,
+        answerList: list[str],
+        feedbackList: list[str],
         fraction: float = 50,
         format="html",
     ) -> list[ET.Element]:
+        """Take the answer Strings and format them each into a xml-tree.
+
+        If a feedbackList is given it is used. Otherwise the standard feedbacks are used.
+        """
         elementList: list[ET.Element] = []
+        if feedbackList is None:
+            if fraction > 0:
+                feedbackList = [self.rawData.get(Tags.FALSEFB) for _ in answerList]
+            else:
+                feedbackList = [self.rawData.get(Tags.TRUEFB) for _ in answerList]
         for i, ans in enumerate(answerList):
             p = TextElements.PLEFT.create()
             if self.answerType == "picture":
@@ -72,7 +82,7 @@ class MCQuestionParser(QuestionParser):
                 elementList[-1].append(
                     self.getFeedBEle(
                         XMLTags.ANSFEEDBACK,
-                        text=self.rawInput.get(Tags.FALSEFB),
+                        text=feedbackList[i],
                         style=TextElements.SPANRED,
                     ),
                 )
@@ -82,7 +92,7 @@ class MCQuestionParser(QuestionParser):
                 elementList[-1].append(
                     self.getFeedBEle(
                         XMLTags.ANSFEEDBACK,
-                        text=self.rawInput.get(Tags.TRUEFB),
+                        text=feedbackList[i],
                         style=TextElements.SPANGREEN,
                     ),
                 )
@@ -91,21 +101,21 @@ class MCQuestionParser(QuestionParser):
         return elementList
 
     def _parseAnswers(self) -> list[ET.Element]:
-        self.answerType = self.rawInput.get(Tags.ANSTYPE)
+        self.answerType = self.rawData.get(Tags.ANSTYPE)
         if self.answerType not in self.question.AnsStyles:
             msg = f"The Answer style: {self.answerType} is not supported"
             raise InvalidFieldException(msg, self.question.id, Tags.ANSTYPE)
         if self.answerType == "picture":
             f = self.settings.get(Tags.PICTUREFOLDER)
             imgFolder = (f / self.question.katName).resolve()
-            width = self.rawInput.get(Tags.ANSPICWIDTH)
+            width = self.rawData.get(Tags.ANSPICWIDTH)
             self.trueImgs: list[Picture] = [
                 Picture(t, imgFolder, self.question.id, width=width)
-                for t in self.rawInput.get(Tags.TRUE)
+                for t in self.rawData.get(Tags.TRUE)
             ]
             self.falseImgs: list[Picture] = [
                 Picture(t, imgFolder, self.question.id, width=width)
-                for t in self.rawInput.get(Tags.FALSE)
+                for t in self.rawData.get(Tags.FALSE)
             ]
             trueAnsList: list[str] = [pic.htmlTag for pic in self.trueImgs if pic.ready]
             falseAList: list[str] = [pic.htmlTag for pic in self.falseImgs if pic.ready]
@@ -114,19 +124,47 @@ class MCQuestionParser(QuestionParser):
                 raise QNotParsedException(msg, self.question.id)
         else:
             trueAnsList: list[str] = stringHelpers.texWrapper(
-                self.rawInput.get(Tags.TRUE), style=self.answerType
+                self.rawData.get(Tags.TRUE), style=self.answerType
             )
             self.logger.debug(f"got the following true answers \n {trueAnsList=}")
             falseAList: list[str] = stringHelpers.texWrapper(
-                self.rawInput.get(Tags.FALSE), style=self.answerType
+                self.rawData.get(Tags.FALSE), style=self.answerType
             )
             self.logger.debug(f"got the following false answers \n {falseAList=}")
+        trueFbs = self.rawData.get(Tags.TRUEANSFB)
+        falseFbs = self.rawData.get(Tags.FALSEANSFB)
+        if trueFbs is None:
+            trueFbs = [self.rawData.get(Tags.FALSEFB) for _ in trueAnsList]
+        if falseFbs is None:
+            falseFbs = [self.rawData.get(Tags.TRUEFB) for _ in falseAList]
+        if len(trueFbs) < len(trueAnsList):
+            self.logger.warning(
+                "There are less true-feedbacks than true-answers given. Using fallback feedback"
+            )
+            delta = len(trueAnsList) - len(trueFbs)
+            while delta > 0:
+                trueFbs.append(self.rawData.get(Tags.TRUEFB))
+                delta -= 1
+        if len(falseFbs) < len(falseAList):
+            self.logger.warning(
+                "There are less false-feedbacks than false-answers given. Using fallback feedback"
+            )
+            delta = len(falseAList) - len(falseFbs)
+            while delta > 0:
+                falseFbs.append(self.rawData.get(Tags.TRUEFB))
+                delta -= 1
         truefrac = 1 / len(trueAnsList) * 100
         falsefrac = 1 / len(falseAList) * (-100)
         self.tmpEle.find(XMLTags.PENALTY).text = str(round(truefrac / 100, 4))
-        ansList = self.getAnsElementsList(trueAnsList, fraction=round(truefrac, 4))
+        ansList = self.getAnsElementsList(
+            answerList=trueAnsList, feedbackList=trueFbs, fraction=round(truefrac, 4)
+        )
         ansList.extend(
-            self.getAnsElementsList(falseAList, fraction=round(falsefrac, 4)),
+            self.getAnsElementsList(
+                answerList=falseAList,
+                feedbackList=falseFbs,
+                fraction=round(falsefrac, 4),
+            ),
         )
         return ansList
 
@@ -138,5 +176,5 @@ class MCQuestionParser(QuestionParser):
             XMLTags.INCORFEEDB: Tags.FALSEFB,
         }
         for feedb, tag in feedBacks.items():
-            self.tmpEle.append(self.getFeedBEle(feedb, text=self.rawInput.get(tag)))
+            self.tmpEle.append(self.getFeedBEle(feedb, text=self.rawData.get(tag)))
         self._finalizeParsing()

excel2moodle/question_types/nf.py

@@ -17,10 +17,10 @@ class NFQuestion(Question):
     def __init__(self, *args, **kwargs) -> None:
         super().__init__(*args, **kwargs)
 
-    nfOpt: ClassVar[dict[Tags, type | UnionType]] = {
+    optionalTags: ClassVar[dict[Tags, type | UnionType]] = {
         Tags.BPOINTS: str,
     }
-    nfMand: ClassVar[dict[Tags, type | UnionType]] = {
+    mandatoryTags: ClassVar[dict[Tags, type | UnionType]] = {
         Tags.RESULT: float | int,
     }
 
@@ -37,13 +37,13 @@ class NFQuestionParser(QuestionParser):
         super().setup(question)
 
     def _parseAnswers(self) -> list[ET.Element]:
-        result: float = self.rawInput.get(Tags.RESULT)
+        result: float = self.rawData.get(Tags.RESULT)
         ansEle: list[ET.Element] = []
         ansEle.append(self.getNumericAnsElement(result=result))
         return ansEle
 
     def _finalizeParsing(self) -> None:
         self.tmpEle.append(
-            self.getFeedBEle(XMLTags.GENFEEDB, text=self.rawInput.get(Tags.GENERALFB))
+            self.getFeedBEle(XMLTags.GENFEEDB, text=self.rawData.get(Tags.GENERALFB))
         )
         return super()._finalizeParsing()

excel2moodle/question_types/nfm.py

@@ -14,7 +14,7 @@ from excel2moodle.core.question import ParametricQuestion, Parametrics
 
 
 class NFMQuestion(ParametricQuestion):
-    nfmMand: ClassVar[dict[Tags, type | UnionType]] = {
+    mandatoryTags: ClassVar[dict[Tags, type | UnionType]] = {
         Tags.RESULT: str,
         Tags.BPOINTS: str,
     }
@@ -58,20 +58,20 @@ class NFMQuestionParser(QuestionParser):
     def _parseAnswers(self) -> list[ET.Element]:
         variables = self.question.bulletList.getVariablesDict(self.question)
         self.question.parametrics = Parametrics(
-            self.rawInput.get(Tags.EQUATION),
-            self.rawInput.get(Tags.FIRSTRESULT),
+            self.rawData.get(Tags.EQUATION),
+            self.rawData.get(Tags.FIRSTRESULT),
             self.question.id,
         )
         self.question.parametrics.variables = variables
         self.question.answerElement = self.getNumericAnsElement()
         self.question.answerElementWrongSign = self.getNumericAnsElement(
-            fraction=self.rawInput.get(Tags.WRONGSIGNPERCENT),
-            feedback=self.rawInput.get(Tags.WRONGSIGNFB),
+            fraction=self.rawData.get(Tags.WRONGSIGNPERCENT),
+            feedback=self.rawData.get(Tags.WRONGSIGNFB),
         )
         return [self.question.answerElement, self.question.answerElementWrongSign]
 
     def _finalizeParsing(self) -> None:
         self.tmpEle.append(
-            self.getFeedBEle(XMLTags.GENFEEDB, text=self.rawInput.get(Tags.GENERALFB))
+            self.getFeedBEle(XMLTags.GENFEEDB, text=self.rawData.get(Tags.GENERALFB))
         )
         return super()._finalizeParsing()

{excel2moodle-0.7.0.dist-info → excel2moodle-0.7.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: excel2moodle
-Version: 0.7.0
+Version: 0.7.2
 Summary: A package for converting questions from a spreadsheet, to valid moodle-xml
 Author: Jakob Bosse
 License-Expression: GPL-3.0-or-later
@@ -90,6 +90,30 @@ If You want to support my work as well, you can by me a [coffee](https://ko-fi.c
 
 # Changelogs
 
+## 0.7.2 (2025-10-11)
+small important bugfixes
+
+### improvement (2 changes)
+
+- [BulletPoints are decoded using regex to allow multi word names](https://gitlab.com/jbosse3/excel2moodle/-/commit/7e32e9817323054d84a0dfb9a0a241c702fd096d)
+- [Restructured globals, renamed rawInput to rawData](https://gitlab.com/jbosse3/excel2moodle/-/commit/effd9c3cd196b36d49204fe715acc1ffb124549c)
+
+### bugfix (2 changes)
+
+- [Added the number do the mandatory tags because it is](https://gitlab.com/jbosse3/excel2moodle/-/commit/56e9b69d71504dffe7c235d69ff44dec6931db28)
+- [fixed assigning the first result to all clozes](https://gitlab.com/jbosse3/excel2moodle/-/commit/09a281c253502adc23442892be03aac36e6ea720)
+
+## 0.7.1 (2025-10-04)
+feedbacking improved
+
+### documentation (1 change)
+
+- [documentation improvement](https://gitlab.com/jbosse3/excel2moodle/-/commit/1a1110d05b49175e049a9ca18a027216a765e277)
+
+### feature (1 change)
+
+- [Added MC answer feedback support](https://gitlab.com/jbosse3/excel2moodle/-/commit/4f5fe550786cf29839ba54fbdfedbf03c72d3009)
+
 ## 0.7.0 (2025-09-30)
 Rework of the equation checker done!
 

{excel2moodle-0.7.0.dist-info → excel2moodle-0.7.2.dist-info}/RECORD

@@ -2,15 +2,15 @@ excel2moodle/__init__.py,sha256=W05Gsm3IOcxJnp4C-TPvxRiO3NR2L9g8PSIHDoRJua0,1893
 excel2moodle/__main__.py,sha256=B55ZK25z-HzIIox2xLYkJXMUwYzITPKGCi9fELMFGaM,1877
 excel2moodle/logger.py,sha256=fq8ZOkCI1wj38v8IyrZsUlpt16onlSH_phqbVvYUwBQ,3725
 excel2moodle/core/__init__.py,sha256=87BwhtZse72Tk17Ib-V9X2k9wkhmtVnEj2ZmJ9JBAnI,63
-excel2moodle/core/bullets.py,sha256=TiRf2EfhsryE-KBfvo43dMtsMWuZi9L9H7TuwXAZ1rg,3550
+excel2moodle/core/bullets.py,sha256=Gpe6vO-XZqqW_vknlvinbbrL_YtsB4ZoYVtfBv98564,4251
 excel2moodle/core/category.py,sha256=fOMj2ynoAy6tXwmFhJ9uST9BQHiRJeU2BrkK1r57ek4,2897
 excel2moodle/core/dataStructure.py,sha256=f3aqSPSIQxspYf1FmhFnlr4H1tc1gpVG_DQBdD0bZQk,19858
 excel2moodle/core/etHelpers.py,sha256=LzimWGuX6RH2TbfEnWUoAXT2Tr0z6P7bCANjxuANSX0,1667
 excel2moodle/core/exceptions.py,sha256=9xfsaIcm6Yej6QAZga0d3DK3jLQejdfgJARuAaG-uZY,739
-excel2moodle/core/globals.py,sha256=gvkl8Obq4XBW40B1L68Ewg06sonK27l-KIiodwFv8ic,2393
-excel2moodle/core/parser.py,sha256=hjbA0i7N1oHoJHhOmvEtVl4Ryaqd0eqUS26bXS47CBo,8467
-excel2moodle/core/question.py,sha256=bRQhWyJPwvNMOABlT-WCngTx-Bt8AuOoQXgyPTQh_aQ,14528
-excel2moodle/core/settings.py,sha256=_H3TJ67-4Q0hFi8g3JWFILJ6q3mfcEsBRaV74jhbko8,6531
+excel2moodle/core/globals.py,sha256=Ua0ptvVfga-WSimEaf3YI3-9fMcOE81MuThRIxVcL0U,4906
+excel2moodle/core/parser.py,sha256=l7fsDTPskbTZurdpg-rMqfDXZwlZ3CVfJTbdmOeNg2o,8453
+excel2moodle/core/question.py,sha256=hwQ0_p_NKWn6OPi5kPO_y-2Hl0F3CDON7J87L3GjUzU,14611
+excel2moodle/core/settings.py,sha256=A_kdbvpLPWLQGKCytNrK_KEjy3HfGnQU4Fz-a39WzHs,3362
 excel2moodle/core/stringHelpers.py,sha256=OzFZ6Eu3PeBLKb61K-aeVfUZmVuBerr9KfyOsuNRd7Y,2403
 excel2moodle/core/validator.py,sha256=6nZIyTwcXPT2jgi31QrBGur3Cq7A3Q9btLp5ALFEsKw,4998
 excel2moodle/extra/__init__.py,sha256=PM-id60HD21A3IcGC_fCYFihS8osBGZMIJCcN-ZRsIM,293
@@ -19,10 +19,10 @@ excel2moodle/extra/scriptCaller.py,sha256=nJsUxz0EzoChobCJbAbfS8NSMghdUFV6oEPdO6
 excel2moodle/extra/updateQuery.py,sha256=kD_L23Qea9Cx4zUwfQVNJXXFbybd9cwE8sSbZrz7VF8,1554
 excel2moodle/extra/variableGenerator.py,sha256=jcXbyA1B3-uZHsovU9QhZ879FoemeHqAe_BxPT4ZXoY,11484
 excel2moodle/question_types/__init__.py,sha256=81mss0g7SVtnlb-WkydE28G_dEAAf6oT1uB8lpK2-II,1041
-excel2moodle/question_types/cloze.py,sha256=WGeA37Dq405Zda_WNU2SrAhfW9DNjkdnLBfM-JFM4lw,14656
-excel2moodle/question_types/mc.py,sha256=nx6PsbfLLH_4H5eCSjGcfgEC6EEVgseI7xy15jg5JmA,5482
-excel2moodle/question_types/nf.py,sha256=HAolGy13-FbLVJskAUXCFy76NJu91IG9wtq6OI05Igw,1374
-excel2moodle/question_types/nfm.py,sha256=D5-aE4C7TAuwHFidXR15DLWNZ4JT-HVbPXI0CzGWOS0,3013
+excel2moodle/question_types/cloze.py,sha256=vcG1XCVsnncrb8Sm6O_zNMuTdYtE_5boWzgpkU1r1tA,14675
+excel2moodle/question_types/mc.py,sha256=pXhVw79GxRVJOeKVp7-p0NdzD1t92qPDnTkB0hrOs_I,7102
+excel2moodle/question_types/nf.py,sha256=Urw970Y-YhISSakonBWRiQYheHgASkJkHLhAtwWrS9M,1386
+excel2moodle/question_types/nfm.py,sha256=hRpVlaGdW3VaHITMFiVhMIjGwtBnnI17PX1d10JL3MI,3014
 excel2moodle/ui/UI_equationChecker.py,sha256=jA5gKemrgeertbp2iip-icQCRFKnV-dR-f0eODBBAp0,8910
 excel2moodle/ui/UI_exportSettingsDialog.py,sha256=I0Vqw2TCWoUhDKxTgLoGaAo4_L77vfN8G7_zi7b_5lY,8254
 excel2moodle/ui/UI_mainWindow.py,sha256=9w8bRgOrVEX7BRGQvMuVhPCiSOsXYkMb4rxLDeRErII,21544
@@ -33,9 +33,9 @@ excel2moodle/ui/__init__.py,sha256=4EdGtpzwH3rgw4xW9E5x9kdPQYwKbo9rehHRZTNxCrQ,4
 excel2moodle/ui/appUi.py,sha256=jlurK6sb_CVEV1vNAC_mL8lmX9H9Ex-QZ3BQXgAisJM,14887
 excel2moodle/ui/dialogs.py,sha256=du6v17lh6LhgDDK0QltPzD-z8wUn3aD4QzaAQBmiTBQ,7314
 excel2moodle/ui/treewidget.py,sha256=3hZRLlrhp4FMXFyNY0LGDy7k1RSuKH87QyqB1N4qOqg,2335
-excel2moodle-0.7.0.dist-info/licenses/LICENSE,sha256=ywQqe6Sitymkf2lV2NRcx_aGsaC-KbSl_EfEsRXmNRw,35135
-excel2moodle-0.7.0.dist-info/METADATA,sha256=f2ZbXDgR3FOXRwhJ7I2eUgCzsIaEVfuJdBkcYuAF_z0,12716
-excel2moodle-0.7.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-excel2moodle-0.7.0.dist-info/entry_points.txt,sha256=myfMLDThuGgWHMJDPPfILiZqo_7D3fhmDdJGqWOAjPw,60
-excel2moodle-0.7.0.dist-info/top_level.txt,sha256=5V1xRUQ9o7UmOCmNoWCZPAuy5nXp3Qbzyqch8fUGT_c,13
-excel2moodle-0.7.0.dist-info/RECORD,,
+excel2moodle-0.7.2.dist-info/licenses/LICENSE,sha256=ywQqe6Sitymkf2lV2NRcx_aGsaC-KbSl_EfEsRXmNRw,35135
+excel2moodle-0.7.2.dist-info/METADATA,sha256=wTdBTBoHroAy5ARxV1Uh3FspriO2TE_A_UzmtXmpuJY,13761
+excel2moodle-0.7.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+excel2moodle-0.7.2.dist-info/entry_points.txt,sha256=myfMLDThuGgWHMJDPPfILiZqo_7D3fhmDdJGqWOAjPw,60
+excel2moodle-0.7.2.dist-info/top_level.txt,sha256=5V1xRUQ9o7UmOCmNoWCZPAuy5nXp3Qbzyqch8fUGT_c,13
+excel2moodle-0.7.2.dist-info/RECORD,,