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 +6 -4
4 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 556725b3ef - Show all commits

2
app/but/bulletin_but_court_pdf.py
View File

@ -416,7 +416,7 @@ class BulletinGeneratorBUTCourt(BulletinGeneratorStandard):
f""" f"""
<b>{self.bul["demission"]}</b><br/> <b>{self.bul["demission"]}</b><br/>
Formation: {self.formsemestre.titre_num()}<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, style=self.style_base,

2
app/templates/assiduites/pages/ajout_justificatif_etud.j2
View File

@ -93,7 +93,7 @@ div.submit > input {
{{ render_field_errors(form, 'raison') }} {{ render_field_errors(form, 'raison') }}
<div class="help">La raison sera visible aux utilisateurs ayant le droit <div class="help">La raison sera visible aux utilisateurs ayant le droit
<tt>AbsJustifView</tt> et à celui ayant déposé le justificatif <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> </div>
{% else %} {% else %}
<div class="unauthorized">raison confidentielle</div> <div class="unauthorized">raison confidentielle</div>

4
app/views/scolar.py
View File

@ -2089,7 +2089,9 @@ def export_etudiants_courants():
departement = Departement.query.get(g.scodoc_dept_id) departement = Departement.query.get(g.scodoc_dept_id)
if not departement: if not departement:
raise ScoValueError("département invalide") 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) table = list_etuds.table_etudiants_courants(formsemestres)
if fmt.startswith("xls"): if fmt.startswith("xls"):
return scu.send_file( return scu.send_file(

2
sco_version.py
View File

@ -1,7 +1,7 @@
# -*- mode: python -*- # -*- mode: python -*-
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
SCOVERSION = "9.6.89" SCOVERSION = "9.6.90"
SCONAME = "ScoDoc" SCONAME = "ScoDoc"