simplify selection in term_bilan
This commit is contained in:
parent
954c2ac027
commit
b273cb548f
|
@ -1,7 +1,7 @@
|
|||
#!/usr/bin/env python
|
||||
# encoding: utf-8
|
||||
|
||||
from notes_tools.tools import extract_flat_marks, get_class_ws, digest_flat_df, term_tools, eval_tools
|
||||
from notes_tools.tools import extract_flat_marks, get_class_ws, digest_flat_df, term_tools
|
||||
from .texenv import feed_template
|
||||
import pandas as pd
|
||||
import numpy as np
|
||||
|
@ -49,13 +49,12 @@ def term_bilan(classe, term, path = Path('./'),
|
|||
logger.info("Worksheets of {} imported".format(classe))
|
||||
|
||||
flat_df = extract_flat_marks(ws)
|
||||
quest_df, exo_df, eval_df = digest_flat_df(flat_df)
|
||||
logger.info("Worksheets parsed")
|
||||
|
||||
quest_df, exo_df, eval_df = \
|
||||
term_tools.select(quest_df, exo_df, eval_df, term)
|
||||
_, conn_df, _ = \
|
||||
eval_tools.select_contains(quest_df, exo_df, eval_df, "Conn")
|
||||
term_df = flat_df[flat_df['Trimestre'] == term]
|
||||
|
||||
quest_df, exo_df, eval_df = digest_flat_df(term_df)
|
||||
conn_df = exo_df[exo_df["Nom"].str.contains('Conn')]
|
||||
|
||||
bilan_info = term_info(classe, eval_df)
|
||||
students = term_tools.students_pov(quest_df, exo_df, eval_df)
|
||||
|
|
Loading…
Reference in New Issue