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

2
app/pe/pe_jury.py
View File

@ -437,7 +437,7 @@ class JuryPE(object):
# Les moys # Les moys
champ = (descr, nom_stat_promo, "moy") champ = (descr, nom_stat_promo, "moy")
moys = moy_interclass.get_max() moys = moy_interclass.get_moy()
donnees.loc[etudids_communs, champ] = moys.loc[etudids_communs] donnees.loc[etudids_communs, champ] = moys.loc[etudids_communs]
df_synthese = df_synthese.join(donnees) df_synthese = df_synthese.join(donnees)

2
sco_version.py
View File

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