jmartin/ScoDoc
1
0
Fork 0
forked from ScoDoc/ScoDoc
Code Issues Pull Requests Projects Releases Wiki Activity

remet nom auteurs annotations étudiants

Browse Source
This commit is contained in:
Emmanuel Viennet 2021-09-27 17:33:44 +02:00
parent c7aba95015
commit bf57f2bfa5
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/scodoc/sco_page_etud.py
View File

@ -47,6 +47,7 @@ from app.scodoc import sco_groups
from app.scodoc import sco_parcours_dut from app.scodoc import sco_parcours_dut
from app.scodoc import sco_permissions_check from app.scodoc import sco_permissions_check
from app.scodoc import sco_photos from app.scodoc import sco_photos
from app.scodoc import sco_users
from app.scodoc import sco_report from app.scodoc import sco_report
from app.scodoc import sco_etud from app.scodoc import sco_etud
from app.scodoc.sco_bulletins import etud_descr_situation_semestre from app.scodoc.sco_bulletins import etud_descr_situation_semestre
@ -300,9 +301,11 @@ def ficheEtud(etudid=None):
title="Supprimer cette annotation", title="Supprimer cette annotation",
), ),
) )
author = sco_users.user_info(a["author"])
alist.append( alist.append(
'<tr><td><span class="annodate">Le %(date)s par %(author)s : </span><span class="annoc">%(comment)s</span></td>%(dellink)s</tr>' f"""<tr><td><span class="annodate">Le {a['date']} par {author['prenomnom']} :
% a </span><span class="annoc">{a['comment']}</span></td>{a['dellink']}</tr>
"""
) )
info["liste_annotations"] = "\n".join(alist) info["liste_annotations"] = "\n".join(alist)
# fiche admission # fiche admission

2
app/views/scolar.py
View File

@ -541,7 +541,7 @@ def doAddAnnotation(etudid, comment):
args={ args={
"etudid": etudid, "etudid": etudid,
"comment": comment, "comment": comment,
"authenticated_user": current_user.user_name, "author": current_user.user_name,
}, },
) )
logdb(cnx, method="addAnnotation", etudid=etudid) logdb(cnx, method="addAnnotation", etudid=etudid)