cleo/ScoDoc-PE
1
0
Fork 0
Code Issues 4 Pull Requests Packages Projects Releases Wiki Activity

fix #238

Browse Source
This commit is contained in:
Emmanuel Viennet 2021-12-21 23:05:49 +01:00
parent 6dbba98097
commit 3631719f54
3 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
app/scodoc/sco_abs_views.py
View File

@ -30,7 +30,7 @@
""" """
import datetime import datetime
from flask import url_for, g, request from flask import url_for, g, request, abort
import app.scodoc.sco_utils as scu import app.scodoc.sco_utils as scu
from app.scodoc import notesdb as ndb from app.scodoc import notesdb as ndb
@ -773,7 +773,8 @@ def CalAbs(etudid, sco_year=None):
def ListeAbsEtud( def ListeAbsEtud(
etudid, etudid=None,
code_nip=None,
with_evals=True, with_evals=True,
format="html", format="html",
absjust_only=0, absjust_only=0,
@ -793,9 +794,13 @@ def ListeAbsEtud(
# si absjust_only, table absjust seule (export xls ou pdf) # si absjust_only, table absjust seule (export xls ou pdf)
absjust_only = ndb.bool_or_str(absjust_only) absjust_only = ndb.bool_or_str(absjust_only)
datedebut = "%s-08-01" % scu.AnneeScolaire(sco_year=sco_year) datedebut = "%s-08-01" % scu.AnneeScolaire(sco_year=sco_year)
etudid = etudid or False
etud = sco_etud.get_etud_info(etudid=etudid, filled=True)[0] etuds = sco_etud.get_etud_info(etudid=etudid, code_nip=code_nip, filled=True)
if not etuds:
log(f"ListeAbsEtud: no etuds with etudid={etudid} or nip={code_nip}")
abort(404)
etud = etuds[0]
etudid = etud["etudid"]
# Liste des absences et titres colonnes tables: # Liste des absences et titres colonnes tables:
titles, columns_ids, absnonjust, absjust = _tables_abs_etud( titles, columns_ids, absnonjust, absjust = _tables_abs_etud(
etudid, datedebut, with_evals=with_evals, format=format etudid, datedebut, with_evals=with_evals, format=format

2
app/scodoc/sco_evaluations.py
View File

@ -98,7 +98,7 @@ def ListMedian(L):
def do_evaluation_etat(evaluation_id, partition_id=None, select_first_partition=False): def do_evaluation_etat(evaluation_id, partition_id=None, select_first_partition=False):
"""donne infos sur l'etat du evaluation """donne infos sur l'état de l'évaluation
{ nb_inscrits, nb_notes, nb_abs, nb_neutre, nb_att, { nb_inscrits, nb_notes, nb_abs, nb_neutre, nb_att,
moyenne, mediane, mini, maxi, moyenne, mediane, mini, maxi,
date_last_modif, gr_complets, gr_incomplets, evalcomplete } date_last_modif, gr_complets, gr_incomplets, evalcomplete }

6
app/views/absences.py
View File

@ -251,14 +251,16 @@ sco_publish(
@permission_required_compat_scodoc7(Permission.ScoView) @permission_required_compat_scodoc7(Permission.ScoView)
@scodoc7func @scodoc7func
def ListeAbsEtud( def ListeAbsEtud(
etudid, etudid=None,
code_nip=None,
with_evals=True, with_evals=True,
format="html", format="html",
absjust_only=0, absjust_only=0,
sco_year=None, sco_year=None,
): ):
return sco_abs_views.ListeAbsEtud( return sco_abs_views.ListeAbsEtud(
etudid, etudid=etudid,
code_nip=str(code_nip),
with_evals=with_evals, with_evals=with_evals,
format=format, format=format,
absjust_only=absjust_only, absjust_only=absjust_only,