excel2moodle 0.7.1__tar.gz → 0.7.2__tar.gz

{excel2moodle-0.7.1 → excel2moodle-0.7.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: excel2moodle
-Version: 0.7.1
+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,19 @@ 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
 

{excel2moodle-0.7.1 → excel2moodle-0.7.2}/README.md

@@ -68,6 +68,19 @@ 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
 

{excel2moodle-0.7.1 → excel2moodle-0.7.2}/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-0.7.1/excel2moodle/core/settings.py → excel2moodle-0.7.2/excel2moodle/core/globals.py

@@ -1,13 +1,20 @@
-"""Settings module provides the adjusted subclass of ``PySide6.QtCore.QSettings``."""
-
 import logging
-from enum import StrEnum
+from enum import Enum, StrEnum
 from pathlib import Path
-from typing import ClassVar, Literal, overload
+
+import lxml.etree as ET
 
 logger = logging.getLogger(__name__)
 
 
+QUESTION_TYPES = {
+    "NF": "numerical",
+    "NFM": "numerical",
+    "MC": "multichoice",
+    "CLOZE": "cloze",
+}
+
+
 class Tags(StrEnum):
     """Tags and Settings Keys are needed to always acess the correct Value.
 
@@ -16,50 +23,6 @@ class Tags(StrEnum):
     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_}"
-
-    @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"
@@ -101,114 +64,98 @@ class Tags(StrEnum):
     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_}"
 
-class Settings:
-    values: ClassVar[dict[str, str | float | Path | list]] = {}
+    @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 __contains__(self, tag: Tags) -> bool:
-        return bool(tag in type(self).values)
+    def typ(self) -> type:
+        """Get type of the keys data."""
+        return self._typ_
 
-    @classmethod
-    def clear(cls) -> None:
-        cls.values.clear()
 
-    @classmethod
-    def pop(cls, key: str):
-        return cls.values.pop(key)
+class TextElements(Enum):
+    PLEFT = "p", "text-align: left;"
+    SPANRED = "span", "color: rgb(239, 69, 64)"
+    SPANGREEN = "span", "color: rgb(152, 202, 62)"
+    SPANORANGE = "span", "color: rgb(152, 100, 100)"
+    ULIST = "ul", ""
+    LISTITEM = "li", "text-align: left;"
+    DIV = "div", ""
 
-    @overload
-    @classmethod
-    def get(
-        cls,
-        key: Literal[Tags.POINTS],
-    ) -> float: ...
-    @overload
-    @classmethod
-    def get(
-        cls,
-        key: Literal[
-            Tags.QUESTIONVARIANT,
-            Tags.TOLERANCE,
-            Tags.PICTUREWIDTH,
-            Tags.ANSPICWIDTH,
-            Tags.WRONGSIGNPERCENT,
-        ],
-    ) -> int: ...
-    @overload
-    @classmethod
-    def get(cls, key: Literal[Tags.INCLUDEINCATS, Tags.GENEXPORTREPORT]) -> bool: ...
-    @overload
-    @classmethod
-    def get(
-        cls,
-        key: Literal[
-            Tags.PICTURESUBFOLDER,
-            Tags.LOGLEVEL,
-            Tags.LOGFILE,
-            Tags.CATEGORIESSHEET,
-            Tags.IMPORTMODULE,
-            Tags.WRONGSIGNFB,
-        ],
-    ) -> str: ...
-    @overload
-    @classmethod
-    def get(
-        cls,
-        key: Literal[Tags.PICTUREFOLDER, Tags.SPREADSHEETPATH],
-    ) -> Path: ...
-
-    @classmethod
-    def get(cls, key: Tags):
-        """Get the typesafe settings value.
-
-        If no setting is made, the default value is returned.
-        """
-        try:
-            raw = cls.values[key]
-        except KeyError:
-            default = key.default
-            if default is None:
-                return None
-            logger.debug("Returning the default value for %s", key)
-            return default
-        if key.typ() is Path:
-            path: Path = Path(raw)
-            try:
-                path.resolve(strict=True)
-            except ValueError:
-                logger.warning(
-                    f"The settingsvalue {key} couldn't be fetched with correct typ",
-                )
-                return key.default
-            logger.debug("Returning path setting: %s = %s", key, path)
-            return path
-        try:
-            return key.typ()(raw)
-        except (ValueError, TypeError):
-            logger.warning(
-                f"The settingsvalue {key} couldn't be fetched with correct typ",
-            )
-            return key.default
-
-    @classmethod
-    def set(
-        cls,
-        key: Tags | str,
-        value: float | bool | Path | str,
-    ) -> None:
-        """Set the setting to value."""
-        if key in Tags:
-            tag = Tags(key) if not isinstance(key, Tags) else key
-            try:
-                cls.values[tag] = tag.typ()(value)
-            except TypeError:
-                logger.exception(
-                    "trying to save %s = %s %s with wrong type not possible.",
-                    tag,
-                    value,
-                    type(value),
-                )
-                return
-            logger.info("Saved  %s = %s: %s", key, value, tag.typ().__name__)
+    def create(self, tag: str | None = None):
+        if tag is None:
+            tag, style = self.value
         else:
-            logger.warning("got invalid local Setting %s = %s", key, value)
+            style = self.value[1]
+        return ET.Element(tag, dir="ltr", style=style)
+
+    @property
+    def style(
+        self,
+    ) -> str:
+        return self.value[1]
+
+
+class XMLTags(StrEnum):
+    NAME = "name"
+    QTEXT = "questiontext"
+    QUESTION = "question"
+    TEXT = "text"
+    PICTURE = "file"
+    GENFEEDB = "generalfeedback"
+    CORFEEDB = "correctfeedback"
+    PCORFEEDB = "partialcorrectfeedback"
+    INCORFEEDB = "incorrectfeedback"
+    ANSFEEDBACK = "feedback"
+    POINTS = "defaultgrade"
+    PENALTY = "penalty"
+    HIDE = "hidden"
+    ID = "idnumber"
+    TYPE = "type"
+    ANSWER = "answer"
+    TOLERANCE = "tolerance"
+
+
+feedBElements = {
+    XMLTags.CORFEEDB: TextElements.SPANGREEN.create(),
+    XMLTags.PCORFEEDB: TextElements.SPANORANGE.create(),
+    XMLTags.INCORFEEDB: TextElements.SPANRED.create(),
+    XMLTags.ANSFEEDBACK: TextElements.SPANGREEN.create(),
+    XMLTags.GENFEEDB: TextElements.SPANGREEN.create(),
+}

{excel2moodle-0.7.1 → excel2moodle-0.7.2}/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-0.7.1 → excel2moodle-0.7.2}/excel2moodle/core/question.py

@@ -120,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-0.7.2/excel2moodle/core/settings.py

@@ -0,0 +1,121 @@
+"""Settings module provides the adjusted subclass of ``PySide6.QtCore.QSettings``."""
+
+import logging
+from pathlib import Path
+from typing import ClassVar, Literal, overload
+
+from excel2moodle.core.globals import Tags
+
+logger = logging.getLogger(__name__)
+
+
+class Settings:
+    values: ClassVar[dict[str, str | float | Path | list]] = {}
+
+    def __contains__(self, tag: Tags) -> bool:
+        return bool(tag in type(self).values)
+
+    @classmethod
+    def clear(cls) -> None:
+        cls.values.clear()
+
+    @classmethod
+    def pop(cls, key: str):
+        return cls.values.pop(key)
+
+    @overload
+    @classmethod
+    def get(
+        cls,
+        key: Literal[Tags.POINTS],
+    ) -> float: ...
+    @overload
+    @classmethod
+    def get(
+        cls,
+        key: Literal[
+            Tags.QUESTIONVARIANT,
+            Tags.TOLERANCE,
+            Tags.PICTUREWIDTH,
+            Tags.ANSPICWIDTH,
+            Tags.WRONGSIGNPERCENT,
+        ],
+    ) -> int: ...
+    @overload
+    @classmethod
+    def get(cls, key: Literal[Tags.INCLUDEINCATS, Tags.GENEXPORTREPORT]) -> bool: ...
+    @overload
+    @classmethod
+    def get(
+        cls,
+        key: Literal[
+            Tags.PICTURESUBFOLDER,
+            Tags.LOGLEVEL,
+            Tags.LOGFILE,
+            Tags.CATEGORIESSHEET,
+            Tags.IMPORTMODULE,
+            Tags.WRONGSIGNFB,
+        ],
+    ) -> str: ...
+    @overload
+    @classmethod
+    def get(
+        cls,
+        key: Literal[Tags.PICTUREFOLDER, Tags.SPREADSHEETPATH],
+    ) -> Path: ...
+
+    @classmethod
+    def get(cls, key: Tags):
+        """Get the typesafe settings value.
+
+        If no setting is made, the default value is returned.
+        """
+        try:
+            raw = cls.values[key]
+        except KeyError:
+            default = key.default
+            if default is None:
+                return None
+            logger.debug("Returning the default value for %s", key)
+            return default
+        if key.typ() is Path:
+            path: Path = Path(raw)
+            try:
+                path.resolve(strict=True)
+            except ValueError:
+                logger.warning(
+                    f"The settingsvalue {key} couldn't be fetched with correct typ",
+                )
+                return key.default
+            logger.debug("Returning path setting: %s = %s", key, path)
+            return path
+        try:
+            return key.typ()(raw)
+        except (ValueError, TypeError):
+            logger.warning(
+                f"The settingsvalue {key} couldn't be fetched with correct typ",
+            )
+            return key.default
+
+    @classmethod
+    def set(
+        cls,
+        key: Tags | str,
+        value: float | bool | Path | str,
+    ) -> None:
+        """Set the setting to value."""
+        if key in Tags:
+            tag = Tags(key) if not isinstance(key, Tags) else key
+            try:
+                cls.values[tag] = tag.typ()(value)
+            except TypeError:
+                logger.exception(
+                    "trying to save %s = %s %s with wrong type not possible.",
+                    tag,
+                    value,
+                    type(value),
+                )
+                return
+            logger.info("Saved  %s = %s: %s", key, value, tag.typ().__name__)
+        else:
+            logger.warning("got invalid local Setting %s = %s", key, value)

{excel2moodle-0.7.1 → excel2moodle-0.7.2}/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-0.7.1 → excel2moodle-0.7.2}/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,
@@ -64,9 +64,9 @@ class MCQuestionParser(QuestionParser):
         elementList: list[ET.Element] = []
         if feedbackList is None:
             if fraction > 0:
-                feedbackList = [self.rawInput.get(Tags.FALSEFB) for _ in answerList]
+                feedbackList = [self.rawData.get(Tags.FALSEFB) for _ in answerList]
             else:
-                feedbackList = [self.rawInput.get(Tags.TRUEFB) for _ in answerList]
+                feedbackList = [self.rawData.get(Tags.TRUEFB) for _ in answerList]
         for i, ans in enumerate(answerList):
             p = TextElements.PLEFT.create()
             if self.answerType == "picture":
@@ -101,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]
@@ -124,26 +124,26 @@ 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.rawInput.get(Tags.TRUEANSFB)
-        falseFbs = self.rawInput.get(Tags.FALSEANSFB)
+        trueFbs = self.rawData.get(Tags.TRUEANSFB)
+        falseFbs = self.rawData.get(Tags.FALSEANSFB)
         if trueFbs is None:
-            trueFbs = [self.rawInput.get(Tags.FALSEFB) for _ in trueAnsList]
+            trueFbs = [self.rawData.get(Tags.FALSEFB) for _ in trueAnsList]
         if falseFbs is None:
-            falseFbs = [self.rawInput.get(Tags.TRUEFB) for _ in falseAList]
+            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.rawInput.get(Tags.TRUEFB))
+                trueFbs.append(self.rawData.get(Tags.TRUEFB))
                 delta -= 1
         if len(falseFbs) < len(falseAList):
             self.logger.warning(
@@ -151,7 +151,7 @@ class MCQuestionParser(QuestionParser):
             )
             delta = len(falseAList) - len(falseFbs)
             while delta > 0:
-                falseFbs.append(self.rawInput.get(Tags.TRUEFB))
+                falseFbs.append(self.rawData.get(Tags.TRUEFB))
                 delta -= 1
         truefrac = 1 / len(trueAnsList) * 100
         falsefrac = 1 / len(falseAList) * (-100)
@@ -176,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-0.7.1 → excel2moodle-0.7.2}/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-0.7.1 → excel2moodle-0.7.2}/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.1 → excel2moodle-0.7.2}/excel2moodle.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: excel2moodle
-Version: 0.7.1
+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,19 @@ 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
 

{excel2moodle-0.7.1 → excel2moodle-0.7.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "excel2moodle"
-version = "0.7.1"
+version = "0.7.2"
 authors = [
   { name="Jakob Bosse" },
 ]

{excel2moodle-0.7.1 → excel2moodle-0.7.2}/test/test_bullets.py

@@ -2,6 +2,7 @@ from pathlib import Path
 
 import pytest
 
+from excel2moodle.core.bullets import BulletList
 from excel2moodle.core.dataStructure import QuestionDB
 from excel2moodle.core.settings import Settings, Tags
 
@@ -43,3 +44,22 @@ def test_bulletVariants(variant, bulletName, bulletStr) -> None:
     question.getUpdatedElement(variant=variant)
     for bullet in question.bulletList.bullets[bulletName].element:
         assert bullet == bulletStr
+
+
+@pytest.mark.parametrize(
+    ("bulletString", "name", "var", "value", "unit"),
+    [
+        (r"Große Kraft F = 25,0 kN", "Große Kraft", "F", 25.0, "kN"),
+        (r"Lange Kraft F_l = 22,0 kN", "Lange Kraft", "F_l", 22.0, "kN"),
+        (r"Streckenlast p = 15,0 kN/m", "Streckenlast", "p", 15, "kN/m"),
+        (r"Längste Strecke l_{max} = 15.0 km", "Längste Strecke", "l_{max}", 15, "km"),
+        (r"Strng Var q_{st} = 33,339 kN/m²", "Strng Var", "q_{st}", 33.339, "kN/m²"),
+        (r"Max Sp \sigma_{max} = 33 kN/m^2", "Max Sp", r"\sigma_{max}", 33, "kN/m^2"),
+    ],
+)
+def test_paresBPointNames(bulletString, name, var, value, unit) -> None:
+    bList: BulletList = BulletList([bulletString], "0000")
+    assert bList.bullets.get(1).name == name
+    assert bList.bullets.get(1).value == value
+    assert bList.bullets.get(1).var == var
+    assert bList.bullets.get(1).unit == unit

excel2moodle-0.7.1/excel2moodle/core/globals.py

@@ -1,91 +0,0 @@
-from enum import Enum, StrEnum
-
-import lxml.etree as ET
-
-from excel2moodle.core.settings import Tags
-
-QUESTION_TYPES = {
-    "NF": "numerical",
-    "NFM": "numerical",
-    "MC": "multichoice",
-    "CLOZE": "cloze",
-}
-
-
-class TextElements(Enum):
-    PLEFT = "p", "text-align: left;"
-    SPANRED = "span", "color: rgb(239, 69, 64)"
-    SPANGREEN = "span", "color: rgb(152, 202, 62)"
-    SPANORANGE = "span", "color: rgb(152, 100, 100)"
-    ULIST = "ul", ""
-    LISTITEM = "li", "text-align: left;"
-    DIV = "div", ""
-
-    def create(self, tag: str | None = None):
-        if tag is None:
-            tag, style = self.value
-        else:
-            style = self.value[1]
-        return ET.Element(tag, dir="ltr", style=style)
-
-    @property
-    def style(
-        self,
-    ) -> str:
-        return self.value[1]
-
-
-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
-    QUESTION = "question"
-    TEXT = "text"
-    PICTURE = "file", Tags.PICTURE
-    GENFEEDB = "generalfeedback"
-    CORFEEDB = "correctfeedback"
-    PCORFEEDB = "partialcorrectfeedback"
-    INCORFEEDB = "incorrectfeedback"
-    ANSFEEDBACK = "feedback"
-    POINTS = "defaultgrade"
-    PENALTY = "penalty"
-    HIDE = "hidden"
-    ID = "idnumber"
-    TYPE = "type"
-    ANSWER = "answer"
-    TOLERANCE = "tolerance"
-
-
-feedBElements = {
-    XMLTags.CORFEEDB: TextElements.SPANGREEN.create(),
-    XMLTags.PCORFEEDB: TextElements.SPANORANGE.create(),
-    XMLTags.INCORFEEDB: TextElements.SPANRED.create(),
-    XMLTags.ANSFEEDBACK: TextElements.SPANGREEN.create(),
-    XMLTags.GENFEEDB: TextElements.SPANGREEN.create(),
-}