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 +5 -1
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 262d68c844 - Show all commits

4
app/comp/moy_sem.py
View File

@ -78,7 +78,11 @@ def compute_sem_moys_apc_using_ects(
else: else:
ects = ects_df.to_numpy() ects = ects_df.to_numpy()
# ects est maintenant un array nb_etuds x nb_ues # ects est maintenant un array nb_etuds x nb_ues
moy_gen = (etud_moy_ue_df * ects).sum(axis=1) / ects.sum(axis=1) moy_gen = (etud_moy_ue_df * ects).sum(axis=1) / ects.sum(axis=1)
except ZeroDivisionError:
# peut arriver si aucun module... on ignore
moy_gen = pd.Series(np.NaN, index=etud_moy_ue_df.index)
except TypeError: except TypeError:
if None in ects: if None in ects:
formation = db.session.get(Formation, formation_id) formation = db.session.get(Formation, formation_id)

2
app/scodoc/sco_utils.py
View File

@ -260,7 +260,7 @@ class AssiduitesMetrics:
"""Labels associés au métrique de l'assiduité""" """Labels associés au métrique de l'assiduité"""
SHORT: list[str] = ["1/2 J.", "J.", "H."] SHORT: list[str] = ["1/2 J.", "J.", "H."]
LONG: list[str] = ["Demi-Journée", "Journée", "Heure"] LONG: list[str] = ["Demi-journée", "Journée", "Heure"]
TAG: list[str] = ["demi", "journee", "heure"] TAG: list[str] = ["demi", "journee", "heure"]