From 31505e1330c9fee7d03cca0aee68c835a3af1474 Mon Sep 17 00:00:00 2001 From: Emmanuel Viennet Date: Sat, 18 Sep 2021 14:21:15 +0200 Subject: [PATCH] =?UTF-8?q?d=C3=A9tails=20feuille=20placement?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/scodoc/sco_moduleimpl_status.py | 5 +- app/scodoc/sco_placement.py | 5 +- app/templates/scodoc/forms/placement.html | 107 +++++++++++----------- 3 files changed, 62 insertions(+), 55 deletions(-) diff --git a/app/scodoc/sco_moduleimpl_status.py b/app/scodoc/sco_moduleimpl_status.py index fd062f64d..cb78688f5 100644 --- a/app/scodoc/sco_moduleimpl_status.py +++ b/app/scodoc/sco_moduleimpl_status.py @@ -128,8 +128,9 @@ def moduleimpl_evaluation_menu(evaluation_id, nbnotes=0, REQUEST=None): "args": { "evaluation_id": evaluation_id, }, - "enabled": nbnotes == 0 - and sco_permissions_check.can_edit_notes(current_user, E["moduleimpl_id"]), + "enabled": sco_permissions_check.can_edit_notes( + current_user, E["moduleimpl_id"] + ), }, { "title": "Absences ce jour", diff --git a/app/scodoc/sco_placement.py b/app/scodoc/sco_placement.py index 5df8976df..ab9777b44 100644 --- a/app/scodoc/sco_placement.py +++ b/app/scodoc/sco_placement.py @@ -107,7 +107,10 @@ class PlacementForm(FlaskForm): batiment = StringField("Batiment") salle = StringField("Salle") nb_rangs = SelectField( - "nb_rangs", coerce=int, choices=[3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14] + "nb de places en largeur", + coerce=int, + choices=[3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14], + description="largeur de la salle, en nombre de places", ) etiquetage = RadioField( "Numérotation", diff --git a/app/templates/scodoc/forms/placement.html b/app/templates/scodoc/forms/placement.html index f2c11b159..5d2c3c205 100644 --- a/app/templates/scodoc/forms/placement.html +++ b/app/templates/scodoc/forms/placement.html @@ -1,34 +1,34 @@ {% import 'bootstrap/wtf.html' as wtf %} {% macro render_field(field) %} - - {{ field.label }} - {{ field()|safe }} + + {{ field.label }} + {{ field()|safe }} {% if field.errors %} - {% endif %} - - + + {% endmacro %}
-
- {{ form.evaluation_id }} - {{ form.csrf_token }} - - - {{ render_field(form.surveillants) }} - {{ render_field(form.batiment) }} - {{ render_field(form.salle) }} - {{ render_field(form.nb_rangs) }} - {{ render_field(form.etiquetage) }} - {% if form.has_groups %} - {{ render_field(form.groups) }} - - {% endif %} - {{ render_field(form.file_format) }} - -
-

- - - -

+ {% endif %} + {{ render_field(form.file_format) }} + + +

+ + + +

Explications

- -
- - + + \ No newline at end of file