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

excel2moodle/__init__.py

@@ -45,6 +45,8 @@ if __package__ is not None:
         "documentation": "https://jbosse3.gitlab.io/excel2moodle",
         "homepage": meta["project-url"].split()[1],
         "issues": "https://gitlab.com/jbosse3/excel2moodle/issues",
+        "funding": "https://ko-fi.com/jbosse3",
+        "API_id": "jbosse3%2Fexcel2moodle",
     }
 
 

excel2moodle/__main__.py

@@ -5,17 +5,20 @@ import signal
 import sys
 from pathlib import Path
 
+from PySide6.QtCore import QTimer
 from PySide6.QtWidgets import QApplication
 
 import excel2moodle
-from excel2moodle import e2mMetadata, mainLogger
+from excel2moodle import __version__, e2mMetadata, mainLogger
 from excel2moodle.core import dataStructure
 from excel2moodle.core.settings import Settings, Tags
+from excel2moodle.extra import updateQuery
 from excel2moodle.logger import loggerConfig
 from excel2moodle.ui import appUi as ui
 
 
 def main() -> None:
+    app = QApplication(sys.argv)
     excel2moodle.isMain = True
     settings = Settings()
     logfile = Path(settings.get(Tags.LOGFILE)).resolve()
@@ -24,12 +27,24 @@ def main() -> None:
         logfile.replace(f"{logfile}.old")
     logConfig.dictConfig(config=loggerConfig)
     signal.signal(signal.SIGINT, signal.SIG_DFL)
-    app = QApplication(sys.argv)
-    settings = Settings()
     database: dataStructure.QuestionDB = dataStructure.QuestionDB(settings)
     window = ui.MainWindow(settings, database)
     database.window = window
     window.show()
+    # Update check
+    latestTag = updateQuery.get_latest_tag(e2mMetadata.get("API_id"))
+    if latestTag is None:
+        mainLogger.warning(
+            "Couldn't check for Updates, maybe there is  no internet connection"
+        )
+    if latestTag is not None and latestTag.strip("v") != __version__:
+        mainLogger.warning(
+            "A new Update is available: %s --> %s ", __version__, latestTag
+        )
+        changelog = updateQuery.get_changelog(e2mMetadata.get("API_id"))
+        # Delay showing the update dialog slightly
+        QTimer.singleShot(100, lambda: window.showUpdateDialog(changelog, latestTag))
+
     for k, v in e2mMetadata.items():
         msg = f"{k:^14s}:  {v}"
         mainLogger.info(msg)

excel2moodle/core/bullets.py

@@ -15,7 +15,7 @@ class BulletList:
     def __init__(self, rawBullets: list[str], qID: str) -> None:
         self.rawBullets: list[str] = rawBullets
         self.element: ET.Element = ET.Element("ul")
-        self.bullets: dict[str, BulletP] = {}
+        self.bullets: dict[str | int, BulletP] = {}
         self.id = qID
         self.logger = LogAdapterQuestionID(loggerObj, {"qID": self.id})
         self._setupBullets(rawBullets)
@@ -70,7 +70,7 @@ class BulletList:
             if match is None:
                 self.logger.debug("Got a normal bulletItem")
                 num: float = float(quant.replace(",", "."))
-                bulletName: str = str(i + 1)
+                bulletName = i + 1
             else:
                 bulletName = match.group(1)
                 num: float = 0.0

excel2moodle/core/category.py

@@ -24,8 +24,9 @@ class Category:
     ) -> None:
         """Instantiate a new Category object."""
         self.NAME = name
-        match = re.search(r"\d+$", str(self.NAME))
-        self.n: int = int(match.group(0)) if match else 99
+        match = re.search(r"\d+", str(self.NAME))
+        n = int(match.group(0)) if match else 99
+        self.n: int = n if n <= 99 and n >= 0 else 99
         self.desc = str(description)
         self.dataframe: pd.DataFrame = dataframe
         self.settings: dict[str, float | str] = settings if settings else {}
@@ -52,7 +53,7 @@ class Category:
     @property
     def questions(self) -> dict:
         if not hasattr(self, "_questions"):
-            msg = "Category question are not yet initialized"
+            msg = f"Category {self.id} doesn't contain any valid questions."
             raise ValueError(msg)
         return self._questions
 

excel2moodle/core/dataStructure.py

@@ -105,25 +105,20 @@ class QuestionDB:
             When there is no 'seetings' worksheet in the file.
         InvalidFieldException
             When the settings are invalid
+            Or When the categories Sheet doesn't provide the necessary keys.
 
         Before raising it logges the exceptions with a meaningful message.
 
         """
         sheetPath = sheetPath if sheetPath else self.spreadsheet
         logger.info("Start Parsing the Excel Metadata Sheet\n")
-        try:
-            with Path(sheetPath).open("rb") as f:
-                settingDf = pd.read_excel(
-                    f,
-                    sheet_name="settings",
-                    index_col=0,
-                    engine="calamine",
-                )
-        except ValueError:
-            logger.exception(
-                "Did you forget to specify a 'settings' sheet in the file?"
+        with Path(sheetPath).open("rb") as f:
+            settingDf = pd.read_excel(
+                f,
+                sheet_name="settings",
+                index_col=0,
+                engine="calamine",
             )
-            raise
         logger.debug("Found the settings: \n\t%s", settingDf)
         settingDf = self.harmonizeDFIndex(settingDf)
         for tag, value in settingDf.iterrows():
@@ -131,13 +126,7 @@ class QuestionDB:
             if pd.notna(val):
                 self.settings.set(tag, val)
 
-        try:
-            self._validateProjectSettings(sheetPath=sheetPath)
-        except InvalidFieldException:
-            logger.exception(
-                "Can not create the database with invalid project settings."
-            )
-            raise
+        self._validateProjectSettings(sheetPath=sheetPath)
         with Path(sheetPath).open("rb") as f:
             self.categoriesMetaData = pd.read_excel(
                 f,
@@ -145,10 +134,20 @@ class QuestionDB:
                 index_col=0,
                 engine="calamine",
             )
-            logger.info("Sucessfully read categoriesMetaData")
+        if "description" not in self.categoriesMetaData.columns:
+            msg = f"You need to specify the 'description' tag for each category in the sheet '{self.settings.get(Tags.CATEGORIESSHEET)}'."
+            raise InvalidFieldException(msg, "0000", "description")
+        logger.info("Sucessfully read categoriesMetaData")
         return self.categoriesMetaData
 
     def _validateProjectSettings(self, sheetPath: Path) -> None:
+        if Tags.LOGLEVEL in self.settings:
+            level: str = self.settings.get(Tags.LOGLEVEL)
+            if level.upper() not in ("DEBUG", "INFO", "WARNING", "ERROR"):
+                self.settings.pop(Tags.LOGLEVEL)
+                logger.warning("You specified an unsupported Loglevel: %s", level)
+        if self.window is not None:
+            self.window.logHandler.setLevel(self.settings.get(Tags.LOGLEVEL).upper())
         if Tags.IMPORTMODULE in self.settings:
             logger.warning(
                 "Appending: %s to sys.path. All names defined by it will be usable",
@@ -297,7 +296,7 @@ class QuestionDB:
         for qNum in category.dataframe.columns:
             try:
                 self.setupAndParseQuestion(category, qNum)
-            except (InvalidFieldException, QNotParsedException):
+            except (InvalidFieldException, QNotParsedException, AttributeError):
                 logger.exception(
                     "Question %s%02d couldn't be parsed. The Question Data: \n %s",
                     category.id,
@@ -379,10 +378,10 @@ class QuestionDB:
         catdict: dict[Category, list[Question]] = {}
         for q in questions:
             logger.debug(f"got a question to append {q=}")
-            cat = q.parent().getCategory()
+            cat = q.parent().category
             if cat not in catdict:
                 catdict[cat] = []
-            catdict[cat].append(q.getQuestion())
+            catdict[cat].append(q.question)
         for cat, qlist in catdict.items():
             self._appendQElements(
                 cat,
@@ -423,6 +422,8 @@ class QuestionDB:
                 else:
                     logger.warning("Keine Fragenvariante wurde gewählt.")
                 tree.append(q.getUpdatedElement(variant=variant))
+            else:
+                tree.append(q.getUpdatedElement(variant=variant))
             self._exportedQuestions.append(q)
 
     def generateExportReport(

excel2moodle/core/settings.py

@@ -107,6 +107,10 @@ class Settings:
     def clear(cls) -> None:
         cls.values.clear()
 
+    @classmethod
+    def pop(cls, key: str):
+        return cls.values.pop(key)
+
     @overload
     @classmethod
     def get(
@@ -160,7 +164,7 @@ class Settings:
             default = key.default
             if default is None:
                 return None
-            logger.info("Returning the default value for %s", key)
+            logger.debug("Returning the default value for %s", key)
             return default
         if key.typ() is Path:
             path: Path = Path(raw)

excel2moodle/extra/updateQuery.py

@@ -0,0 +1,48 @@
+"""This module provides functions to query the GitLab API for project information."""
+
+import json
+import sys
+import urllib.request
+
+
+def get_latest_tag(project_id: str) -> str | None:
+    """Queries the GitLab API for the latest tag of a project.
+
+    Args:
+        project_id: The URL-encoded project ID (e.g., 'jbosse3%2Fexcel2moodle').
+
+    Returns:
+        The name of the latest tag.
+
+    """
+    url = f"https://gitlab.com/api/v4/projects/{project_id}/repository/tags"
+    try:
+        with urllib.request.urlopen(url) as response:
+            if response.status == 200:
+                data = json.loads(response.read().decode())
+                if data:
+                    return data[0]["name"]
+    except urllib.error.URLError as e:
+        print(f"Error fetching latest tag: {e}", file=sys.stderr)
+    return None
+
+
+def get_changelog(project_id: str, branch: str = "master") -> str:
+    """Queries the GitLab API for the content of the CHANGELOG.md file.
+
+    Args:
+        project_id: The URL-encoded project ID (e.g., 'jbosse3%2Fexcel2moodle').
+        branch: The branch to get the file from.
+
+    Returns:
+        The content of the CHANGELOG.md file.
+
+    """
+    url = f"https://gitlab.com/api/v4/projects/{project_id}/repository/files/CHANGELOG.md/raw?ref={branch}"
+    try:
+        with urllib.request.urlopen(url) as response:
+            if response.status == 200:
+                return response.read().decode()
+    except urllib.error.URLError as e:
+        print(f"Error fetching changelog: {e}", file=sys.stderr)
+    return ""

excel2moodle/extra/variableGenerator.py

@@ -2,9 +2,11 @@ import logging
 import random
 
 from asteval import Interpreter
+from PySide6.QtCore import Qt, Slot
 from PySide6.QtWidgets import (
     QDialog,
     QLineEdit,
+    QListWidgetItem,
     QMainWindow,
     QMessageBox,
     QTableWidget,
@@ -52,7 +54,7 @@ class VariableGeneratorDialog(QDialog):
             # Add QLineEdit for Min, Max, and Decimal Places
             min_le = QLineEdit(str(min(values)) if values else "0")
             max_le = QLineEdit(str(max(values)) if values else "100")
-            dec_le = QLineEdit("0")  # Default to 0 decimal places
+            dec_le = QLineEdit("1")  # Default to 0 decimal places
 
             self.ui.tableWidget_variables.setCellWidget(row, 1, min_le)
             self.ui.tableWidget_variables.setCellWidget(row, 2, max_le)
@@ -67,11 +69,20 @@ class VariableGeneratorDialog(QDialog):
         self.ui.groupBox_existing_variables.toggled.connect(
             self.ui.tableWidget_existing_variables.setVisible
         )
+        self.ui.listWidget_rules.itemDoubleClicked.connect(self._edit_rule)
+
+    @Slot(QListWidgetItem)
+    def _edit_rule(self, item) -> None:
+        """Move the double-clicked rule into the line edit and remove it from the list."""
+        self.ui.lineEdit_newRule.setText(item.text())
+        self.ui.listWidget_rules.takeItem(self.ui.listWidget_rules.row(item))
 
     def _add_rule(self) -> None:
         rule_text = self.ui.lineEdit_newRule.text().strip()
         if rule_text:
-            self.ui.listWidget_rules.addItem(rule_text)
+            # Check if the rule already exists. If so, do nothing.
+            if not self.ui.listWidget_rules.findItems(rule_text, Qt.MatchExactly):
+                self.ui.listWidget_rules.addItem(rule_text)
             self.ui.lineEdit_newRule.clear()
 
     def _remove_rule(self) -> None:
@@ -100,40 +111,70 @@ class VariableGeneratorDialog(QDialog):
 
         num_sets = self.ui.spinBox_numSets.value()
 
+        # Build a set of existing variable combinations to ensure we don't generate duplicates of them.
+        unique_sets_tracker = set()
+        if self.origParametrics.variables:
+            var_names = list(self.origParametrics.variables.keys())
+            if var_names:
+                # Assuming all variable lists have the same length
+                num_variants = len(self.origParametrics.variables[var_names[0]])
+                for i in range(num_variants):
+                    existing_set = {
+                        var: self.origParametrics.variables[var][i] for var in var_names
+                    }
+                    unique_sets_tracker.add(frozenset(existing_set.items()))
+
+        generated_sets = []  # This will be a list of dicts
         try:
-            generated_sets = [
-                self._findSet(varConstraints, rules) for _ in range(num_sets)
-            ]
+            while len(generated_sets) < num_sets:
+                new_set = self._findSet(varConstraints, rules, unique_sets_tracker)
+                generated_sets.append(new_set)
+                unique_sets_tracker.add(frozenset(new_set.items()))
+
         except IndexError as e:
             logger.exception("Invalid variables in Rule:")
             QMessageBox.critical(self, "Rule Error", f"{e}")
+            return  # Stop generation
         except ValueError as e:
-            logger.warning("No variable set found:")
-            QMessageBox.warning(
-                self,
-                "Generation Failed",
-                f"{e} Consider relaxing your rules or increasing the number of attempts.",
-            )
-        else:
-            # convert the generated_sets list[dict[str, float]] into dict[str, list[float]]
-            # [{A:7, B:8}, {A:11, B:9}] -> {A: [7, 11], B: [8, 9]}
-            newVariables = {}
-            for var in self.origParametrics.variables:
-                newVariables[var] = [dataSet[var] for dataSet in generated_sets]
-            self._generatedParametrics.variables = newVariables
-            self.ui.groupBox_generated_variables.show()
-            populateDataSetTable(
-                self.ui.tableWidget_generated_variables,
-                parametrics=self._generatedParametrics,
-            )
+            logger.warning("Failed to generate a new unique set: %s", e)
+            if len(generated_sets) < num_sets:
+                QMessageBox.warning(
+                    self,
+                    "Generation Incomplete",
+                    f"Could only generate {len(generated_sets)} unique sets out of the requested {num_sets}. "
+                    "The space of possible unique combinations may be exhausted.",
+                )
+
+        if not generated_sets:
+            logger.info("No new variable sets were generated.")
+            if not self._rule_error_occurred:
+                QMessageBox.information(
+                    self,
+                    "No Sets Generated",
+                    "No new unique variable sets could be generated with the given constraints and rules.",
+                )
+            return
+
+        # convert the generated_sets list[dict[str, float]] into dict[str, list[float]]
+        # [{A:7, B:8}, {A:11, B:9}] -> {A: [7, 11], B: [8, 9]}
+        newVariables = {}
+        for var in self.origParametrics.variables:
+            newVariables[var] = [dataSet[var] for dataSet in generated_sets]
+        self._generatedParametrics.variables = newVariables
+        self.ui.groupBox_generated_variables.show()
+        populateDataSetTable(
+            self.ui.tableWidget_generated_variables,
+            parametrics=self._generatedParametrics,
+        )
 
     def _findSet(
         self,
         constraints: dict[str, dict[str, float | int]],
         rules: list[str],
+        existing_sets: set[frozenset],
         maxAttempts: int = 1000,
     ) -> dict[str, float]:
-        """Generate Random numbers for each variable and check if the rules apply.
+        """Generate a random set of variables that satisfies the rules and is not in existing_sets.
 
         Raises
         ------
@@ -143,6 +184,7 @@ class VariableGeneratorDialog(QDialog):
         """
         attempts = 0
         while attempts < maxAttempts:
+            attempts += 1
             current_set: dict[str, float] = {}
             # Generate initial values based on min/max constraints
             for var_name, constr in constraints.items():
@@ -158,11 +200,15 @@ class VariableGeneratorDialog(QDialog):
                     current_set[var_name] = round(
                         random.uniform(min_val, max_val), dec_places
                     )
+
+            # Check for uniqueness first, as it's a cheaper check than evaluating rules.
+            if frozenset(current_set.items()) in existing_sets:
+                continue  # It's a duplicate, try again.
+
             if self._check_rules(current_set, rules):
-                logger.info("Found matching set after %s attemps", attempts)
+                logger.info("Found matching unique set after %s attempts", attempts)
                 return current_set
-            attempts += 1
-        msg = f"Could not generate a valid set after {maxAttempts} attempts."
+        msg = f"Could not generate a valid unique set after {maxAttempts} attempts."
         raise ValueError(msg)
 
     def _check_rules(
@@ -226,25 +272,3 @@ def populateDataSetTable(
             )
     tableWidget.resizeColumnsToContents()
 
-
-# This part is for testing the UI independently
-if __name__ == "__main__":
-    import sys
-
-    from PySide6.QtWidgets import QApplication
-
-    # Mock ParametricQuestion for testing
-    class MockParametricQuestion:
-        def __init__(self) -> None:
-            self.origParametrics.variables = {
-                "a": [1.0, 2.0, 3.0],
-                "b": [10, 20, 30],
-                "c": [0.5, 1.5, 2.5],
-            }
-
-    app = QApplication(sys.argv)
-    mock_question = MockParametricQuestion()
-    dialog = VariableGeneratorDialog(paramQuestion=mock_question)
-    if dialog.exec():
-        print("Generated Sets:", dialog.generatedVarSets())
-    sys.exit(app.exec())

excel2moodle/question_types/cloze.py

@@ -228,7 +228,7 @@ class ClozeQuestion(ParametricQuestion):
         pts: int = 0
         if not self.isParsed:
             msg = "The Cloze question has no points because it is not yet parsed"
-            logger.warning(msg)
+            self.logger.warning(msg)
             return pts
         for p in self.questionParts.values():
             pts = pts + p.points
@@ -315,7 +315,7 @@ class ClozeQuestionParser(NFMQuestionParser):
             for part in parts.values():
                 part.points = point
         else:
-            logger.warning(
+            loclogger.warning(
                 "Some Answer parts are missing the points, they will get the standard points"
             )
             for num, part in parts.items():
@@ -328,7 +328,7 @@ class ClozeQuestionParser(NFMQuestionParser):
             points = self.rawInput.get(Tags.POINTS)
         corrPoints: int = round(points)
         if not math.isclose(corrPoints, points):
-            logger.warning(
+            self.logger.warning(
                 "Type cloze supports only integers as points. %s was round to %s",
                 points,
                 corrPoints,
@@ -367,8 +367,7 @@ class ClozeQuestionParser(NFMQuestionParser):
                     result=result,
                     points=part.points,
                 )
-                self.logger.info("NF answer part: %s ", ansStr)
-                logger.debug("Appended NF part %s result", partNum)
+                self.logger.debug("Generated %s answer part: %s ", partNum, ansStr)
             elif part.typ == "MC":
                 ansStr = ClozePart.getMCAnsStr(
                     part.trueAnswers,
@@ -376,7 +375,7 @@ class ClozeQuestionParser(NFMQuestionParser):
                     points=part.points,
                 )
                 part.mcAnswerString = ansStr
-                logger.debug("Appended MC part %s: %s", partNum, ansStr)
+                self.logger.debug("Appended MC part %s: %s", partNum, ansStr)
             else:
                 msg = "Type of the answer part is invalid"
                 raise QNotParsedException(msg, self.id)

excel2moodle/ui/UI_updateDlg.py

@@ -0,0 +1,106 @@
+# -*- coding: utf-8 -*-
+
+################################################################################
+## Form generated from reading UI file 'UI_updateDlg.ui'
+##
+## Created by: Qt User Interface Compiler version 6.9.1
+##
+## 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, QAbstractScrollArea, QApplication, QDialog,
+    QDialogButtonBox, QFrame, QLabel, QSizePolicy,
+    QTextBrowser, QVBoxLayout, QWidget)
+
+class Ui_UpdateDialog(object):
+    def setupUi(self, UpdateDialog):
+        if not UpdateDialog.objectName():
+            UpdateDialog.setObjectName(u"UpdateDialog")
+        UpdateDialog.setWindowModality(Qt.WindowModality.NonModal)
+        UpdateDialog.resize(534, 512)
+        UpdateDialog.setModal(True)
+        self.verticalLayout = QVBoxLayout(UpdateDialog)
+        self.verticalLayout.setObjectName(u"verticalLayout")
+        self.titleLabel = QLabel(UpdateDialog)
+        self.titleLabel.setObjectName(u"titleLabel")
+        sizePolicy = QSizePolicy(QSizePolicy.Policy.Preferred, QSizePolicy.Policy.Fixed)
+        sizePolicy.setHorizontalStretch(0)
+        sizePolicy.setVerticalStretch(0)
+        sizePolicy.setHeightForWidth(self.titleLabel.sizePolicy().hasHeightForWidth())
+        self.titleLabel.setSizePolicy(sizePolicy)
+
+        self.verticalLayout.addWidget(self.titleLabel)
+
+        self.fundingLabel = QLabel(UpdateDialog)
+        self.fundingLabel.setObjectName(u"fundingLabel")
+        sizePolicy.setHeightForWidth(self.fundingLabel.sizePolicy().hasHeightForWidth())
+        self.fundingLabel.setSizePolicy(sizePolicy)
+        self.fundingLabel.setAlignment(Qt.AlignmentFlag.AlignCenter)
+        self.fundingLabel.setOpenExternalLinks(True)
+
+        self.verticalLayout.addWidget(self.fundingLabel)
+
+        self.line = QFrame(UpdateDialog)
+        self.line.setObjectName(u"line")
+        self.line.setFrameShape(QFrame.Shape.HLine)
+        self.line.setFrameShadow(QFrame.Shadow.Sunken)
+
+        self.verticalLayout.addWidget(self.line)
+
+        self.changelogLabel = QLabel(UpdateDialog)
+        self.changelogLabel.setObjectName(u"changelogLabel")
+        sizePolicy.setHeightForWidth(self.changelogLabel.sizePolicy().hasHeightForWidth())
+        self.changelogLabel.setSizePolicy(sizePolicy)
+
+        self.verticalLayout.addWidget(self.changelogLabel)
+
+        self.changelogBrowser = QTextBrowser(UpdateDialog)
+        self.changelogBrowser.setObjectName(u"changelogBrowser")
+        sizePolicy1 = QSizePolicy(QSizePolicy.Policy.Expanding, QSizePolicy.Policy.Minimum)
+        sizePolicy1.setHorizontalStretch(0)
+        sizePolicy1.setVerticalStretch(0)
+        sizePolicy1.setHeightForWidth(self.changelogBrowser.sizePolicy().hasHeightForWidth())
+        self.changelogBrowser.setSizePolicy(sizePolicy1)
+        self.changelogBrowser.setVerticalScrollBarPolicy(Qt.ScrollBarPolicy.ScrollBarAsNeeded)
+        self.changelogBrowser.setHorizontalScrollBarPolicy(Qt.ScrollBarPolicy.ScrollBarAsNeeded)
+        self.changelogBrowser.setSizeAdjustPolicy(QAbstractScrollArea.SizeAdjustPolicy.AdjustToContents)
+
+        self.verticalLayout.addWidget(self.changelogBrowser)
+
+        self.label = QLabel(UpdateDialog)
+        self.label.setObjectName(u"label")
+        sizePolicy.setHeightForWidth(self.label.sizePolicy().hasHeightForWidth())
+        self.label.setSizePolicy(sizePolicy)
+
+        self.verticalLayout.addWidget(self.label)
+
+        self.buttonBox = QDialogButtonBox(UpdateDialog)
+        self.buttonBox.setObjectName(u"buttonBox")
+        self.buttonBox.setOrientation(Qt.Orientation.Horizontal)
+        self.buttonBox.setStandardButtons(QDialogButtonBox.StandardButton.Ok)
+
+        self.verticalLayout.addWidget(self.buttonBox)
+
+
+        self.retranslateUi(UpdateDialog)
+        self.buttonBox.accepted.connect(UpdateDialog.accept)
+        self.buttonBox.rejected.connect(UpdateDialog.reject)
+
+        QMetaObject.connectSlotsByName(UpdateDialog)
+    # setupUi
+
+    def retranslateUi(self, UpdateDialog):
+        UpdateDialog.setWindowTitle(QCoreApplication.translate("UpdateDialog", u"Dialog", None))
+        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))
+    # retranslateUi
+

excel2moodle/ui/appUi.py

@@ -21,6 +21,7 @@ from PySide6.QtWidgets import (
 from excel2moodle import e2mMetadata, mainLogger
 from excel2moodle.core.category import Category
 from excel2moodle.core.dataStructure import QuestionDB
+from excel2moodle.core.exceptions import InvalidFieldException
 from excel2moodle.core.question import ParametricQuestion
 from excel2moodle.core.settings import Settings, Tags
 from excel2moodle.extra.variableGenerator import VariableGeneratorDialog
@@ -34,15 +35,14 @@ from excel2moodle.ui.UI_mainWindow import Ui_MoodleTestGenerator
 
 logger = logging.getLogger(__name__)
 
-loggerSignal = LogWindowHandler()
-mainLogger.addHandler(loggerSignal)
-
 
 class MainWindow(QMainWindow):
     def __init__(self, settings: Settings, testDB: QuestionDB) -> None:
         super().__init__()
         self.settings = settings
         self.qSettings = QSettings("jbosse3", "excel2moodle")
+        self.logHandler = LogWindowHandler()
+        mainLogger.addHandler(self.logHandler)
         logger.info("Settings are stored under: %s", self.qSettings.fileName())
 
         self.excelPath: Path | None = None
@@ -93,7 +93,7 @@ class MainWindow(QMainWindow):
         self.ui.checkBoxQuestionListSelectAll.checkStateChanged.connect(
             self.toggleQuestionSelectionState,
         )
-        loggerSignal.emitter.signal.connect(self.updateLog)
+        self.logHandler.emitter.signal.connect(self.updateLog)
         self.ui.actionEquationChecker.triggered.connect(self.openEqCheckerDlg)
         self.ui.actionParseAll.triggered.connect(self.parseSpreadsheetAll)
         self.testDB.signals.categoryQuestionsReady.connect(self.treeRefreshCategory)
@@ -110,6 +110,10 @@ class MainWindow(QMainWindow):
             self.openSpreadsheetExternally
         )
 
+    def showUpdateDialog(self, changelog, version) -> None:
+        dialog = dialogs.UpdateDialog(self, changelog=changelog, version=version)
+        dialog.exec()
+
     @Slot()
     def parseSpreadsheetAll(self) -> None:
         """Event triggered by the *Tools/Parse all Questions* Event.
@@ -159,7 +163,7 @@ class MainWindow(QMainWindow):
         selection = self.ui.treeWidget.selectedItems()
         for q in selection:
             questions += 1
-            count += q.getQuestion().points
+            count += q.question.points
         self.ui.pointCounter.setValue(count)
         self.ui.questionCounter.setValue(questions)
         if self.eqChecker.isVisible():
@@ -221,18 +225,33 @@ class MainWindow(QMainWindow):
 
     @Slot(Category)
     def treeRefreshCategory(self, cat: Category) -> None:
-        """Append Category with its Questions to the treewidget."""
+        """Append Category with its Questions to the treewidget.
+
+        If the category already has an item, refresh it.
+        """
+        # Find existing item
+        for i in range(self.ui.treeWidget.topLevelItemCount()):
+            item = self.ui.treeWidget.topLevelItem(i)
+            # The top level items are categories
+            if isinstance(item, CategoryItem) and item.category.NAME == cat.NAME:
+                item.refresh()
+                return
+
         catItem = CategoryItem(self.ui.treeWidget, cat)
         catItem.setFlags(catItem.flags() & ~Qt.ItemIsSelectable)
-        for q in cat.questions.values():
-            QuestionItem(catItem, q)
+        try:
+            for q in cat.questions.values():
+                QuestionItem(catItem, q)
+        except ValueError:
+            logger.exception("No Questions to update.")
+        catItem.updateVariantCount()
         self.ui.treeWidget.sortItems(0, Qt.SortOrder.AscendingOrder)
 
     @Slot()
     def updateQuestionPreview(self) -> None:
         item = self.ui.treeWidget.currentItem()
         if isinstance(item, QuestionItem):
-            self.questionPreview.setupQuestion(item.getQuestion())
+            self.questionPreview.setupQuestion(item.question)
         else:
             logger.info("current Item is not a Question, can't preview")
 
@@ -244,12 +263,12 @@ class MainWindow(QMainWindow):
     def openEqCheckerDlg(self) -> None:
         item = self.ui.treeWidget.currentItem()
         if isinstance(item, QuestionItem):
-            question = item.getQuestion()
+            question = item.question
             if isinstance(question, (NFQuestion, MCQuestion)):
                 logger.debug("Can't check an MC or NF Question")
             else:
                 logger.debug("opening wEquationChecker \n")
-                self.eqChecker.setup(item.getQuestion())
+                self.eqChecker.setup(item.question)
                 self.eqChecker.show()
         else:
             logger.debug("No Question Item selected: %s", type(item))
@@ -269,11 +288,12 @@ class MainWindow(QMainWindow):
     def openVariableGeneratorDlg(self) -> None:
         item = self.ui.treeWidget.currentItem()
         if isinstance(item, QuestionItem):
-            question = item.getQuestion()
+            question = item.question
             if isinstance(question, ParametricQuestion):
                 dialog = VariableGeneratorDialog(self, parametrics=question.parametrics)
                 if dialog.exec():
                     self.questionPreview.setupQuestion(question)
+                    self.treeRefreshCategory(question.category)
                     logger.info("Updated QuestionItem display for %s", question.id)
                     self.copyVariablesToClipboard(
                         variables=question.parametrics.variables
@@ -294,7 +314,7 @@ class MainWindow(QMainWindow):
         if not variables:
             item = self.ui.treeWidget.currentItem()
             if isinstance(item, QuestionItem):
-                question = item.getQuestion()
+                question = item.question
                 if isinstance(question, ParametricQuestion):
                     variables = question.parametrics.variables
         varsList = [
@@ -335,7 +355,15 @@ class ParseAllThread(QRunnable):
 
     @Slot()
     def run(self) -> None:
-        self.testDB.readCategoriesMetadata()
-        self.testDB.asyncInitAllCategories(self.mainApp.excelPath)
-        self.mainApp.setStatus("[OK] Tabellen wurde eingelesen")
-        self.testDB.parseAllQuestions()
+        try:
+            self.testDB.readCategoriesMetadata()
+        except InvalidFieldException:
+            logger.exception("Youre spreadsheet questionbank isn't correctly setup.")
+        except ValueError:
+            logger.exception(
+                "Did you forget to specify a 'settings' sheet in the file?"
+            )
+        else:
+            self.testDB.asyncInitAllCategories(self.mainApp.excelPath)
+            self.mainApp.setStatus("[OK] Tabellen wurde eingelesen")
+            self.testDB.parseAllQuestions()

excel2moodle/ui/dialogs.py

@@ -6,7 +6,7 @@ from typing import TYPE_CHECKING
 
 import lxml.etree as ET
 from PySide6.QtCore import Slot
-from PySide6.QtWidgets import QDialog, QFileDialog, QMessageBox, QWidget
+from PySide6.QtWidgets import QDialog, QFileDialog, QMainWindow, QMessageBox, QWidget
 
 from excel2moodle import e2mMetadata
 from excel2moodle.core.globals import XMLTags
@@ -14,6 +14,7 @@ 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_updateDlg import Ui_UpdateDialog
 from excel2moodle.ui.UI_variantDialog import Ui_Dialog
 
 if TYPE_CHECKING:
@@ -22,6 +23,22 @@ if TYPE_CHECKING:
 logger = logging.getLogger(__name__)
 
 
+class UpdateDialog(QDialog):
+    def __init__(
+        self, parent: QMainWindow, changelog: str = "", version: str = ""
+    ) -> None:
+        super().__init__(parent)
+        self.ui = Ui_UpdateDialog()
+        self.ui.setupUi(self)
+        self.ui.changelogBrowser.setMarkdown(changelog)
+        self.ui.titleLabel.setText(
+            f"<h2>New Version {version} of <i>exel2moodle</i> just dropped!!</h2>"
+        )
+        self.ui.fundingLabel.setText(
+            f'If you find this project useful, please consider supporting its development. <br> <a href="{e2mMetadata["funding"]}">Buy jbosse3 a coffee</a>, so he stays caffeinated during coding.',
+        )
+
+
 class QuestionVariantDialog(QDialog):
     def __init__(self, parent, question: ParametricQuestion) -> None:
         super().__init__(parent)

excel2moodle/ui/treewidget.py

@@ -4,24 +4,33 @@ Those two are subclasses of `QTreeWidgetItem`, to provide an easy interface
 of accessing the corresponding questions from the items.
 """
 
+import logging
+
 from PySide6.QtCore import Qt
 from PySide6.QtWidgets import QTreeWidgetItem
 
 from excel2moodle.core.dataStructure import Category
 from excel2moodle.core.question import ParametricQuestion, Question
 
+logger = logging.getLogger(__name__)
+
 
 class QuestionItem(QTreeWidgetItem):
     def __init__(self, parent, question: Question | ParametricQuestion) -> None:
         super().__init__(parent)
         self.setData(2, Qt.UserRole, question)
+        self.refresh()
+
+    def refresh(self) -> None:
+        question = self.question
         self.setText(0, question.id)
         self.setText(1, question.name)
         self.setText(2, str(question.points))
-        if hasattr(question, "variants") and question.variants is not None:
-            self.setText(3, str(question.variants))
+        if isinstance(question, ParametricQuestion):
+            self.setText(3, str(question.parametrics.variants))
 
-    def getQuestion(self) -> Question | ParametricQuestion:
+    @property
+    def question(self) -> Question | ParametricQuestion:
         """Return the question Object the QTreeWidgetItem represents."""
         return self.data(2, Qt.UserRole)
 
@@ -30,9 +39,9 @@ class CategoryItem(QTreeWidgetItem):
     def __init__(self, parent, category: Category) -> None:
         super().__init__(parent)
         self.setData(2, Qt.UserRole, category)
-        self.setText(0, category.NAME)
-        self.setText(1, category.desc)
-        self.setText(2, str(category.points))
+        self.refresh()
+
+    def updateVariantCount(self) -> None:
         var = self.getMaxVariants()
         if var != 0:
             self.setText(3, str(var))
@@ -44,10 +53,21 @@ class CategoryItem(QTreeWidgetItem):
     def getMaxVariants(self) -> int:
         count: int = 0
         for child in self.iterateChildren():
-            q = child.getQuestion()
-            if hasattr(q, "variants") and q.variants is not None:
-                count = max(q.variants, count)
+            q = child.question
+            if isinstance(q, ParametricQuestion):
+                count = max(q.parametrics.variants, count)
         return count
 
-    def getCategory(self) -> Category:
+    @property
+    def category(self) -> Category:
         return self.data(2, Qt.UserRole)
+
+    def refresh(self) -> None:
+        for child in self.iterateChildren():
+            child.refresh()
+        # Update category data, as it might have changed
+        cat = self.category
+        self.setText(0, cat.NAME)
+        self.setText(1, cat.desc)
+        self.setText(2, str(cat.points))
+        self.updateVariantCount()

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: excel2moodle
-Version: 0.6.2
+Version: 0.6.3
 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,26 @@ If You want to support my work as well, you can by me a [coffee](https://ko-fi.c
 
 # Changelogs
 
+## 0.6.3 (2025-08-03)
+Lots of small improvements made
+
+### improvement (3 changes)
+
+- [small logging improvements and error handling](https://gitlab.com/jbosse3/excel2moodle/-/commit/149f8e923a06d9d7077fe90c7005a3e1d5d2d42f)
+- [Make variable generator rules editable](https://gitlab.com/jbosse3/excel2moodle/-/commit/80ea32d97bdec16b77100bc870a0e0272a739dd4)
+- [Variable generator only generates unique sets.](https://gitlab.com/jbosse3/excel2moodle/-/commit/d347c91bbac66de1da157fee4f76faf8d4636557)
+
+### bugfix (3 changes)
+
+- [mixed parametric and non parametric Bullets are working now](https://gitlab.com/jbosse3/excel2moodle/-/commit/f094b13dffd4b6b7ac1a03fc7e34eec6e8d1bfa7)
+- [Loglevel setting is respected in spreadsheet file](https://gitlab.com/jbosse3/excel2moodle/-/commit/d6ef89beeec94f24782a00b7564883074badf72d)
+- [Treewidget variants count updated after variable generation](https://gitlab.com/jbosse3/excel2moodle/-/commit/c48a0d093a0cce85fd3e9c3c091eef936739c02b)
+
+### feature (2 changes)
+
+- [Category ID taken from any number in its name](https://gitlab.com/jbosse3/excel2moodle/-/commit/ac7e19af5f25ac2e576b63c478e7b07153e782ef)
+- [Implemented Update Check on Startup](https://gitlab.com/jbosse3/excel2moodle/-/commit/a143edd47f566c5e731c05612f4ac21dc7728eb7)
+
 ## 0.6.2 (2025-08-02)
 Adding export options and fixing cloze points bug
 

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

@@ -1,39 +1,41 @@
-excel2moodle/__init__.py,sha256=mnb-RWgmWIPSBk4S65a_jP6rxntAkTeYxN0ObUJalbQ,1801
-excel2moodle/__main__.py,sha256=DgddHjnxFPXQp4CFvqGNjgUZRgaHp15U57Va9UdW_ms,1184
+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=F9g0dZfkMjoYQ5jneT47GwM1-RAyhPF8y203W5mOYpU,3505
-excel2moodle/core/category.py,sha256=7sn7Xq5SBzxVxllPXk9Mv99XHULSVqAPYHQ9vwFG00s,2839
-excel2moodle/core/dataStructure.py,sha256=xlGTYvRv-qysjvu-mSmkpibFpO75qWH18Z-q6vGnHLk,19332
+excel2moodle/core/bullets.py,sha256=KwlxGOWbWexMkfXkY4Zg-gmxpzQCNZ09kSo8kPffGQU,3501
+excel2moodle/core/category.py,sha256=fOMj2ynoAy6tXwmFhJ9uST9BQHiRJeU2BrkK1r57ek4,2897
+excel2moodle/core/dataStructure.py,sha256=BzBKg_fCT1FHuJum2aGLK_4RqmA2qluODvg1GwiEA7E,19797
 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=l0_TyQxAfHUQLuyE5ervU6CVbRVKlcivgU4lFzrWFAg,6350
+excel2moodle/core/settings.py,sha256=zqtA1fcQeO3bELLvS8bzP9TSZT7RksFxMaqnYYBXQCQ,6432
 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=oQpk-4cM0x_vKGEexC0Z1UyVoGG7w3V3RydtkM0MV_Y,3869
-excel2moodle/extra/variableGenerator.py,sha256=fiXaTeFaC--1KRyMNcsjBgUlUZ8H1rGS6f_WenN60fQ,9851
+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
-excel2moodle/question_types/cloze.py,sha256=ozYIAr8xCvXZ-tInKBTIWqxpKBH6gZ5sDwQSarnkUXo,14687
+excel2moodle/question_types/cloze.py,sha256=xxhsqSNYqt878bjZ8MfGr-Oe7jLy9FdSTIUZ_GPE9PY,14657
 excel2moodle/question_types/mc.py,sha256=nx6PsbfLLH_4H5eCSjGcfgEC6EEVgseI7xy15jg5JmA,5482
 excel2moodle/question_types/nf.py,sha256=HAolGy13-FbLVJskAUXCFy76NJu91IG9wtq6OI05Igw,1374
 excel2moodle/question_types/nfm.py,sha256=D5-aE4C7TAuwHFidXR15DLWNZ4JT-HVbPXI0CzGWOS0,3013
 excel2moodle/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_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=Das3bBrg44VgC2p7kIrfAMDn0iyzz6eAoWE6FXnaCrU,13905
-excel2moodle/ui/dialogs.py,sha256=XAqPt1ST1kceoaZ0ZDDY1w1iJOPRezZSa2jvB7FWar0,6576
+excel2moodle/ui/appUi.py,sha256=y5SWTNo45tIZ-HekdZkR7fPOD0QSP66uB_wlrk-b4YM,15046
+excel2moodle/ui/dialogs.py,sha256=du6v17lh6LhgDDK0QltPzD-z8wUn3aD4QzaAQBmiTBQ,7314
 excel2moodle/ui/equationChecker.py,sha256=RII9DlZAlHqe5udBWzeUaozhtyi3ZkCZs8h3-oO6pEw,2700
-excel2moodle/ui/treewidget.py,sha256=aLR_B1iT2j1AAGk_9Dc6WtRbq1XijK8pICG8BEOW_Ak,1916
-excel2moodle-0.6.2.dist-info/licenses/LICENSE,sha256=ywQqe6Sitymkf2lV2NRcx_aGsaC-KbSl_EfEsRXmNRw,35135
-excel2moodle-0.6.2.dist-info/METADATA,sha256=cECd-rkz8kJamOpqqXBcH1OB38BhXdLP1irbrtWXWBc,10611
-excel2moodle-0.6.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-excel2moodle-0.6.2.dist-info/entry_points.txt,sha256=myfMLDThuGgWHMJDPPfILiZqo_7D3fhmDdJGqWOAjPw,60
-excel2moodle-0.6.2.dist-info/top_level.txt,sha256=5V1xRUQ9o7UmOCmNoWCZPAuy5nXp3Qbzyqch8fUGT_c,13
-excel2moodle-0.6.2.dist-info/RECORD,,
+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,,