diff --git a/app/static/css/parcour_formation.css b/app/static/css/parcour_formation.css index 9df26fe03..a08bdac8a 100644 --- a/app/static/css/parcour_formation.css +++ b/app/static/css/parcour_formation.css @@ -159,6 +159,12 @@ option.non_associe { margin-bottom: 8px; } +div.ue_validation_code { + display: inline-block; +} +div.ue_validation_code div.code { + margin-left: 12px; +} select.validation_rcue { display: inline-block; margin-left: 32px; diff --git a/app/templates/but/validation_rcues.j2 b/app/templates/but/validation_rcues.j2 index 5ad913987..ebb556738 100644 --- a/app/templates/but/validation_rcues.j2 +++ b/app/templates/but/validation_rcues.j2 @@ -13,7 +13,7 @@ {{ niv['ue_'+sem].acronyme }} {% set validation = ue_validation_by_niveau.get((niv['niveau'].id, sem)) %}
-
+
{% if validation %} {{validation.code}} {% else %} @@ -80,7 +80,7 @@ {{niv['niveau'].libelle if niv['niveau'] else ''}}
-
+
{% set validation = rcue_validation_by_niveau.get(niv['niveau'].id) %} {% if validation %} @@ -97,6 +97,7 @@ data-ue1_id="{{niv['ue_impair'].id}}" data-ue2_id="{{niv['ue_pair'].id}}" + data-code="{{validation.code if validation else ''}}" > {% for code in rcue_codes %}
-
+
{{ show_ue(niv, "impair", 2*annee-1) }}
-
+
{{ show_ue(niv, "pair", 2*annee) }}
@@ -206,11 +207,12 @@ function record_rcue_validation(event, niveau_id) { .then(response => response.json()) .then(data => { if (data.status) { - /* sco_message(data.message); */ + sco_message(data.message); /* revert menu to initial state */ - event.target.value = event.target.dataset.ue_id; + event.target.value = event.target.dataset.code; + } else { + sco_message("code jury enregistré"); } - location.reload(); }); }