excel2moodle 0.6.3__py3-none-any.whl → 0.6.5__py3-none-any.whl

excel2moodle/core/bullets.py

@@ -5,7 +5,7 @@ import lxml.etree as ET
 
 from excel2moodle.core import stringHelpers
 from excel2moodle.core.globals import TextElements
-from excel2moodle.core.question import ParametricQuestion
+from excel2moodle.core.question import ParametricQuestion, Parametrics
 from excel2moodle.logger import LogAdapterQuestionID
 
 loggerObj = logging.getLogger(__name__)
@@ -20,9 +20,8 @@ class BulletList:
         self.logger = LogAdapterQuestionID(loggerObj, {"qID": self.id})
         self._setupBullets(rawBullets)
 
-    def updateBullets(
-        self, variables: dict[str, list[float]], variant: int = 1
-    ) -> None:
+    def update(self, parametrics: Parametrics, variant: int = 1) -> None:
+        variables: dict[str, list[float]] = parametrics.variables
         for var, bullet in self.bullets.items():
             bullet.update(value=variables[var][variant - 1])
 

excel2moodle/core/dataStructure.py

@@ -117,14 +117,15 @@ class QuestionDB:
                 f,
                 sheet_name="settings",
                 index_col=0,
+                header=None,
                 engine="calamine",
             )
         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)
+        settingsDict = Validator.dfToDict(settingDf[1])
+        Validator.listify(settingsDict)
+        for tag, value in settingsDict.items():
+            self.settings.set(tag, value)
 
         self._validateProjectSettings(sheetPath=sheetPath)
         with Path(sheetPath).open("rb") as f:

excel2moodle/core/parser.py

@@ -11,8 +11,9 @@ from excel2moodle.core.globals import (
     XMLTags,
     feedBElements,
 )
-from excel2moodle.core.question import Picture, Question
+from excel2moodle.core.question import ParametricQuestion, Picture, Question
 from excel2moodle.core.settings import Settings, Tags
+from excel2moodle.extra.scriptCaller import MediaCall
 from excel2moodle.logger import LogAdapterQuestionID
 
 loggerObj = logging.getLogger(__name__)
@@ -129,9 +130,13 @@ class QuestionParser:
                 )
             self.htmlRoot.append(bullets.element)
             self.question.bulletList = bullets
+            if isinstance(self.question, ParametricQuestion):
+                self.question.updateQue = [bullets]
         if self.hasPicture():
             self.htmlRoot.append(self.question.picture.htmlTag)
             textRootElem.append(self.question.picture.element)
+        if Tags.MEDIACALL in self.rawInput:
+            self.insertScriptedMedia()
         ansList = self._parseAnswers()
         if ansList is not None:
             for ele in ansList:
@@ -166,6 +171,19 @@ class QuestionParser:
         ele.append(eth.getCdatTxtElement(par))
         return ele
 
+    def insertScriptedMedia(self) -> None:
+        """Load the scripts, insert the div and call a Function."""
+        for script in self.rawInput.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)
+        self.htmlRoot.append(scriptCall.element)
+        if isinstance(self.question, ParametricQuestion):
+            self.question.updateQue.append(scriptCall)
+
     def _parseAnswers(self) -> list[ET.Element] | None:
         """Needs to be implemented in the type-specific subclasses."""
         return None

excel2moodle/core/question.py

@@ -53,7 +53,14 @@ class QuestionData(dict):
     @overload
     def get(
         self,
-        key: Literal[Tags.BPOINTS, Tags.TRUE, Tags.FALSE, Tags.QUESTIONPART, Tags.TEXT],
+        key: Literal[
+            Tags.BPOINTS,
+            Tags.TRUE,
+            Tags.FALSE,
+            Tags.QUESTIONPART,
+            Tags.TEXT,
+            Tags.MEDIASCRIPTS,
+        ],
         default: object = None,
     ) -> list: ...
     @overload
@@ -115,6 +122,7 @@ class Question:
     }
     optionalTags: ClassVar[dict[Tags, type | UnionType]] = {
         Tags.PICTURE: int | str,
+        Tags.MEDIACALL: list,
     }
 
     def __init_subclass__(cls, **kwargs) -> None:
@@ -202,6 +210,7 @@ class ParametricQuestion(Question):
         self.rules: list[str] = []
         self.parametrics: Parametrics
         self._variant: int
+        self.updateQue: list
 
     @property
     def currentVariant(self) -> int:
@@ -214,13 +223,12 @@ class ParametricQuestion(Question):
         `Question` returns the Element.
 
         """
-        if not hasattr(self, "bulletList"):
-            msg = "Can't assemble a parametric question, without the bulletPoints variables"
+        if not hasattr(self, "updateQue"):
+            msg = "Can't assemble a parametric question, without the updateQue"
             raise QNotParsedException(msg, self.id)
 
-        self.bulletList.updateBullets(
-            variables=self.parametrics.variables, variant=variant
-        )
+        for obj in self.updateQue:
+            obj.update(parametrics=self.parametrics, variant=variant)
         self._variant = variant
         return super().getUpdatedElement(variant)
 

excel2moodle/core/settings.py

@@ -96,9 +96,12 @@ class Tags(StrEnum):
     PCORRECFB = "partialcorrectfeedback", str, "Your answer is partially right."
     GENERALFB = "feedback", str, "You answered this question."
 
+    MEDIASCRIPTS = "mediascripts", list, None
+    MEDIACALL = "parametricmedia", str, None
+
 
 class Settings:
-    values: ClassVar[dict[str, str | float | Path]] = {}
+    values: ClassVar[dict[str, str | float | Path | list]] = {}
 
     def __contains__(self, tag: Tags) -> bool:
         return bool(tag in type(self).values)

excel2moodle/core/validator.py

@@ -54,31 +54,29 @@ class Validator:
             if missing is not None:
                 raise InvalidFieldException(msg, qid, missing)
 
-    def getQuestionData(self) -> QuestionData:
-        """Get the data from the spreadsheet as a dictionary."""
-        self.qdata: dict[str, int | float | list[str] | str] = {}
-        for idx, val in self.df.items():
-            if not isinstance(idx, str):
+    @staticmethod
+    def dfToDict(df: pd.Series) -> dict[str, int | float | list[str] | str]:
+        """Convert a dataframe to dictionary, preserving lists."""
+        dic: dict[str, int | float | list[str] | str] = {}
+        for var, val in df.items():
+            if not isinstance(var, str):
                 continue
             if pd.isna(val):
                 continue
-            if idx in self.qdata:
-                if isinstance(self.qdata[idx], list):
-                    self.qdata[idx].append(val)
+            if var in dic:
+                if isinstance(dic[var], list):
+                    dic[var].append(val)
                 else:
-                    existing = self.qdata[idx]
-                    self.qdata[idx] = [existing, val]
+                    existing = dic[var]
+                    dic[var] = [existing, val]
             else:
-                self.qdata[idx] = val
-        return self.formatQData()
-
-    def formatQData(self) -> QuestionData:
-        """Format the dictionary to The types for QuestionData."""
-        listTags = (Tags.BPOINTS, Tags.TRUE, Tags.FALSE, Tags.TEXT, Tags.QUESTIONPART)
-        for tag in listTags:
-            for key in self.qdata:
-                if key.startswith(tag) and not isinstance(self.qdata[key], list):
-                    self.qdata[key] = stringHelpers.getListFromStr(self.qdata[key])
+                dic[var] = val
+        return dic
+
+    def getQuestionData(self) -> QuestionData:
+        """Get the data from the spreadsheet as a dictionary."""
+        self.qdata = self.dfToDict(self.df)
+        self.listify(self.qdata)
         tol = float(self.qdata.get(Tags.TOLERANCE, 0))
         if tol < 0 or tol > 99:
             tol = settings.get(Tags.TOLERANCE)
@@ -89,6 +87,18 @@ class Validator:
             self.qdata[Tags.EQUATION] = str(self.qdata[Tags.RESULT])
         return QuestionData(self.qdata)
 
+    @staticmethod
+    def listify(dictionary: dict) -> None:
+        """Converts to list all tag values, which are supposed to be a list."""
+        for key in dictionary:
+            k: str = key.split(":")[0]
+            if k in Tags:
+                tag = Tags(k)
+                logger.info("Got the Tag %s from key: %s", tag, key)
+                if tag.typ() is list and not isinstance(dictionary[key], list):
+                    dictionary[key] = stringHelpers.getListFromStr(dictionary[key])
+                    logger.info("Converted Input to list for %s", key)
+
     def _mandatory(self) -> tuple[bool, Tags | None]:
         """Detects if all keys of mandatory are filled with values."""
         checker = pd.Series.notna(self.df)

excel2moodle/extra/scriptCaller.py

@@ -0,0 +1,27 @@
+import logging
+import re
+
+import lxml.etree as ET
+
+from excel2moodle.core.question import Parametrics
+
+loggerObj = logging.getLogger(__name__)
+
+
+class MediaCall:
+    def __init__(self, callString: str, divId: str) -> None:
+        self.call: str = re.sub(r"\(", f'("{divId}", ', callString)
+        self._scriptElem = ET.Element("script")
+        self._scriptElem.text = callString
+        self.divId = divId
+
+    @property
+    def element(self) -> ET.Element:
+        return self._scriptElem
+
+    def update(self, parametrics: Parametrics, variant: int = 0) -> None:
+        updatedCall = self.call
+        for var, val in parametrics.variables.items():
+            updatedCall = re.sub(rf",\s+{var}\s*", f", {val[variant]}", updatedCall)
+        self._scriptElem.text = updatedCall
+        loggerObj.info("Inserted function call: %s", updatedCall)

excel2moodle/ui/UI_updateDlg.py

@@ -3,7 +3,7 @@
 ################################################################################
 ## Form generated from reading UI file 'UI_updateDlg.ui'
 ##
-## Created by: Qt User Interface Compiler version 6.9.1
+## Created by: Qt User Interface Compiler version 6.9.0
 ##
 ## WARNING! All changes made in this file will be lost when recompiling UI file!
 ################################################################################
@@ -24,7 +24,7 @@ class Ui_UpdateDialog(object):
         if not UpdateDialog.objectName():
             UpdateDialog.setObjectName(u"UpdateDialog")
         UpdateDialog.setWindowModality(Qt.WindowModality.NonModal)
-        UpdateDialog.resize(534, 512)
+        UpdateDialog.resize(540, 512)
         UpdateDialog.setModal(True)
         self.verticalLayout = QVBoxLayout(UpdateDialog)
         self.verticalLayout.setObjectName(u"verticalLayout")
@@ -78,6 +78,10 @@ class Ui_UpdateDialog(object):
         self.label.setObjectName(u"label")
         sizePolicy.setHeightForWidth(self.label.sizePolicy().hasHeightForWidth())
         self.label.setSizePolicy(sizePolicy)
+        font = QFont()
+        font.setPointSize(12)
+        font.setBold(True)
+        self.label.setFont(font)
 
         self.verticalLayout.addWidget(self.label)
 
@@ -101,6 +105,6 @@ class Ui_UpdateDialog(object):
         self.titleLabel.setText(QCoreApplication.translate("UpdateDialog", u"<h2>A new <i>excel2moodle</i> version is available!</h2>", None))
         self.fundingLabel.setText(QCoreApplication.translate("UpdateDialog", u"If you find this project useful, please consider supporting its development.", None))
         self.changelogLabel.setText(QCoreApplication.translate("UpdateDialog", u"<h3>Changelog:</h3>", None))
-        self.label.setText(QCoreApplication.translate("UpdateDialog", u"To install the update run: 'uv tool upgrade excel2moodle'", None))
+        self.label.setText(QCoreApplication.translate("UpdateDialog", u"To install the update execute: 'uv tool upgrade excel2moodle'", None))
     # retranslateUi
 

excel2moodle/ui/appUi.py

@@ -337,7 +337,7 @@ class MainWindow(QMainWindow):
     def openSpreadsheetExternally(self) -> None:
         if self.excelPath is None:
             return
-        spreadsheetPath = QUrl(f"file://{self.excelPath.absolute()}")
+        spreadsheetPath = QUrl(f"file://{self.excelPath.resolve()}")
         logger.info("Opening: %s", spreadsheetPath)
         QDesktopServices.openUrl(spreadsheetPath)
 

{excel2moodle-0.6.3.dist-info → excel2moodle-0.6.5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: excel2moodle
-Version: 0.6.3
+Version: 0.6.5
 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,18 @@ If You want to support my work as well, you can by me a [coffee](https://ko-fi.c
 
 # Changelogs
 
+## 0.6.5 (2025-09-02)
+Added Scripted Media Support now with the module
+
+No changes.
+
+## 0.6.4 (2025-09-02)
+Added Scripted Media Support
+
+### feature (1 change)
+
+- [Added support for scripted Media content.](https://gitlab.com/jbosse3/excel2moodle/-/commit/2021942392147d0e9740af5286f469dd6226ffa5)
+
 ## 0.6.3 (2025-08-03)
 Lots of small improvements made
 

{excel2moodle-0.6.3.dist-info → excel2moodle-0.6.5.dist-info}/RECORD

@@ -2,19 +2,20 @@ 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=KwlxGOWbWexMkfXkY4Zg-gmxpzQCNZ09kSo8kPffGQU,3501
+excel2moodle/core/bullets.py,sha256=TiRf2EfhsryE-KBfvo43dMtsMWuZi9L9H7TuwXAZ1rg,3550
 excel2moodle/core/category.py,sha256=fOMj2ynoAy6tXwmFhJ9uST9BQHiRJeU2BrkK1r57ek4,2897
-excel2moodle/core/dataStructure.py,sha256=BzBKg_fCT1FHuJum2aGLK_4RqmA2qluODvg1GwiEA7E,19797
+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=wth3SPjlbWnS1zUVPap6PsJeVGCRatLuJZe6U7KgXBg,7540
-excel2moodle/core/question.py,sha256=eylkSKYQYo0uRxzfTZqoQNFAXq94mzzxbRWyknstupg,14187
-excel2moodle/core/settings.py,sha256=zqtA1fcQeO3bELLvS8bzP9TSZT7RksFxMaqnYYBXQCQ,6432
+excel2moodle/core/parser.py,sha256=hjbA0i7N1oHoJHhOmvEtVl4Ryaqd0eqUS26bXS47CBo,8467
+excel2moodle/core/question.py,sha256=H_4C2hO4Hrb5fMXnIsuxoeAJVWrHn9nSnNR2x4QnaqY,14324
+excel2moodle/core/settings.py,sha256=_H3TJ67-4Q0hFi8g3JWFILJ6q3mfcEsBRaV74jhbko8,6531
 excel2moodle/core/stringHelpers.py,sha256=OzFZ6Eu3PeBLKb61K-aeVfUZmVuBerr9KfyOsuNRd7Y,2403
-excel2moodle/core/validator.py,sha256=ssgkyUwrR-0AGPX1cUqvRwZsGja13J7HQ2W72ltqN-Y,4683
+excel2moodle/core/validator.py,sha256=6nZIyTwcXPT2jgi31QrBGur3Cq7A3Q9btLp5ALFEsKw,4998
 excel2moodle/extra/__init__.py,sha256=PM-id60HD21A3IcGC_fCYFihS8osBGZMIJCcN-ZRsIM,293
 excel2moodle/extra/equationVerification.py,sha256=oQpk-4cM0x_vKGEexC0Z1UyVoGG7w3V3RydtkM0MV_Y,3869
+excel2moodle/extra/scriptCaller.py,sha256=nJsUxz0EzoChobCJbAbfS8NSMghdUFV6oEPdO6J6KlU,850
 excel2moodle/extra/updateQuery.py,sha256=kD_L23Qea9Cx4zUwfQVNJXXFbybd9cwE8sSbZrz7VF8,1554
 excel2moodle/extra/variableGenerator.py,sha256=qYY9i872yJAE4_nrxy_M5jCdMtGgVKB7yz1Th31bySY,11486
 excel2moodle/question_types/__init__.py,sha256=81mss0g7SVtnlb-WkydE28G_dEAAf6oT1uB8lpK2-II,1041
@@ -25,17 +26,17 @@ excel2moodle/question_types/nfm.py,sha256=D5-aE4C7TAuwHFidXR15DLWNZ4JT-HVbPXI0Cz
 excel2moodle/ui/UI_equationChecker.py,sha256=evQDlqCHeooJcAnYjhFCyjlPhfknr7ULGKQwMmqQeJ4,8947
 excel2moodle/ui/UI_exportSettingsDialog.py,sha256=I0Vqw2TCWoUhDKxTgLoGaAo4_L77vfN8G7_zi7b_5lY,8254
 excel2moodle/ui/UI_mainWindow.py,sha256=9w8bRgOrVEX7BRGQvMuVhPCiSOsXYkMb4rxLDeRErII,21544
-excel2moodle/ui/UI_updateDlg.py,sha256=uabFUsK0O6cRSzNcM84mPntuwdXZCNkqsRDJxAOxG4Q,5144
+excel2moodle/ui/UI_updateDlg.py,sha256=kPv6XyyTqKs2Avsji9peVUrsp0di4B41mXI0Qz_uLfA,5261
 excel2moodle/ui/UI_variableGenerator.py,sha256=DjpZnBELSqyOjJdwjXNP2V71rCPm3tr6_XkNT9F3e34,11205
 excel2moodle/ui/UI_variantDialog.py,sha256=snVaF3_YAc7NWjMRg7NzbjL_PzNbOpt4eiqElkE46io,5414
 excel2moodle/ui/__init__.py,sha256=4EdGtpzwH3rgw4xW9E5x9kdPQYwKbo9rehHRZTNxCrQ,44
-excel2moodle/ui/appUi.py,sha256=y5SWTNo45tIZ-HekdZkR7fPOD0QSP66uB_wlrk-b4YM,15046
+excel2moodle/ui/appUi.py,sha256=woISWvPFegL9e0ntORNaMM1IxQSlP7qAHhYmNsYfI6U,15045
 excel2moodle/ui/dialogs.py,sha256=du6v17lh6LhgDDK0QltPzD-z8wUn3aD4QzaAQBmiTBQ,7314
 excel2moodle/ui/equationChecker.py,sha256=RII9DlZAlHqe5udBWzeUaozhtyi3ZkCZs8h3-oO6pEw,2700
 excel2moodle/ui/treewidget.py,sha256=3hZRLlrhp4FMXFyNY0LGDy7k1RSuKH87QyqB1N4qOqg,2335
-excel2moodle-0.6.3.dist-info/licenses/LICENSE,sha256=ywQqe6Sitymkf2lV2NRcx_aGsaC-KbSl_EfEsRXmNRw,35135
-excel2moodle-0.6.3.dist-info/METADATA,sha256=gspbMXBm2lHiIkV-_-8XL45Q7ItMAEZV-7YFaDGJhZc,11891
-excel2moodle-0.6.3.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-excel2moodle-0.6.3.dist-info/entry_points.txt,sha256=myfMLDThuGgWHMJDPPfILiZqo_7D3fhmDdJGqWOAjPw,60
-excel2moodle-0.6.3.dist-info/top_level.txt,sha256=5V1xRUQ9o7UmOCmNoWCZPAuy5nXp3Qbzyqch8fUGT_c,13
-excel2moodle-0.6.3.dist-info/RECORD,,
+excel2moodle-0.6.5.dist-info/licenses/LICENSE,sha256=ywQqe6Sitymkf2lV2NRcx_aGsaC-KbSl_EfEsRXmNRw,35135
+excel2moodle-0.6.5.dist-info/METADATA,sha256=nyPFcKgz5IqewsbtgdHk5nJgjv140bQpshhJu6GmYZ8,12190
+excel2moodle-0.6.5.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+excel2moodle-0.6.5.dist-info/entry_points.txt,sha256=myfMLDThuGgWHMJDPPfILiZqo_7D3fhmDdJGqWOAjPw,60
+excel2moodle-0.6.5.dist-info/top_level.txt,sha256=5V1xRUQ9o7UmOCmNoWCZPAuy5nXp3Qbzyqch8fUGT_c,13
+excel2moodle-0.6.5.dist-info/RECORD,,