dubacq/ScoDoc
1
0
Fork 0
forked from ScoDoc/ScoDoc
Code Pull Requests Activity

misc fixes

Browse Source
This commit is contained in:
Emmanuel Viennet 2021-07-13 16:39:41 +02:00
parent ac438b3c6a
commit 6a18188eda
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/scodoc/pe_view.py
View File

@ -89,7 +89,7 @@ def pe_view_sem_recap(
mode_debug = Pour "squeezer" le calcul du jury pe (long)
et debugger uniquement la partie avis latex
"""
if REQUEST and REQUEST.method == "GET":
if REQUEST and REQUEST.REQUEST_METHOD == "GET":
return _pe_view_sem_recap_form(context, formsemestre_id, REQUEST=REQUEST)
prefs = sco_preferences.SemPreferences(context, formsemestre_id=formsemestre_id)

2
app/scodoc/sco_compute_moy.py
View File

@ -361,7 +361,7 @@ def do_moduleimpl_moyennes(context, nt, mod):
if eval_rattr["evaluation_type"] == EVALUATION_RATTRAPAGE:
# rattrapage classique: prend la meilleure note entre moyenne
# module et note eval rattrapage
if note_sur_20 > R[etudid]:
if (R[etudid] == "NA0") or (note_sur_20 > R[etudid]):
# log('note_sur_20=%s' % note_sur_20)
R[etudid] = note_sur_20
elif eval_rattr["evaluation_type"] == EVALUATION_SESSION2:

2
app/scodoc/sco_debouche.py
View File

@ -111,7 +111,7 @@ def table_debouche_etudids(context, etudids, keep_numeric=True):
etud = sco_etud.get_etud_info(filled=1, etudid=etudid)[0]
# retrouve le "dernier" semestre (au sens de la date de fin)
sems = etud["sems"]
es = [(s["date_fin-iso"], i) for i, s in enumerate(sems)]
es = [(s["date_fin_iso"], i) for i, s in enumerate(sems)]
imax = max(es)[1]
last_sem = sems[imax]
nt = sco_core.get_notes_cache(

2
app/scodoc/sco_report.py
View File

@ -447,7 +447,7 @@ def table_suivi_cohorte(
S[s["formsemestre_id"]] = s
bacs.add(etud["bac"])
bacspecialites.add(bacspe)
annee_bacs.add(etud["annee_bac"])
annee_bacs.add(str(etud["annee_bac"]))
civilites.add(etud["civilite"])
if etud["statut"]: # ne montre pas les statuts non renseignés
statuts.add(etud["statut"])