From c6f0fa86ea88ad5a39b1da93def4db10233bd082 Mon Sep 17 00:00:00 2001 From: Emmanuel Viennet Date: Sun, 11 Jul 2021 17:37:12 +0200 Subject: [PATCH] rewritten all ficheEtud urls using Flask --- app/scodoc/html_sidebar.py | 12 ++- app/scodoc/notes_table.py | 23 ++++-- app/scodoc/sco_abs_notification.py | 6 +- app/scodoc/sco_abs_views.py | 18 ++--- app/scodoc/sco_archives_etud.py | 26 ++++-- app/scodoc/sco_bulletins.py | 22 +++--- app/scodoc/sco_debouche.py | 10 ++- app/scodoc/sco_etape_apogee_view.py | 8 +- app/scodoc/sco_etape_bilan.py | 7 +- app/scodoc/sco_etud.py | 13 ++- app/scodoc/sco_export_results.py | 5 +- app/scodoc/sco_find_etud.py | 26 +++--- app/scodoc/sco_formsemestre_exterieurs.py | 11 ++- app/scodoc/sco_formsemestre_inscriptions.py | 59 ++++++++++---- app/scodoc/sco_formsemestre_validation.py | 18 +++-- app/scodoc/sco_groups_view.py | 14 +++- app/scodoc/sco_inscr_passage.py | 13 ++- app/scodoc/sco_liste_notes.py | 9 ++- app/scodoc/sco_lycee.py | 20 ++++- app/scodoc/sco_moduleimpl_inscriptions.py | 34 ++++++-- app/scodoc/sco_page_etud.py | 15 ++-- app/scodoc/sco_poursuite_dut.py | 9 ++- app/scodoc/sco_pvjury.py | 9 ++- app/scodoc/sco_report.py | 9 ++- app/scodoc/sco_trombino.py | 12 ++- app/views/absences.py | 23 ++++-- app/views/notes.py | 8 +- app/views/scolar.py | 88 +++++++++++++++------ 28 files changed, 381 insertions(+), 146 deletions(-) diff --git a/app/scodoc/html_sidebar.py b/app/scodoc/html_sidebar.py index 12218d364..266e8bab9 100644 --- a/app/scodoc/html_sidebar.py +++ b/app/scodoc/html_sidebar.py @@ -28,7 +28,7 @@ """ Génération de la "sidebar" (marge gauche des pages HTML) """ -from flask import url_for +from flask import url_for, g import app.scodoc.sco_utils as scu from app.scodoc import sco_preferences @@ -81,7 +81,10 @@ def sidebar(context, REQUEST=None): from app.scodoc.sco_abs import getAbsSemEtud from app.scodoc import sco_etud - params = {"ScoURL": scu.ScoURL(), "SCO_USER_MANUAL": scu.SCO_USER_MANUAL} + params = { + "ScoURL": scu.ScoURL(), + "SCO_USER_MANUAL": scu.SCO_USER_MANUAL, + } H = ['
', sidebar_common(context, REQUEST)] @@ -99,9 +102,12 @@ def sidebar(context, REQUEST=None): etudid = REQUEST.form["etudid"] etud = sco_etud.get_etud_info(filled=1, etudid=etudid)[0] params.update(etud) + params["fiche_url"] = url_for( + "scolar.ficheEtud", scodoc_dept=g.scodoc_dept, etudid=etudid + ) # compte les absences du semestre en cours H.append( - """

+ """

%(civilite_str)s %(nom_disp)s

Absences""" diff --git a/app/scodoc/notes_table.py b/app/scodoc/notes_table.py index 270dc5bbf..088804840 100644 --- a/app/scodoc/notes_table.py +++ b/app/scodoc/notes_table.py @@ -33,6 +33,8 @@ import pdb import inspect from operator import itemgetter +from flask import g, url_for + import app.scodoc.sco_utils as scu import app.scodoc.notesdb as ndb from app.scodoc.notes_log import log, logCallStack @@ -1269,16 +1271,23 @@ class NotesTable(object): % (self.formsemestre_id, etudid, ue, ue_cap) ) raise ScoValueError( - """

Coefficient de l'UE capitalisée %s impossible à déterminer pour l'étudiant %s

-

Il faut saisir le coefficient de cette UE avant de continuer

-
- """ + """

Coefficient de l'UE capitalisée %s impossible à déterminer + pour l'étudiant %s

+

Il faut saisir le coefficient de cette UE avant de continuer

+
+ """ % ( ue["acronyme"], - etudid, + url_for( + "scolar.ficheEtud", scodoc_dept=g.scodoc_dept, etudid=etudid + ), self.get_nom_long(etudid), - self.formsemestre_id, - ue["ue_id"], + url_for( + "scolar.formsemestre_edit_uecoefs", + scodoc_dept=g.scodoc_dept, + formsemestre_id=self.formsemestre_id, + err_ue_id=ue["ue_id"], + ), ) ) diff --git a/app/scodoc/sco_abs_notification.py b/app/scodoc/sco_abs_notification.py index 37a997d4d..b70a79801 100644 --- a/app/scodoc/sco_abs_notification.py +++ b/app/scodoc/sco_abs_notification.py @@ -37,6 +37,8 @@ from email.mime.multipart import MIMEMultipart from email.mime.text import MIMEText from email.header import Header +from flask import g, url_for + from app.scodoc import sco_emails import app.scodoc.notesdb as ndb import app.scodoc.sco_utils as scu @@ -250,7 +252,9 @@ def abs_notification_message(context, sem, prefs, etudid, nbabs, nbabsjust): values["nbabs"] = nbabs values["nbabsjust"] = nbabsjust values["nbabsnonjust"] = nbabs - nbabsjust - values["url_ficheetud"] = scu.ScoURL() + "/ficheEtud?etudid=" + etudid + values["url_ficheetud"] = url_for( + "scolar.ficheEtud", scodoc_dept=g.scodoc_dept, etudid=etudid + ) template = prefs["abs_notification_mail_tmpl"] if template: diff --git a/app/scodoc/sco_abs_views.py b/app/scodoc/sco_abs_views.py index fc3408d77..749886ada 100644 --- a/app/scodoc/sco_abs_views.py +++ b/app/scodoc/sco_abs_views.py @@ -30,8 +30,7 @@ """ import datetime -from stripogram import html2text, html2safehtml - +from flask import url_for, g import app.scodoc.sco_utils as scu from app.scodoc import notesdb as ndb @@ -49,7 +48,6 @@ from app.scodoc import sco_photos from app.scodoc import sco_preferences from app.scodoc.notes_log import log from app.scodoc.sco_exceptions import ScoValueError -from app.scodoc.sco_permissions import Permission def doSignaleAbsence( @@ -232,7 +230,8 @@ def SignaleAbsenceEtud(context, REQUEST=None): # etudid implied """ % etud, - """""" % (scu.ScoURL(), etud["etudid"]), + """""" + % url_for("scolar.ficheEtud", scodoc_dept=g.scodoc_dept, etudid=etud["etudid"]), sco_photos.etud_photo_html( context, etudid=etudid, @@ -388,7 +387,8 @@ def JustifAbsenceEtud(context, REQUEST=None): # etudid implied """ % etud, - """""" % (scu.ScoURL(), etud["etudid"]), + """""" + % url_for("scolar.ficheEtud", scodoc_dept=g.scodoc_dept, etudid=etudid), sco_photos.etud_photo_html( context, etudid=etudid, @@ -498,7 +498,8 @@ def AnnuleAbsenceEtud(context, REQUEST=None): # etudid implied """ % etud, # " - """""" % (scu.ScoURL(), etud["etudid"]), + """""" + % url_for("scolar.ficheEtud", scodoc_dept=g.scodoc_dept, etudid=etudid), sco_photos.etud_photo_html( context, etudid=etudid, @@ -776,12 +777,11 @@ def CalAbs(context, REQUEST=None): # etud implied """ % (nbabs, nbabsjust, nbabs - nbabsjust, len(justifs_noabs)), """ -%s +%s """ % ( - scu.ScoURL(), - etudid, + url_for("scolar.ficheEtud", scodoc_dept=g.scodoc_dept, etudid=etudid), sco_photos.etud_photo_html( context, etudid=etudid, diff --git a/app/scodoc/sco_archives_etud.py b/app/scodoc/sco_archives_etud.py index 9193c992b..e8c216e67 100644 --- a/app/scodoc/sco_archives_etud.py +++ b/app/scodoc/sco_archives_etud.py @@ -29,6 +29,7 @@ Il s'agit de fichiers quelconques, généralement utilisés pour conserver les dossiers d'admission et autres pièces utiles. """ +from flask import url_for, g import app.scodoc.sco_utils as scu from app.scodoc import sco_import_etuds @@ -165,7 +166,9 @@ def etud_upload_file_form(context, REQUEST, etudid): if tf[0] == 0: return "\n".join(H) + tf[1] + html_sco_header.sco_footer(context, REQUEST) elif tf[0] == -1: - return REQUEST.RESPONSE.redirect(scu.NotesURL() + "/ficheEtud?etudid=" + etudid) + return REQUEST.RESPONSE.redirect( + url_for("scolar.ficheEtud", scodoc_dept=g.scodoc_dept, etudid=etudid) + ) else: data = tf[2]["datafile"][0].read() descr = tf[2]["description"] @@ -173,7 +176,9 @@ def etud_upload_file_form(context, REQUEST, etudid): _store_etud_file_to_new_archive( context, REQUEST, etudid, data, filename, description=descr ) - return REQUEST.RESPONSE.redirect(scu.ScoURL() + "/ficheEtud?etudid=" + etudid) + return REQUEST.RESPONSE.redirect( + url_for("scolar.ficheEtud", scodoc_dept=g.scodoc_dept, etudid=etudid) + ) def _store_etud_file_to_new_archive( @@ -196,7 +201,6 @@ def etud_delete_archive(context, REQUEST, etudid, archive_name, dialog_confirmed ) etud = sco_etud.get_etud_info(filled=1, REQUEST=REQUEST)[0] archive_id = EtudsArchive.get_id_from_name(context, etudid, archive_name) - dest_url = "ficheEtud?etudid=%s" % etudid if not dialog_confirmed: return scu.confirm_dialog( context, @@ -209,12 +213,24 @@ def etud_delete_archive(context, REQUEST, etudid, archive_name, dialog_confirmed ), dest_url="", REQUEST=REQUEST, - cancel_url=dest_url, + cancel_url=url_for( + "scolar.ficheEtud", + scodoc_dept=g.scodoc_dept, + etudid=etudid, + head_message="annulation", + ), parameters={"etudid": etudid, "archive_name": archive_name}, ) EtudsArchive.delete_archive(archive_id) - return REQUEST.RESPONSE.redirect(dest_url + "&head_message=Archive%20supprimée") + return REQUEST.RESPONSE.redirect( + url_for( + "scolar.ficheEtud", + scodoc_dept=g.scodoc_dept, + etudid=etudid, + head_message="Archive%20supprimée", + ) + ) def etud_get_archived_file(context, REQUEST, etudid, archive_name, filename): diff --git a/app/scodoc/sco_bulletins.py b/app/scodoc/sco_bulletins.py index 6ac8e2ec7..cb85a60b8 100644 --- a/app/scodoc/sco_bulletins.py +++ b/app/scodoc/sco_bulletins.py @@ -31,8 +31,6 @@ import time from types import StringType import pprint -import six.moves.urllib.request, six.moves.urllib.parse, six.moves.urllib.error -from app.scodoc import htmlutils import email from email.mime.multipart import MIMEMultipart from email.mime.text import MIMEText @@ -40,6 +38,8 @@ from email.mime.base import MIMEBase from email.header import Header from reportlab.lib.colors import Color +import six.moves.urllib.request, six.moves.urllib.parse, six.moves.urllib.error +from flask import g, url_for from app.scodoc import sco_emails import app.scodoc.sco_utils as scu @@ -48,6 +48,7 @@ from app.scodoc.notes_log import log from app.scodoc.sco_permissions import Permission from app.scodoc.sco_exceptions import AccessDenied from app.scodoc import html_sco_header +from app.scodoc import htmlutils from app.scodoc import sco_abs from app.scodoc import sco_abs_views from app.scodoc import sco_bulletins_generator @@ -1077,9 +1078,14 @@ def _formsemestre_bulletinetud_header_html( cssstyles=["css/radar_bulletin.css"], ), """
-

%(nomprenom)s

+

%s

""" - % etud, + % ( + url_for( + "scolar.ficheEtud", scodoc_dept=g.scodoc_dept, etudid=etud["etudid"] + ), + etud["nomprenom"], + ), """
""" % REQUEST.URL0, @@ -1252,12 +1258,10 @@ def _formsemestre_bulletinetud_header_html( H.append("""
""") # H.append( - """ - %s - """ + """%s + """ % ( - scu.ScoURL(), - etudid, + url_for("scolar.ficheEtud", scodoc_dept=g.scodoc_dept, etudid=etudid), sco_photos.etud_photo_html( context, etud, title="fiche de " + etud["nom"], REQUEST=REQUEST ), diff --git a/app/scodoc/sco_debouche.py b/app/scodoc/sco_debouche.py index 0355ca790..8895c9c12 100644 --- a/app/scodoc/sco_debouche.py +++ b/app/scodoc/sco_debouche.py @@ -31,6 +31,8 @@ Rapport (table) avec dernier semestre fréquenté et débouché de chaque étudi from types import StringType import safehtml +from flask import url_for, g + import app.scodoc.sco_utils as scu import app.scodoc.notesdb as ndb from app.scodoc.notes_log import log @@ -121,8 +123,12 @@ def table_debouche_etudids(context, etudids, keep_numeric=True): "civilite": etud["civilite"], "nom": etud["nom"], "prenom": etud["prenom"], - "_nom_target": "ficheEtud?etudid=" + etud["etudid"], - "_prenom_target": "ficheEtud?etudid=" + etud["etudid"], + "_nom_target": url_for( + "scolar.ficheEtud", scodoc_dept=g.scodoc_dept, etudid=etudid + ), + "_prenom_target": url_for( + "scolar.ficheEtud", scodoc_dept=g.scodoc_dept, etudid=etudid + ), "_nom_td_attrs": 'id="%s" class="etudinfo"' % (etud["etudid"]), # 'debouche' : etud['debouche'], "moy": scu.fmt_note(nt.get_etud_moy_gen(etudid), keep_numeric=keep_numeric), diff --git a/app/scodoc/sco_etape_apogee_view.py b/app/scodoc/sco_etape_apogee_view.py index f16033d6f..77c538875 100644 --- a/app/scodoc/sco_etape_apogee_view.py +++ b/app/scodoc/sco_etape_apogee_view.py @@ -31,6 +31,8 @@ from cStringIO import StringIO from zipfile import ZipFile +from flask import url_for, g + import app.scodoc.sco_utils as scu from app.scodoc.notes_log import log from app.scodoc import html_sco_header @@ -546,7 +548,7 @@ def view_scodoc_etuds( raise ValueError("etudid or NIP must be specified") for e in etuds: - tgt = "ficheEtud?etudid=" + e["etudid"] + tgt = url_for("scolar.ficheEtud", scodoc_dept=g.scodoc_dept, etudid=e["etudid"]) e["_nom_target"] = tgt e["_prenom_target"] = tgt e["_nom_td_attrs"] = 'id="%s" class="etudinfo"' % (e["etudid"],) @@ -758,7 +760,9 @@ def view_apo_csv(context, etape_apo="", semset_id="", format="html", REQUEST=Non e["in_scodoc"] = e["nip"] not in nips_no_sco e["in_scodoc_str"] = {True: "oui", False: "non"}[e["in_scodoc"]] if e["in_scodoc"]: - e["_in_scodoc_str_target"] = "ficheEtud?code_nip=" + e["nip"] + e["_in_scodoc_str_target"] = url_for( + "scolar.ficheEtud", scodoc_dept=g.scodoc_dept, code_nip=e["nip"] + ) e.update(sco_etud.get_etud_info(code_nip=e["nip"], filled=True)[0]) e["_nom_td_attrs"] = 'id="%s" class="etudinfo"' % (e["etudid"],) e["_prenom_td_attrs"] = 'id="pre-%s" class="etudinfo"' % (e["etudid"],) diff --git a/app/scodoc/sco_etape_bilan.py b/app/scodoc/sco_etape_bilan.py index 015b440d6..4231acdd5 100644 --- a/app/scodoc/sco_etape_bilan.py +++ b/app/scodoc/sco_etape_bilan.py @@ -92,6 +92,8 @@ Le filtrage s'effctue sur la date et non plus sur la parité du semestre (1-3/2- import json +from flask import url_for, g + from app.scodoc.sco_portal_apogee import get_inscrits_etape from app.scodoc.notes_log import log from app.scodoc.sco_utils import annee_scolaire_debut @@ -681,7 +683,10 @@ class EtapeBilan(object): @staticmethod def link_etu(etudid, nom): - return '%s' % (etudid, nom) + return '%s' % ( + url_for("scolar.ficheEtud", scodoc_dept=g.scodoc_dept, etudid=etudid), + nom, + ) def link_semestre(self, semestre, short=False): if short: diff --git a/app/scodoc/sco_etud.py b/app/scodoc/sco_etud.py index 7abe00bbe..f99fa5a3a 100644 --- a/app/scodoc/sco_etud.py +++ b/app/scodoc/sco_etud.py @@ -32,6 +32,8 @@ import time +from flask import url_for, g + from email.mime.multipart import MIMEMultipart from email.mime.text import MIMEText from email.header import Header @@ -332,8 +334,13 @@ def _check_duplicate_code(cnx, args, code_name, context, edit=True, REQUEST=None listh = [] # liste des doubles for e in etuds: listh.append( - """Autre étudiant: %(nom)s %(prenom)s""" - % e + """Autre étudiant: """ + % url_for( + "scolar.ficheEtud", + scodoc_dept=g.scodoc_dept, + etudid=e["etudid"], + ) + + """%(nom)s %(prenom)s""" % e ) if etudid: OK = "retour à la fiche étudiant" @@ -704,7 +711,7 @@ def create_etud(context, cnx, args={}, REQUEST=None): ) etud = etudident_list(cnx, {"etudid": etudid})[0] fill_etuds_info([etud]) - etud["url"] = "ficheEtud?etudid=%(etudid)s" % etud + etud["url"] = url_for("scolar.ficheEtud", scodoc_dept=g.scodoc_dept, etudid=etudid) sco_news.add( context, REQUEST, diff --git a/app/scodoc/sco_export_results.py b/app/scodoc/sco_export_results.py index 936498f4f..90d15de36 100644 --- a/app/scodoc/sco_export_results.py +++ b/app/scodoc/sco_export_results.py @@ -29,6 +29,8 @@ """ from types import ListType +from flask import url_for, g + import app.scodoc.notesdb as ndb import app.scodoc.sco_utils as scu from app.scodoc.notes_log import log @@ -174,7 +176,8 @@ def _build_results_list(context, dpv_by_sem, etuds_infos): "nom_usuel": etud["nom_usuel"], "prenom": etud["prenom"], "civilite_str": etud["civilite_str"], - "_nom_target": "%s/ficheEtud?etudid=%s" % (scu.ScoURL(), etudid), + "_nom_target": "%s" + % url_for("scolar.ficheEtud", scodoc_dept=g.scodoc_dept, etudid=etudid), "_nom_td_attrs": 'id="%s" class="etudinfo"' % etudid, "bac": bac.abbrev(), "parcours": dec["parcours"], diff --git a/app/scodoc/sco_find_etud.py b/app/scodoc/sco_find_etud.py index 2ac608a3d..3cb91c93d 100644 --- a/app/scodoc/sco_find_etud.py +++ b/app/scodoc/sco_find_etud.py @@ -27,6 +27,7 @@ """Recherche d'étudiants """ +from flask import url_for, g from scodoc_manager import sco_mgr import app.scodoc.sco_utils as scu @@ -105,7 +106,6 @@ def search_etud_in_dept(context, expnom="", REQUEST=None): Args: expnom: string, regexp sur le nom ou un code_nip ou un etudid """ - dest_url = "ficheEtud" if len(expnom) > 1: etuds = sco_etud.get_etud_info(filled=1, etudid=expnom, REQUEST=REQUEST) if len(etuds) != 1: @@ -119,7 +119,9 @@ def search_etud_in_dept(context, expnom="", REQUEST=None): if len(etuds) == 1: # va directement a la fiche return REQUEST.RESPONSE.redirect( - scu.NotesURL() + "/ficheEtud?etudid=" + etuds[0]["etudid"] + url_for( + "scolar.ficheEtud", scodoc_dept=g.scodoc_dept, etudid=etuds[0]["etudid"] + ) ) H = [ @@ -135,7 +137,9 @@ def search_etud_in_dept(context, expnom="", REQUEST=None): % (len(etuds), expnom), form_search_etud( context, - dest_url=dest_url, + dest_url=url_for( + "scolar.ficheEtud", scodoc_dept=g.scodoc_dept + ), # sans l'etudid, post du form REQUEST=REQUEST, title="Autre recherche", ), @@ -143,7 +147,9 @@ def search_etud_in_dept(context, expnom="", REQUEST=None): if len(etuds) > 0: # Choix dans la liste des résultats: for e in etuds: - target = dest_url + "?etudid=%s&" % e["etudid"] + target = url_for( + "scolar.ficheEtud", scodoc_dept=g.scodoc_dept, etudid=e["etudid"] + ) e["_nomprenom_target"] = target e["inscription_target"] = target e["_nomprenom_td_attrs"] = 'id="%s" class="etudinfo"' % (e["etudid"]) @@ -169,7 +175,7 @@ def search_etud_in_dept(context, expnom="", REQUEST=None): H.append( form_search_etud( context, - dest_url=dest_url, + dest_url=url_for("scolar.ficheEtud", scodoc_dept=g.scodoc_dept), REQUEST=REQUEST, title="Autre recherche", ) @@ -303,16 +309,16 @@ def table_etud_in_accessible_depts(context, expnom=None, REQUEST=None): ] for etuds in result: if etuds: - DeptId = etuds[0]["dept"] + dept_id = etuds[0]["dept"] # H.append('

Département %s

' % DeptId) - dest_url = DeptId + "/Scolarite/ficheEtud" for e in etuds: - target = dest_url + "?etudid=%s" % e["etudid"] - e["_nomprenom_target"] = target + e["_nomprenom_target"] = url_for( + "scolar.ficheEtud", scodoc_dept=dept_id, etudid=e["etudid"] + ) e["_nomprenom_td_attrs"] = 'id="%s" class="etudinfo"' % (e["etudid"]) tab = GenTable( - titles={"nomprenom": "Etudiants en " + DeptId}, + titles={"nomprenom": "Etudiants en " + dept_id}, columns_ids=("nomprenom",), rows=etuds, html_sortable=True, diff --git a/app/scodoc/sco_formsemestre_exterieurs.py b/app/scodoc/sco_formsemestre_exterieurs.py index ee93d8a40..1ac881e2b 100644 --- a/app/scodoc/sco_formsemestre_exterieurs.py +++ b/app/scodoc/sco_formsemestre_exterieurs.py @@ -33,6 +33,8 @@ Ces semestres n'auront qu'un seul inscrit ! """ import time +from flask import url_for, g + import app.scodoc.sco_utils as scu import app.scodoc.notesdb as ndb from app.scodoc.sco_utils import log @@ -97,8 +99,11 @@ def formsemestre_ext_create_form(context, etudid, formsemestre_id, REQUEST=None)

""" % (etudid,), - """

Etudiant %s

""" - % (etudid, etud["nomprenom"]), + """

Etudiant %s

""" + % ( + url_for("scolar.ficheEtud", scodoc_dept=g.scodoc_dept, etudid=etudid), + etud["nomprenom"], + ), ] F = html_sco_header.sco_footer(context, REQUEST) orig_sem = sco_formsemestre.get_formsemestre(context, formsemestre_id) @@ -204,7 +209,7 @@ def formsemestre_ext_create_form(context, etudid, formsemestre_id, REQUEST=None) tf[2]["formation_id"] = orig_sem["formation_id"] formsemestre_ext_create(context, etudid, tf[2], REQUEST=REQUEST) return REQUEST.RESPONSE.redirect( - "%s/ficheEtud?etudid=%s" % (scu.ScoURL(), etudid) + url_for("scolar.ficheEtud", scodoc_dept=g.scodoc_dept, etudid=etudid) ) diff --git a/app/scodoc/sco_formsemestre_inscriptions.py b/app/scodoc/sco_formsemestre_inscriptions.py index 375c43118..f57341633 100644 --- a/app/scodoc/sco_formsemestre_inscriptions.py +++ b/app/scodoc/sco_formsemestre_inscriptions.py @@ -29,6 +29,8 @@ """ import time +from flask import url_for, g + import app.scodoc.sco_utils as scu from app.scodoc.notes_log import log from app.scodoc.scolog import logdb @@ -315,8 +317,11 @@ def formsemestre_inscription_with_modules_form( else: H.append("

aucune session de formation !

") H.append( - '

ou

retour à la fiche de %s' - % (scu.ScoURL(), etudid, etud["nomprenom"]) + '

ou

retour à la fiche de %s' + % ( + url_for("scolar.ficheEtud", scodoc_dept=g.scodoc_dept, etudid=etudid), + etud["nomprenom"], + ) ) return "\n".join(H) + F @@ -357,9 +362,20 @@ def formsemestre_inscription_with_modules( % (etud["nomprenom"], sem["titremois"]) ) H.append( - """""" - % (etudid, etud["nomprenom"], formsemestre_id, sem["titremois"]) + """""" + % ( + url_for("scolar.ficheEtud", scodoc_dept=g.scodoc_dept, etudid=etudid), + etud["nomprenom"], + url_for( + "notes.formsemestre_status", + scodoc_dept=g.scodoc_dept, + formsemestre_id=formsemestre_id, + ), + sem["titremois"], + ) ) return "\n".join(H) + F # Check 2: déjà inscrit dans un semestre recouvrant les même dates ? @@ -401,7 +417,9 @@ def formsemestre_inscription_with_modules( REQUEST=REQUEST, method="formsemestre_inscription_with_modules", ) - return REQUEST.RESPONSE.redirect(scu.ScoURL() + "/ficheEtud?etudid=" + etudid) + return REQUEST.RESPONSE.redirect( + url_for("scolar.ficheEtud", scodoc_dept=g.scodoc_dept, etudid=etudid) + ) else: # formulaire choix groupe H.append( @@ -555,7 +573,7 @@ function chkbx_select(field_id, state) { return "\n".join(H) + "\n" + tf[1] + F elif tf[0] == -1: return REQUEST.RESPONSE.redirect( - "%s/ficheEtud?etudid=%s" % (scu.ScoURL(), etudid) + url_for("scolar.ficheEtud", scodoc_dept=g.scodoc_dept, etudid=etudid) ) else: # Inscriptions aux modules choisis @@ -591,8 +609,9 @@ function chkbx_select(field_id, state) { if (not a_inscrire) and (not a_desinscrire): H.append( """

Aucune modification à effectuer

-

retour à la fiche étudiant

""" - % (scu.ScoURL(), etudid) +

retour à la fiche étudiant

+ """ + % url_for("scolar.ficheEtud", scodoc_dept=g.scodoc_dept, etudid=etudid) ) return "\n".join(H) + F @@ -643,15 +662,14 @@ function chkbx_select(field_id, state) { - + """ % ( etudid, modulesimpls_ainscrire, modulesimpls_adesinscrire, - scu.ScoURL(), - etudid, + url_for("scolar.ficheEtud", scodoc_dept=g.scodoc_dept, etudid=etudid), ) ) return "\n".join(H) + F @@ -712,10 +730,10 @@ def do_moduleimpl_incription_options( H = [ html_sco_header.sco_header(context, REQUEST), """

Modifications effectuées

-

+

Retour à la fiche étudiant

- """ - % (scu.ScoURL(), etudid), + """ + % url_for("scolar.ficheEtud", scodoc_dept=g.scodoc_dept, etudid=etudid), html_sco_header.sco_footer(context, REQUEST), ] return "\n".join(H) @@ -780,8 +798,15 @@ def formsemestre_inscrits_ailleurs(context, formsemestre_id, REQUEST=None): H.append("