From 14d533b38ac46032415ec632a02fc1eddfd72e52 Mon Sep 17 00:00:00 2001 From: Emmanuel Viennet Date: Sat, 25 Sep 2021 15:12:13 +0200 Subject: [PATCH] lien inscription ailleurs sur page etud --- app/scodoc/sco_page_etud.py | 20 +++++++++++++++----- app/static/css/scodoc.css | 1 + sco_version.py | 2 +- 3 files changed, 17 insertions(+), 6 deletions(-) diff --git a/app/scodoc/sco_page_etud.py b/app/scodoc/sco_page_etud.py index 7b79d06b0c..fc583aa5cd 100644 --- a/app/scodoc/sco_page_etud.py +++ b/app/scodoc/sco_page_etud.py @@ -255,10 +255,19 @@ def ficheEtud(etudid=None, REQUEST=None): with_all_columns=False, a_url="Notes/", ) - info["link_bul_pdf"] = ( - 'tous les bulletins' - % etud - ) + info[ + "link_bul_pdf" + ] = f"""tous les bulletins""" + if authuser.has_permission(Permission.ScoEtudInscrit): + info[ + "link_inscrire_ailleurs" + ] = f"""inscrire à un autre semestre""" + else: + info["link_inscrire_ailleurs"] = "" else: # non inscrit l = ["

Etudiant%s non inscrit%s" % (info["ne"], info["ne"])] @@ -393,10 +402,11 @@ def ficheEtud(etudid=None, REQUEST=None): "inscriptions_mkup" ] = """

Parcours
%s -%s +%s %s
""" % ( info["liste_inscriptions"], info["link_bul_pdf"], + info["link_inscrire_ailleurs"], ) # diff --git a/app/static/css/scodoc.css b/app/static/css/scodoc.css index 4b01840bde..7149a5ca6d 100644 --- a/app/static/css/scodoc.css +++ b/app/static/css/scodoc.css @@ -688,6 +688,7 @@ td.fichetitre2 .fl { span.link_bul_pdf { font-size: 80%; + padding-right: 2em; } /* Page accueil Sco */ diff --git a/sco_version.py b/sco_version.py index 260c569587..7540f0324f 100644 --- a/sco_version.py +++ b/sco_version.py @@ -1,7 +1,7 @@ # -*- mode: python -*- # -*- coding: utf-8 -*- -SCOVERSION = "9.0.37" +SCOVERSION = "9.0.38" SCONAME = "ScoDoc"