opolka/ScoDoc
1
0
Fork 0
forked from ScoDoc/ScoDoc
Code Issues Pull Requests Activity

Update opolka/ScoDoc from ScoDoc/ScoDoc #2

Merged
opolka merged 1272 commits from ScoDoc/ScoDoc:master into master 2024-05-27 09:11:04 +02:00
Conversation 0 Commits 1272 Files Changed 656 +12 -8
4 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 579d71937d - Show all commits

2
app/scodoc/sco_etud.py
View File

@ -860,6 +860,8 @@ def fill_etuds_info(etuds: list[dict], add_admission=True):
etud.update(etud_inscriptions_infos(etudid, etud["ne"])) etud.update(etud_inscriptions_infos(etudid, etud["ne"]))
# nettoyage champs souvent vides # nettoyage champs souvent vides
etud["codepostallycee"] = etud.get("codepostallycee", "") or ""
etud["nomlycee"] = etud.get("nomlycee", "") or ""
if etud.get("nomlycee"): if etud.get("nomlycee"):
etud["ilycee"] = "Lycée " + format_lycee(etud["nomlycee"]) etud["ilycee"] = "Lycée " + format_lycee(etud["nomlycee"])
if etud["villelycee"]: if etud["villelycee"]:

2
app/scodoc/sco_lycee.py
View File

@ -114,7 +114,7 @@ def _table_etuds_lycees(etuds, group_lycees, title, preferences, no_links=False)
L = [etuds_by_lycee[codelycee][0] for codelycee in etuds_by_lycee] L = [etuds_by_lycee[codelycee][0] for codelycee in etuds_by_lycee]
for l in L: for l in L:
l["nbetuds"] = len(etuds_by_lycee[l["codelycee"]]) l["nbetuds"] = len(etuds_by_lycee[l["codelycee"]])
# L.sort( key=operator.itemgetter('codepostallycee', 'nomlycee') ) argh, only python 2.5+ !!!
L.sort(key=itemgetter("codepostallycee", "nomlycee")) L.sort(key=itemgetter("codepostallycee", "nomlycee"))
columns_ids = ( columns_ids = (
"nbetuds", "nbetuds",

6
app/scodoc/sco_report.py
View File

@ -468,7 +468,7 @@ def table_suivi_cohorte(
for etudid in etudids: for etudid in etudids:
etud = sco_etud.get_etud_info(etudid=etudid, filled=True)[0] etud = sco_etud.get_etud_info(etudid=etudid, filled=True)[0]
etud["annee_admission"] = etud["annee"] etud["annee_admission"] = etud["annee"]
bacspe = etud["bac"] + " / " + etud["specialite"] bacspe = (etud["bac"] or "?") + " / " + (etud["specialite"] or "")
# sélection sur bac: # sélection sur bac:
if ( if (
(not bac or (bac == etud["bac"])) (not bac or (bac == etud["bac"]))
@ -488,9 +488,11 @@ def table_suivi_cohorte(
sem["date_debut"] sem["date_debut"]
): ):
S[s["formsemestre_id"]] = s S[s["formsemestre_id"]] = s
if etud.get("bac", False):
bacs.add(etud["bac"]) bacs.add(etud["bac"])
bacspecialites.add(bacspe) bacspecialites.add(bacspe)
annee_bacs.add(str(etud["annee_bac"])) annee_bacs.add(str(etud["annee_bac"]))
if etud["annee_admission"] is not None:
annee_admissions.add(str(etud["annee_admission"])) annee_admissions.add(str(etud["annee_admission"]))
civilites.add(etud["civilite"]) civilites.add(etud["civilite"])
if etud["statut"]: # ne montre pas les statuts non renseignés if etud["statut"]: # ne montre pas les statuts non renseignés
@ -1117,7 +1119,7 @@ def tsp_etud_list(
for etudid in etudids: for etudid in etudids:
etud = sco_etud.get_etud_info(etudid=etudid, filled=True)[0] etud = sco_etud.get_etud_info(etudid=etudid, filled=True)[0]
etud["annee_admission"] = etud["annee"] # plus explicite etud["annee_admission"] = etud["annee"] # plus explicite
bacspe = etud["bac"] + " / " + etud["specialite"] bacspe = (etud["bac"] or "?") + " / " + (etud["specialite"] or "")
# sélection sur bac, primo, ...: # sélection sur bac, primo, ...:
if ( if (
(not bac or (bac == etud["bac"])) (not bac or (bac == etud["bac"]))

2
app/tables/recap.py
View File

@ -460,7 +460,7 @@ class TableRecap(tb.Table):
) )
def add_admissions(self): def add_admissions(self):
"""Ajoute les colonnes "admission" pour tous les étduiants de la table """Ajoute les colonnes "admission" pour tous les étudiants de la table
Les colonnes ont la classe css "admission" Les colonnes ont la classe css "admission"
""" """
fields = { fields = {