diff --git a/app/scodoc/sco_page_etud.py b/app/scodoc/sco_page_etud.py index 7a840c3a..424e835c 100644 --- a/app/scodoc/sco_page_etud.py +++ b/app/scodoc/sco_page_etud.py @@ -47,6 +47,7 @@ from app.scodoc import sco_groups from app.scodoc import sco_parcours_dut from app.scodoc import sco_permissions_check from app.scodoc import sco_photos +from app.scodoc import sco_users from app.scodoc import sco_report from app.scodoc import sco_etud from app.scodoc.sco_bulletins import etud_descr_situation_semestre @@ -300,9 +301,11 @@ def ficheEtud(etudid=None): title="Supprimer cette annotation", ), ) + author = sco_users.user_info(a["author"]) alist.append( - 'Le %(date)s par %(author)s : %(comment)s%(dellink)s' - % a + f"""Le {a['date']} par {author['prenomnom']} : + {a['comment']}{a['dellink']} + """ ) info["liste_annotations"] = "\n".join(alist) # fiche admission diff --git a/app/views/scolar.py b/app/views/scolar.py index f2ccf4ff..a84cdfee 100644 --- a/app/views/scolar.py +++ b/app/views/scolar.py @@ -541,7 +541,7 @@ def doAddAnnotation(etudid, comment): args={ "etudid": etudid, "comment": comment, - "authenticated_user": current_user.user_name, + "author": current_user.user_name, }, ) logdb(cnx, method="addAnnotation", etudid=etudid)