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

13
app/pe/pe_jury.py
View File

@ -608,7 +608,7 @@ class JuryPE(object):
# Les données des étudiants # Les données des étudiants
etuds = [etud for etudid, etud in self.etudiants.etudiants_diplomes.items()] etuds = [etud for etudid, etud in self.etudiants.etudiants_diplomes.items()]
df = pe_tabletags.df_administratif(etuds, aggregat="", cohorte="") df = pe_tabletags.df_administratif(etuds, aggregat="Administratif", cohorte="")
if type_moy == pe_moytag.CODE_MOY_UE: if type_moy == pe_moytag.CODE_MOY_UE:
aggregats = pe_rcs.TOUS_LES_SEMESTRES aggregats = pe_rcs.TOUS_LES_SEMESTRES
@ -769,5 +769,14 @@ def convert_colonnes_to_multiindex(df):
multiindex""" multiindex"""
colonnes = list(df.columns) colonnes = list(df.columns)
colonnes = [tuple(col.split("|")) for col in colonnes] colonnes = [tuple(col.split("|")) for col in colonnes]
df.columns = pd.MultiIndex.from_tuples(colonnes) # modifie le nom du semestre par sa descr
colonnes_verbose = []
for col in colonnes:
if col[0] in pe_rcs.TYPES_RCS:
col_verbose = [pe_rcs.TYPES_RCS[col[0]]] + list(col[1:])
col_verbose = tuple(col_verbose)
else:
col_verbose = col
colonnes_verbose.append(col)
df.columns = pd.MultiIndex.from_tuples(colonnes_verbose)
return df return df