opolka/ScoDoc
1
0
Fork 0
forked from ScoDoc/ScoDoc
Code Issues Pull Requests Activity

WIP: jury BUT avec redoublements (à compléter).

Browse Source
This commit is contained in:
Emmanuel Viennet 2022-12-20 19:00:01 -03:00 committed by iziram
parent 8e6dc37a87
commit 7e1b0177f0
1 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/but/jury_but_view.py
View File

@ -75,7 +75,12 @@ def show_etud(deca: DecisionsProposeesAnnee, read_only: bool = True) -> str:
formsemestre_1 = deca.formsemestre_impair formsemestre_1 = deca.formsemestre_impair
formsemestre_2 = deca.formsemestre_pair formsemestre_2 = deca.formsemestre_pair
# Ordonne selon les dates des 2 semestres considérés (pour les redoublants à cheval): # Ordonne selon les dates des 2 semestres considérés (pour les redoublants à cheval):
if deca.formsemestre_pair.date_debut < deca.formsemestre_impair.date_debut: reverse_semestre = (
deca.formsemestre_pair
and deca.formsemestre_impair
and deca.formsemestre_pair.date_debut < deca.formsemestre_impair.date_debut
)
if reverse_semestre:
formsemestre_1, formsemestre_2 = formsemestre_2, formsemestre_1 formsemestre_1, formsemestre_2 = formsemestre_2, formsemestre_1
H.append( H.append(
f""" f"""
@ -116,10 +121,11 @@ def show_etud(deca: DecisionsProposeesAnnee, read_only: bool = True) -> str:
), ),
] ]
# Ordonne selon les dates des 2 semestres considérés: # Ordonne selon les dates des 2 semestres considérés:
if deca.formsemestre_pair.date_debut < deca.formsemestre_impair.date_debut: if reverse_semestre:
ues_ro[0], ues_ro[1] = ues_ro[1], ues_ro[0] ues_ro[0], ues_ro[1] = ues_ro[1], ues_ro[0]
# Colonnes d'UE: # Colonnes d'UE:
for ue, ue_read_only in ues_ro: for ue, ue_read_only in ues_ro:
if ue:
H.append( H.append(
_gen_but_niveau_ue( _gen_but_niveau_ue(
ue, ue,
@ -128,6 +134,8 @@ def show_etud(deca: DecisionsProposeesAnnee, read_only: bool = True) -> str:
annee_prec=ue_read_only, annee_prec=ue_read_only,
) )
) )
else:
H.append("""<div class="niveau_vide"></div>""")
# RCUE # RCUE
if dec_rcue is None: if dec_rcue is None: