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 +4 -6
3 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 49a5ec488d - Show all commits

4
app/comp/res_common.py
View File

@ -432,7 +432,7 @@ class ResultatsSemestre(ResultatsCache):
ue_cap_dict["compense_formsemestre_id"] = None ue_cap_dict["compense_formsemestre_id"] = None
return ue_cap_dict return ue_cap_dict
def get_etud_ue_status(self, etudid: int, ue_id: int) -> dict: def get_etud_ue_status(self, etudid: int, ue_id: int) -> dict | None:
"""L'état de l'UE pour cet étudiant. """L'état de l'UE pour cet étudiant.
Result: dict, ou None si l'UE n'est pas dans ce semestre. Result: dict, ou None si l'UE n'est pas dans ce semestre.
{ {
@ -470,7 +470,7 @@ class ResultatsSemestre(ResultatsCache):
"ects": 0.0, "ects": 0.0,
"ects_ue": ue.ects, "ects_ue": ue.ects,
} }
if not ue_id in self.etud_moy_ue: if not ue_id in self.etud_moy_ue or not etudid in self.etud_moy_ue[ue_id]:
return None return None
if not self.validations: if not self.validations:
self.validations = res_sem.load_formsemestre_validations(self.formsemestre) self.validations = res_sem.load_formsemestre_validations(self.formsemestre)

4
app/scodoc/sco_poursuite_dut.py
View File

@ -72,9 +72,7 @@ def etud_get_poursuite_info(sem: dict, etud: dict) -> dict:
moy_ues.append( moy_ues.append(
( (
ue["acronyme"], ue["acronyme"],
scu.fmt_note( scu.fmt_note(ue_status["moy"]),
nt.get_etud_ue_status(etudid, ue["ue_id"])["moy"]
),
) )
) )
else: else:

2
sco_version.py
View File

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