fares.amer
/
ScoDoc
forked from ScoDoc/ScoDoc
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix

This commit is contained in:
Emmanuel Viennet 2021-01-23 22:57:01 +01:00
parent d6b6796ae5
commit d57c2c3a4d
3 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
ZAbsences.py
View File

@ -70,6 +70,7 @@ from TrivialFormulator import TrivialFormulator, TF
from gen_tables import GenTable from gen_tables import GenTable
import scolars import scolars
import sco_formsemestre import sco_formsemestre
import sco_moduleimpl
import sco_groups import sco_groups
import sco_groups_view import sco_groups_view
import sco_excel import sco_excel
@ -547,8 +548,8 @@ class ZAbsences(
desc = a["description"] desc = a["description"]
if a["moduleimpl_id"] and a["moduleimpl_id"] != "NULL": if a["moduleimpl_id"] and a["moduleimpl_id"] != "NULL":
# Trouver le nom du module # Trouver le nom du module
Mlist = self.Notes.do_moduleimpl_withmodule_list( Mlist = sco_moduleimpl.do_moduleimpl_withmodule_list(
moduleimpl_id=a["moduleimpl_id"] self.Notes, moduleimpl_id=a["moduleimpl_id"]
) )
if Mlist: if Mlist:
M = Mlist[0] M = Mlist[0]
@ -713,8 +714,8 @@ class ZAbsences(
mod_inscrits = set( mod_inscrits = set(
[ [
x["etudid"] x["etudid"]
for x in self.Notes.do_moduleimpl_inscription_list( for x in sco_moduleimpl.do_moduleimpl_inscription_list(
moduleimpl_id=moduleimpl_id self.Notes, moduleimpl_id=moduleimpl_id
) )
] ]
) )
@ -847,8 +848,8 @@ class ZAbsences(
mod_inscrits = set( mod_inscrits = set(
[ [
x["etudid"] x["etudid"]
for x in self.Notes.do_moduleimpl_inscription_list( for x in sco_moduleimpl.do_moduleimpl_inscription_list(
moduleimpl_id=moduleimpl_id self.Notes, moduleimpl_id=moduleimpl_id
) )
] ]
) )
@ -1221,8 +1222,8 @@ class ZAbsences(
return "" return ""
ex = [] ex = []
for ev in a["evals"]: for ev in a["evals"]:
mod = self.Notes.do_moduleimpl_withmodule_list( mod = sco_moduleimpl.do_moduleimpl_withmodule_list(
moduleimpl_id=ev["moduleimpl_id"] self.Notes, moduleimpl_id=ev["moduleimpl_id"]
)[0] )[0]
if format == "html": if format == "html":
ex.append( ex.append(
@ -1238,8 +1239,8 @@ class ZAbsences(
def descr_abs(a): def descr_abs(a):
ex = [] ex = []
for ev in a.get("absent", []): for ev in a.get("absent", []):
mod = self.Notes.do_moduleimpl_withmodule_list( mod = sco_moduleimpl.do_moduleimpl_withmodule_list(
moduleimpl_id=ev["moduleimpl_id"] self.Notes, moduleimpl_id=ev["moduleimpl_id"]
)[0] )[0]
if format == "html": if format == "html":
ex.append( ex.append(

5
sco_moduleimpl.py
View File

@ -240,8 +240,11 @@ def do_moduleimpl_inscrit_etuds(
# Inscriptions au module: # Inscriptions au module:
inmod_set = set( inmod_set = set(
[ [
# hum ?
x["etudid"] x["etudid"]
for x in context.do_moduleimpl_inscription_list(moduleimpl_id=moduleimpl_id) for x in do_moduleimpl_inscription_list(
context, moduleimpl_id=moduleimpl_id
)
] ]
) )
for etudid in etudids: for etudid in etudids:

4
sco_pvpdf.py
View File

@ -813,8 +813,8 @@ def _pvjury_pdf_type(
"""<para spaceBefore="10mm" align="right"> """<para spaceBefore="10mm" align="right">
Le %s, %s</para>""" Le %s, %s</para>"""
% ( % (
context.get_preference("DirectorTitle", formsemestre_id), context.get_preference("DirectorTitle", formsemestre_id) or "",
context.get_preference("DirectorName", formsemestre_id), context.get_preference("DirectorName", formsemestre_id) or "",
), ),
style, style,
) )