From 1b037d6c7c75eca60d210a7897d9953840b8d84a Mon Sep 17 00:00:00 2001
From: Iziram <matthias.hartmann@iziram.fr>
Date: Fri, 1 Mar 2024 16:04:16 +0100
Subject: [PATCH] =?UTF-8?q?Assiduit=C3=A9=20:=20fix=20format=20nbabs=20sid?=
 =?UTF-8?q?ebar?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/scodoc/html_sidebar.py | 2 +-
 app/templates/sidebar.j2   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/scodoc/html_sidebar.py b/app/scodoc/html_sidebar.py
index 2d351e62..008d366b 100755
--- a/app/scodoc/html_sidebar.py
+++ b/app/scodoc/html_sidebar.py
@@ -185,7 +185,7 @@ def sidebar(etudid: int = None):
                     formsemestre.date_fin.strftime("%d/%m/%Y")
                 }">({
                     sco_preferences.get_preference("assi_metrique", None)})
-                <br>{nbabsjust:1.0f} J., {nbabsnj:1.0f} N.J.</span>"""
+                <br>{nbabsjust:1g} J., {nbabsnj:1g} N.J.</span>"""
             )
         H.append("<ul>")
         if current_user.has_permission(Permission.AbsChange):
diff --git a/app/templates/sidebar.j2 b/app/templates/sidebar.j2
index 00c61230..5e8f349f 100755
--- a/app/templates/sidebar.j2
+++ b/app/templates/sidebar.j2
@@ -58,7 +58,7 @@
         {% if sco.etud_cur_sem %}
         <span title="absences du {{ sco.etud_cur_sem['date_debut'].strftime('%d/%m/%Y') }}
         au {{ sco.etud_cur_sem['date_fin'].strftime('%d/%m/%Y') }}">({{sco.prefs["assi_metrique"]}})
-            <br />{{'%1.0f'|format(sco.nbabsjust)}} J., {{'%1.0f'|format(sco.nbabsnj)}} N.J.</span>
+            <br />{{'%1g'|format(sco.nbabsjust)}} J., {{'%1g'|format(sco.nbabsnj)}} N.J.</span>
         {% endif %}
         <ul>
             {% if current_user.has_permission(sco.Permission.AbsChange) %}
@@ -94,4 +94,4 @@
             {{ scu.icontag("scologo_img", no_size=True) | safe}}</a>
     </div>
 </div>
-<!-- end of sidebar -->
+<!-- end of sidebar -->
\ No newline at end of file