forked from ScoDoc/ScoDoc
Update opolka/ScoDoc from ScoDoc/ScoDoc #2
@ -416,7 +416,7 @@ class BulletinGeneratorBUTCourt(BulletinGeneratorStandard):
|
||||
f"""
|
||||
<b>{self.bul["demission"]}</b><br/>
|
||||
Formation: {self.formsemestre.titre_num()}<br/>
|
||||
Année scolaire: {self.formsemestre.annee_scolaire_str()}<br/>
|
||||
Année universitaire: {self.formsemestre.annee_scolaire_str()}<br/>
|
||||
"""
|
||||
),
|
||||
style=self.style_base,
|
||||
|
@ -93,7 +93,7 @@ div.submit > input {
|
||||
{{ render_field_errors(form, 'raison') }}
|
||||
<div class="help">La raison sera visible aux utilisateurs ayant le droit
|
||||
<tt>AbsJustifView</tt> et à celui ayant déposé le justificatif
|
||||
{%- if justif %} (<b>{{justif.user.get_prenomnom()}}</b>){%- endif -%}.
|
||||
{%- if justif and justif.user %} (<b>{{justif.user.get_prenomnom()}}</b>){%- endif -%}.
|
||||
</div>
|
||||
{% else %}
|
||||
<div class="unauthorized">raison confidentielle</div>
|
||||
|
@ -2089,7 +2089,9 @@ def export_etudiants_courants():
|
||||
departement = Departement.query.get(g.scodoc_dept_id)
|
||||
if not departement:
|
||||
raise ScoValueError("département invalide")
|
||||
formsemestres = FormSemestre.get_dept_formsemestres_courants(departement)
|
||||
formsemestres = FormSemestre.get_dept_formsemestres_courants(departement).all()
|
||||
if not formsemestres:
|
||||
raise ScoValueError("aucun semestre courant !")
|
||||
table = list_etuds.table_etudiants_courants(formsemestres)
|
||||
if fmt.startswith("xls"):
|
||||
return scu.send_file(
|
||||
|
@ -1,7 +1,7 @@
|
||||
# -*- mode: python -*-
|
||||
# -*- coding: utf-8 -*-
|
||||
|
||||
SCOVERSION = "9.6.89"
|
||||
SCOVERSION = "9.6.90"
|
||||
|
||||
SCONAME = "ScoDoc"
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user