jmplace/ScoDoc-Lille
1
0
Fork 0
forked from ScoDoc/ScoDoc
Code Issues Pull Requests Projects Releases Wiki Activity

test ajout cb

Browse Source
This commit is contained in:
Jean-Marie Place 2021-09-21 05:35:56 +02:00
parent b552588c1c
commit b05aea95b6
2 changed files with 81 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

95
app/scodoc/sco_placement.py
View File

@ -46,7 +46,8 @@ from wtforms import (
RadioField,
HiddenField,
SelectMultipleField,
BooleanField, FormField,
BooleanField,
FormField,
)
from wtforms.form import BaseForm
@ -87,7 +88,7 @@ def _get_group_info(evaluation_id):
group_name = group["group_name"] or TOUS
if partition not in groups_tree:
groups_tree[partition] = {}
name = "G_%s_%s" % (partition, group_name)
name = "GR_%s_%s" % (partition, group_name)
groups_tree[partition][group_name] = {
"id": group_id,
"field": BooleanField(name),
@ -96,21 +97,9 @@ def _get_group_info(evaluation_id):
return groups_tree
def form_from(groups_tree):
def create_form(prefix='', **kwargs):
fields = [(groups_tree[partition][groupe]['name'], groups_tree[partition][groupe]['field'])
for partition in groups_tree
for groupe in groups_tree[partition]
]
form_enclosed = BaseForm(fields, prefix=prefix, meta=FlaskForm.Meta)
form_enclosed.process(**kwargs)
return form_enclosed
return create_form
class PlacementForm(FlaskForm):
"""Formulaire pour placement des étudiants en Salle"""
evaluation_id = HiddenField("evaluation_id")
file_format = RadioField(
"Format de fichier",
@ -132,34 +121,64 @@ class PlacementForm(FlaskForm):
wtforms.validators.DataRequired("indiquez le style de numérotation"),
],
)
groups = SelectMultipleField(
"Groupe(s)",
validators=[
wtforms.validators.DataRequired("indiquez au moins un groupe"),
],
)
cb_groups = FormField("cb_groups")
# groups = SelectMultipleField(
# "Groupe(s)",
# validators=[
# wtforms.validators.DataRequired("indiquez au moins un groupe"),
# ],
# )
submit = SubmitField("OK")
dynamic_fields = {}
def __init__(self, groups_tree, formdata=None, data=None):
super().__init__(formdata=formdata, data=data)
self.groups_tree = groups_tree
self.nb_partitions = len(self.groups_tree)
self.has_groups = self.nb_partitions > 1
self.set_evaluation_infos(data["evaluation_id"])
def clear_dynamics(self):
if self.dynamic_fields:
for field_name in self.dynamic_fields:
del self._fields[field_name]
def set_evaluation_infos(self, evaluation_id):
def add_dynamic(self, name, field):
breakpoint()
bind_field = self._fields[name] = self.meta.bind_field(
form=self, unbound_field=field, options={"name": name, "prefix": self._prefix}
)
self.__setattr__(name, bind_field)
breakpoint()
self.dynamic_fields[name] = field
def get_dynamic(self, name):
return self.dynamic_fields[name]
def __init__(self, groups_tree, formdata=None, data=None, **kwargs):
super().__init__(formdata=formdata, data=data, **kwargs)
# first remove previous dynamic fields that might have been created for this form
self.clear_dynamics()
self.add_dynamic("test_cb", BooleanField("test_cb"))
# compute the values for new dynamic fields
evaluation_id = data["evaluation_id"]
# self.groups_tree = groups_tree
# self.nb_groups = sum([len(x) for x in groups_tree.values()])
# self.has_groups = self.nb_groups > 1
# add dynamic fields to Class
# for partition in groups_tree:
# for groupe in groups_tree[partition]:
# name = self.groups_tree[partition][groupe].name
# field = self.groups_tree[partition][groupe].field
# self.dynamic_fields.add(name)
# self._fields[name] = field
# create the form (including new dynamic fields) and proccess all fields
"""Initialise les données du formulaire avec les données de l'évaluation."""
eval_data = sco_evaluations.do_evaluation_list({"evaluation_id": evaluation_id})
if not eval_data:
raise ScoValueError("invalid evaluation_id")
if self.has_groups:
choices = []
for partition in self.groups_tree:
for groupe in self.groups_tree[partition]:
groupe_id = str(self.groups_tree[partition][groupe])
choices.append((groupe_id, "%s (%s)" % (str(groupe), partition)))
self.groups.choices = choices
# if self.has_groups:
# choices = []
# for partition in self.groups_tree:
# for groupe in self.groups_tree[partition]:
# groupe_id = str(self.groups_tree[partition][groupe])
# choices.append((groupe_id, "%s (%s)" % (str(groupe), partition)))
# self.groups.choices = choices
self.groups_tree = groups_tree
self.nb_partitions = len(self.groups_tree)
self.has_groups = self.nb_partitions > 1
def get_checkbox(self, partition, groupe):
return self.groups_tree[partition][groupe]["field"]
@ -199,8 +218,6 @@ class _Distributeur2D:
def placement_eval_selectetuds(evaluation_id):
"""Creation de l'écran de placement"""
groups_tree = _get_group_info(evaluation_id)
breakpoint()
PlacementForm.cb_groups = form_from(groups_tree)
form = PlacementForm(
groups_tree,
request.form,
@ -633,7 +650,7 @@ class PlacementRunner:
ws0.set_column_dimension_width("A", 750 * column_width_ratio)
for col in range(nb_rangs):
ws0.set_column_dimension_width(
"ABCDEFGHIJKLMNOPQRSTUVWXYZ"[col + 1: col + 2], width
"ABCDEFGHIJKLMNOPQRSTUVWXYZ"[col + 1 : col + 2], width
)
sheet_name_1 = "Positions"

35
app/templates/scodoc/forms/placement.html
View File

@ -27,24 +27,25 @@
{{ render_field(form.nb_rangs) }}
{{ render_field(form.etiquetage) }}
{% if form.has_groups %}
{{ render_field(form.groups) }}
{# {{ render_field(form.groups) }}#}
{{ form.get_dynamic("test_cb") }}
{# Tentative de recréer le choix des groupes sous forme de cases à cocher // demande à créer des champs wtf dynamiquement #}
<tr><th>Groupes</th>
<td><table><tbody>
{% for partition in form.groups_tree %}
<tr>
{# {% if partition == 'Tous' %}#}
{# <td colspan="{{ form.nb_max_groups }}">Tous</td>#}
{# {% else %}#}
<th>{{ partition }}</th>
{% for groupe in form.groups_tree[partition] %}
<td>{{ groupe }}{{ form.get_checkbox(partition, groupe)()|safe() }}</td>
{% endfor %}
{# {% endif %}#}
</tr>
{% endfor %}
</tbody></table></td>
</tr>
{# <tr><th>Groupes</th>#}
{# <td><table><tbody>#}
{# {% for partition in form.groups_tree %}#}
{# <tr>#}
{#1 {% if partition == 'Tous' %}#}
{#1 <td colspan="{{ form.nb_max_groups }}">Tous</td>#}
{#1 {% else %}#}
{# <th>{{ partition }}</th>#}
{# {% for groupe in form.groups_tree[partition] %}#}
{# <td>{{ groupe }}{{ form.get_checkbox(partition, groupe)()|safe() }}</td>#}
{# {% endfor %}#}
{#1 {% endif %}#}
{# </tr>#}
{# {% endfor %}#}
{# </tbody></table></td>#}
{# </tr>#}
{# Fin tentative #}
{% endif %}
{{ render_field(form.file_format) }}