From f79003186ae416effda50c0b806a32eccaa6d038 Mon Sep 17 00:00:00 2001 From: Emmanuel Viennet Date: Tue, 28 Sep 2021 07:28:16 +0200 Subject: [PATCH] cosmetic --- app/scodoc/sco_formsemestre.py | 2 +- app/scodoc/sco_report.py | 2 +- app/static/css/scodoc.css | 4 ++++ app/views/entreprises.py | 4 ++-- sco_version.py | 2 +- 5 files changed, 9 insertions(+), 5 deletions(-) diff --git a/app/scodoc/sco_formsemestre.py b/app/scodoc/sco_formsemestre.py index 91e20c293..40355120b 100644 --- a/app/scodoc/sco_formsemestre.py +++ b/app/scodoc/sco_formsemestre.py @@ -96,7 +96,7 @@ _formsemestreEditor = ndb.EditableTable( def get_formsemestre(formsemestre_id): "list ONE formsemestre" if not isinstance(formsemestre_id, int): - raise ValueError() + raise ValueError("formsemestre_id must be an integer !") try: sem = do_formsemestre_list(args={"formsemestre_id": formsemestre_id})[0] return sem diff --git a/app/scodoc/sco_report.py b/app/scodoc/sco_report.py index c7bbf30e3..7d9a80821 100644 --- a/app/scodoc/sco_report.py +++ b/app/scodoc/sco_report.py @@ -1395,7 +1395,7 @@ def graph_parcours( if len(edges[(src_id, dst_id)]) <= MAX_ETUD_IN_DESCR: etud_descr = _descr_etud_set(edges[(src_id, dst_id)]) bubbles[src_id + ":" + dst_id] = etud_descr - e.set_URL("__xxxetudlist__?" + src_id + ":" + dst_id) + e.set_URL(f"__xxxetudlist__?{src_id}:{dst_id}") # Genere graphe _, path = tempfile.mkstemp(".gr") g.write(path=path, format=format) diff --git a/app/static/css/scodoc.css b/app/static/css/scodoc.css index 7149a5ca6..59a96712b 100644 --- a/app/static/css/scodoc.css +++ b/app/static/css/scodoc.css @@ -27,6 +27,10 @@ h3 { font-weight: bold; } +div#gtrcontent { + margin-bottom: 4ex; +} + .scotext { font-family : TimesNewRoman, "Times New Roman", Times, Baskerville, Georgia, serif; } diff --git a/app/views/entreprises.py b/app/views/entreprises.py index e5cda93a2..730e0bb5d 100644 --- a/app/views/entreprises.py +++ b/app/views/entreprises.py @@ -1244,7 +1244,7 @@ def entreprise_edit(entreprise_id, start=1): H.append("") return "\n".join(H) + entreprise_footer() elif tf[0] == -1: - return flask.redirect(scu.EntreprisesURL() + "?start=" + start) + return flask.redirect(scu.EntreprisesURL() + "?start=" + str(start)) else: sco_entreprises.do_entreprise_edit(tf[2]) - return flask.redirect(scu.EntreprisesURL() + "?start=" + start) + return flask.redirect(scu.EntreprisesURL() + "?start=" + str(start)) diff --git a/sco_version.py b/sco_version.py index b3b059b07..2bbdbe8bf 100644 --- a/sco_version.py +++ b/sco_version.py @@ -1,7 +1,7 @@ # -*- mode: python -*- # -*- coding: utf-8 -*- -SCOVERSION = "9.0.41" +SCOVERSION = "9.0.42" SCONAME = "ScoDoc"