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

extension code Apogee multiples pour UE (JMP)

Browse Source
This commit is contained in:
Emmanuel Viennet 2021-06-24 18:54:59 +02:00
parent 70f97c8501
commit e1cda28c47
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/scodoc/sco_apogee_csv.py
View File

@ -90,6 +90,7 @@ from cStringIO import StringIO
from zipfile import ZipFile from zipfile import ZipFile
import pprint import pprint
# Pour la détection auto de l'encodage des fichiers Apogée:
try: try:
from chardet import detect as chardet_detect from chardet import detect as chardet_detect
except: except:
@ -438,7 +439,7 @@ class ApoEtud(dict):
# Elements UE # Elements UE
decisions_ue = nt.get_etud_decision_ues(etudid) decisions_ue = nt.get_etud_decision_ues(etudid)
for ue in nt.get_ues(): for ue in nt.get_ues():
if ue["code_apogee"] == code: if code in ue["code_apogee"].split(","):
if self.export_res_ues: if self.export_res_ues:
if decisions_ue and ue["ue_id"] in decisions_ue: if decisions_ue and ue["ue_id"] in decisions_ue:
ue_status = nt.get_etud_ue_status(etudid, ue["ue_id"]) ue_status = nt.get_etud_ue_status(etudid, ue["ue_id"])
@ -459,7 +460,7 @@ class ApoEtud(dict):
modimpls = nt.get_modimpls() modimpls = nt.get_modimpls()
module_code_found = False module_code_found = False
for modimpl in modimpls: for modimpl in modimpls:
if modimpl["module"]["code_apogee"] == code: if code in modimpl["module"]["code_apogee"].split(","):
n = nt.get_etud_mod_moy(modimpl["moduleimpl_id"], etudid) n = nt.get_etud_mod_moy(modimpl["moduleimpl_id"], etudid)
if n != "NI" and self.export_res_modules: if n != "NI" and self.export_res_modules:
return dict(N=_apo_fmt_note(n), B=20, J="", R="") return dict(N=_apo_fmt_note(n), B=20, J="", R="")
@ -988,13 +989,13 @@ class ApoData:
self.context, sem["formsemestre_id"] self.context, sem["formsemestre_id"]
) )
for ue in nt.get_ues(): for ue in nt.get_ues():
if ue["code_apogee"] == code: if code in ue["code_apogee"].split(","):
s.add(code) s.add(code)
continue continue
# associé à un module: # associé à un module:
modimpls = nt.get_modimpls() modimpls = nt.get_modimpls()
for modimpl in modimpls: for modimpl in modimpls:
if modimpl["module"]["code_apogee"] == code: if code in modimpl["module"]["code_apogee"].split(","):
s.add(code) s.add(code)
continue continue
# log('codes_by_sem=%s' % pprint.pformat(codes_by_sem)) # log('codes_by_sem=%s' % pprint.pformat(codes_by_sem))