From c0719df0c0f0777c79fa3ff27dbda6250c30e194 Mon Sep 17 00:00:00 2001
From: Emmanuel Viennet <emmanuel.viennet@gmail.com>
Date: Tue, 1 Mar 2022 19:27:03 +0100
Subject: [PATCH 1/4] noms modules sur menu saisie absences

---
 app/scodoc/sco_edit_module.py | 7 +++++--
 app/views/absences.py         | 5 ++---
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/app/scodoc/sco_edit_module.py b/app/scodoc/sco_edit_module.py
index 9ea4e2fe..63bcb72a 100644
--- a/app/scodoc/sco_edit_module.py
+++ b/app/scodoc/sco_edit_module.py
@@ -562,7 +562,7 @@ def module_edit(module_id=None):
             "code",
             {
                 "size": 10,
-                "explanation": "code du module (doit être unique dans la formation)",
+                "explanation": "code du module (issu du programme, exemple M1203 ou R2.01. Doit être unique dans la formation)",
                 "allow_null": False,
                 "validator": lambda val, field, formation_id=formation_id: check_module_code_unicity(
                     val, field, formation_id, module_id=module_id
@@ -701,7 +701,10 @@ def module_edit(module_id=None):
             {
                 "title": "Code Apogée",
                 "size": 25,
-                "explanation": "(optionnel) code élément pédagogique Apogée ou liste de codes ELP séparés par des virgules",
+                "explanation": """(optionnel) code élément pédagogique Apogée ou liste de codes ELP 
+                séparés par des virgules (ce code est propre à chaque établissement, se rapprocher 
+                du référent Apogée).
+                """,
                 "validator": lambda val, _: len(val) < APO_CODE_STR_LEN,
             },
         ),
diff --git a/app/views/absences.py b/app/views/absences.py
index cf8de2c1..bdbae145 100644
--- a/app/views/absences.py
+++ b/app/views/absences.py
@@ -611,8 +611,7 @@ def SignaleAbsenceGrSemestre(
                 """<option value="%(modimpl_id)s" %(sel)s>%(modname)s</option>\n"""
                 % {
                     "modimpl_id": modimpl["moduleimpl_id"],
-                    "modname": modimpl["module"]["code"]
-                    or ""
+                    "modname": (modimpl["module"]["code"] or "")
                     + " "
                     + (modimpl["module"]["abbrev"] or modimpl["module"]["titre"]),
                     "sel": sel,
@@ -624,7 +623,7 @@ def SignaleAbsenceGrSemestre(
             sel = "selected"  # aucun module specifie
         H.append(
             """<p>
-Module concerné par ces absences (%(optionel_txt)s): 
+Module concerné par ces absences (%(optionel_txt)s):
 <select id="moduleimpl_id" name="moduleimpl_id" 
 onchange="document.location='%(url)s&moduleimpl_id='+document.getElementById('moduleimpl_id').value">
 <option value="" %(sel)s>non spécifié</option>

From 9d53e389928e1752d260c1d6fd42a0cd72368638 Mon Sep 17 00:00:00 2001
From: Emmanuel Viennet <emmanuel.viennet@gmail.com>
Date: Tue, 1 Mar 2022 23:25:42 +0100
Subject: [PATCH 2/4] cosmetic / ECTS

---
 app/scodoc/sco_edit_apc.py     | 17 ++++++++++++++++-
 app/scodoc/sco_edit_ue.py      |  8 ++++----
 app/templates/pn/form_ues.html |  6 ++----
 3 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/app/scodoc/sco_edit_apc.py b/app/scodoc/sco_edit_apc.py
index c6b0151d..cec8b7c2 100644
--- a/app/scodoc/sco_edit_apc.py
+++ b/app/scodoc/sco_edit_apc.py
@@ -52,6 +52,7 @@ def html_edit_formation_apc(
     """
     parcours = formation.get_parcours()
     assert parcours.APC_SAE
+
     ressources = formation.modules.filter_by(module_type=ModuleType.RESSOURCE).order_by(
         Module.semestre_id, Module.numero, Module.code
     )
@@ -68,6 +69,19 @@ def html_edit_formation_apc(
     ).order_by(
         Module.semestre_id, Module.module_type.desc(), Module.numero, Module.code
     )
+
+    ues_by_sem = {}
+    ects_by_sem = {}
+    for semestre_idx in semestre_ids:
+        ues_by_sem[semestre_idx] = formation.ues.filter_by(
+            semestre_idx=semestre_idx
+        ).order_by(UniteEns.semestre_idx, UniteEns.numero, UniteEns.acronyme)
+        ects = [ue.ects for ue in ues_by_sem[semestre_idx]]
+        if None in ects:
+            ects_by_sem[semestre_idx] = '<span class="missing_ue_ects">manquant</span>'
+        else:
+            ects_by_sem[semestre_idx] = sum(ects)
+
     arrow_up, arrow_down, arrow_none = sco_groups.get_arrow_icons_tags()
 
     icons = {
@@ -93,7 +107,8 @@ def html_edit_formation_apc(
             editable=editable,
             tag_editable=tag_editable,
             icons=icons,
-            UniteEns=UniteEns,
+            ues_by_sem=ues_by_sem,
+            ects_by_sem=ects_by_sem,
         ),
     ]
     for semestre_idx in semestre_ids:
diff --git a/app/scodoc/sco_edit_ue.py b/app/scodoc/sco_edit_ue.py
index 8cc3269a..14e4faec 100644
--- a/app/scodoc/sco_edit_ue.py
+++ b/app/scodoc/sco_edit_ue.py
@@ -305,7 +305,7 @@ def ue_edit(ue_id=None, create=False, formation_id=None, default_semestre_idx=No
         (
             "numero",
             {
-                "size": 2,
+                "size": 4,
                 "explanation": "numéro (1,2,3,4) de l'UE pour l'ordre d'affichage",
                 "type": "int",
             },
@@ -722,16 +722,16 @@ du programme" (menu "Semestre") si vous avez un semestre en cours);
             <a href="{url_for('notes.refcomp_show', 
             scodoc_dept=g.scodoc_dept, refcomp_id=formation.referentiel_competence.id)}">
             {formation.referentiel_competence.type_titre} {formation.referentiel_competence.specialite_long}
-            </a> """
+            </a>&nbsp;"""
             msg_refcomp = "changer"
         H.append(
             f"""
         <ul>
-        <li>{descr_refcomp}&nbsp; <a class="stdlink" href="{url_for('notes.refcomp_assoc_formation', 
+        <li>{descr_refcomp} <a class="stdlink" href="{url_for('notes.refcomp_assoc_formation', 
         scodoc_dept=g.scodoc_dept, formation_id=formation_id)
         }">{msg_refcomp}</a>
         </li>
-        <li><a class="stdlink" href="{
+        <li> <a class="stdlink" href="{
             url_for('notes.edit_modules_ue_coefs', scodoc_dept=g.scodoc_dept, formation_id=formation_id, semestre_idx=semestre_idx)
         }">éditer les coefficients des ressources et SAÉs</a>
         </li>
diff --git a/app/templates/pn/form_ues.html b/app/templates/pn/form_ues.html
index 98c590f7..a91f2942 100644
--- a/app/templates/pn/form_ues.html
+++ b/app/templates/pn/form_ues.html
@@ -3,11 +3,9 @@
 <div class="formation_list_ues">
     <div class="formation_list_ues_titre">Unités d'Enseignement (UEs)</div>
     {% for semestre_idx in semestre_ids %}
-        <div class="formation_list_ues_sem">Semestre S{{semestre_idx}}</div>
+        <div class="formation_list_ues_sem">Semestre S{{semestre_idx}} (ECTS: {{ects_by_sem[semestre_idx] | safe}})</div>
         <ul class="apc_ue_list">
-            {% for ue in formation.ues.filter_by(semestre_idx=semestre_idx).order_by(
-                UniteEns.semestre_idx, UniteEns.numero, UniteEns.acronyme
-            ) %}
+            {% for ue in ues_by_sem[semestre_idx] %}
                 <li class="notes_ue_list">
                 {% if editable and not loop.first %}
                     <a href="{{ url_for('notes.ue_move', 

From a19a54e0542f8aa6460b41b4508ca0f88fab9b57 Mon Sep 17 00:00:00 2001
From: Emmanuel Viennet <emmanuel.viennet@gmail.com>
Date: Tue, 1 Mar 2022 23:51:39 +0100
Subject: [PATCH 3/4] fix typo

---
 app/comp/bonus_spo.py | 3 +--
 sco_version.py        | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/app/comp/bonus_spo.py b/app/comp/bonus_spo.py
index aa7697d5..d1c3ddca 100644
--- a/app/comp/bonus_spo.py
+++ b/app/comp/bonus_spo.py
@@ -220,8 +220,7 @@ class BonusSportAdditif(BonusSport):
         bonus_moy_arr = np.sum(
             np.where(
                 sem_modimpl_moys_inscrits > self.seuil_moy_gen,
-                (sem_modimpl_moys_inscrits - self.seuil_comptage)
-                * self.proportion_point,
+                (sem_modimpl_moys_inscrits - seuil_comptage) * self.proportion_point,
                 0.0,
             ),
             axis=1,
diff --git a/sco_version.py b/sco_version.py
index fbbf5bc8..54c9d0fd 100644
--- a/sco_version.py
+++ b/sco_version.py
@@ -1,7 +1,7 @@
 # -*- mode: python -*-
 # -*- coding: utf-8 -*-
 
-SCOVERSION = "9.1.67"
+SCOVERSION = "9.1.68"
 
 SCONAME = "ScoDoc"
 

From 750744094e4cb03e432823dc6770ff546bf3ff02 Mon Sep 17 00:00:00 2001
From: Emmanuel Viennet <emmanuel.viennet@gmail.com>
Date: Wed, 2 Mar 2022 00:01:22 +0100
Subject: [PATCH 4/4] version 9.1.69

---
 sco_version.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sco_version.py b/sco_version.py
index 54c9d0fd..19d27aea 100644
--- a/sco_version.py
+++ b/sco_version.py
@@ -1,7 +1,7 @@
 # -*- mode: python -*-
 # -*- coding: utf-8 -*-
 
-SCOVERSION = "9.1.68"
+SCOVERSION = "9.1.69"
 
 SCONAME = "ScoDoc"