excel2moodle 0.4.3__py3-none-any.whl → 0.4.4__py3-none-any.whl

excel2moodle/core/dataStructure.py

@@ -125,8 +125,9 @@ class QuestionDB:
         for tag, value in settings.iterrows():
             value = value.iloc[0]
             if tag == Tags.TOLERANCE:
-                tol = value if value <= 1 else value / 100
-                self.settings.set(Tags.TOLERANCE, tol)
+                tol = value if value < 1 else value / 100
+                if tol > 0 and tol < 1:
+                    self.settings.set(Tags.TOLERANCE, tol)
             else:
                 self.settings.set(tag, value)
         if Tags.IMPORTMODULE in settings.index:

excel2moodle/core/validator.py

@@ -80,9 +80,9 @@ class Validator:
                 if key.startswith(tag) and not isinstance(self.qdata[key], list):
                     self.qdata[key] = stringHelpers.getListFromStr(self.qdata[key])
         tol = float(self.qdata.get(Tags.TOLERANCE, 0))
-        if tol <= 0 or tol > 99:
-            self.qdata[Tags.TOLERANCE] = settings.get(Tags.TOLERANCE)
-        else:
+        if tol < 0 or tol > 99:
+            tol = settings.get(Tags.TOLERANCE)
+        elif tol != 0:
             self.qdata[Tags.TOLERANCE] = tol if tol < 1 else tol / 100
 
         if self.qdata[Tags.TYPE] == "NFM":

{excel2moodle-0.4.3.dist-info → excel2moodle-0.4.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: excel2moodle
-Version: 0.4.3
+Version: 0.4.4
 Summary: A package for converting questions from a spreadsheet, to valid moodle-xml
 Author: Jakob Bosse
 License-Expression: GPL-3.0-or-later

{excel2moodle-0.4.3.dist-info → excel2moodle-0.4.4.dist-info}/RECORD

@@ -3,7 +3,7 @@ excel2moodle/__main__.py,sha256=sG4ygwfVFskLQorBn-v98SvasNcPmwl_vLYpruT5Hk8,1175
 excel2moodle/logger.py,sha256=S9tvSwsOx2xta_AhGKHPNgi5FaiycyUDtkzHlIlNAX8,3193
 excel2moodle/core/__init__.py,sha256=87BwhtZse72Tk17Ib-V9X2k9wkhmtVnEj2ZmJ9JBAnI,63
 excel2moodle/core/category.py,sha256=TzntDhEURshxWuI6qc_K_t5bSTLXn6s0n_RA56Basg8,1885
-excel2moodle/core/dataStructure.py,sha256=Gg9dq4koJPAKj87YFItTCz8QlK743K8s_iflJjLWZyU,15535
+excel2moodle/core/dataStructure.py,sha256=lmquDdRyMqKxHjbcMOJ83BRs1otXqG9vhNFVfQsljwE,15578
 excel2moodle/core/etHelpers.py,sha256=G37qplp8tPJxqHNCBrf2Wo0jJZ0aDbxE9slQavqYqd8,2293
 excel2moodle/core/exceptions.py,sha256=9xfsaIcm6Yej6QAZga0d3DK3jLQejdfgJARuAaG-uZY,739
 excel2moodle/core/globals.py,sha256=Zm1wcrzQTRnhjrkwgBvo7VjKCFdPMjh-VLSSI5_QCO8,2837
@@ -12,7 +12,7 @@ excel2moodle/core/parser.py,sha256=Ec8bQ0CiiZCIdzQovfH2rce406wmyRmvhpDrCPeQfGU,8
 excel2moodle/core/question.py,sha256=nJDs8SPDRYP6xG4rvo8Bbh1734eQ96DZxVXb7yrT8LM,10802
 excel2moodle/core/settings.py,sha256=JhcgZcOrgFC7P4h9fSXZAApEl_9dE643r5arFpU1HXQ,5808
 excel2moodle/core/stringHelpers.py,sha256=OzFZ6Eu3PeBLKb61K-aeVfUZmVuBerr9KfyOsuNRd7Y,2403
-excel2moodle/core/validator.py,sha256=RwDQ-9Fpc5i2Buy3oorWUAh5zsS5fCF-MjRT4CgcXhY,4698
+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/question_types/__init__.py,sha256=81mss0g7SVtnlb-WkydE28G_dEAAf6oT1uB8lpK2-II,1041
@@ -30,9 +30,9 @@ excel2moodle/ui/dialogs.py,sha256=JbQ1y55wbzWVTY0nxdGrUm81AdOIY3PXKgET03Hc6Ys,67
 excel2moodle/ui/equationChecker.py,sha256=ANpN7S0llkp6pGL1sKHII1Jc8YUvgDR458UnGVnZZOo,2702
 excel2moodle/ui/treewidget.py,sha256=az64swVj1yQUsioeaZys32AauvQDdC4EKcqdbbWgL6s,2489
 excel2moodle/ui/windowDoc.py,sha256=WvzHj6F4JvHP82WlTsyFeOXW024Xq3BUqtp--T4twuI,661
-excel2moodle-0.4.3.dist-info/licenses/LICENSE,sha256=ywQqe6Sitymkf2lV2NRcx_aGsaC-KbSl_EfEsRXmNRw,35135
-excel2moodle-0.4.3.dist-info/METADATA,sha256=mFhUf8uf-GTxdpyOV1JJlb5bkA-fUqUYeHPea-LwMfw,2951
-excel2moodle-0.4.3.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-excel2moodle-0.4.3.dist-info/entry_points.txt,sha256=myfMLDThuGgWHMJDPPfILiZqo_7D3fhmDdJGqWOAjPw,60
-excel2moodle-0.4.3.dist-info/top_level.txt,sha256=5V1xRUQ9o7UmOCmNoWCZPAuy5nXp3Qbzyqch8fUGT_c,13
-excel2moodle-0.4.3.dist-info/RECORD,,
+excel2moodle-0.4.4.dist-info/licenses/LICENSE,sha256=ywQqe6Sitymkf2lV2NRcx_aGsaC-KbSl_EfEsRXmNRw,35135
+excel2moodle-0.4.4.dist-info/METADATA,sha256=NnGjQn0V6gBHcWuIjnleEqTeeFK5zVS0bDpwB6240SE,2951
+excel2moodle-0.4.4.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+excel2moodle-0.4.4.dist-info/entry_points.txt,sha256=myfMLDThuGgWHMJDPPfILiZqo_7D3fhmDdJGqWOAjPw,60
+excel2moodle-0.4.4.dist-info/top_level.txt,sha256=5V1xRUQ9o7UmOCmNoWCZPAuy5nXp3Qbzyqch8fUGT_c,13
+excel2moodle-0.4.4.dist-info/RECORD,,