diff --git a/app/scodoc/sco_page_etud.py b/app/scodoc/sco_page_etud.py index ff36538b..94abc5ed 100644 --- a/app/scodoc/sco_page_etud.py +++ b/app/scodoc/sco_page_etud.py @@ -564,7 +564,7 @@ def fiche_etud(etudid=None): %(etat_civil)s %(email_link)s -%(etudfoto)s +%(etudfoto)s """ + situation_template diff --git a/app/views/scolar.py b/app/views/scolar.py index 34e7384e..c0280874 100644 --- a/app/views/scolar.py +++ b/app/views/scolar.py @@ -1018,23 +1018,21 @@ sco_publish("/get_photo_image", sco_photos.get_photo_image, Permission.ScoView) sco_publish("/etud_photo_html", sco_photos.etud_photo_html, Permission.ScoView) -@bp.route("/etud_photo_orig_page") +@bp.route("/etud_photo_orig_page/") @scodoc @permission_required(Permission.ScoView) -@scodoc7func -def etud_photo_orig_page(etudid=None): +def etud_photo_orig_page(etudid): "Page with photo in orig. size" - etud = sco_etud.get_etud_info(filled=True, etudid=etudid)[0] - H = [ - html_sco_header.sco_header(page_title=etud["nomprenom"]), - "

%s

" % etud["nomprenom"], - '
' - % url_for("scolar.fiche_etud", scodoc_dept=g.scodoc_dept, etudid=etudid), - sco_photos.etud_photo_orig_html(etud), - "
", - html_sco_header.sco_footer(), - ] - return "\n".join(H) + etud = Identite.get_etud(etudid) + return f"""{ + html_sco_header.sco_header(etudid=etud.id, page_title=etud.nomprenom) + } +

{etud.nomprenom}

+
+ {etud.photo_html(size='orig')} +
+ {html_sco_header.sco_footer()} + """ @bp.route("/form_change_photo", methods=["GET", "POST"])