From cdbecfc421842755a8dc1646a319b9d39913ee73 Mon Sep 17 00:00:00 2001
From: Emmanuel Viennet <emmanuel.viennet@gmail.com>
Date: Thu, 3 Aug 2023 13:48:22 +0200
Subject: [PATCH] =?UTF-8?q?Bulletin=20court=20BUT:=20ajout=20boite=20assid?=
 =?UTF-8?q?uit=C3=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/but/bulletin_but_court.py            |  1 +
 app/static/css/bulletin_court.css        | 33 ++++++++++++++++++++++++
 app/templates/but/bulletin_court_page.j2 | 14 +++++++++-
 3 files changed, 47 insertions(+), 1 deletion(-)

diff --git a/app/but/bulletin_but_court.py b/app/but/bulletin_but_court.py
index 1831cf6f2..132e2655a 100644
--- a/app/but/bulletin_but_court.py
+++ b/app/but/bulletin_but_court.py
@@ -83,5 +83,6 @@ def bulletin_but(formsemestre_id: int, etudid: int = None):
         logo=logo,
         sco=ScoData(formsemestre=formsemestre, etud=etud),
         time=time,
+        title=f"Bul. {etud.nom_disp()} BUT (court)",
         ue_validation_by_niveau=ue_validation_by_niveau,
     )
diff --git a/app/static/css/bulletin_court.css b/app/static/css/bulletin_court.css
index 7fb7e5914..6e16b6b70 100644
--- a/app/static/css/bulletin_court.css
+++ b/app/static/css/bulletin_court.css
@@ -37,6 +37,39 @@ div.but_bul_court {
   height: 3cm;
 }
 
+#assiduite {
+  grid-column: 1;
+  grid-row: 2;
+  align-self: start;
+  justify-self: start;
+  margin-top: 5mm;
+  margin-bottom: 5mm;
+
+  background-color: rgb(245, 237, 200);
+	align-items: baseline;
+  border: 1px solid black;
+	padding: 4px 8px;
+	border-radius: 3mm;
+	display: grid;
+	grid-template-columns: auto auto;
+	column-gap: 4px;
+	flex: none;
+}
+#assiduite > div > div:nth-child(2n) {
+	text-align: right;
+  font-weight: normal;
+}
+#assiduite .ligne-entete {
+    grid-column: 1/3;
+    color: black;
+    font-weight: bold;
+    font-size: 14px;
+    margin-bottom: 4px;
+}
+#assiduite abs {
+  font-weight: bold;
+}
+
 div.but_bul_court table {
   border-collapse: collapse;
   border: 2px solid black; 
diff --git a/app/templates/but/bulletin_court_page.j2 b/app/templates/but/bulletin_court_page.j2
index cedef09e9..593ec54f4 100644
--- a/app/templates/but/bulletin_court_page.j2
+++ b/app/templates/but/bulletin_court_page.j2
@@ -57,6 +57,16 @@
         {% endif %}
     </div>
 
+    {% if bul.options.show_abs %}
+        <div id="assiduite">
+            <div class="ligne-entete">Absences {{bul.semestre.absences.metrique}}</div>
+            <div class="abs">Non justifiées</div>
+            <div>{{bul.semestre.absences.injustifie}}</div>
+            <div class="abs">Total</div>
+            <div>{{bul.semestre.absences.total}}</div>
+        </div>
+    {% endif %}
+
     <div id="ues">
         <table>
         <thead>
@@ -110,7 +120,9 @@
             <tr class="jury">
                 <td>Jury</td>
                 {% for ue in bul.ues %}
-                    <td class="col_ue">{{decision_ues[ue].code}}</td>
+                    <td class="col_ue">{{
+                        decision_ues[ue].code if ue in decision_ues else ""
+                    }}</td>
                 {% endfor %}
             </tr>
         </tbody>