excel2moodle 0.3.7__py3-none-any.whl → 0.4.1__py3-none-any.whl

excel2moodle/question_types/mc.py

@@ -6,6 +6,7 @@ import lxml.etree as ET
 
 import excel2moodle.core.etHelpers as eth
 from excel2moodle.core import stringHelpers
+from excel2moodle.core.exceptions import InvalidFieldException
 from excel2moodle.core.globals import (
     DFIndex,
     TextElements,
@@ -13,7 +14,8 @@ from excel2moodle.core.globals import (
     feedbackStr,
 )
 from excel2moodle.core.parser import QuestionParser
-from excel2moodle.core.question import Question
+from excel2moodle.core.question import Picture, Question
+from excel2moodle.core.settings import SettingsKey
 
 
 class MCQuestion(Question):
@@ -29,6 +31,7 @@ class MCQuestion(Question):
 
     def __init__(self, *args, **kwargs) -> None:
         super().__init__(*args, **kwargs)
+        self.AnsStyles = ["math", "unit", "text", "picture"]
 
 
 class MCQuestionParser(QuestionParser):
@@ -42,6 +45,10 @@ class MCQuestionParser(QuestionParser):
             XMLTags.INCORFEEDB,
         ]
 
+    def setup(self, question: MCQuestion) -> None:
+        self.question: MCQuestion = question
+        super().setup(question)
+
     def getAnsElementsList(
         self,
         answerList: list,
@@ -49,9 +56,12 @@ class MCQuestionParser(QuestionParser):
         format="html",
     ) -> list[ET.Element]:
         elementList: list[ET.Element] = []
-        for ans in answerList:
+        for i, ans in enumerate(answerList):
             p = TextElements.PLEFT.create()
-            p.text = str(ans)
+            if self.answerType == "picture":
+                p.append(ans)
+            else:
+                p.text = str(ans)
             text = eth.getCdatTxtElement(p)
             elementList.append(
                 ET.Element(XMLTags.ANSWER, fraction=str(fraction), format=format),
@@ -65,6 +75,8 @@ class MCQuestionParser(QuestionParser):
                         style=TextElements.SPANRED,
                     ),
                 )
+                if self.answerType == "picture":
+                    elementList[-1].append(self.falseImgs[i].element)
             elif fraction > 0:
                 elementList[-1].append(
                     eth.getFeedBEle(
@@ -73,21 +85,43 @@ class MCQuestionParser(QuestionParser):
                         style=TextElements.SPANGREEN,
                     ),
                 )
+                if self.answerType == "picture":
+                    elementList[-1].append(self.trueImgs[i].element)
         return elementList
 
     def setAnswers(self) -> list[ET.Element]:
-        ansStyle = self.rawInput[DFIndex.ANSTYPE]
+        self.answerType = self.rawInput[DFIndex.ANSTYPE]
         true = stringHelpers.getListFromStr(self.rawInput[DFIndex.TRUE])
-        trueAnsList = stringHelpers.texWrapper(true, style=ansStyle)
-        self.logger.debug(f"got the following true answers \n {trueAnsList=}")
         false = stringHelpers.getListFromStr(self.rawInput[DFIndex.FALSE])
-        falseAnsList = stringHelpers.texWrapper(false, style=ansStyle)
-        self.logger.debug(f"got the following false answers \n {falseAnsList=}")
+        if self.answerType not in self.question.AnsStyles:
+            msg = f"The Answer style: {self.answerType} is not supported"
+            raise InvalidFieldException(msg, self.question.id, DFIndex.ANSTYPE)
+        if self.answerType == "picture":
+            f = self.settings.get(SettingsKey.PICTUREFOLDER)
+            imgFolder = (f / self.question.katName).resolve()
+            w = self.settings.get(SettingsKey.ANSPICWIDTH)
+            self.trueImgs: list[Picture] = [
+                Picture(t, imgFolder, self.question.id, width=w) for t in true
+            ]
+            self.falseImgs: list[Picture] = [
+                Picture(t, imgFolder, self.question.id, width=w) for t in false
+            ]
+            trueAnsList: list[str] = [pic.htmlTag for pic in self.trueImgs]
+            falseAList: list[str] = [pic.htmlTag for pic in self.falseImgs]
+        else:
+            trueAnsList: list[str] = stringHelpers.texWrapper(
+                true, style=self.answerType
+            )
+            self.logger.debug(f"got the following true answers \n {trueAnsList=}")
+            falseAList: list[str] = stringHelpers.texWrapper(
+                false, style=self.answerType
+            )
+            self.logger.debug(f"got the following false answers \n {falseAList=}")
         truefrac = 1 / len(trueAnsList) * 100
-        falsefrac = 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.extend(
-            self.getAnsElementsList(falseAnsList, fraction=round(falsefrac, 4)),
+            self.getAnsElementsList(falseAList, fraction=round(falsefrac, 4)),
         )
         return ansList

excel2moodle/question_types/nf.py

@@ -25,6 +25,5 @@ class NFQuestionParser(QuestionParser):
     def setAnswers(self) -> list[ET.Element]:
         result = self.rawInput[DFIndex.RESULT]
         ansEle: list[ET.Element] = []
-        tol = self.rawInput[DFIndex.TOLERANCE]
-        ansEle.append(self.getNumericAnsElement(result=result, tolerance=tol))
+        ansEle.append(self.getNumericAnsElement(result=result))
         return ansEle

excel2moodle/question_types/nfm.py

@@ -39,9 +39,8 @@ class NFMQuestionParser(QuestionParser):
             self._setupAstIntprt(self.question.variables, n)
             result = self.astEval(equation)
             if isinstance(result, float):
-                tol = self.rawInput[DFIndex.TOLERANCE]
                 ansElementsList.append(
-                    self.getNumericAnsElement(result=round(result, 3), tolerance=tol),
+                    self.getNumericAnsElement(result=round(result, 3)),
                 )
         self.question.answerVariants = ansElementsList
         self.setVariants(len(ansElementsList))

excel2moodle/ui/appUi.py

@@ -13,11 +13,12 @@ from PySide6.QtCore import QRunnable, Qt, QThreadPool
 from excel2moodle import mainLogger
 from excel2moodle.core.category import Category
 from excel2moodle.core.dataStructure import QuestionDB
+from excel2moodle.core.settings import Settings, SettingsKey
 from excel2moodle.extra import equationVerification as eqVerif
 from excel2moodle.logger import LogWindowHandler
 from excel2moodle.ui import dialogs
-from excel2moodle.ui.settings import Settings, SettingsKey
 from excel2moodle.ui.treewidget import CategoryItem, QuestionItem
+from excel2moodle.ui.windowDoc import DocumentationWindow
 from excel2moodle.ui.windowMain import Ui_MoodleTestGenerator
 
 from .windowEquationChecker import Ui_EquationChecker
@@ -38,16 +39,18 @@ class MainWindow(QtWidgets.QMainWindow):
         self.testDB = testDB
         self.ui = Ui_MoodleTestGenerator()
         self.ui.setupUi(self)
+        self.exportDialog = dialogs.ExportDialog(self)
+        self.questionPreview = dialogs.QuestionPreview(self)
         self.connectEvents()
         logger.info("Settings are stored under: %s", self.settings.fileName())
         self.ui.treeWidget.setSelectionMode(QtWidgets.QAbstractItemView.MultiSelection)
         self.ui.treeWidget.header().setSectionResizeMode(
             QtWidgets.QHeaderView.ResizeToContents,
         )
-        self.ui.checkBoxIncludeCategories.setChecked(
+        self.exportDialog.ui.checkBoxIncludeCategories.setChecked(
             self.settings.get(SettingsKey.INCLUDEINCATS),
         )
-        self.ui.spinBoxDefaultQVariant.setValue(
+        self.exportDialog.ui.spinBoxDefaultQVariant.setValue(
             self.settings.get(SettingsKey.QUESTIONVARIANT)
         )
         self.ui.pointCounter.setReadOnly(True)
@@ -69,17 +72,22 @@ class MainWindow(QtWidgets.QMainWindow):
         )
         loggerSignal.emitter.signal.connect(self.updateLog)
         self.ui.actionEquationChecker.triggered.connect(self.openEqCheckerDlg)
-        self.ui.checkBoxIncludeCategories.checkStateChanged.connect(
+        self.exportDialog.ui.checkBoxIncludeCategories.checkStateChanged.connect(
             self.setIncludeCategoriesSetting,
         )
         self.ui.actionParseAll.triggered.connect(self.parseSpreadsheetAll)
         self.testDB.signals.categoryQuestionsReady.connect(self.treeRefreshCategory)
-        self.ui.buttonSpreadSheet.clicked.connect(self.onButSpreadsheet)
-        self.ui.buttonTestGen.clicked.connect(self.onButGenTest)
-        self.ui.actionPreviewQ.triggered.connect(self.openPreviewQuestionDlg)
+        self.ui.actionSpreadsheet.triggered.connect(self.actionSpreadsheet)
+        self.ui.actionExport.triggered.connect(self.onButGenTest)
+        self.ui.buttonSpreadsheet.clicked.connect(self.actionSpreadsheet)
+        self.ui.buttonExport.clicked.connect(self.onButGenTest)
+        self.ui.treeWidget.itemClicked.connect(self.updateQuestionPreview)
         self.ui.actionAbout.triggered.connect(self.openAboutDlg)
+        self.ui.actionDocumentation.triggered.connect(self.openDocumentation)
         self.settings.shPathChanged.connect(self.onSheetPathChanged)
-        self.ui.spinBoxDefaultQVariant.valueChanged.connect(self.setQVariantDefault)
+        self.exportDialog.ui.spinBoxDefaultQVariant.valueChanged.connect(
+            self.setQVariantDefault
+        )
 
     @QtCore.Slot()
     def setQVariantDefault(self, value: int) -> None:
@@ -105,14 +113,14 @@ class MainWindow(QtWidgets.QMainWindow):
         svgFolder = self.mainPath / self.settings.get(SettingsKey.PICTURESUBFOLDER)
         svgFolder.resolve()
         self.settings.set(SettingsKey.PICTUREFOLDER, svgFolder)
-        self.ui.buttonSpreadSheet.setText(str(sheet.name))
+        self.ui.buttonSpreadsheet.setText(f"../{sheet.name}")
         self.parseSpreadsheetAll()
 
     def updateLog(self, log) -> None:
         self.ui.loggerWindow.append(log)
 
     def setIncludeCategoriesSetting(self) -> None:
-        if self.ui.checkBoxIncludeCategories.isChecked():
+        if self.exportDialog.ui.checkBoxIncludeCategories.isChecked():
             self.settings.set(SettingsKey.INCLUDEINCATS, True)
         else:
             self.settings.set(SettingsKey.INCLUDEINCATS, False)
@@ -146,6 +154,7 @@ class MainWindow(QtWidgets.QMainWindow):
     @QtCore.Slot()
     def onButGenTest(self) -> None:
         """Open a file Dialog so the export file may be choosen."""
+        self.exportDialog.exec()
         path = QtWidgets.QFileDialog.getSaveFileName(
             self,
             "Select Output File",
@@ -158,7 +167,7 @@ class MainWindow(QtWidgets.QMainWindow):
         self.testDB.appendQuestions(selection, self.exportFile)
 
     @QtCore.Slot()
-    def onButSpreadsheet(self) -> None:
+    def actionSpreadsheet(self) -> None:
         file = QtWidgets.QFileDialog.getOpenFileName(
             self,
             self.tr("Open Spreadsheet"),
@@ -184,11 +193,10 @@ class MainWindow(QtWidgets.QMainWindow):
         self.ui.treeWidget.sortItems(0, Qt.SortOrder.AscendingOrder)
 
     @QtCore.Slot()
-    def openPreviewQuestionDlg(self) -> None:
+    def updateQuestionPreview(self) -> None:
         item = self.ui.treeWidget.currentItem()
         if isinstance(item, QuestionItem):
-            dialog = dialogs.QuestinoPreviewDialog(self, item.getQuestion())
-            dialog.show()
+            self.questionPreview.setupQuestion(item.getQuestion())
         else:
             logger.info("current Item is not a Question, can't preview")
 
@@ -208,6 +216,14 @@ class MainWindow(QtWidgets.QMainWindow):
         about = dialogs.AboutDialog(self)
         about.exec()
 
+    @QtCore.Slot()
+    def openDocumentation(self) -> None:
+        if hasattr(self, "documentationWindow"):
+            self.documentationWindow.show()
+        else:
+            self.documentationWindow = DocumentationWindow(self)
+            self.documentationWindow.show()
+
 
 class ParseAllThread(QRunnable):
     """Parse the whole Spreadsheet.
@@ -226,7 +242,6 @@ class ParseAllThread(QRunnable):
         self.testDB.asyncInitAllCategories(self.mainApp.spreadSheetPath)
         self.mainApp.setStatus("[OK] Tabellen wurde eingelesen")
         self.testDB.parseAllQuestions()
-        self.mainApp.ui.buttonTestGen.setEnabled(True)
 
 
 class EqCheckerWindow(QtWidgets.QWidget):

excel2moodle/ui/dialogs.py

@@ -7,7 +7,7 @@ from PySide6.QtSvgWidgets import QGraphicsSvgItem
 from excel2moodle import e2mMetadata
 from excel2moodle.core.globals import XMLTags
 from excel2moodle.core.question import Question
-from excel2moodle.ui.questionPreviewDialog import Ui_QuestionPrevDialog
+from excel2moodle.ui.exportSettingsDialog import Ui_ExportDialog
 from excel2moodle.ui.variantDialog import Ui_Dialog
 
 
@@ -32,43 +32,48 @@ class QuestionVariantDialog(QtWidgets.QDialog):
         return self.ui.checkBox.isChecked()
 
 
-class QuestinoPreviewDialog(QtWidgets.QDialog):
-    def __init__(self, parent: QtWidgets.QWidget, question: Question) -> None:
+class ExportDialog(QtWidgets.QDialog):
+    def __init__(self, parent) -> None:
         super().__init__(parent)
-        self.question = question
-        self.ui = Ui_QuestionPrevDialog()
+        self.setWindowTitle("Export question Selection")
+        self.ui = Ui_ExportDialog()
         self.ui.setupUi(self)
-        self.setModal(True)
-        self.setWindowTitle(f"Question - {question.id} - Preview")
-        self.setupQuestion()
 
-    def setupQuestion(self) -> None:
-        self.ui.qNameLine.setText(self.question.name)
-        self.ui.qTypeLine.setText(self.question.qtype)
+
+class QuestionPreview:
+    def __init__(self, parent) -> None:
+        self.ui = parent.ui
+        self.parent = parent
+
+    def setupQuestion(self, question: Question) -> None:
+        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.setAnswers()
+        if hasattr(self, "picItem"):
+            self.picScene.removeItem(self.picItem)
         self.setPicture()
 
     def setPicture(self) -> None:
         if hasattr(self.question, "picture") and self.question.picture.ready:
-            self.picScene = QtWidgets.QGraphicsScene(self)
-            self.ui.graphicsView.setScene(self.picScene)
             path = self.question.picture.path
             if path.suffix == ".svg":
-                picItem = QGraphicsSvgItem(str(self.question.picture.path))
+                self.picItem = QGraphicsSvgItem(str(self.question.picture.path))
             else:
                 pic = QtGui.QPixmap(self.question.picture.path)
                 aspRat = pic.height() // pic.width()
                 width = 400
                 scaleHeight = aspRat * width
-                picItem = QtWidgets.QGraphicsPixmapItem(
+                self.picItem = QtWidgets.QGraphicsPixmapItem(
                     pic.scaled(
                         width, scaleHeight, QtGui.Qt.AspectRatioMode.KeepAspectRatio
                     )
                 )
-            self.picScene.addItem(picItem)
-        else:
-            self.ui.graphicsView.setFixedHeight(1)
+            self.picScene.addItem(self.picItem)
+        # else:
+        #     self.ui.graphicsView.setFixedHeight(1)
 
     def setText(self) -> None:
         t = []
@@ -80,24 +85,26 @@ class QuestinoPreviewDialog(QtWidgets.QDialog):
 
     def setAnswers(self) -> None:
         if self.question.qtype == "NFM":
-            for i, ans in enumerate(self.question.answerVariants):
-                t = ans.find("text").text
-                text = QtWidgets.QLineEdit(t, self)
-                self.ui.answersFormLayout.addRow(f"Answer {i + 1}", text)
-
+            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"))
         elif self.question.qtype == "NF":
             ans = self.question.element.find(XMLTags.ANSWER)
-            t = ans.find("text").text
-            text = QtWidgets.QLineEdit(t, self)
-            self.ui.answersFormLayout.addRow("Result", text)
-
+            self.ui.answersLabel.setText(f" Result: {ans.find('text').text}")
         elif self.question.qtype == "MC":
-            for i, ans in enumerate(self.question.element.findall(XMLTags.ANSWER)):
+            list = ET.Element("ol")
+            for ans in self.question.element.findall(XMLTags.ANSWER):
+                textEle = ET.Element("li")
                 pEle = ans.find("text").text
-                t = ET.fromstring(pEle).text
                 frac = ans.get("fraction")
-                text = QtWidgets.QLineEdit(t, self)
-                self.ui.answersFormLayout.addRow(f"Fraction: {frac}", text)
+                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):
@@ -114,8 +121,9 @@ class AboutDialog(QtWidgets.QMessageBox):
                 <b><a href="{e2mMetadata["homepage"]}">{e2mMetadata["name"]}</a> - {e2mMetadata["description"]}</b>
         </p>
         <p style="text-align:center">
-            The documentation can be found under <b>
-            <a href="{e2mMetadata["documentation"]}">{e2mMetadata["documentation"]}</a></b>
+            A <b>
+            <a href="{e2mMetadata["documentation"]}">documentation</a></b>
+            is also available.
             </br>
         </p>
         <p style="text-align:center">

excel2moodle/ui/exportSettingsDialog.py

@@ -0,0 +1,79 @@
+# -*- coding: utf-8 -*-
+
+################################################################################
+## Form generated from reading UI file 'exportSettingsDialog.ui'
+##
+## Created by: Qt User Interface Compiler version 6.9.0
+##
+## WARNING! All changes made in this file will be lost when recompiling UI file!
+################################################################################
+
+from PySide6.QtCore import (QCoreApplication, QDate, QDateTime, QLocale,
+    QMetaObject, QObject, QPoint, QRect,
+    QSize, QTime, QUrl, Qt)
+from PySide6.QtGui import (QBrush, QColor, QConicalGradient, QCursor,
+    QFont, QFontDatabase, QGradient, QIcon,
+    QImage, QKeySequence, QLinearGradient, QPainter,
+    QPalette, QPixmap, QRadialGradient, QTransform)
+from PySide6.QtWidgets import (QAbstractButton, QApplication, QCheckBox, QDialog,
+    QDialogButtonBox, QFormLayout, QHBoxLayout, QLabel,
+    QSizePolicy, QSpinBox, QWidget)
+
+class Ui_ExportDialog(object):
+    def setupUi(self, ExportDialog):
+        if not ExportDialog.objectName():
+            ExportDialog.setObjectName(u"ExportDialog")
+        ExportDialog.resize(572, 217)
+        self.horizontalLayout = QHBoxLayout(ExportDialog)
+        self.horizontalLayout.setObjectName(u"horizontalLayout")
+        self.formLayout_2 = QFormLayout()
+        self.formLayout_2.setObjectName(u"formLayout_2")
+        self.formLayout_2.setContentsMargins(5, 5, 5, 5)
+        self.label_10 = QLabel(ExportDialog)
+        self.label_10.setObjectName(u"label_10")
+
+        self.formLayout_2.setWidget(0, QFormLayout.ItemRole.LabelRole, self.label_10)
+
+        self.spinBoxDefaultQVariant = QSpinBox(ExportDialog)
+        self.spinBoxDefaultQVariant.setObjectName(u"spinBoxDefaultQVariant")
+
+        self.formLayout_2.setWidget(0, QFormLayout.ItemRole.FieldRole, self.spinBoxDefaultQVariant)
+
+        self.label_9 = QLabel(ExportDialog)
+        self.label_9.setObjectName(u"label_9")
+
+        self.formLayout_2.setWidget(1, QFormLayout.ItemRole.LabelRole, self.label_9)
+
+        self.checkBoxIncludeCategories = QCheckBox(ExportDialog)
+        self.checkBoxIncludeCategories.setObjectName(u"checkBoxIncludeCategories")
+
+        self.formLayout_2.setWidget(1, QFormLayout.ItemRole.FieldRole, self.checkBoxIncludeCategories)
+
+
+        self.horizontalLayout.addLayout(self.formLayout_2)
+
+        self.buttonBox = QDialogButtonBox(ExportDialog)
+        self.buttonBox.setObjectName(u"buttonBox")
+        self.buttonBox.setOrientation(Qt.Orientation.Vertical)
+        self.buttonBox.setStandardButtons(QDialogButtonBox.StandardButton.Cancel|QDialogButtonBox.StandardButton.Ok)
+
+        self.horizontalLayout.addWidget(self.buttonBox)
+
+
+        self.retranslateUi(ExportDialog)
+        self.buttonBox.accepted.connect(ExportDialog.accept)
+        self.buttonBox.rejected.connect(ExportDialog.reject)
+
+        QMetaObject.connectSlotsByName(ExportDialog)
+    # setupUi
+
+    def retranslateUi(self, ExportDialog):
+        ExportDialog.setWindowTitle(QCoreApplication.translate("ExportDialog", u"Dialog", None))
+        self.label_10.setText(QCoreApplication.translate("ExportDialog", u"Default Question Variant", None))
+#if QT_CONFIG(tooltip)
+        self.label_9.setToolTip(QCoreApplication.translate("ExportDialog", u"If enabled, all questions will be categorized, when importing into moodle. Otherwise they will all be imported into one category", None))
+#endif // QT_CONFIG(tooltip)
+        self.label_9.setText(QCoreApplication.translate("ExportDialog", u"Include Questions in Categories", None))
+        self.checkBoxIncludeCategories.setText("")
+    # retranslateUi
+

excel2moodle/ui/windowDoc.py

@@ -1,35 +1,27 @@
-import os
 import sys
-from PySide6 import QtWidgets, QtWebEngineWidgets, QtCore
-from excel2moodle import dirDocumentation
+
+from PySide6 import QtCore, QtWebEngineWidgets, QtWidgets
+
+from excel2moodle import e2mMetadata
+
 
 class DocumentationWindow(QtWidgets.QMainWindow):
-    def __init__(self, documentationDirectory, parent=None):
+    def __init__(self, parent=None) -> None:
         super().__init__(parent)
 
         self.web_view = QtWebEngineWidgets.QWebEngineView()
         self.setCentralWidget(self.web_view)
 
         # Load the HTML documentation
-
-        index_file = os.path.join(documentationDirectory, "index.html")
-        url = QtCore.QUrl.fromLocalFile(index_file)
+        url = QtCore.QUrl(e2mMetadata["documentation"])
+        print(f"Opening URL {url}")
         self.web_view.setUrl(url)
 
-        # Set up navigation events
-        self.web_view.page().linkHovered.connect(self.link_hovered)
-        self.web_view.page().loadFinished.connect(self.load_finished)
-
-    def link_hovered(self, url):
-        print(f"Link hovered: {url}")
-
-    def load_finished(self, ok):
-        print(f"Load finished: {ok}")
 
 if __name__ == "__main__":
     app = QtWidgets.QApplication(sys.argv)
 
-    window = DocumentationWindow(dirDocumentation)
+    window = DocumentationWindow()
     window.show()
 
     sys.exit(app.exec())