excel2moodle 0.7.0__py3-none-any.whl → 0.7.1__py3-none-any.whl

excel2moodle/core/question.py

@@ -60,6 +60,8 @@ class QuestionData(dict):
             Tags.QUESTIONPART,
             Tags.TEXT,
             Tags.MEDIASCRIPTS,
+            Tags.TRUEANSFB,
+            Tags.FALSEANSFB,
         ],
         default: object = None,
     ) -> list: ...

excel2moodle/core/settings.py

@@ -95,6 +95,8 @@ class Tags(StrEnum):
     FALSEFB = "falsefeedback", str, "Your answer is sadly wrong, try again!!!"
     PCORRECFB = "partialcorrectfeedback", str, "Your answer is partially right."
     GENERALFB = "feedback", str, "You answered this question."
+    TRUEANSFB = "trueanswerfeedback", list, None
+    FALSEANSFB = "falseanswerfeedback", list, None
 
     MEDIASCRIPTS = "mediascripts", list, None
     MEDIACALL = "parametricmedia", str, None

excel2moodle/question_types/mc.py

@@ -52,11 +52,21 @@ class MCQuestionParser(QuestionParser):
 
     def getAnsElementsList(
         self,
-        answerList: list,
+        answerList: list[str],
+        feedbackList: list[str],
         fraction: float = 50,
         format="html",
     ) -> list[ET.Element]:
+        """Take the answer Strings and format them each into a xml-tree.
+
+        If a feedbackList is given it is used. Otherwise the standard feedbacks are used.
+        """
         elementList: list[ET.Element] = []
+        if feedbackList is None:
+            if fraction > 0:
+                feedbackList = [self.rawInput.get(Tags.FALSEFB) for _ in answerList]
+            else:
+                feedbackList = [self.rawInput.get(Tags.TRUEFB) for _ in answerList]
         for i, ans in enumerate(answerList):
             p = TextElements.PLEFT.create()
             if self.answerType == "picture":
@@ -72,7 +82,7 @@ class MCQuestionParser(QuestionParser):
                 elementList[-1].append(
                     self.getFeedBEle(
                         XMLTags.ANSFEEDBACK,
-                        text=self.rawInput.get(Tags.FALSEFB),
+                        text=feedbackList[i],
                         style=TextElements.SPANRED,
                     ),
                 )
@@ -82,7 +92,7 @@ class MCQuestionParser(QuestionParser):
                 elementList[-1].append(
                     self.getFeedBEle(
                         XMLTags.ANSFEEDBACK,
-                        text=self.rawInput.get(Tags.TRUEFB),
+                        text=feedbackList[i],
                         style=TextElements.SPANGREEN,
                     ),
                 )
@@ -121,12 +131,40 @@ class MCQuestionParser(QuestionParser):
                 self.rawInput.get(Tags.FALSE), style=self.answerType
             )
             self.logger.debug(f"got the following false answers \n {falseAList=}")
+        trueFbs = self.rawInput.get(Tags.TRUEANSFB)
+        falseFbs = self.rawInput.get(Tags.FALSEANSFB)
+        if trueFbs is None:
+            trueFbs = [self.rawInput.get(Tags.FALSEFB) for _ in trueAnsList]
+        if falseFbs is None:
+            falseFbs = [self.rawInput.get(Tags.TRUEFB) for _ in falseAList]
+        if len(trueFbs) < len(trueAnsList):
+            self.logger.warning(
+                "There are less true-feedbacks than true-answers given. Using fallback feedback"
+            )
+            delta = len(trueAnsList) - len(trueFbs)
+            while delta > 0:
+                trueFbs.append(self.rawInput.get(Tags.TRUEFB))
+                delta -= 1
+        if len(falseFbs) < len(falseAList):
+            self.logger.warning(
+                "There are less false-feedbacks than false-answers given. Using fallback feedback"
+            )
+            delta = len(falseAList) - len(falseFbs)
+            while delta > 0:
+                falseFbs.append(self.rawInput.get(Tags.TRUEFB))
+                delta -= 1
         truefrac = 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 = self.getAnsElementsList(
+            answerList=trueAnsList, feedbackList=trueFbs, fraction=round(truefrac, 4)
+        )
         ansList.extend(
-            self.getAnsElementsList(falseAList, fraction=round(falsefrac, 4)),
+            self.getAnsElementsList(
+                answerList=falseAList,
+                feedbackList=falseFbs,
+                fraction=round(falsefrac, 4),
+            ),
         )
         return ansList
 

{excel2moodle-0.7.0.dist-info → excel2moodle-0.7.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: excel2moodle
-Version: 0.7.0
+Version: 0.7.1
 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,17 @@ If You want to support my work as well, you can by me a [coffee](https://ko-fi.c
 
 # Changelogs
 
+## 0.7.1 (2025-10-04)
+feedbacking improved
+
+### documentation (1 change)
+
+- [documentation improvement](https://gitlab.com/jbosse3/excel2moodle/-/commit/1a1110d05b49175e049a9ca18a027216a765e277)
+
+### feature (1 change)
+
+- [Added MC answer feedback support](https://gitlab.com/jbosse3/excel2moodle/-/commit/4f5fe550786cf29839ba54fbdfedbf03c72d3009)
+
 ## 0.7.0 (2025-09-30)
 Rework of the equation checker done!
 

{excel2moodle-0.7.0.dist-info → excel2moodle-0.7.1.dist-info}/RECORD

@@ -9,8 +9,8 @@ excel2moodle/core/etHelpers.py,sha256=LzimWGuX6RH2TbfEnWUoAXT2Tr0z6P7bCANjxuANSX
 excel2moodle/core/exceptions.py,sha256=9xfsaIcm6Yej6QAZga0d3DK3jLQejdfgJARuAaG-uZY,739
 excel2moodle/core/globals.py,sha256=gvkl8Obq4XBW40B1L68Ewg06sonK27l-KIiodwFv8ic,2393
 excel2moodle/core/parser.py,sha256=hjbA0i7N1oHoJHhOmvEtVl4Ryaqd0eqUS26bXS47CBo,8467
-excel2moodle/core/question.py,sha256=bRQhWyJPwvNMOABlT-WCngTx-Bt8AuOoQXgyPTQh_aQ,14528
-excel2moodle/core/settings.py,sha256=_H3TJ67-4Q0hFi8g3JWFILJ6q3mfcEsBRaV74jhbko8,6531
+excel2moodle/core/question.py,sha256=HQ6rC5JWfr4XF3m7ZHk1IKjjZZ_1AhvI77wqaTuq8fY,14585
+excel2moodle/core/settings.py,sha256=rYGJZeXAQ4d3NKkme_YiG5uLi-cheIaAsoV6EDDGQsI,6631
 excel2moodle/core/stringHelpers.py,sha256=OzFZ6Eu3PeBLKb61K-aeVfUZmVuBerr9KfyOsuNRd7Y,2403
 excel2moodle/core/validator.py,sha256=6nZIyTwcXPT2jgi31QrBGur3Cq7A3Q9btLp5ALFEsKw,4998
 excel2moodle/extra/__init__.py,sha256=PM-id60HD21A3IcGC_fCYFihS8osBGZMIJCcN-ZRsIM,293
@@ -20,7 +20,7 @@ excel2moodle/extra/updateQuery.py,sha256=kD_L23Qea9Cx4zUwfQVNJXXFbybd9cwE8sSbZrz
 excel2moodle/extra/variableGenerator.py,sha256=jcXbyA1B3-uZHsovU9QhZ879FoemeHqAe_BxPT4ZXoY,11484
 excel2moodle/question_types/__init__.py,sha256=81mss0g7SVtnlb-WkydE28G_dEAAf6oT1uB8lpK2-II,1041
 excel2moodle/question_types/cloze.py,sha256=WGeA37Dq405Zda_WNU2SrAhfW9DNjkdnLBfM-JFM4lw,14656
-excel2moodle/question_types/mc.py,sha256=nx6PsbfLLH_4H5eCSjGcfgEC6EEVgseI7xy15jg5JmA,5482
+excel2moodle/question_types/mc.py,sha256=qslqLRfqQuo_57IFXFMDGD4IJSCL3Ig29rppvKTplgc,7103
 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=jA5gKemrgeertbp2iip-icQCRFKnV-dR-f0eODBBAp0,8910
@@ -33,9 +33,9 @@ excel2moodle/ui/__init__.py,sha256=4EdGtpzwH3rgw4xW9E5x9kdPQYwKbo9rehHRZTNxCrQ,4
 excel2moodle/ui/appUi.py,sha256=jlurK6sb_CVEV1vNAC_mL8lmX9H9Ex-QZ3BQXgAisJM,14887
 excel2moodle/ui/dialogs.py,sha256=du6v17lh6LhgDDK0QltPzD-z8wUn3aD4QzaAQBmiTBQ,7314
 excel2moodle/ui/treewidget.py,sha256=3hZRLlrhp4FMXFyNY0LGDy7k1RSuKH87QyqB1N4qOqg,2335
-excel2moodle-0.7.0.dist-info/licenses/LICENSE,sha256=ywQqe6Sitymkf2lV2NRcx_aGsaC-KbSl_EfEsRXmNRw,35135
-excel2moodle-0.7.0.dist-info/METADATA,sha256=f2ZbXDgR3FOXRwhJ7I2eUgCzsIaEVfuJdBkcYuAF_z0,12716
-excel2moodle-0.7.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-excel2moodle-0.7.0.dist-info/entry_points.txt,sha256=myfMLDThuGgWHMJDPPfILiZqo_7D3fhmDdJGqWOAjPw,60
-excel2moodle-0.7.0.dist-info/top_level.txt,sha256=5V1xRUQ9o7UmOCmNoWCZPAuy5nXp3Qbzyqch8fUGT_c,13
-excel2moodle-0.7.0.dist-info/RECORD,,
+excel2moodle-0.7.1.dist-info/licenses/LICENSE,sha256=ywQqe6Sitymkf2lV2NRcx_aGsaC-KbSl_EfEsRXmNRw,35135
+excel2moodle-0.7.1.dist-info/METADATA,sha256=mAWPtJes2MEC75ot_dMaxGjC_pmFTwanHfh-B8Z8Mbg,13065
+excel2moodle-0.7.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+excel2moodle-0.7.1.dist-info/entry_points.txt,sha256=myfMLDThuGgWHMJDPPfILiZqo_7D3fhmDdJGqWOAjPw,60
+excel2moodle-0.7.1.dist-info/top_level.txt,sha256=5V1xRUQ9o7UmOCmNoWCZPAuy5nXp3Qbzyqch8fUGT_c,13
+excel2moodle-0.7.1.dist-info/RECORD,,