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

Merge branch 'master' of https://scodoc.org/git/viennet/ScoDoc into PNBUT

Browse Source
This commit is contained in:
Emmanuel Viennet 2021-11-12 11:40:31 +01:00
commit d71b399c3d
2 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
app/scodoc/sco_groups.py
View File

@ -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) { etudid : { partition_id : group_name }} (attr=group_name or group_id)
""" """
infos = ndb.SimpleDictFetch( infos = ndb.SimpleDictFetch(
"""SELECT i.etudid AS etudid, p.id AS partition_id, """SELECT
gd.group_name, gd.id AS group_id i.etudid AS etudid,
FROM notes_formsemestre_inscription i, partition p, p.id AS partition_id,
group_descr gd, group_membership gm gd.group_name,
WHERE i.formsemestre_id=%(formsemestre_id)s 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 i.formsemestre_id = p.formsemestre_id
and p.id = gd.partition_id and p.id = gd.partition_id
and gm.etudid = i.etudid and gm.etudid = i.etudid

4
app/scodoc/sco_undo_notes.py
View File

@ -178,7 +178,7 @@ def formsemestre_list_saisies_notes(formsemestre_id, format="html"):
""" """
sem = sco_formsemestre.get_formsemestre(formsemestre_id) sem = sco_formsemestre.get_formsemestre(formsemestre_id)
r = ndb.SimpleDictFetch( 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, FROM notes_notes n, notes_evaluation e, notes_moduleimpl mi,
notes_modules mod, identite i notes_modules mod, identite i
WHERE mi.id = e.moduleimpl_id WHERE mi.id = e.moduleimpl_id
@ -192,6 +192,7 @@ def formsemestre_list_saisies_notes(formsemestre_id, format="html"):
) )
columns_ids = ( columns_ids = (
"date", "date",
"code_nip",
"nom", "nom",
"value", "value",
"uid", "uid",
@ -201,6 +202,7 @@ def formsemestre_list_saisies_notes(formsemestre_id, format="html"):
"comment", "comment",
) )
titles = { titles = {
"code_nip": "NIP",
"nom": "Etudiant", "nom": "Etudiant",
"date": "Date", "date": "Date",
"value": "Note", "value": "Note",