From 6bc4d6dbb49cd293efdf756d696330673798bb2a Mon Sep 17 00:00:00 2001
From: Iziram <matthias.hartmann@iziram.fr>
Date: Mon, 20 Nov 2023 20:59:40 +0100
Subject: [PATCH 1/2] Assiduites : bugfix conflict fakeiso

---
 app/templates/assiduites/widgets/conflict.j2 | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/templates/assiduites/widgets/conflict.j2 b/app/templates/assiduites/widgets/conflict.j2
index 15cf644409..987cdfb21b 100644
--- a/app/templates/assiduites/widgets/conflict.j2
+++ b/app/templates/assiduites/widgets/conflict.j2
@@ -270,14 +270,14 @@
                 ) {
                     const assiduite_avant = {
                         etat: this.selectedAssiduite.etat,
-                        date_debut: assiduite_debut.toFakeIso()(),
-                        date_fin: separtorDate.toFakeIso()(),
+                        date_debut: assiduite_debut.toFakeIso(),
+                        date_fin: separtorDate.toFakeIso(),
                     };
 
                     const assiduite_apres = {
                         etat: this.selectedAssiduite.etat,
-                        date_debut: separtorDate.toFakeIso()(),
-                        date_fin: assiduite_fin.toFakeIso()(),
+                        date_debut: separtorDate.toFakeIso(),
+                        date_fin: assiduite_fin.toFakeIso(),
                     };
 
                     if (this.selectedAssiduite.moduleimpl_id) {

From 7672c3e3c5f62ae514fc5f2ebbf0c9633ccae098 Mon Sep 17 00:00:00 2001
From: Emmanuel Viennet <emmanuel.viennet@gmail.com>
Date: Mon, 20 Nov 2023 17:57:10 +0100
Subject: [PATCH 2/2] Add check in bul_head

---
 app/templates/bul_head.j2 | 12 ++++++++----
 sco_version.py            |  2 +-
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/app/templates/bul_head.j2 b/app/templates/bul_head.j2
index 91acfb3d9e..8c725f012f 100644
--- a/app/templates/bul_head.j2
+++ b/app/templates/bul_head.j2
@@ -18,8 +18,12 @@
             Bulletin
             <span class="bull_liensemestre">
             {{formsemestre.html_link_status() | safe}}
-            {% if formsemestre.etuds_inscriptions[etud.id].parcour %}
-                <span class="parcours">Parcours {{formsemestre.etuds_inscriptions[etud.id].parcour.code}}</span>
+            {% if etud.id in formsemestre.etuds_inscriptions %}
+                {% if formsemestre.etuds_inscriptions[etud.id].parcour %}
+                    <span class="parcours">Parcours {{formsemestre.etuds_inscriptions[etud.id].parcour.code}}</span>
+                {% endif %}
+            {% else %}
+                <span class="parcours">{{scu.EMO_WARNING|safe}} non inscrit !?</span>
             {% endif %}
             </span>
         </div>
@@ -67,8 +71,8 @@
                 )}}">version courte spéciale BUT</a>
             {% endif %}
             <a style="margin-left: 32px;" class="stdlink"
-            href="{{url_for('notes.validation_rcues', 
-                scodoc_dept=g.scodoc_dept, etudid=etud.id, 
+            href="{{url_for('notes.validation_rcues',
+                scodoc_dept=g.scodoc_dept, etudid=etud.id,
                 formsemestre_id=formsemestre.id
             )}}">visualiser les compétences BUT</a>
         </div>
diff --git a/sco_version.py b/sco_version.py
index e8a195ffcc..12c81cd079 100644
--- a/sco_version.py
+++ b/sco_version.py
@@ -1,7 +1,7 @@
 # -*- mode: python -*-
 # -*- coding: utf-8 -*-
 
-SCOVERSION = "9.6.58"
+SCOVERSION = "9.6.59"
 
 SCONAME = "ScoDoc"