From 5c11e4d9282dd562140bc355905a6a043191c046 Mon Sep 17 00:00:00 2001
From: Arthur ZHU <arthur.zhu38@gmail.com>
Date: Thu, 3 Mar 2022 09:47:19 +0100
Subject: [PATCH] conflits

---
 app/scodoc/sco_groups.py      | 22 ----------------------
 app/scodoc/sco_groups_view.py |  2 --
 app/views/scolar.py           |  3 ---
 3 files changed, 27 deletions(-)

diff --git a/app/scodoc/sco_groups.py b/app/scodoc/sco_groups.py
index f8653fe3..6a1ee467 100644
--- a/app/scodoc/sco_groups.py
+++ b/app/scodoc/sco_groups.py
@@ -60,7 +60,6 @@ from app.scodoc import sco_cache
 from app.scodoc import sco_etud
 from app.scodoc import sco_permissions_check
 from app.scodoc import sco_xml
-from app.scodoc import sco_excel
 from app.scodoc.sco_exceptions import ScoException, AccessDenied, ScoValueError
 from app.scodoc.sco_permissions import Permission
 from app.scodoc.TrivialFormulator import TrivialFormulator
@@ -1610,27 +1609,6 @@ def make_query_groups(group_ids):
         return ""
 
 
-def exportAnnotation(group_ids):
-    cnx = ndb.GetDBConnexion()
-    cursor = cnx.cursor()
-    cursor.execute(
-        """SELECT 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_ids},
-    )
-    titles = ["nom", "prenom", "date", "annotation"]
-    title = "annotations"
-    xlsx = sco_excel.excel_simple_table(
-        titles=titles, lines=cursor.fetchall(), sheet_name=title
-    )
-    filename = title
-    return scu.send_file(xlsx, filename, scu.XLSX_SUFFIX, scu.XLSX_MIMETYPE)
-
-
 class GroupIdInferer(object):
     """Sert à retrouver l'id d'un groupe dans un semestre donné
     à partir de son nom.
diff --git a/app/scodoc/sco_groups_view.py b/app/scodoc/sco_groups_view.py
index cd51a20b..5b89ab44 100644
--- a/app/scodoc/sco_groups_view.py
+++ b/app/scodoc/sco_groups_view.py
@@ -826,8 +826,6 @@ def tab_absences_html(groups_infos, etat=None):
             % groups_infos.groups_query_args,
             """<li><a class="stdlink" href="trombino?%s&format=pdflist">Liste d'appel avec photos</a></li>"""
             % groups_infos.groups_query_args,
-            """<li><a class="stdlink" href="exportAnnotations?%s">Feuille annotations</a></li>"""
-            % groups_infos.groups_query_args,
             "</ul>",
         ]
     )
diff --git a/app/views/scolar.py b/app/views/scolar.py
index 66a9576e..060fd4c3 100644
--- a/app/views/scolar.py
+++ b/app/views/scolar.py
@@ -2193,6 +2193,3 @@ def stat_bac(formsemestre_id):
 sco_publish(
     "/sco_dump_and_send_db", sco_dump_db.sco_dump_and_send_db, Permission.ScoView
 )
-
-# --- Export annotations
-sco_publish("/exportAnnotations", sco_groups.exportAnnotation, Permission.ScoView)