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 +8 -3
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 35e052ed4c - Show all commits

8
app/scodoc/sco_formsemestre_status.py
View File

@ -1044,7 +1044,7 @@ def formsemestre_status_head(formsemestre_id: int = None, page_title: str = None
Le classement des étudiants n'a qu'une valeur indicative.""" Le classement des étudiants n'a qu'une valeur indicative."""
) )
if sem.bul_hide_xml: if sem.bul_hide_xml:
warnings.append("""Bulletins non publiés sur le portail. """) warnings.append("""Bulletins non publiés sur la passerelle.""")
if sem.block_moyennes: if sem.block_moyennes:
warnings.append("Calcul des moyennes bloqué !") warnings.append("Calcul des moyennes bloqué !")
if sem.semestre_id >= 0 and not sem.est_sur_une_annee(): if sem.semestre_id >= 0 and not sem.est_sur_une_annee():
@ -1243,7 +1243,11 @@ def formsemestre_tableau_modules(
mod_descr = "Module " + (mod.titre or "") mod_descr = "Module " + (mod.titre or "")
if mod.is_apc(): if mod.is_apc():
coef_descr = ", ".join( coef_descr = ", ".join(
[f"{ue.acronyme}: {co}" for ue, co in mod.ue_coefs_list()] [
f"{ue.acronyme}: {co}"
for ue, co in mod.ue_coefs_list()
if isinstance(co, float) and co > 0
]
) )
if coef_descr: if coef_descr:
mod_descr += " Coefs: " + coef_descr mod_descr += " Coefs: " + coef_descr

3
app/templates/assiduites/widgets/differee.j2
View File

@ -101,7 +101,8 @@
} }
.td[assiduite_id='insc']::after { .td[assiduite_id='insc']::after {
content: "Etudiant non inscrit"; content: "non inscrit au module";
font-style: italic;
} }
.sticky { .sticky {