diff --git a/app/scodoc/sco_formations.py b/app/scodoc/sco_formations.py
index caeeb707b..573c95dfb 100644
--- a/app/scodoc/sco_formations.py
+++ b/app/scodoc/sco_formations.py
@@ -151,8 +151,14 @@ def formation_export(
if mod["ects"] is None:
del mod["ects"]
+ filename = f"scodoc_formation_{formation.departement.acronym}_{formation.acronyme or ''}_v{formation.version}"
return scu.sendResult(
- F, name="formation", format=format, force_outer_xml_tag=False, attached=True
+ F,
+ name="formation",
+ format=format,
+ force_outer_xml_tag=False,
+ attached=True,
+ filename=filename,
)
diff --git a/app/scodoc/sco_formsemestre_edit.py b/app/scodoc/sco_formsemestre_edit.py
index f056a3e62..7174cfc3d 100644
--- a/app/scodoc/sco_formsemestre_edit.py
+++ b/app/scodoc/sco_formsemestre_edit.py
@@ -545,7 +545,7 @@ def do_formsemestre_createwithmodules(edit=False):
for semestre_id in semestre_ids:
if formation.is_apc():
# pour restreindre l'édition aux module du semestre sélectionné
- tr_class = 'class="sem{semestre_id}"'
+ tr_class = f'class="sem{semestre_id}"'
else:
tr_class = ""
if edit:
diff --git a/app/scodoc/sco_groups_exports.py b/app/scodoc/sco_groups_exports.py
new file mode 100644
index 000000000..b2e95545f
--- /dev/null
+++ b/app/scodoc/sco_groups_exports.py
@@ -0,0 +1,96 @@
+# -*- mode: python -*-
+# -*- coding: utf-8 -*-
+
+##############################################################################
+#
+# Gestion scolarite IUT
+#
+# Copyright (c) 1999 - 2022 Emmanuel Viennet. All rights reserved.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+#
+# Emmanuel Viennet emmanuel.viennet@viennet.net
+#
+##############################################################################
+
+"""Exports groupes
+"""
+from flask import request
+
+from app.scodoc import notesdb as ndb
+from app.scodoc import sco_excel
+from app.scodoc import sco_groups_view
+from app.scodoc import sco_preferences
+from app.scodoc.gen_tables import GenTable
+import app.scodoc.sco_utils as scu
+import sco_version
+
+
+def groups_list_annotation(group_ids: list[int]) -> list[dict]:
+ """Renvoie la liste des annotations pour les groupes d"étudiants indiqués
+ Arg: liste des id de groupes
+ Clés: etudid, ine, nip, nom, prenom, date, comment
+ """
+ cnx = ndb.GetDBConnexion()
+ cursor = cnx.cursor(cursor_factory=ndb.ScoDocCursor)
+ annotations = []
+ for group_id in group_ids:
+ cursor.execute(
+ """SELECT i.id AS etudid, i.code_nip, i.code_ine, i.nom, i.prenom, ea.date, ea.comment
+ FROM group_membership gm, identite i, etud_annotations ea
+ WHERE gm.group_id=%(group_ids)s
+ AND gm.etudid=i.id
+ AND i.id=ea.etudid
+ """,
+ {"group_ids": group_id},
+ )
+ annotations += cursor.dictfetchall()
+ return annotations
+
+
+def groups_export_annotations(group_ids, formsemestre_id=None, format="html"):
+ """Les annotations"""
+ groups_infos = sco_groups_view.DisplayedGroupsInfos(
+ group_ids, formsemestre_id=formsemestre_id
+ )
+ annotations = groups_list_annotation(groups_infos.group_ids)
+ for annotation in annotations:
+ annotation["date_str"] = annotation["date"].strftime("%d/%m/%Y à %Hh%M")
+ if format == "xls":
+ columns_ids = ("etudid", "nom", "prenom", "date", "comment")
+ else:
+ columns_ids = ("etudid", "nom", "prenom", "date_str", "comment")
+ table = GenTable(
+ rows=annotations,
+ columns_ids=columns_ids,
+ titles={
+ "etudid": "etudid",
+ "nom": "Nom",
+ "prenom": "Prénom",
+ "date": "Date",
+ "date_str": "Date",
+ "comment": "Annotation",
+ },
+ origin="Généré par %s le " % sco_version.SCONAME
+ + scu.timedate_human_repr()
+ + "",
+ page_title=f"Annotations sur les étudiants de {groups_infos.groups_titles}",
+ caption="Annotations",
+ base_url=groups_infos.base_url,
+ html_sortable=True,
+ html_class="table_leftalign",
+ preferences=sco_preferences.SemPreferences(formsemestre_id),
+ )
+ return table.make_page(format=format)
diff --git a/app/scodoc/sco_groups_view.py b/app/scodoc/sco_groups_view.py
index 5b89ab44f..259256bd4 100644
--- a/app/scodoc/sco_groups_view.py
+++ b/app/scodoc/sco_groups_view.py
@@ -826,6 +826,8 @@ def tab_absences_html(groups_infos, etat=None):
% groups_infos.groups_query_args,
"""
- {% for ue in formation.ues.filter_by(semestre_idx=semestre_idx).order_by(
- UniteEns.semestre_idx, UniteEns.numero, UniteEns.acronyme
- ) %}
+ {% for ue in ues_by_sem[semestre_idx] %}