arthur.zhu/ScoDoc
1
0
Fork 0
forked from ScoDoc/ScoDoc
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request 'patch_placement' (#127) from jmplace/ScoDoc-Lille:patch_placement into master

Browse Source 
Reviewed-on: https://scodoc.org/git/viennet/ScoDoc/pulls/127
This commit is contained in:
Emmanuel Viennet 2021-09-19 16:14:58 +02:00
commit 29221666a4
2 changed files with 26 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
app/scodoc/sco_placement.py
View File

@ -89,6 +89,9 @@ def _get_group_info(evaluation_id):
if partition != TOUS:
has_groups = True
nb_groups = len(groups_tree)
else:
has_groups = False
nb_groups = 1
return groups_tree, has_groups, nb_groups
@ -121,9 +124,7 @@ class PlacementForm(FlaskForm):
)
groups = SelectMultipleField(
"Groupe(s)",
validators=[
wtforms.validators.DataRequired("indiquez au moins un groupe"),
],
validators=[],
)
submit = SubmitField("OK")
@ -131,8 +132,8 @@ class PlacementForm(FlaskForm):
super().__init__(formdata=formdata, data=data)
self.groups_tree = {}
self.has_groups = None
self.group_tree_length = None
self.nb_groups = None
self.tous_id = None
self.set_evaluation_infos(data["evaluation_id"])
def set_evaluation_infos(self, evaluation_id):
@ -143,13 +144,20 @@ class PlacementForm(FlaskForm):
self.groups_tree, self.has_groups, self.nb_groups = _get_group_info(
evaluation_id
)
if self.has_groups:
choices = []
for partition in self.groups_tree:
for groupe in self.groups_tree[partition]:
if (
groupe == TOUS
): # Affichage et valeur spécifique pour le groupe TOUS
self.tous_id = str(self.groups_tree[partition][groupe])
choices.append((TOUS, TOUS))
else:
groupe_id = str(self.groups_tree[partition][groupe])
choices.append((groupe_id, "%s (%s)" % (str(groupe), partition)))
self.groups.choices = choices
# self.groups.default = [TOUS] # Ne fonctionnne pas... (ni dans la déclaration de PlaceForm.groups)
# la réponse [] est de toute façon transposée en [ self.tous_id ] lors du traitement (cas du groupe unique)
class _DistributeurContinu:
@ -201,7 +209,6 @@ def placement_eval_selectetuds(evaluation_id):
% runner.__dict__
)
return runner.exec_placement() # calcul et generation du fichier
# return flask.redirect(url_for("scodoc.index"))
htmls = [
html_sco_header.sco_header(init_jquery_ui=True),
sco_evaluations.evaluation_describe(evaluation_id=evaluation_id),
@ -224,7 +231,12 @@ class PlacementRunner:
self.salle = form["salle"].data
self.nb_rangs = form["nb_rangs"].data
self.file_format = form["file_format"].data
self.groups_ids = form["groups"].data
if len(form["groups"].data) == 0:
self.groups_ids = [form.tous_id]
else: # On remplace le mot-clé TOUS le l'identiant de ce groupe
self.groups_ids = [
gid if gid != TOUS else form.tous_id for gid in form["groups"].data
]
self.eval_data = sco_evaluations.do_evaluation_list(
{"evaluation_id": self.evaluation_id}
)[0]
@ -504,6 +516,7 @@ class PlacementRunner:
cells_b = [ws0.make_cell("", self.styles["2b"])]
cells_c = [ws0.make_cell("", self.styles["2b"])]
row = 13 # première ligne de signature
rang += 1
for linetud in self.plan:
cells_a.append(ws0.make_cell(linetud[0][0], self.styles["1t"])) # nom
cells_b.append(ws0.make_cell(linetud[0][1], self.styles["1m"])) # prenom

2
app/static/css/scodoc.css
View File

@ -1094,6 +1094,8 @@ h2.formsemestre, .gtrcontent h2 {
}
.wtf-field li {
display: inline;
}.wtf-field ul {
padding-left: 0;
}
.wtf-field .errors {
color: red ; font-weight: bold;