jmplace/DocScoDoc
1
0
Fork 0
forked from ScoDoc/DocScoDoc
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' of https://scodoc.org/git/viennet/ScoDoc into refactor_nt

Browse Source
This commit is contained in:
Emmanuel Viennet 2022-01-15 15:00:44 +01:00
commit 4334a83c17
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/scodoc/sco_import_etuds.py
View File

@ -550,9 +550,9 @@ def _import_one_student(
formsemestre_id = values["codesemestre"] formsemestre_id = values["codesemestre"]
try: try:
formsemestre_id = int(formsemestre_id) formsemestre_id = int(formsemestre_id)
except ValueError as exc: except (ValueError, TypeError) as exc:
raise ScoValueError( raise ScoValueError(
f"valeur invalide dans la colonne codesemestre, ligne {linenum+1}" f"valeur invalide ou manquante dans la colonne codesemestre, ligne {linenum+1}"
) from exc ) from exc
# recupere liste des groupes: # recupere liste des groupes:
if formsemestre_id not in GroupIdInferers: if formsemestre_id not in GroupIdInferers:

3
app/scodoc/sco_liste_notes.py
View File

@ -201,6 +201,7 @@ def do_evaluation_listenotes(
note_sur_20 = tf[2]["note_sur_20"] note_sur_20 = tf[2]["note_sur_20"]
hide_groups = tf[2]["hide_groups"] hide_groups = tf[2]["hide_groups"]
with_emails = tf[2]["with_emails"] with_emails = tf[2]["with_emails"]
group_ids = [x for x in tf[2]["group_ids"] if x != ""]
return ( return (
_make_table_notes( _make_table_notes(
tf[1], tf[1],
@ -208,7 +209,7 @@ def do_evaluation_listenotes(
format=format, format=format,
note_sur_20=note_sur_20, note_sur_20=note_sur_20,
anonymous_listing=anonymous_listing, anonymous_listing=anonymous_listing,
group_ids=tf[2]["group_ids"], group_ids=group_ids,
hide_groups=hide_groups, hide_groups=hide_groups,
with_emails=with_emails, with_emails=with_emails,
mode=mode, mode=mode,