diff --git a/app/scodoc/sco_page_etud.py b/app/scodoc/sco_page_etud.py index 7a840c3a12a6c326b2dca2a215bc03371613e17f..424e835cf25ef271b38a30263b1f711b637408a6 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( - '<tr><td><span class="annodate">Le %(date)s par %(author)s : </span><span class="annoc">%(comment)s</span></td>%(dellink)s</tr>' - % a + f"""<tr><td><span class="annodate">Le {a['date']} par {author['prenomnom']} : + </span><span class="annoc">{a['comment']}</span></td>{a['dellink']}</tr> + """ ) info["liste_annotations"] = "\n".join(alist) # fiche admission diff --git a/app/views/scolar.py b/app/views/scolar.py index f2ccf4ff78fa86536c2206dfe71600f431fd5293..a84cdfeedf3401f15a9cce421e6ea88d95b0ae86 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)