From 331d42f5ee27fc480f04a9f2ba916ff4792698af Mon Sep 17 00:00:00 2001
From: Emmanuel Viennet <emmanuel.viennet@gmail.com>
Date: Sat, 26 Aug 2023 11:03:55 +0200
Subject: [PATCH] Fix affichage validation RCUE (merci @SebL). Corrige certains
 liens externes. Ajout lien vers visu cursus.

---
 app/but/jury_but_view.py                    |  7 +++++++
 app/scodoc/html_sidebar.py                  |  6 ++++--
 app/static/css/parcour_formation.css        |  2 +-
 app/templates/about.j2                      |  3 ++-
 app/templates/entreprises/import_donnees.j2 | 12 +++++++-----
 app/templates/scodoc/help/modules.j2        |  2 +-
 app/templates/sidebar.j2                    |  3 ++-
 app/views/absences.py                       | 17 ++++++++---------
 8 files changed, 32 insertions(+), 20 deletions(-)

diff --git a/app/but/jury_but_view.py b/app/but/jury_but_view.py
index f2ead5ac..3ae00b2f 100644
--- a/app/but/jury_but_view.py
+++ b/app/but/jury_but_view.py
@@ -76,6 +76,13 @@ def show_etud(deca: DecisionsProposeesAnnee, read_only: bool = True) -> str:
         f"""
     <div class="titre_niveaux">
         <b>Niveaux de compétences et unités d'enseignement du BUT{deca.annee_but}</b>
+        <a style="margin-left: 32px;" class="stdlink" target="_blank" rel="noopener noreferrer" 
+            href={
+                url_for("notes.validation_rcues", scodoc_dept=g.scodoc_dept, 
+                    etudid=deca.etud.id,
+                    formsemestre_id=formsemestre_2.id if formsemestre_2 else formsemestre_1.id
+            )
+        }>visualiser son cursus</a>
     </div>
     <div class="but_explanation">{deca.explanation}</div>
     <div class="but_annee">
diff --git a/app/scodoc/html_sidebar.py b/app/scodoc/html_sidebar.py
index 820bf898..6e483df3 100755
--- a/app/scodoc/html_sidebar.py
+++ b/app/scodoc/html_sidebar.py
@@ -152,8 +152,10 @@ def sidebar(etudid: int = None):
     # Logo
     H.append(
         f"""<div class="logo-insidebar">
-        <div class="sidebar-bottom"><a href="{ url_for( 'scodoc.about', scodoc_dept=g.scodoc_dept ) }" class="sidebar">À propos</a><br>
-        <a href="{ scu.SCO_USER_MANUAL }" target="_blank" class="sidebar">Aide</a>
+        <div class="sidebar-bottom"><a href="{ 
+            url_for( 'scodoc.about', scodoc_dept=g.scodoc_dept ) 
+            }" class="sidebar">À propos</a><br>
+        <a href="{ scu.SCO_USER_MANUAL }" target="_blank" rel="noopener" class="sidebar">Aide</a>
         </div></div>
         <div class="logo-logo">
            <a href="{ url_for( 'scodoc.about', scodoc_dept=g.scodoc_dept ) }">
diff --git a/app/static/css/parcour_formation.css b/app/static/css/parcour_formation.css
index cb9ccaef..3d630d0a 100644
--- a/app/static/css/parcour_formation.css
+++ b/app/static/css/parcour_formation.css
@@ -79,7 +79,7 @@ div.competence {
     padding-left: calc(var(--arrow-width) + 8px);
 }
 
-.niveaux>div:not(:last-child)::after {
+.niveaux>div:not(:last-child)::before {
     content: "";
 
     position: absolute;
diff --git a/app/templates/about.j2 b/app/templates/about.j2
index fa322e44..6b5e95b7 100644
--- a/app/templates/about.j2
+++ b/app/templates/about.j2
@@ -12,7 +12,8 @@
 
 <p>ScoDoc est un logiciel libre écrit en
     <a href="http://www.python.org" target="_blank" rel="noopener noreferrer">Python</a>.
-    Information et documentation sur <a href="https://scodoc.org" target="_blank">scodoc.org</a>.
+    Information et documentation sur 
+    <a href="https://scodoc.org" target="_blank" rel="noopener>scodoc.org</a>.
 </p>
 
 <p>Le logiciel est distribué sous
diff --git a/app/templates/entreprises/import_donnees.j2 b/app/templates/entreprises/import_donnees.j2
index 8293e469..be3a7dfa 100644
--- a/app/templates/entreprises/import_donnees.j2
+++ b/app/templates/entreprises/import_donnees.j2
@@ -195,8 +195,9 @@
             Code postal : {{ entreprise.codepostal }}<br>
             Ville : {{ entreprise.ville }}<br>
             Pays : {{ entreprise.pays }}<br>
-            <a href="{{ url_for('entreprises.fiche_entreprise', entreprise_id=entreprise.id) }}" target="_blank">Fiche
-                entreprise</a>
+            <a href="{{ url_for('entreprises.fiche_entreprise', entreprise_id=entreprise.id) }}" 
+                rel="noopener noreferrer" target="_blank"
+            >Fiche entreprise</a>
         </div>
         {% for site in entreprise.sites %}
         <div class="site">
@@ -221,8 +222,9 @@
         Code postal : {{ site.codepostal }}<br>
         Ville : {{ site.ville }}<br>
         Pays : {{ site.pays }}<br>
-        <a href="{{ url_for('entreprises.fiche_entreprise', entreprise_id=site.entreprise_id) }}" target="_blank">Fiche
-            entreprise</a>
+        <a href="{{ url_for('entreprises.fiche_entreprise', entreprise_id=site.entreprise_id) 
+        }}" rel="noopener noreferrer" target="_blank"
+        >Fiche entreprise</a>
     </div>
     {% endfor %}
     {% endif %}
@@ -255,7 +257,7 @@
             Notes : {{ correspondant.notes }}<br>
             {% endif %}
             <a href="{{ url_for('entreprises.fiche_entreprise', entreprise_id=correspondant.site.entreprise.id) }}"
-                target="_blank">Fiche entreprise</a>
+                target="_blank" rel="noopener noreferrer">Fiche entreprise</a>
         </div>
     </div>
     {% endfor %}
diff --git a/app/templates/scodoc/help/modules.j2 b/app/templates/scodoc/help/modules.j2
index 2335df1a..b32f2f7f 100644
--- a/app/templates/scodoc/help/modules.j2
+++ b/app/templates/scodoc/help/modules.j2
@@ -22,7 +22,7 @@
         type, et de saisir les coefficients pondérant l'influence de la
         ressource ou SAÉ vers les Unités d'Enseignement (UE).
         Voir les détails sur
-        <a href="https://scodoc.org/BUT" target="_blank">la documentation</a>.
+        <a href="https://scodoc.org/BUT" target="_blank" rel="noopener">la documentation</a>.
     </p>
     {%endif%}
 </div>
diff --git a/app/templates/sidebar.j2 b/app/templates/sidebar.j2
index 5fe279d9..762b73be 100755
--- a/app/templates/sidebar.j2
+++ b/app/templates/sidebar.j2
@@ -86,7 +86,8 @@
         <div class="sidebar-bottom"><a href="{{ url_for( 'scodoc.about', 
         scodoc_dept=g.scodoc_dept ) }}" class="sidebar">À propos</a>
             <br />
-            <a href="{{ scu.SCO_USER_MANUAL }}" target="_blank" class="sidebar">Aide</a>
+            <a href="{{ scu.SCO_USER_MANUAL }}" 
+                target="_blank" rel="noopener" class="sidebar">Aide</a>
         </div>
     </div>
     <div class="logo-logo">
diff --git a/app/views/absences.py b/app/views/absences.py
index 340752e7..181c8f05 100644
--- a/app/views/absences.py
+++ b/app/views/absences.py
@@ -259,6 +259,7 @@ sco_publish(
     methods=["GET", "POST"],
 )
 
+
 # Antédiluvienne fonction: #deprecated
 @bp.route("/ListeAbsEtud", methods=["GET", "POST"])  # pour compat anciens clients PHP
 @scodoc
@@ -769,15 +770,13 @@ def _gen_form_saisie_groupe(
         td_matin_class = ("matin_1", "matin_2", "matin_3")[i % 3]
 
         H.append(
-            '<tr class="%s"><td><b class="%s" id="%s"><a class="discretelink" href="%s" target="new">%s</a></b>%s</td>'
-            % (
-                tr_class,
-                etud_class,
-                etudid,
-                url_for("scolar.ficheEtud", scodoc_dept=g.scodoc_dept, etudid=etudid),
-                etud["nomprenom"],
-                capstr,
-            )
+            f"""<tr class="{tr_class}">
+            <td>
+                <b class="{etud_class}" id="{etudid}"><a class="discretelink" href="{
+                    url_for("scolar.ficheEtud", scodoc_dept=g.scodoc_dept, etudid=etudid)
+                }" target="_blank" rel="noopener noreferrer">{
+                    etud["nomprenom"]}</a></b>{capstr}
+            </td>"""
         )
         etud_abs = sco_abs.list_abs_in_range(
             etudid, begin, end, moduleimpl_id=moduleimpl_id, cursor=cursor