iziram/ScoDoc
1
0
Fork 0
forked from ScoDoc/ScoDoc
Code Issues 12 Pull Requests Projects 1 Releases Wiki Activity

Fix export Apo BUT/Simpair isolé

Browse Source
This commit is contained in:
Emmanuel Viennet 2023-04-17 12:10:17 +02:00 committed by iziram
parent 68e37a2ccd
commit e36a83a48a
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/scodoc/sco_apogee_csv.py
View File

@ -476,8 +476,10 @@ class ApoEtud(dict):
#
return None # element Apogee non trouvé dans ce semestre
def comp_elt_semestre(self, nt, decision, etudid):
"""Calcul résultat apo semestre"""
def comp_elt_semestre(self, nt: NotesTableCompat, decision: dict, etudid: int):
"""Calcul résultat apo semestre.
Toujours vide pour en BUT/APC.
"""
if self.is_apc:
# pas de code semestre en APC !
return dict(N="", B=20, J="", R="", M="")
@ -522,7 +524,9 @@ class ApoEtud(dict):
cur_formsemestre = FormSemestre.query.get_or_404(cur_sem["formsemestre_id"])
cur_nt: NotesTableCompat = res_sem.load_formsemestre_results(cur_formsemestre)
if not self.is_apc:
if self.is_apc:
cur_decision = {} # comp_elt_semestre sera vide.
else:
cur_decision = cur_nt.get_etud_decision_sem(etudid)
if not cur_decision:
# pas de decision => pas de résultat annuel

2
sco_version.py
View File

@ -1,7 +1,7 @@
# -*- mode: python -*-
# -*- coding: utf-8 -*-
SCOVERSION = "9.4.74"
SCOVERSION = "9.4.72"
SCONAME = "ScoDoc"