lehmann/ScoDoc-Front
1
0
Fork 0
forked from ScoDoc/ScoDoc
Code Pull Requests Activity

Mise à jour des menus. Feuille prépa jury seulement pour non BUT.

Browse Source
This commit is contained in:
Emmanuel Viennet 2023-02-21 02:43:26 +01:00
parent 21714bae59
commit 917070b169
2 changed files with 11 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
app/scodoc/sco_formsemestre_status.py
View File

@ -390,13 +390,6 @@ def formsemestre_status_menubar(formsemestre: FormSemestre) -> str:
"endpoint": "notes.evaluations_recap",
"args": {"formsemestre_id": formsemestre_id},
},
{
"title": "Saisie des notes",
"endpoint": "notes.formsemestre_status",
"args": {"formsemestre_id": formsemestre_id},
"enabled": True,
"helpmsg": "Tableau de bord du semestre",
},
{
"title": "Classeur PDF des bulletins",
"endpoint": "notes.formsemestre_bulletins_pdf_choice",
@ -426,11 +419,6 @@ def formsemestre_status_menubar(formsemestre: FormSemestre) -> str:
"endpoint": "notes.formsemestre_pvjury",
"args": {"formsemestre_id": formsemestre_id},
},
{
"title": "Générer feuille préparation Jury",
"endpoint": "notes.feuille_preparation_jury",
"args": {"formsemestre_id": formsemestre_id},
},
{
"title": "Saisie des décisions du jury",
"endpoint": "notes.formsemestre_recapcomplet",
@ -440,6 +428,12 @@ def formsemestre_status_menubar(formsemestre: FormSemestre) -> str:
},
"enabled": formsemestre.can_edit_jury(),
},
{
"title": "Générer feuille préparation Jury (non BUT)",
"endpoint": "notes.feuille_preparation_jury",
"args": {"formsemestre_id": formsemestre_id},
"enabled": not formsemestre.formation.is_apc(),
},
{
"title": "Éditer les PV et archiver les résultats",
"endpoint": "notes.formsemestre_archive",

9
app/scodoc/sco_pv_forms.py
View File

@ -206,10 +206,11 @@ def pvjury_table(
return lines, titles, columns_ids
# XXX TODO cette page a vocation a disparaitre,
# remplacée par formsemestre_recapcomplet en mode jury (déjà le cas pour les BUT)
def formsemestre_pvjury(formsemestre_id, format="html", publish=True): # XXX
"""Page récapitulant les décisions de jury"""
def formsemestre_pvjury(formsemestre_id, format="html", publish=True):
"""Page récapitulant les décisions de jury
En classique: table spécifique avec les deux semestres pour le DUT
En APC/BUT: renvoie vers table recap, en mode jury.
"""
formsemestre = FormSemestre.query.get_or_404(formsemestre_id)
is_apc = formsemestre.formation.is_apc()
if format == "html" and is_apc: