excel2moodle 0.5.2__py3-none-any.whl → 0.6.0__py3-none-any.whl

excel2moodle/ui/appUi.py

@@ -7,13 +7,23 @@ It needs to be seperated from ``windowMain.py`` because that file will be change
 import logging
 from pathlib import Path
 
-from PySide6 import QtCore, QtWidgets
-from PySide6.QtCore import QRunnable, QSettings, Qt, QThreadPool
+from PySide6.QtCore import QRunnable, QSettings, Qt, QThreadPool, QUrl, Slot
+from PySide6.QtGui import QDesktopServices
+from PySide6.QtWidgets import (
+    QAbstractItemView,
+    QApplication,
+    QFileDialog,
+    QHeaderView,
+    QMainWindow,
+    QMessageBox,
+)
 
-from excel2moodle import mainLogger
+from excel2moodle import e2mMetadata, mainLogger
 from excel2moodle.core.category import Category
 from excel2moodle.core.dataStructure import QuestionDB
+from excel2moodle.core.question import ParametricQuestion
 from excel2moodle.core.settings import Settings, Tags
+from excel2moodle.extra.variableGenerator import VariableGeneratorDialog
 from excel2moodle.logger import LogWindowHandler
 from excel2moodle.question_types.mc import MCQuestion
 from excel2moodle.question_types.nf import NFQuestion
@@ -21,7 +31,6 @@ from excel2moodle.ui import dialogs
 from excel2moodle.ui.equationChecker import EqCheckerWindow
 from excel2moodle.ui.treewidget import CategoryItem, QuestionItem
 from excel2moodle.ui.UI_mainWindow import Ui_MoodleTestGenerator
-from excel2moodle.ui.windowDoc import DocumentationWindow
 
 logger = logging.getLogger(__name__)
 
@@ -29,7 +38,7 @@ loggerSignal = LogWindowHandler()
 mainLogger.addHandler(loggerSignal)
 
 
-class MainWindow(QtWidgets.QMainWindow):
+class MainWindow(QMainWindow):
     def __init__(self, settings: Settings, testDB: QuestionDB) -> None:
         super().__init__()
         self.settings = settings
@@ -47,9 +56,9 @@ class MainWindow(QtWidgets.QMainWindow):
         self.eqChecker = EqCheckerWindow()
         self.connectEvents()
         logger.info("Settings are stored under: %s", self.qSettings.fileName())
-        self.ui.treeWidget.setSelectionMode(QtWidgets.QAbstractItemView.MultiSelection)
+        self.ui.treeWidget.setSelectionMode(QAbstractItemView.MultiSelection)
         self.ui.treeWidget.header().setSectionResizeMode(
-            QtWidgets.QHeaderView.ResizeToContents,
+            QHeaderView.ResizeToContents,
         )
         self.ui.pointCounter.setReadOnly(True)
         self.ui.questionCounter.setReadOnly(True)
@@ -92,8 +101,13 @@ class MainWindow(QtWidgets.QMainWindow):
         self.ui.treeWidget.itemClicked.connect(self.updateQuestionPreview)
         self.ui.actionAbout.triggered.connect(self.openAboutDlg)
         self.ui.actionDocumentation.triggered.connect(self.openDocumentation)
+        self.ui.actionGenerateVariables.triggered.connect(self.openVariableGeneratorDlg)
+        self.ui.actionCopyVariables.triggered.connect(self.copyVariablesToClipboard)
+        self.ui.actionOpenSpreadsheetExternal.triggered.connect(
+            self.openSpreadsheetExternally
+        )
 
-    @QtCore.Slot()
+    @Slot()
     def parseSpreadsheetAll(self) -> None:
         """Event triggered by the *Tools/Parse all Questions* Event.
 
@@ -134,7 +148,7 @@ class MainWindow(QtWidgets.QMainWindow):
             self.settings.get(Tags.QUESTIONVARIANT),
         )
 
-    @QtCore.Slot()
+    @Slot()
     def onSelectionChanged(self, **args) -> None:
         """Whenever the selection changes the total of selected points needs to be recalculated."""
         count: int = 0
@@ -148,7 +162,7 @@ class MainWindow(QtWidgets.QMainWindow):
         if self.eqChecker.isVisible():
             self.openEqCheckerDlg()
 
-    @QtCore.Slot()
+    @Slot()
     def toggleQuestionSelectionState(self, state) -> None:
         setter = state == Qt.Checked
         root = self.ui.treeWidget.invisibleRootItem()
@@ -158,7 +172,7 @@ class MainWindow(QtWidgets.QMainWindow):
             for q in range(qs):
                 root.child(i).child(q).setSelected(setter)
 
-    @QtCore.Slot()
+    @Slot()
     def onButGenTest(self) -> None:
         """Open a file Dialog so the export file may be choosen."""
         selection: list[QuestionItem] = self.ui.treeWidget.selectedItems()
@@ -180,9 +194,9 @@ class MainWindow(QtWidgets.QMainWindow):
         else:
             logger.info("Aborting Export")
 
-    @QtCore.Slot()
+    @Slot()
     def actionSpreadsheet(self) -> None:
-        file = QtWidgets.QFileDialog.getOpenFileName(
+        file = QFileDialog.getOpenFileName(
             self,
             self.tr("Open Spreadsheet"),
             dir=str(self.mainPath),
@@ -192,7 +206,7 @@ class MainWindow(QtWidgets.QMainWindow):
         path = Path(file[0]).resolve(strict=True)
         self.setSheetPath(path)
 
-    @QtCore.Slot(Category)
+    @Slot(Category)
     def treeRefreshCategory(self, cat: Category) -> None:
         """Append Category with its Questions to the treewidget."""
         catItem = CategoryItem(self.ui.treeWidget, cat)
@@ -201,7 +215,7 @@ class MainWindow(QtWidgets.QMainWindow):
             QuestionItem(catItem, q)
         self.ui.treeWidget.sortItems(0, Qt.SortOrder.AscendingOrder)
 
-    @QtCore.Slot()
+    @Slot()
     def updateQuestionPreview(self) -> None:
         item = self.ui.treeWidget.currentItem()
         if isinstance(item, QuestionItem):
@@ -213,7 +227,7 @@ class MainWindow(QtWidgets.QMainWindow):
         self.ui.statusbar.clearMessage()
         self.ui.statusbar.showMessage(self.tr(status))
 
-    @QtCore.Slot()
+    @Slot()
     def openEqCheckerDlg(self) -> None:
         item = self.ui.treeWidget.currentItem()
         if isinstance(item, QuestionItem):
@@ -227,18 +241,71 @@ class MainWindow(QtWidgets.QMainWindow):
         else:
             logger.debug("No Question Item selected: %s", type(item))
 
-    @QtCore.Slot()
+    @Slot()
     def openAboutDlg(self) -> None:
         about = dialogs.AboutDialog(self)
         about.exec()
 
-    @QtCore.Slot()
+    @Slot()
     def openDocumentation(self) -> None:
-        if hasattr(self, "documentationWindow"):
-            self.documentationWindow.show()
+        url = QUrl(e2mMetadata["documentation"])
+        QDesktopServices.openUrl(url)
+
+    @Slot()
+    def openVariableGeneratorDlg(self) -> None:
+        item = self.ui.treeWidget.currentItem()
+        if isinstance(item, QuestionItem):
+            question = item.getQuestion()
+            if isinstance(question, ParametricQuestion):
+                dialog = VariableGeneratorDialog(self, parametrics=question.parametrics)
+                if dialog.exec():
+                    self.questionPreview.setupQuestion(question)
+                    logger.info("Updated QuestionItem display for %s", question.id)
+                    self.copyVariablesToClipboard(
+                        variables=question.parametrics.variables
+                    )
+                else:
+                    logger.warning("No variable sets were generated.")
+            else:
+                logger.info("Selected item is not a ParametricQuestion.")
         else:
-            self.documentationWindow = DocumentationWindow(self)
-            self.documentationWindow.show()
+            logger.info("No Question Item selected.")
+
+    @Slot()
+    def copyVariablesToClipboard(
+        self, variables: dict[str, list[float | int]] | None = None
+    ) -> None:
+        if variables is None:
+            variables = {}
+        if not variables:
+            item = self.ui.treeWidget.currentItem()
+            if isinstance(item, QuestionItem):
+                question = item.getQuestion()
+                if isinstance(question, ParametricQuestion):
+                    variables = question.parametrics.variables
+        varsList = [
+            f"{name}\t{';    '.join(map(str, vals))}"
+            for name, vals in variables.items()
+        ]
+        clipb = QApplication.clipboard()
+        variablesStr = "\n".join(varsList)
+        clipb.setText(variablesStr)
+        logger.info("Copied all variables to the clipboard")
+        QMessageBox.information(
+            self,
+            "Variables Copied.",
+            """All variables from the parametric Question are saved to the system clipboard.\n
+            You can paste them into the spreadsheet.
+            Make sure to import them with 'Tab' as the seperator.""",
+        )
+
+    @Slot()
+    def openSpreadsheetExternally(self) -> None:
+        if self.excelPath is None:
+            return
+        spreadsheetPath = QUrl(f"file://{self.excelPath.absolute()}")
+        logger.info("Opening: %s", spreadsheetPath)
+        QDesktopServices.openUrl(spreadsheetPath)
 
 
 class ParseAllThread(QRunnable):
@@ -252,7 +319,7 @@ class ParseAllThread(QRunnable):
         self.testDB = questionDB
         self.mainApp = mainApp
 
-    @QtCore.Slot()
+    @Slot()
     def run(self) -> None:
         self.testDB.readCategoriesMetadata()
         self.testDB.asyncInitAllCategories(self.mainApp.excelPath)

excel2moodle/ui/dialogs.py

@@ -5,12 +5,13 @@ from pathlib import Path
 from typing import TYPE_CHECKING
 
 import lxml.etree as ET
-from PySide6 import QtGui, QtWidgets
-from PySide6.QtSvgWidgets import QGraphicsSvgItem
+from PySide6.QtWidgets import QDialog, QFileDialog, QMessageBox, QWidget
 
 from excel2moodle import e2mMetadata
 from excel2moodle.core.globals import XMLTags
-from excel2moodle.core.question import Question
+from excel2moodle.core.question import ParametricQuestion, Question
+from excel2moodle.core.settings import Tags
+from excel2moodle.extra import variableGenerator
 from excel2moodle.ui.UI_exportSettingsDialog import Ui_ExportDialog
 from excel2moodle.ui.UI_variantDialog import Ui_Dialog
 
@@ -20,11 +21,11 @@ if TYPE_CHECKING:
 logger = logging.getLogger(__name__)
 
 
-class QuestionVariantDialog(QtWidgets.QDialog):
-    def __init__(self, parent, question: Question) -> None:
+class QuestionVariantDialog(QDialog):
+    def __init__(self, parent, question: ParametricQuestion) -> None:
         super().__init__(parent)
         self.setWindowTitle("Question Variant Dialog")
-        self.maxVal = question.variants
+        self.maxVal = question.parametrics.variants
         self.ui = Ui_Dialog()
         self.ui.setupUi(self)
         self.ui.spinBox.setRange(1, self.maxVal)
@@ -41,7 +42,7 @@ class QuestionVariantDialog(QtWidgets.QDialog):
         return self.ui.checkBox.isChecked()
 
 
-class ExportDialog(QtWidgets.QDialog):
+class ExportDialog(QDialog):
     def __init__(self, parent) -> None:
         super().__init__(parent)
         self.setWindowTitle("Export question Selection")
@@ -62,7 +63,7 @@ class ExportDialog(QtWidgets.QDialog):
         )
 
     def getExportFile(self) -> None:
-        path = QtWidgets.QFileDialog.getSaveFileName(
+        path = QFileDialog.getSaveFileName(
             self,
             "Select Output File",
             dir=str(self.exportFile),
@@ -83,85 +84,51 @@ class QuestionPreview:
         self.ui = parent.ui
         self.parent = parent
 
+    def _replaceImgPlaceholder(self, elementStr: str) -> str:
+        """Replaces '@@PLUGINFILE@@' with the questions Img Folder path."""
+        return elementStr.replace(
+            "@@PLUGINFILE@@",
+            f"{self.pictureFolder}/{self.question.category.NAME}",
+        )
+
     def setupQuestion(self, question: Question) -> None:
+        self.pictureFolder = self.parent.settings.get(Tags.PICTUREFOLDER)
+        self.ui.previewTextEdit.clear()
         self.question: Question = question
         self.ui.qNameLine.setText(f"{self.question.qtype} - {self.question.name}")
-        self.picScene = QtWidgets.QGraphicsScene(self.parent)
-        self.ui.graphicsView.setScene(self.picScene)
-        self.setText()
+        self.ui.previewTextEdit.append(
+            self._replaceImgPlaceholder(
+                ET.tostring(self.question.htmlRoot, encoding="unicode")
+            )
+        )
+        self.parent.ui.tableVariables.hide()
         self.setAnswers()
-        if hasattr(self, "picItem") and self.picItem.scene() == self.picScene:
-            logger.debug("removing Previous picture")
-            self.picScene.removeItem(self.picItem)
-            del self.picItem
-        self.setPicture()
-
-    def setPicture(self) -> None:
-        if hasattr(self.question, "picture") and self.question.picture.ready:
-            path = self.question.picture.path
-            if path.suffix == ".svg":
-                self.picItem = QGraphicsSvgItem(str(path))
-            else:
-                pic = QtGui.QPixmap(str(path))
-                self.picItem = QtWidgets.QGraphicsPixmapItem(pic)
-                if pic.isNull():
-                    logger.warning("Picture null")
-            scale = self._getImgFittingScale()
-            self.picItem.setScale(scale)
-            self.picScene.addItem(self.picItem)
-
-    def _getImgFittingScale(self) -> float:
-        view_size = self.ui.graphicsView.viewport().size()
-        view_width = view_size.width()
-        view_height = view_size.height()
-        if isinstance(self.picItem, QtWidgets.QGraphicsPixmapItem):
-            original_size = self.picItem.pixmap().size()
-        elif isinstance(self.picItem, QGraphicsSvgItem):
-            original_size = self.picItem.renderer().defaultSize()
-        else:
-            return 1  # Unknown item type
-        scale_x = view_width / original_size.width()
-        scale_y = view_height / original_size.height()
-        return min(scale_x, scale_y)
-
-    def setText(self) -> None:
-        t = []
-        for text in self.question.qtextParagraphs:
-            t.append(ET.tostring(text, encoding="unicode"))
-        if self.question.bulletList is not None:
-            t.append(ET.tostring(self.question.bulletList, encoding="unicode"))
-        self.ui.questionText.setText("\n".join(t))
 
     def setAnswers(self) -> None:
-        if self.question.qtype == "NFM":
-            list = ET.Element("ol")
-            for ans in self.question.answerVariants:
-                textEle = ET.Element("li")
-                textEle.text = f"Result: {ans.find('text').text}"
-                list.append(textEle)
-            self.ui.answersLabel.setText(ET.tostring(list, encoding="unicode"))
+        if isinstance(self.question, ParametricQuestion):
+            variableGenerator.populateDataSetTable(
+                self.parent.ui.tableVariables, parametrics=self.question.parametrics
+            )
+            self.parent.ui.tableVariables.show()
         elif self.question.qtype == "NF":
-            ans = self.question.element.find(XMLTags.ANSWER)
-            self.ui.answersLabel.setText(f" Result: {ans.find('text').text}")
+            ans = self.question._element.find(XMLTags.ANSWER)
+            self.ui.previewTextEdit.append(f" Result: {ans.find('text').text}")
         elif self.question.qtype == "MC":
-            list = ET.Element("ol")
-            for ans in self.question.element.findall(XMLTags.ANSWER):
-                textEle = ET.Element("li")
-                pEle = ans.find("text").text
-                frac = ans.get("fraction")
-                anstext = ET.fromstring(pEle).text
-                text = f"Fraction {frac}: {anstext}"
-                textEle.text = text
-                list.append(textEle)
-            self.ui.answersLabel.setText(ET.tostring(list, encoding="unicode"))
-
-
-class AboutDialog(QtWidgets.QMessageBox):
-    def __init__(self, parent: QtWidgets.QWidget) -> None:
+            for n, ans in enumerate(self.question._element.findall(XMLTags.ANSWER)):
+                self.ui.previewTextEdit.append(
+                    f"<b>Answer {n + 1}, Fraction {ans.get('fraction')}:</b>"
+                )
+                self.ui.previewTextEdit.append(
+                    self._replaceImgPlaceholder(ans.find("text").text)
+                )
+
+
+class AboutDialog(QMessageBox):
+    def __init__(self, parent: QWidget) -> None:
         super().__init__(parent)
         self.setWindowTitle(f"About {e2mMetadata['name']}")
-        self.setIcon(QtWidgets.QMessageBox.Information)
-        self.setStandardButtons(QtWidgets.QMessageBox.StandardButton.Close)
+        self.setIcon(QMessageBox.Information)
+        self.setStandardButtons(QMessageBox.StandardButton.Close)
 
         self.aboutMessage: str = f"""
         <h1> About {e2mMetadata["name"]} v{e2mMetadata["version"]}</h1><br>

excel2moodle/ui/equationChecker.py

@@ -2,7 +2,7 @@ import logging
 import math
 from pathlib import Path
 
-from PySide6 import QtWidgets
+from PySide6.QtWidgets import QWidget
 
 from excel2moodle import mainLogger
 from excel2moodle.core.question import ParametricQuestion
@@ -18,7 +18,7 @@ loggerSignal = LogWindowHandler()
 mainLogger.addHandler(loggerSignal)
 
 
-class EqCheckerWindow(QtWidgets.QWidget):
+class EqCheckerWindow(QWidget):
     def __init__(self) -> None:
         super().__init__()
         self.excelFile = Path()

excel2moodle/ui/treewidget.py

@@ -1,11 +1,17 @@
-from PySide6 import QtWidgets
+"""The `treewidget` Module provides the `QuestionItem` and the `CategoryItem` item.
+
+Those two are subclasses of `QTreeWidgetItem`, to provide an easy interface
+of accessing the corresponding questions from the items.
+"""
+
 from PySide6.QtCore import Qt
+from PySide6.QtWidgets import QTreeWidgetItem
 
 from excel2moodle.core.dataStructure import Category
 from excel2moodle.core.question import ParametricQuestion, Question
 
 
-class QuestionItem(QtWidgets.QTreeWidgetItem):
+class QuestionItem(QTreeWidgetItem):
     def __init__(self, parent, question: Question | ParametricQuestion) -> None:
         super().__init__(parent)
         self.setData(2, Qt.UserRole, question)
@@ -20,7 +26,7 @@ class QuestionItem(QtWidgets.QTreeWidgetItem):
         return self.data(2, Qt.UserRole)
 
 
-class CategoryItem(QtWidgets.QTreeWidgetItem):
+class CategoryItem(QTreeWidgetItem):
     def __init__(self, parent, category: Category) -> None:
         super().__init__(parent)
         self.setData(2, Qt.UserRole, category)
@@ -45,24 +51,3 @@ class CategoryItem(QtWidgets.QTreeWidgetItem):
 
     def getCategory(self) -> Category:
         return self.data(2, Qt.UserRole)
-
-
-# class SpinBoxDelegate(QtWidgets.QStyledItemDelegate):
-#     def __init__(self, parent=None):
-#         super().__init__(parent)
-#
-#     def createEditor(self, parent, option, index):
-#         # Create a QSpinBox when the item is being edited
-#         spinbox = QtWidgets.QSpinBox(parent)
-#         spinbox.setMinimum(0)
-#         spinbox.setMaximum(100)
-#         return spinbox
-#
-#     def setEditorData(self, editor, index):
-#         # Set the current value of the QSpinBox based on the item's data
-#         value = index.model().data(index, Qt.EditRole)
-#         editor.setValue(value)
-#
-#     def setModelData(self, editor, model, index):
-#         # When editing is done, update the model data with the QSpinBox value
-#         model.setData(index, editor.value(), Qt.EditRole)

{excel2moodle-0.5.2.dist-info → excel2moodle-0.6.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: excel2moodle
-Version: 0.5.2
+Version: 0.6.0
 Summary: A package for converting questions from a spreadsheet, to valid moodle-xml
 Author: Jakob Bosse
 License-Expression: GPL-3.0-or-later
@@ -12,11 +12,11 @@ Classifier: Operating System :: OS Independent
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: pyside6>=6.8.0
 Requires-Dist: pandas>=2.1.3
 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
 Dynamic: license-file
 
 # excel 2 Moodle
@@ -81,6 +81,31 @@ If You want to support my work as well, you can by me a [coffee](https://ko-fi.c
 
 # Changelogs
 
+## 0.6.0 (2025-07-12)
+Added variable generator and other architechtural improvements
+
+### documentation (1 change)
+
+- [Documenting variable generator usage](https://gitlab.com/jbosse3/excel2moodle/-/commit/3e4d3019b29872b5cfddf5539d5ebe7638bca049)
+
+### feature (5 changes)
+
+- [Opening spreadsheet file works from within excel2moodle](https://gitlab.com/jbosse3/excel2moodle/-/commit/9470f12ea5f098745a3210b281a5144a938ae8b5)
+- [Variables are copied to clipboard](https://gitlab.com/jbosse3/excel2moodle/-/commit/87a7e5ec75f899b293e89ad3c1742567e3ec1c29)
+- [Removed dependence on pyside6-addons](https://gitlab.com/jbosse3/excel2moodle/-/commit/2b3a7cf48581c14bd9cb570cd61d1d41aa410e11)
+- [Var Generator ready](https://gitlab.com/jbosse3/excel2moodle/-/commit/ea97f0639dc35a4c99a64ae3976ccc8a0ac5d109)
+- [Merge development of BulletsObj, Parametrization and VarGenerator](https://gitlab.com/jbosse3/excel2moodle/-/commit/40b46f3c143e082f1bb985d6c8c4e68bb6b6a7a8)
+
+### improvement (7 changes)
+
+- [Adapted Param. Parser to use bullet Obj](https://gitlab.com/jbosse3/excel2moodle/-/commit/194cab7cc6aecb2d25d1cb9c1538ed7d607dd9e1)
+- [Added bulleList Object](https://gitlab.com/jbosse3/excel2moodle/-/commit/4ea982b8d8dc270675d2cb059c59fa980ce38894)
+- [Parametrics in beta stage](https://gitlab.com/jbosse3/excel2moodle/-/commit/7d04d8ef2fc603c1b12b6934c827ce079df5d540)
+- [Refactor parse() method, to construct complete xml-Tree](https://gitlab.com/jbosse3/excel2moodle/-/commit/8dc4bea9aa0673d39357115254dd55b02c04114e)
+- [Refactored question assembly to only update fields.](https://gitlab.com/jbosse3/excel2moodle/-/commit/d7accb69be3b4a1e65f59eeecfb463f2663fabd4)
+- [Adapted NFM Question to parametricResult](https://gitlab.com/jbosse3/excel2moodle/-/commit/fe552cd2b538ca8886415c200e4a2a3ecc1fbb2f) ([merge request](https://gitlab.com/jbosse3/excel2moodle/-/merge_requests/5))
+- [Implemented ParametricResult Object](https://gitlab.com/jbosse3/excel2moodle/-/commit/e36d025955f1cab8e0542d66263ab70e3d8980df) ([merge request](https://gitlab.com/jbosse3/excel2moodle/-/merge_requests/5))
+
 ## 0.5.2 (2025-06-30)
 Extended Documentation and bugfix for import Module
 

{excel2moodle-0.5.2.dist-info → excel2moodle-0.6.0.dist-info}/RECORD

@@ -2,37 +2,38 @@ excel2moodle/__init__.py,sha256=mnb-RWgmWIPSBk4S65a_jP6rxntAkTeYxN0ObUJalbQ,1801
 excel2moodle/__main__.py,sha256=sG4ygwfVFskLQorBn-v98SvasNcPmwl_vLYpruT5Hk8,1175
 excel2moodle/logger.py,sha256=fq8ZOkCI1wj38v8IyrZsUlpt16onlSH_phqbVvYUwBQ,3725
 excel2moodle/core/__init__.py,sha256=87BwhtZse72Tk17Ib-V9X2k9wkhmtVnEj2ZmJ9JBAnI,63
+excel2moodle/core/bullets.py,sha256=F9g0dZfkMjoYQ5jneT47GwM1-RAyhPF8y203W5mOYpU,3505
 excel2moodle/core/category.py,sha256=wLzpbweQbzaItdbp2NCPI_Zmk94fy1EDOwEEN8zPvkU,2123
-excel2moodle/core/dataStructure.py,sha256=0XVu6NqKKNrjL0B9UVD9di-uqriGIdF-57lwx0ckeDI,16026
+excel2moodle/core/dataStructure.py,sha256=eMQAuTTKXLmE72I6MP1255BP15N-35Qb4bESyIy4K7w,16011
 excel2moodle/core/etHelpers.py,sha256=G37qplp8tPJxqHNCBrf2Wo0jJZ0aDbxE9slQavqYqd8,2293
 excel2moodle/core/exceptions.py,sha256=9xfsaIcm6Yej6QAZga0d3DK3jLQejdfgJARuAaG-uZY,739
-excel2moodle/core/globals.py,sha256=Zm1wcrzQTRnhjrkwgBvo7VjKCFdPMjh-VLSSI5_QCO8,2837
-excel2moodle/core/numericMultiQ.py,sha256=vr-gYogu2sf2a_Bhvhnu1ZSZFZXM32MfhJesjTkoOQM,2618
-excel2moodle/core/parser.py,sha256=y0BXXt5j-4gRZO8otmEZ1Rmb0DW7hziesUoZ2kVpo9Y,8235
-excel2moodle/core/question.py,sha256=_BSaMdDB269Q4Ag7izegMiExjYRTYOuhYe-qo92EAAg,11726
+excel2moodle/core/globals.py,sha256=URrDtWUeaZvhv38ETk_MGRDZpWF0J5cTWO_Jpf0rS9E,2807
+excel2moodle/core/parser.py,sha256=ExTgPkRXevXDcnQlWE2oGoEp6mbpzP1GBmzY4zs-OPU,7220
+excel2moodle/core/question.py,sha256=pltXKN52tBpFoPKEt9cIdGzZzVKpCQcXun2g9Eu1ljE,13726
 excel2moodle/core/settings.py,sha256=27D-P44rYk-DMrwI1dNpxHcznpFQf1W3XZrOc8e6rX4,5855
 excel2moodle/core/stringHelpers.py,sha256=OzFZ6Eu3PeBLKb61K-aeVfUZmVuBerr9KfyOsuNRd7Y,2403
 excel2moodle/core/validator.py,sha256=ssgkyUwrR-0AGPX1cUqvRwZsGja13J7HQ2W72ltqN-Y,4683
 excel2moodle/extra/__init__.py,sha256=PM-id60HD21A3IcGC_fCYFihS8osBGZMIJCcN-ZRsIM,293
 excel2moodle/extra/equationVerification.py,sha256=GLJl1r90d8AAiNy0H2hooZrg3D6aEwNfifYKAe3aGxM,3921
+excel2moodle/extra/variableGenerator.py,sha256=fiXaTeFaC--1KRyMNcsjBgUlUZ8H1rGS6f_WenN60fQ,9851
 excel2moodle/question_types/__init__.py,sha256=81mss0g7SVtnlb-WkydE28G_dEAAf6oT1uB8lpK2-II,1041
-excel2moodle/question_types/cloze.py,sha256=-F2CozuNHRvTDQM69DgkKXTvw9wMLXfipkdhfTNWSSs,11969
+excel2moodle/question_types/cloze.py,sha256=SvUS4gVKTr6z26KI17zV7pNIGIWQ2JdIVtPr-hgOOo8,13602
 excel2moodle/question_types/mc.py,sha256=2kn6dPjFVg97H8SlUBFbcPjzDk84vgDGCMOtSABseu0,5225
 excel2moodle/question_types/nf.py,sha256=bMP4IXrhnXmAI0NmjEc7DtX4xGaUbxzLicE2LjeaUho,1150
-excel2moodle/question_types/nfm.py,sha256=LTQ60qrhYUqKXoZW4AKz352rD4pgN0wAX_tm5FLFbV0,5022
+excel2moodle/question_types/nfm.py,sha256=p1yP6QWtFzQpVVfpjZ7R8GrsEtUSUPklbvjC8_VgYmQ,2734
 excel2moodle/ui/UI_equationChecker.py,sha256=evQDlqCHeooJcAnYjhFCyjlPhfknr7ULGKQwMmqQeJ4,8947
 excel2moodle/ui/UI_exportSettingsDialog.py,sha256=71xxXEqtewN0ReMfJ5t4gbrX_Bf0VEuxJ_DIV7ZtH94,6045
-excel2moodle/ui/UI_mainWindow.py,sha256=asWUmKIYqufKUvRuCuA1JoMyv4qfRXyoR70F0331lww,19291
+excel2moodle/ui/UI_mainWindow.py,sha256=9w8bRgOrVEX7BRGQvMuVhPCiSOsXYkMb4rxLDeRErII,21544
+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=caNdBb4_C2Ptl0He2iCQqoxw6Tm0wmJL9eOoKfjMah8,10681
-excel2moodle/ui/dialogs.py,sha256=0h6aD4tguph1P07dorkn1A5B7_Z5SJZQ2_8xBYWK6MU,7689
-excel2moodle/ui/equationChecker.py,sha256=ANpN7S0llkp6pGL1sKHII1Jc8YUvgDR458UnGVnZZOo,2702
-excel2moodle/ui/treewidget.py,sha256=az64swVj1yQUsioeaZys32AauvQDdC4EKcqdbbWgL6s,2489
-excel2moodle/ui/windowDoc.py,sha256=WvzHj6F4JvHP82WlTsyFeOXW024Xq3BUqtp--T4twuI,661
-excel2moodle-0.5.2.dist-info/licenses/LICENSE,sha256=ywQqe6Sitymkf2lV2NRcx_aGsaC-KbSl_EfEsRXmNRw,35135
-excel2moodle-0.5.2.dist-info/METADATA,sha256=pskuhRVnt-PEmvxVxvPUvN03gHmilnZqeFluoPOkPrk,6330
-excel2moodle-0.5.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-excel2moodle-0.5.2.dist-info/entry_points.txt,sha256=myfMLDThuGgWHMJDPPfILiZqo_7D3fhmDdJGqWOAjPw,60
-excel2moodle-0.5.2.dist-info/top_level.txt,sha256=5V1xRUQ9o7UmOCmNoWCZPAuy5nXp3Qbzyqch8fUGT_c,13
-excel2moodle-0.5.2.dist-info/RECORD,,
+excel2moodle/ui/appUi.py,sha256=0jxpgGiDU82AEDrj-BFgD9XdktrY_0EB7bAVMqWzJLY,13283
+excel2moodle/ui/dialogs.py,sha256=8m1_hBGHt56T581PpPDsCrAd66cIy_Kxo_8NIy9kw_0,6179
+excel2moodle/ui/equationChecker.py,sha256=RII9DlZAlHqe5udBWzeUaozhtyi3ZkCZs8h3-oO6pEw,2700
+excel2moodle/ui/treewidget.py,sha256=aLR_B1iT2j1AAGk_9Dc6WtRbq1XijK8pICG8BEOW_Ak,1916
+excel2moodle-0.6.0.dist-info/licenses/LICENSE,sha256=ywQqe6Sitymkf2lV2NRcx_aGsaC-KbSl_EfEsRXmNRw,35135
+excel2moodle-0.6.0.dist-info/METADATA,sha256=ry39D3WK7oORTNVo4H1zmK9SU3d1QYEPNGBFwEpoRLI,8429
+excel2moodle-0.6.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+excel2moodle-0.6.0.dist-info/entry_points.txt,sha256=myfMLDThuGgWHMJDPPfILiZqo_7D3fhmDdJGqWOAjPw,60
+excel2moodle-0.6.0.dist-info/top_level.txt,sha256=5V1xRUQ9o7UmOCmNoWCZPAuy5nXp3Qbzyqch8fUGT_c,13
+excel2moodle-0.6.0.dist-info/RECORD,,

excel2moodle/core/numericMultiQ.py

@@ -1,80 +0,0 @@
-"""Numeric Multi Questions Module to calculate results from a formula.
-
-This module calculates a series of results from al matrix of variables.
-For each column in the matrix there will be one result.
-As well it returns a bullet points string that shows the numerical values corresponding to the set of variables
-"""
-
-import re
-
-import pandas as pd
-from asteval import Interpreter
-
-astEval = Interpreter()
-
-
-def getVariablesDict(df: pd.DataFrame, keyList: list, index: int) -> dict:
-    """Liest alle Variablen-Listen deren Name in ``keyList`` ist aus dem DataFrame im Column[index]."""
-    dic = {}
-    for k in keyList:
-        val = df.loc[str(k)][index]
-        if isinstance(val, str) and val is not None:
-            li = val.split(";")
-            dic[str(k)] = li
-        else:
-            dic[str(k)] = [str(val)]
-    return dic
-
-
-def setParameters(parameters: dict, index: int) -> None:
-    """Ubergibt die Parameter mit entsprechenden Variablen-Namen an den asteval-Interpreter.
-
-    Dann kann dieser die equation loesen.
-    """
-    for k, v in parameters.items():
-        comma = re.compile(r",")
-        value = comma.sub(".", v[index])
-        astEval.symtable[k] = float(value)
-
-
-def insertVariablesToBPoints(varDict: dict, bulletPoints: str, index: int) -> str:
-    """Für jeden Eintrag im varDict, wird im bulletPoints String der
-    Substring "{key}" durch value[index] ersetzt.
-    """
-    for k, v in varDict.items():
-        s = r"{" + str(k) + r"}"
-        matcher = re.compile(s)
-        bulletPoints = matcher.sub(str(v[index]), bulletPoints)
-    return bulletPoints
-
-
-def getVarsList(bps: str) -> list:
-    """Durchsucht den bulletPoints String nach den Variablen `{var}`."""
-    vars = re.findall(r"\{\w\}", str(bps))
-    variablen = []
-    for v in vars:
-        variablen.append(v.strip("{}"))
-    return variablen
-
-
-def parseNumericMultiQuestion(
-    datFrame: pd.DataFrame,
-    bulletPoints: str,
-    equation: str,
-    questionIndex: int,
-) -> tuple[list[str], list[float]]:
-    """Berechnet die Ergebnisse anhand der Variablen in *bulletPoints*.
-
-    Gibt eine Liste mit allen Ergebnissen zurück
-    und eine Liste mit den bulletPoints-Strings, die die Numerischen Variablen enthalten
-    """
-    results = []
-    bps = []
-    varNames = getVarsList(bulletPoints)
-    variables = getVariablesDict(datFrame, varNames, questionIndex)
-    length = len(next(iter(variables.values())))
-    for n in range(length):
-        setParameters(variables, n)
-        results.append(astEval(equation))
-        bps.append(insertVariablesToBPoints(variables, bulletPoints, n))
-    return bps, results