forked from ScoDoc/ScoDoc
Merge branch 'master' of https://scodoc.org/git/viennet/ScoDoc into PNBUT
This commit is contained in:
commit
d71b399c3d
@ -377,11 +377,18 @@ def formsemestre_get_etud_groupnames(formsemestre_id, attr="group_name"):
|
||||
{ etudid : { partition_id : group_name }} (attr=group_name or group_id)
|
||||
"""
|
||||
infos = ndb.SimpleDictFetch(
|
||||
"""SELECT i.etudid AS etudid, p.id AS partition_id,
|
||||
gd.group_name, gd.id AS group_id
|
||||
FROM notes_formsemestre_inscription i, partition p,
|
||||
group_descr gd, group_membership gm
|
||||
WHERE i.formsemestre_id=%(formsemestre_id)s
|
||||
"""SELECT
|
||||
i.etudid AS etudid,
|
||||
p.id AS partition_id,
|
||||
gd.group_name,
|
||||
gd.id AS group_id
|
||||
FROM
|
||||
notes_formsemestre_inscription i,
|
||||
partition p,
|
||||
group_descr gd,
|
||||
group_membership gm
|
||||
WHERE
|
||||
i.formsemestre_id=%(formsemestre_id)s
|
||||
and i.formsemestre_id = p.formsemestre_id
|
||||
and p.id = gd.partition_id
|
||||
and gm.etudid = i.etudid
|
||||
|
@ -178,7 +178,7 @@ def formsemestre_list_saisies_notes(formsemestre_id, format="html"):
|
||||
"""
|
||||
sem = sco_formsemestre.get_formsemestre(formsemestre_id)
|
||||
r = ndb.SimpleDictFetch(
|
||||
"""SELECT i.nom, n.*, mod.titre, e.description, e.jour
|
||||
"""SELECT i.nom, i.id as etudid, n.*, mod.titre, e.description, e.jour
|
||||
FROM notes_notes n, notes_evaluation e, notes_moduleimpl mi,
|
||||
notes_modules mod, identite i
|
||||
WHERE mi.id = e.moduleimpl_id
|
||||
@ -192,6 +192,7 @@ def formsemestre_list_saisies_notes(formsemestre_id, format="html"):
|
||||
)
|
||||
columns_ids = (
|
||||
"date",
|
||||
"code_nip",
|
||||
"nom",
|
||||
"value",
|
||||
"uid",
|
||||
@ -201,6 +202,7 @@ def formsemestre_list_saisies_notes(formsemestre_id, format="html"):
|
||||
"comment",
|
||||
)
|
||||
titles = {
|
||||
"code_nip": "NIP",
|
||||
"nom": "Etudiant",
|
||||
"date": "Date",
|
||||
"value": "Note",
|
||||
|
Loading…
Reference in New Issue
Block a user