Update opolka/ScoDoc from ScoDoc/ScoDoc #2

Merged
opolka merged 1272 commits from ScoDoc/ScoDoc:master into master 2024-05-27 09:11:04 +02:00
3 changed files with 4 additions and 3 deletions
Showing only changes of commit 0fd16c8bbb - Show all commits

View File

@ -536,7 +536,9 @@ def check_convert_evaluation_args(moduleimpl: ModuleImpl, data: dict):
raise ScoValueError("invalid note_max value (must be positive or null)") raise ScoValueError("invalid note_max value (must be positive or null)")
data["note_max"] = note_max data["note_max"] = note_max
# --- coefficient # --- coefficient
coef = data.get("coefficient", 1.0) or 1.0 coef = data.get("coefficient", None)
if coef is None:
coef = 1.0
try: try:
coef = float(coef) coef = float(coef)
except ValueError as exc: except ValueError as exc:

View File

@ -46,7 +46,6 @@ from app.scodoc.sco_exceptions import ScoValueError
from app.scodoc.TrivialFormulator import TrivialFormulator from app.scodoc.TrivialFormulator import TrivialFormulator
from app.scodoc import html_sco_header from app.scodoc import html_sco_header
from app.scodoc import sco_evaluations from app.scodoc import sco_evaluations
from app.scodoc import sco_evaluation_db
from app.scodoc import sco_moduleimpl from app.scodoc import sco_moduleimpl
from app.scodoc import sco_preferences from app.scodoc import sco_preferences

View File

@ -22,7 +22,7 @@
{{tableau | safe}} {{tableau | safe}}
<div class=""help"> <div class=""help">
Les comptes sont exprimés en {{ assi_metric }}. Les comptes sont exprimés en {{ assi_metric | lower}}s.
</div> </div>
<script> <script>