diff --git a/app/models/formsemestre.py b/app/models/formsemestre.py
index 4506eed0105ebcd137178148c915daa3a7a07198..322958165cc6684c866d9a19b44fbac096e27b95 100644
--- a/app/models/formsemestre.py
+++ b/app/models/formsemestre.py
@@ -187,7 +187,7 @@ class FormSemestre(db.Model):
def get_formsemestre(
cls, formsemestre_id: int | str, dept_id: int = None
) -> "FormSemestre":
- """ "FormSemestre ou 404, cherche uniquement dans le département spécifié ou le courant"""
+ """FormSemestre ou 404, cherche uniquement dans le département spécifié ou le courant"""
if not isinstance(formsemestre_id, int):
try:
formsemestre_id = int(formsemestre_id)
diff --git a/app/models/moduleimpls.py b/app/models/moduleimpls.py
index b674ed99621053ac86157938dae639e1e4397591..9cb168eb90b62bc4fa3348e89a36583af700489b 100644
--- a/app/models/moduleimpls.py
+++ b/app/models/moduleimpls.py
@@ -2,6 +2,7 @@
"""ScoDoc models: moduleimpls
"""
import pandas as pd
+from flask import abort, g
from flask_sqlalchemy.query import Query
from app import db
@@ -82,6 +83,23 @@ class ModuleImpl(db.Model):
df_cache.EvaluationsPoidsCache.set(self.id, evaluations_poids)
return evaluations_poids
+ @classmethod
+ def get_modimpl(cls, moduleimpl_id: int | str, dept_id: int = None) -> "ModuleImpl":
+ """FormSemestre ou 404, cherche uniquement dans le département spécifié ou le courant."""
+ from app.models.formsemestre import FormSemestre
+
+ if not isinstance(moduleimpl_id, int):
+ try:
+ moduleimpl_id = int(moduleimpl_id)
+ except (TypeError, ValueError):
+ abort(404, "moduleimpl_id invalide")
+ if g.scodoc_dept:
+ dept_id = dept_id if dept_id is not None else g.scodoc_dept_id
+ query = cls.query.filter_by(id=moduleimpl_id)
+ if dept_id is not None:
+ query = query.join(FormSemestre).filter_by(dept_id=dept_id)
+ return query.first_or_404()
+
def invalidate_evaluations_poids(self):
"""Invalide poids cachés"""
df_cache.EvaluationsPoidsCache.delete(self.id)
diff --git a/app/scodoc/sco_moduleimpl_inscriptions.py b/app/scodoc/sco_moduleimpl_inscriptions.py
index 34b3d3bd6e570cf5176bdc780d3f6646fe70f815..487368f0c174b2a6941cb404c50c5baa7bb65141 100644
--- a/app/scodoc/sco_moduleimpl_inscriptions.py
+++ b/app/scodoc/sco_moduleimpl_inscriptions.py
@@ -40,6 +40,7 @@ from app.comp.res_compat import NotesTableCompat
from app.models import (
FormSemestre,
Identite,
+ ModuleImpl,
Partition,
ScolarFormSemestreValidation,
UniteEns,
@@ -52,7 +53,6 @@ from app.scodoc import codes_cursus
from app.scodoc import sco_edit_module
from app.scodoc import sco_edit_ue
from app.scodoc import sco_etud
-from app.scodoc import sco_formsemestre
from app.scodoc import sco_formsemestre_inscriptions
from app.scodoc import sco_groups
from app.scodoc import sco_moduleimpl
@@ -63,7 +63,9 @@ import app.scodoc.sco_utils as scu
from app.tables import list_etuds
-def moduleimpl_inscriptions_edit(moduleimpl_id, etuds=[], submitted=False):
+def moduleimpl_inscriptions_edit(
+ moduleimpl_id, etudids: list[int] | None = None, submitted=False
+):
"""Formulaire inscription des etudiants a ce module
* Gestion des inscriptions
Nom TD TA TP (triable)
@@ -75,12 +77,12 @@ def moduleimpl_inscriptions_edit(moduleimpl_id, etuds=[], submitted=False):
* Si pas les droits: idem en readonly
"""
- M = sco_moduleimpl.moduleimpl_list(moduleimpl_id=moduleimpl_id)[0]
- formsemestre_id = M["formsemestre_id"]
- mod = sco_edit_module.module_list(args={"module_id": M["module_id"]})[0]
- sem = sco_formsemestre.get_formsemestre(formsemestre_id)
+ etudids = etudids or []
+ modimpl = ModuleImpl.get_modimpl(moduleimpl_id)
+ module = modimpl.module
+ formsemestre = modimpl.formsemestre
# -- check lock
- if not sem["etat"]:
+ if not formsemestre.etat:
raise ScoValueError("opération impossible: semestre verrouille")
header = html_sco_header.sco_header(
page_title="Inscription au module",
@@ -90,25 +92,23 @@ def moduleimpl_inscriptions_edit(moduleimpl_id, etuds=[], submitted=False):
footer = html_sco_header.sco_footer()
H = [
header,
- """<h2>Inscriptions au module <a href="moduleimpl_status?moduleimpl_id=%s">%s</a> (%s)</a></h2>
+ f"""<h2>Inscriptions au module <a class="stdlink" href="{
+ url_for("notes.moduleimpl_status", scodoc_dept=g.scodoc_dept,
+ moduleimpl_id=moduleimpl_id)
+ }">{module.titre or "(module sans titre)"}</a> ({module.code})</a></h2>
<p class="help">Cette page permet d'éditer les étudiants inscrits à ce module
(ils doivent évidemment être inscrits au semestre).
- Les étudiants cochés sont (ou seront) inscrits. Vous pouvez facilement inscrire ou
+ Les étudiants cochés sont (ou seront) inscrits. Vous pouvez inscrire ou
désinscrire tous les étudiants d'un groupe à l'aide des menus "Ajouter" et "Enlever".
</p>
- <p class="help">Aucune modification n'est prise en compte tant que l'on n'appuie pas sur le bouton
- "Appliquer les modifications".
+ <p class="help">Aucune modification n'est prise en compte tant que l'on n'appuie pas
+ sur le bouton "Appliquer les modifications".
</p>
- """
- % (
- moduleimpl_id,
- mod["titre"] or "(module sans titre)",
- mod["code"] or "(module sans code)",
- ),
+ """,
]
# Liste des inscrits à ce semestre
inscrits = sco_formsemestre_inscriptions.do_formsemestre_inscription_listinscrits(
- formsemestre_id
+ formsemestre.id
)
for ins in inscrits:
etuds_info = sco_etud.get_etud_info(etudid=ins["etudid"], filled=1)
@@ -121,12 +121,10 @@ def moduleimpl_inscriptions_edit(moduleimpl_id, etuds=[], submitted=False):
)
ins["etud"] = etuds_info[0]
inscrits.sort(key=lambda inscr: sco_etud.etud_sort_key(inscr["etud"]))
- in_m = sco_moduleimpl.do_moduleimpl_inscription_list(
- moduleimpl_id=M["moduleimpl_id"]
- )
- in_module = set([x["etudid"] for x in in_m])
+ in_m = sco_moduleimpl.do_moduleimpl_inscription_list(moduleimpl_id=modimpl.id)
+ in_module = {x["etudid"] for x in in_m}
#
- partitions = sco_groups.get_partitions_list(formsemestre_id)
+ partitions = sco_groups.get_partitions_list(formsemestre.id)
#
if not submitted:
H.append(
@@ -149,27 +147,32 @@ def moduleimpl_inscriptions_edit(moduleimpl_id, etuds=[], submitted=False):
}
}
- </script>"""
+ </script>
+ <style>
+ table.mi_table td, table.mi_table th {
+ text-align: left;
+ }
+ </style>
+ """
)
H.append(
f"""<form method="post" id="mi_form" action="{request.base_url}">
- <input type="hidden" name="moduleimpl_id" value="{M['moduleimpl_id']}"/>
+ <input type="hidden" name="moduleimpl_id" value="{modimpl.id}"/>
<input type="submit" name="submitted" value="Appliquer les modifications"/>
- <p></p>
- <table><tr>
- { _make_menu(partitions, "Ajouter", "true") }
- { _make_menu(partitions, "Enlever", "false")}
- </tr></table>
- <p><br></p>
- <table class="sortable" id="mi_table">
+ <div>
+ { _make_menu(partitions, "Ajouter", "true") }
+ { _make_menu(partitions, "Enlever", "false")}
+ </div>
+ <table class="gt_table mi_table">
+ <thead>
<tr>
- <th>Nom</th>
+ <th class="etud">Nom</th>
"""
)
for partition in partitions:
if partition["partition_name"]:
- H.append("<th>%s</th>" % partition["partition_name"])
- H.append("</tr>")
+ H.append(f"<th>{partition['partition_name']}</th>")
+ H.append("</tr></thead><tbody>")
for ins in inscrits:
etud = ins["etud"]
@@ -178,24 +181,20 @@ def moduleimpl_inscriptions_edit(moduleimpl_id, etuds=[], submitted=False):
else:
checked = ""
H.append(
- """<tr><td><input type="checkbox" name="etuds:list" value="%s" %s>"""
- % (etud["etudid"], checked)
+ f"""<tr><td class="etud"><input type="checkbox" name="etudids:list" value="{etud['etudid']}" {checked}>"""
)
H.append(
- """<a class="discretelink etudinfo" href="%s" id="%s">%s</a>"""
- % (
+ f"""<a class="discretelink etudinfo" href="{
url_for(
"scolar.ficheEtud",
scodoc_dept=g.scodoc_dept,
etudid=etud["etudid"],
- ),
- etud["etudid"],
- etud["nomprenom"],
- )
+ )
+ }" id="{etud['etudid']}">{etud['nomprenom']}</a>"""
)
H.append("""</input></td>""")
- groups = sco_groups.get_etud_groups(etud["etudid"], formsemestre_id)
+ groups = sco_groups.get_etud_groups(etud["etudid"], formsemestre.id)
for partition in partitions:
if partition["partition_name"]:
gr_name = ""
@@ -205,11 +204,11 @@ def moduleimpl_inscriptions_edit(moduleimpl_id, etuds=[], submitted=False):
break
# gr_name == '' si etud non inscrit dans un groupe de cette partition
H.append(f"<td>{gr_name}</td>")
- H.append("""</table></form>""")
+ H.append("""</tbody></table></form>""")
else: # SUBMISSION
# inscrit a ce module tous les etuds selectionnes
sco_moduleimpl.do_moduleimpl_inscrit_etuds(
- moduleimpl_id, formsemestre_id, etuds, reset=True
+ moduleimpl_id, formsemestre.id, etudids, reset=True
)
return flask.redirect(
url_for(
@@ -225,10 +224,10 @@ def moduleimpl_inscriptions_edit(moduleimpl_id, etuds=[], submitted=False):
def _make_menu(partitions: list[dict], title="", check="true") -> str:
"""Menu with list of all groups"""
- items = [{"title": "Tous", "attr": "onclick=\"group_select('', -1, %s)\"" % check}]
+ items = [{"title": "Tous", "attr": f"onclick=\"group_select('', -1, {check})\""}]
p_idx = 0
for partition in partitions:
- if partition["partition_name"] != None:
+ if partition["partition_name"] is not None:
p_idx += 1
for group in sco_groups.get_partition_groups(partition):
items.append(
@@ -240,9 +239,9 @@ def _make_menu(partitions: list[dict], title="", check="true") -> str:
}
)
return (
- '<td class="inscr_addremove_menu">'
+ '<div class="inscr_addremove_menu">'
+ htmlutils.make_menu(title, items, alone=True)
- + "</td>"
+ + "</div>"
)
diff --git a/app/static/css/scodoc.css b/app/static/css/scodoc.css
index f42cc0f6d58f343269f1d3272524653162915ee3..ac2c691a35f7ad5b25cfc7436ee97a4f082294d0 100644
--- a/app/static/css/scodoc.css
+++ b/app/static/css/scodoc.css
@@ -1736,7 +1736,9 @@ formsemestre_page_title .lock img {
width: 200px !important;
}
-span.inscr_addremove_menu {
+div.inscr_addremove_menu {
+ display: inline-block;
+ margin: 8px 0px;
width: 150px;
}
diff --git a/sco_version.py b/sco_version.py
index 7b986ac6c91816af6ea7a9c73efe6e54bed77d5e..6535cd674e837fe0e32c361e274d6fa4953c48f6 100644
--- a/sco_version.py
+++ b/sco_version.py
@@ -1,7 +1,7 @@
# -*- mode: python -*-
# -*- coding: utf-8 -*-
-SCOVERSION = "9.6.78"
+SCOVERSION = "9.6.79"
SCONAME = "ScoDoc"