lehmann/ScoDoc-Front
1
0
Fork 0
forked from ScoDoc/ScoDoc
Code Pull Requests Activity

Fix sur fonctions statistiques

Browse Source
This commit is contained in:
Emmanuel Viennet 2021-08-21 17:37:38 +02:00
parent ae46d29f01
commit 09af326b03
3 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
app/scodoc/notes_table.py
View File

@ -27,9 +27,10 @@
"""Calculs sur les notes et cache des resultats """Calculs sur les notes et cache des resultats
""" """
import time
import pdb
import inspect import inspect
import os
import pdb
import time
from operator import itemgetter from operator import itemgetter
from flask import g, url_for from flask import g, url_for
@ -172,7 +173,7 @@ class NotesTable(object):
""" """
def __init__(self, formsemestre_id): def __init__(self, formsemestre_id):
log("NotesTable( formsemestre_id=%s )" % formsemestre_id) log(f"[pid={os.getpid()}] NotesTable( formsemestre_id={formsemestre_id} )")
if not formsemestre_id: if not formsemestre_id:
raise ValueError("invalid formsemestre_id (%s)" % formsemestre_id) raise ValueError("invalid formsemestre_id (%s)" % formsemestre_id)
self.formsemestre_id = formsemestre_id self.formsemestre_id = formsemestre_id
@ -356,7 +357,9 @@ class NotesTable(object):
# #
self.compute_moy_moy() self.compute_moy_moy()
# #
log("NotesTable( formsemestre_id=%s ) done." % formsemestre_id) log(
f"[pid={os.getpid()}] NotesTable( formsemestre_id={formsemestre_id} ) done."
)
def get_etudids(self, sorted=False): def get_etudids(self, sorted=False):
if sorted: if sorted:

5
app/scodoc/sco_report.py
View File

@ -696,6 +696,7 @@ def formsemestre_suivi_cohorte(
REQUEST=None, REQUEST=None,
): ):
"""Affiche suivi cohortes par numero de semestre""" """Affiche suivi cohortes par numero de semestre"""
annee_bac = str(annee_bac)
percent = int(percent) percent = int(percent)
( (
tab, tab,
@ -798,7 +799,8 @@ def _gen_form_selectetuds(
bacs.sort() bacs.sort()
bacspecialites = list(bacspecialites) bacspecialites = list(bacspecialites)
bacspecialites.sort() bacspecialites.sort()
annee_bacs = list(annee_bacs) # on peut avoir un mix de chaines vides et d'entiers:
annee_bacs = [int(x) if x else 0 for x in annee_bacs]
annee_bacs.sort() annee_bacs.sort()
civilites = list(civilites) civilites = list(civilites)
civilites.sort() civilites.sort()
@ -1467,6 +1469,7 @@ def formsemestre_graph_parcours(
REQUEST=None, REQUEST=None,
): ):
"""Graphe suivi cohortes""" """Graphe suivi cohortes"""
annee_bac = str(annee_bac)
# log("formsemestre_graph_parcours") # log("formsemestre_graph_parcours")
sem = sco_formsemestre.get_formsemestre(formsemestre_id) sem = sco_formsemestre.get_formsemestre(formsemestre_id)
if format == "pdf": if format == "pdf":

2
app/scodoc/sco_synchro_etuds.py
View File

@ -133,7 +133,6 @@ def formsemestre_synchro_etuds(
inscrits_without_key_all, inscrits_without_key_all,
etudsapo_ident, etudsapo_ident,
) = list_synch(sem, anneeapogee=anneeapogee) ) = list_synch(sem, anneeapogee=anneeapogee)
breakpoint()
if export_cat_xls: if export_cat_xls:
filename = export_cat_xls filename = export_cat_xls
xls = build_page( xls = build_page(
@ -156,7 +155,6 @@ def formsemestre_synchro_etuds(
read_only=read_only, read_only=read_only,
) )
else: else:
breakpoint()
etuds_set = set(etuds) etuds_set = set(etuds)
a_importer = a_importer.intersection(etuds_set) a_importer = a_importer.intersection(etuds_set)
a_desinscrire = inscrits_set - etuds_set a_desinscrire = inscrits_set - etuds_set