From e36a83a48a660c3a41999edf3e9ed8fc9ed09218 Mon Sep 17 00:00:00 2001
From: Emmanuel Viennet <emmanuel.viennet@gmail.com>
Date: Mon, 17 Apr 2023 12:10:17 +0200
Subject: [PATCH] =?UTF-8?q?Fix=20export=20Apo=20BUT/Simpair=20isol=C3=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/scodoc/sco_apogee_csv.py | 10 +++++++---
 sco_version.py               |  2 +-
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/app/scodoc/sco_apogee_csv.py b/app/scodoc/sco_apogee_csv.py
index 928d4b4a..6ed4c7f2 100644
--- a/app/scodoc/sco_apogee_csv.py
+++ b/app/scodoc/sco_apogee_csv.py
@@ -476,8 +476,10 @@ class ApoEtud(dict):
         #
         return None  # element Apogee non trouvé dans ce semestre
 
-    def comp_elt_semestre(self, nt, decision, etudid):
-        """Calcul résultat apo semestre"""
+    def comp_elt_semestre(self, nt: NotesTableCompat, decision: dict, etudid: int):
+        """Calcul résultat apo semestre.
+        Toujours vide pour en BUT/APC.
+        """
         if self.is_apc:
             # pas de code semestre en APC !
             return dict(N="", B=20, J="", R="", M="")
@@ -522,7 +524,9 @@ class ApoEtud(dict):
         cur_formsemestre = FormSemestre.query.get_or_404(cur_sem["formsemestre_id"])
         cur_nt: NotesTableCompat = res_sem.load_formsemestre_results(cur_formsemestre)
 
-        if not self.is_apc:
+        if self.is_apc:
+            cur_decision = {}  # comp_elt_semestre sera vide.
+        else:
             cur_decision = cur_nt.get_etud_decision_sem(etudid)
             if not cur_decision:
                 # pas de decision => pas de résultat annuel
diff --git a/sco_version.py b/sco_version.py
index e43776aa..26e724b0 100644
--- a/sco_version.py
+++ b/sco_version.py
@@ -1,7 +1,7 @@
 # -*- mode: python -*-
 # -*- coding: utf-8 -*-
 
-SCOVERSION = "9.4.74"
+SCOVERSION = "9.4.72"
 
 SCONAME = "ScoDoc"