Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
S
SCODOC_R6A06
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Paul Milleville
SCODOC_R6A06
Commits
bf57f2bf
Commit
bf57f2bf
authored
3 years ago
by
Emmanuel Viennet
Browse files
Options
Downloads
Patches
Plain Diff
remet nom auteurs annotations étudiants
parent
c7aba950
Branches
Branches containing commit
No related tags found
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
app/scodoc/sco_page_etud.py
+5
-2
5 additions, 2 deletions
app/scodoc/sco_page_etud.py
app/views/scolar.py
+1
-1
1 addition, 1 deletion
app/views/scolar.py
with
6 additions
and
3 deletions
app/scodoc/sco_page_etud.py
+
5
−
2
View file @
bf57f2bf
...
...
@@ -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
...
...
This diff is collapsed.
Click to expand it.
app/views/scolar.py
+
1
−
1
View file @
bf57f2bf
...
...
@@ -541,7 +541,7 @@ def doAddAnnotation(etudid, comment):
args
=
{
"
etudid
"
:
etudid
,
"
comment
"
:
comment
,
"
auth
enticated_use
r
"
:
current_user
.
user_name
,
"
auth
o
r
"
:
current_user
.
user_name
,
},
)
logdb
(
cnx
,
method
=
"
addAnnotation
"
,
etudid
=
etudid
)
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment