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

Apo: améliore changement période

Browse Source
This commit is contained in:
Emmanuel Viennet 2023-04-18 02:20:32 +02:00
parent b2296d94df
commit 339d70edd2
4 changed files with 23 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/scodoc/sco_etape_apogee.py
View File

@ -143,9 +143,10 @@ def apo_csv_list_stored_archives(annee_scolaire=None, sem_id=None, etapes=None):
if annee_scolaire: if annee_scolaire:
e = re.compile(str(annee_scolaire) + "-.+") e = re.compile(str(annee_scolaire) + "-.+")
oids = [x for x in oids if e.match(x)] oids = [x for x in oids if e.match(x)]
if sem_id: # Note: ne filtre plus sur la période, afin que l'on puisse chnager le semset de période.
e = re.compile(r"[0-9]{4}-" + str(sem_id)) # if sem_id:
oids = [x for x in oids if e.match(x)] # e = re.compile(r"[0-9]{4}-" + str(sem_id))
# oids = [x for x in oids if e.match(x)]
infos = [] # liste d'infos infos = [] # liste d'infos
for oid in oids: for oid in oids:

16
app/scodoc/sco_etape_apogee_view.py
View File

@ -640,20 +640,20 @@ def view_apo_csv_store(semset_id="", csvfile=None, data: bytes = "", autodetect=
apo_data = sco_apogee_csv.ApoData( apo_data = sco_apogee_csv.ApoData(
data_str, periode=semset["sem_id"] data_str, periode=semset["sem_id"]
) # parse le fichier -> exceptions ) # parse le fichier -> exceptions
dest_url = url_for(
"notes.apo_semset_maq_status",
scodoc_dept=g.scodoc_dept,
semset_id=semset_id,
)
if apo_data.etape not in semset["etapes"]: if apo_data.etape not in semset["etapes"]:
raise ScoValueError( raise ScoValueError(
"Le code étape de ce fichier ne correspond pas à ceux de cet ensemble" "Le code étape de ce fichier ne correspond pas à ceux de cet ensemble",
dest_url=dest_url,
) )
sco_etape_apogee.apo_csv_store(data_str, semset["annee_scolaire"], semset["sem_id"]) sco_etape_apogee.apo_csv_store(data_str, semset["annee_scolaire"], semset["sem_id"])
return flask.redirect( return flask.redirect(dest_url)
url_for(
"notes.apo_semset_maq_status",
scodoc_dept=g.scodoc_dept,
semset_id=semset_id,
)
)
def view_apo_csv_download_and_store(etape_apo="", semset_id=""): def view_apo_csv_download_and_store(etape_apo="", semset_id=""):

14
app/scodoc/sco_semset.py
View File

@ -137,8 +137,15 @@ class SemSet(dict):
self["semtitles"] = [sem["titre_num"] for sem in self.sems] self["semtitles"] = [sem["titre_num"] for sem in self.sems]
# Construction du ou des lien(s) vers le semestre # Construction du ou des lien(s) vers le semestre
pattern = '<a class="stdlink" href="formsemestre_status?formsemestre_id=%(formsemestre_id)s">%(titreannee)s</a>' self["semlinks"] = [
self["semlinks"] = [(pattern % sem) for sem in self.sems] f"""<a class="stdlink" href="{
url_for("notes.formsemestre_status", scodoc_dept=g.scodoc_dept,
formsemestre_id=sem["formsemestre_id"])
}">{sem["titreannee"]}</a>
"""
for sem in self.sems
]
self["semtitles_str"] = "<br>".join(self["semlinks"]) self["semtitles_str"] = "<br>".join(self["semlinks"])
def fill_formsemestres(self): def fill_formsemestres(self):
@ -364,8 +371,7 @@ class SemSet(dict):
""" """
if sco_portal_apogee.has_portal(): if sco_portal_apogee.has_portal():
return self.bilan.html_diagnostic() return self.bilan.html_diagnostic()
else: return ""
return ""
def get_semsets_list(): def get_semsets_list():

2
sco_version.py
View File

@ -1,7 +1,7 @@
# -*- mode: python -*- # -*- mode: python -*-
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
SCOVERSION = "9.4.72" SCOVERSION = "9.4.73"
SCONAME = "ScoDoc" SCONAME = "ScoDoc"