From 556725b3efb0ebfaf5e9bbce4a00cb66b07aa5dd Mon Sep 17 00:00:00 2001
From: Emmanuel Viennet <emmanuel.viennet@gmail.com>
Date: Wed, 31 Jan 2024 14:27:08 +0100
Subject: [PATCH] 3 petites corrections

---
 app/but/bulletin_but_court_pdf.py                         | 2 +-
 app/templates/assiduites/pages/ajout_justificatif_etud.j2 | 2 +-
 app/views/scolar.py                                       | 4 +++-
 sco_version.py                                            | 2 +-
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/app/but/bulletin_but_court_pdf.py b/app/but/bulletin_but_court_pdf.py
index 585280451..2021ddf6a 100644
--- a/app/but/bulletin_but_court_pdf.py
+++ b/app/but/bulletin_but_court_pdf.py
@@ -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,
diff --git a/app/templates/assiduites/pages/ajout_justificatif_etud.j2 b/app/templates/assiduites/pages/ajout_justificatif_etud.j2
index 4088bbac2..feced80e8 100644
--- a/app/templates/assiduites/pages/ajout_justificatif_etud.j2
+++ b/app/templates/assiduites/pages/ajout_justificatif_etud.j2
@@ -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>
diff --git a/app/views/scolar.py b/app/views/scolar.py
index 7e1837ce6..b9e57cbe2 100644
--- a/app/views/scolar.py
+++ b/app/views/scolar.py
@@ -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(
diff --git a/sco_version.py b/sco_version.py
index 65feb9eb6..66bec19bd 100644
--- a/sco_version.py
+++ b/sco_version.py
@@ -1,7 +1,7 @@
 # -*- mode: python -*-
 # -*- coding: utf-8 -*-
 
-SCOVERSION = "9.6.89"
+SCOVERSION = "9.6.90"
 
 SCONAME = "ScoDoc"