From 6224f37e4a565517e405f9d035d08a2903bff6e8 Mon Sep 17 00:00:00 2001 From: Emmanuel Viennet Date: Wed, 19 Jun 2024 16:34:45 +0200 Subject: [PATCH] =?UTF-8?q?Export=20table=20comptes=20crois=C3=A9s:=20fix?= =?UTF-8?q?=20#934?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/scodoc/gen_tables.py | 7 +++++-- app/scodoc/sco_report.py | 16 +++++++++------- sco_version.py | 2 +- 3 files changed, 15 insertions(+), 10 deletions(-) diff --git a/app/scodoc/gen_tables.py b/app/scodoc/gen_tables.py index a58125f9..83752b5e 100644 --- a/app/scodoc/gen_tables.py +++ b/app/scodoc/gen_tables.py @@ -313,9 +313,12 @@ class GenTable: T.append(l + [self.bottom_titles.get(cid, "") for cid in self.columns_ids]) return T - def get_titles_list(self): + def get_titles_list(self, with_lines_titles=True): "list of titles" - return [self.titles.get(cid, "") for cid in self.columns_ids] + titles = [self.titles.get(cid, "") for cid in self.columns_ids] + if with_lines_titles: + titles.insert(0, "") + return titles def gen(self, fmt="html", columns_ids=None): """Build representation of the table in the specified format. diff --git a/app/scodoc/sco_report.py b/app/scodoc/sco_report.py index ab960406..db037e70 100644 --- a/app/scodoc/sco_report.py +++ b/app/scodoc/sco_report.py @@ -248,8 +248,6 @@ def formsemestre_report( result="codedecision", category_name="", result_name="", - title="Statistiques", - only_primo=None, ): """ Tableau sur résultats (result) par type de category bac @@ -277,9 +275,6 @@ def formsemestre_report( f"Répartition des résultats par {category_name}, semestre {sem['titreannee']}" ) tab.html_caption = f"Répartition des résultats par {category_name}." - tab.base_url = "%s?formsemestre_id=%s" % (request.base_url, formsemestre_id) - if only_primo: - tab.base_url += "&only_primo=on" return tab @@ -326,8 +321,15 @@ def formsemestre_report_counts( category=category, result=result, category_name=category_name, - title=title, - only_primo=only_primo, + ) + tab.base_url = url_for( + "notes.formsemestre_report_counts", + scodoc_dept=g.scodoc_dept, + formsemestre_id=formsemestre_id, + category=category, + only_primo=int(bool(only_primo)), + result=result, + group_ids=group_ids, ) if len(formsemestre.inscriptions) == 0: F = ["""

Aucun étudiant

"""] diff --git a/sco_version.py b/sco_version.py index 69426191..0001c080 100644 --- a/sco_version.py +++ b/sco_version.py @@ -1,7 +1,7 @@ # -*- mode: python -*- # -*- coding: utf-8 -*- -SCOVERSION = "9.6.977" +SCOVERSION = "9.6.978" SCONAME = "ScoDoc"