leonard.montalbano/ScoDoc
1
0
Fork 0
forked from ScoDoc/ScoDoc
Code Issues Pull Requests Projects Releases Wiki Activity

début réintégration module poursuite d'études. Pb excel à régler.

Browse Source
This commit is contained in:
Emmanuel Viennet 2021-08-29 23:04:38 +02:00
parent 3586920809
commit 315a80b670
4 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/scodoc/pe_jurype.py
View File

@ -487,9 +487,15 @@ class JuryPE(object):
# if PETable.AFFICHAGE_DEBUG_PE == True : pe_tools.pe_print(" derniere inscription = ", lastDateSem) # if PETable.AFFICHAGE_DEBUG_PE == True : pe_tools.pe_print(" derniere inscription = ", lastDateSem)
semestresDeScoDoc = sco_formsemestre.do_formsemestre_list() semestresDeScoDoc = sco_formsemestre.do_formsemestre_list()
semestresSuperieurs = [ if sonDernierSidValide is None:
sem for sem in semestresDeScoDoc if sem["semestre_id"] > sonDernierSidValide # si l'étudiant n'a validé aucun semestre, les prend tous ? (à vérifier)
] # Semestre de rang plus élevé que son dernier sem valide semestresSuperieurs = semestresDeScoDoc
else:
semestresSuperieurs = [
sem
for sem in semestresDeScoDoc
if sem["semestre_id"] > sonDernierSidValide
] # Semestre de rang plus élevé que son dernier sem valide
datesDesSemestresSuperieurs = [ datesDesSemestresSuperieurs = [
pe_tagtable.conversionDate_StrToDate(sem["date_debut"]) pe_tagtable.conversionDate_StrToDate(sem["date_debut"])
for sem in semestresSuperieurs for sem in semestresSuperieurs

4
app/scodoc/pe_semestretag.py
View File

@ -280,8 +280,8 @@ class SemestreTag(pe_tagtable.TableTag):
modprec_id = modimpl_prec[0]["moduleimpl_id"] modprec_id = modimpl_prec[0]["moduleimpl_id"]
moy_ue_capitalisee = get_moy_ue_from_nt(nt_prec, etudid, modprec_id) moy_ue_capitalisee = get_moy_ue_from_nt(nt_prec, etudid, modprec_id)
if ( if (
moy_ue_actuelle >= moy_ue_capitalisee moy_ue_capitalisee is None
): # on prend la meilleure ue ) or moy_ue_actuelle >= moy_ue_capitalisee: # on prend la meilleure ue
note = self.nt.get_etud_mod_moy( note = self.nt.get_etud_mod_moy(
modimpl_id, etudid modimpl_id, etudid
) # lecture de la note ) # lecture de la note

4
app/scodoc/pe_tagtable.py
View File

@ -179,7 +179,9 @@ class TableTag(object):
# Calcule les rangs # Calcule les rangs
lesMoyennesTriees = sorted( lesMoyennesTriees = sorted(
listMoyEtCoeff, reverse=True, key=lambda col: col[0] listMoyEtCoeff,
reverse=True,
key=lambda col: col[0] or 0, # remplace les None par des zéros
) # triées ) # triées
self.rangs[tag] = notes_table.comp_ranks(lesMoyennesTriees) # les rangs self.rangs[tag] = notes_table.comp_ranks(lesMoyennesTriees) # les rangs

7
app/views/notes.py
View File

@ -2357,7 +2357,12 @@ sco_publish(
sco_poursuite_dut.formsemestre_poursuite_report, sco_poursuite_dut.formsemestre_poursuite_report,
Permission.ScoView, Permission.ScoView,
) )
sco_publish("/pe_view_sem_recap", pe_view.pe_view_sem_recap, Permission.ScoView) sco_publish(
"/pe_view_sem_recap",
pe_view.pe_view_sem_recap,
Permission.ScoView,
methods=["GET", "POST"],
)
sco_publish( sco_publish(
"/report_debouche_date", sco_debouche.report_debouche_date, Permission.ScoView "/report_debouche_date", sco_debouche.report_debouche_date, Permission.ScoView
) )