diff --git a/app/but/jury_but.py b/app/but/jury_but.py index 74fd9687c..561ba5433 100644 --- a/app/but/jury_but.py +++ b/app/but/jury_but.py @@ -266,6 +266,8 @@ class DecisionsProposeesAnnee(DecisionsProposees): explanation: {self.explanation} """ + def annee_scolaire_sr(self) + def comp_formsemestres( self, formsemestre: FormSemestre ) -> tuple[FormSemestre, FormSemestre]: diff --git a/app/static/css/jury_but.css b/app/static/css/jury_but.css new file mode 100644 index 000000000..beffba975 --- /dev/null +++ b/app/static/css/jury_but.css @@ -0,0 +1,68 @@ +/* Saisie décision de jury BUT */ + +.jury_but { + font-family: Verdana, Geneva, Tahoma, sans-serif; +} + +.but_annee { + display: inline-grid; + grid-template-columns: repeat(4, auto); + gap: 4px; +} + +.but_annee_caption { + grid-column: 4 / 5; +} + +.but_annee_caption, +.but_niveau_titre { + background: #09c !important; + color: #FFF; + padding: 8px !important; +} + +.but_annee>* { + display: flex; + align-items: center; + padding: 0px 16px; + background: #FFF; + border: 1px solid #aaa; + border-radius: 8px; +} + +.but_annee>div.titre { + background: rgb(242, 242, 238); + border: none; + border-radius: 0px; + border-bottom: 1px solid gray; +} + +.but_niveau_ue>div:nth-child(1), +.but_note { + border-right: 1px solid #aaa; + padding: 8px; +} + +.but_annee select { + padding: 8px 8px; + border: none; +} + +.but_niveau_rcue, +.but_niveau_rcue>* { + border-color: #09c; + font-weight: bold; +} + +div.but_section_annee { + margin-bottom: 10px; +} + +div.but_settings { + margin-top: 16px; +} + +span.but_explanation { + color: blueviolet; + font-style: italic; +} \ No newline at end of file diff --git a/app/static/js/jury_but.js b/app/static/js/jury_but.js new file mode 100644 index 000000000..a2f13dd18 --- /dev/null +++ b/app/static/js/jury_but.js @@ -0,0 +1,6 @@ + + +// active les menus des codes "manuels" (année, RCUEs) +function enable_manual_codes(elt) { + $(".jury_but select.manual").prop("disabled", !elt.checked); +} diff --git a/app/views/notes.py b/app/views/notes.py index 99cd224e6..020d1cca4 100644 --- a/app/views/notes.py +++ b/app/views/notes.py @@ -2234,10 +2234,13 @@ def formsemestre_validation_but(formsemestre_id: int, etudid: int): # XXX TODO Page expérimentale pour les devs H = [ html_sco_header.sco_header( - page_title="Validation BUT", formsemestre_id=formsemestre_id, etudid=etudid + page_title="Validation BUT", + formsemestre_id=formsemestre_id, + etudid=etudid, + cssstyles=("css/jury_but.css",), + javascripts=("js/jury_but.js",), ), f""" -