1
0
forked from ScoDoc/ScoDoc

Ajout recap. parcours BUT sur page saisie jury

This commit is contained in:
Emmanuel Viennet 2023-06-23 15:35:52 +02:00
parent c9babcd8c2
commit 87cc4c06d6
4 changed files with 34 additions and 11 deletions

View File

@ -423,7 +423,7 @@ def jury_but_semestriel(
{warning} {warning}
</div> </div>
<form method="post" id="jury_but"> <form method="post" class="jury_but_box" id="jury_but">
""", """,
] ]

View File

@ -36,7 +36,7 @@ from flask_login import current_user
import app.scodoc.sco_utils as scu import app.scodoc.sco_utils as scu
import app.scodoc.notesdb as ndb import app.scodoc.notesdb as ndb
from app import log from app import log
from app.but import cursus_but, jury_but_view from app.but import cursus_but
from app.models.etudiants import Identite, make_etud_args from app.models.etudiants import Identite, make_etud_args
from app.models.formsemestre import FormSemestre from app.models.formsemestre import FormSemestre
from app.scodoc import html_sco_header from app.scodoc import html_sco_header

View File

@ -23,7 +23,7 @@
margin-top: 0px; margin-top: 0px;
} }
form#jury_but { .jury_but_box {
margin: 0px 16px 16px 16px; margin: 0px 16px 16px 16px;
background-color: rgb(253, 253, 231); background-color: rgb(253, 253, 231);
border: 2px solid rgb(4, 4, 118); border: 2px solid rgb(4, 4, 118);
@ -35,7 +35,9 @@ form#jury_but {
min-width: var(--sco-content-min-width); min-width: var(--sco-content-min-width);
max-width: var(--sco-content-max-width); max-width: var(--sco-content-max-width);
} }
div.jury_but_box_title {
margin-bottom: 10px;
}
.but_annee { .but_annee {
margin-left: 32px; margin-left: 32px;
display: inline-grid; display: inline-grid;

View File

@ -42,12 +42,17 @@ from flask_login import current_user
from app import db from app import db
from app import models from app import models
from app.auth.models import User from app.auth.models import User
from app.but import apc_edit_ue from app.but import (
from app.but import jury_but, jury_but_validation_auto apc_edit_ue,
cursus_but,
jury_edit_manual,
jury_but,
jury_but_pv,
jury_but_validation_auto,
jury_but_view,
)
from app.but.forms import jury_but_forms from app.but.forms import jury_but_forms
from app.but import jury_but_pv
from app.but import jury_but_view
from app.but import jury_edit_manual
from app.comp import jury, res_sem from app.comp import jury, res_sem
from app.comp.res_compat import NotesTableCompat from app.comp.res_compat import NotesTableCompat
@ -2368,7 +2373,10 @@ def formsemestre_validation_but(
page_title=f"Validation BUT S{formsemestre.semestre_id}", page_title=f"Validation BUT S{formsemestre.semestre_id}",
formsemestre_id=formsemestre_id, formsemestre_id=formsemestre_id,
etudid=etudid, etudid=etudid,
cssstyles=("css/jury_but.css",), cssstyles=[
"css/jury_but.css",
"css/cursus_but.css",
],
javascripts=("js/jury_but.js",), javascripts=("js/jury_but.js",),
), ),
"""<div class="jury_but"> """<div class="jury_but">
@ -2469,7 +2477,7 @@ def formsemestre_validation_but(
{warning} {warning}
</div> </div>
<form method="post" id="jury_but"> <form method="post" class="jury_but_box" id="jury_but">
""" """
) )
@ -2546,6 +2554,19 @@ def formsemestre_validation_but(
</div> </div>
""" """
) )
# Affichage cursus BUT
but_cursus = cursus_but.EtudCursusBUT(etud, deca.formsemestre.formation)
H += [
"""<div class="jury_but_box">
<div class="jury_but_box_title"><b>Niveaux de compétences enregistrés :</b></div>
""",
render_template(
"but/cursus_etud.j2",
cursus=but_cursus,
scu=scu,
),
"</div>",
]
H.append( H.append(
render_template( render_template(
"but/documentation_codes_jury.j2", "but/documentation_codes_jury.j2",