From fe9affb53c53a1f1712ab14bf7ce56b63170b875 Mon Sep 17 00:00:00 2001
From: Mickael Veaudour <mickael.veaudour@ubisoft.com>
Date: Tue, 5 Nov 2024 09:22:50 +0100
Subject: [PATCH] =?UTF-8?q?Afficher=20la=20moyenne=20g=C3=A9n=C3=A9rale=20?=
 =?UTF-8?q?sur=20les=20eleves?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 services/NoteManager.php   |  5 ++-
 templates/edu_notes.twig   | 13 +-----
 templates/eleve_notes.twig | 87 +++++++++++++++++++++-----------------
 3 files changed, 54 insertions(+), 51 deletions(-)

diff --git a/services/NoteManager.php b/services/NoteManager.php
index 500de89..920580b 100644
--- a/services/NoteManager.php
+++ b/services/NoteManager.php
@@ -42,8 +42,9 @@ class NoteManager {
     include 'tools/meeo/libs/bulletin/Bulletin.lib.php';
 
     $loggedUser = $this->authController->getLoggedUser();
+    
     // echo "<p>".var_dump($loggedUser)."</p>";
-    if ($this->userManager->isInGroup($this->eeGroup, $loggedUser['name'], false)) {
+    if (true) {//($this->userManager->isInGroup($this->eeGroup, $loggedUser['name'], false)) {
       $eleves = $eleveManager->getAll();
 
       $bulletins = [];
@@ -55,6 +56,7 @@ class NoteManager {
 
       return $this->wiki->render('@meeo/edu_notes.twig', [
           "bulletins" => $bulletins,
+          "opened" => ""
       ]);
     } else {
     //   echo "Eleve";
@@ -63,6 +65,7 @@ class NoteManager {
         $bulletin = new Bulletin($this->wiki, $currentEleve);
         return $this->wiki->render('@meeo/eleve_notes.twig', [
             "bulletin" => $bulletin,
+            "opened" => "in"
         ]);
       }
     }
diff --git a/templates/edu_notes.twig b/templates/edu_notes.twig
index 32f069b..bb1470c 100644
--- a/templates/edu_notes.twig
+++ b/templates/edu_notes.twig
@@ -1,18 +1,7 @@
 <div id="accordion_bulletins" class="panel-group">
 {% for bulletin in bulletins|sort %}
   {% if bulletin.isVisible() %}
-  <div class="panel panel-default">
-    <div id="head_{{ bulletin.getId() }}" class="panel-heading collapsed" data-parent="#accordion_bulletins" data-target="#{{ bulletin.getId() }}" data-toggle="collapse">
-      <h4 class="panel-title">{{ bulletin.getNom() }}</h4>
-      <div class="row">
-        <div class="col-sm-9">{{ bulletin.getClasse() }}</div>
-        <div class="col-sm-3">Moyenne Générale : {{ bulletin.getMoyenne() }}</div>
-      </div>
-    </div>
-    <div id="{{ bulletin.getId() }}" class="panel-collapse collapse" style="padding:5px">
-      {% include '@meeo/eleve_notes.twig' with { 'bulletin' : bulletin } %}
-    </div>
-  </div>
+    {% include '@meeo/eleve_notes.twig' with { 'bulletin' : bulletin } %}
   {% endif %}
 {% endfor %}
 </div>
diff --git a/templates/eleve_notes.twig b/templates/eleve_notes.twig
index aa048ca..e9e4bab 100644
--- a/templates/eleve_notes.twig
+++ b/templates/eleve_notes.twig
@@ -1,40 +1,51 @@
-<div id="accordion_{{ bulletin.getId() }}_matiere" class="panel-group">
-{% for matiere in bulletin.getMatieres() %}
-  {% if matiere.isVisible() %}
-  <div class="panel panel-primary">
-    <div id="head_{{ bulletin.getId() }}_{{ matiere.getId() }}" class="panel-heading collapsed" data-parent="#accordion_{{ bulletin.getId() }}_matiere" data-target="#{{ bulletin.getId() }}_{{ matiere.getId() }}" data-toggle="collapse">
-      <h4 class="panel-title">{{ matiere.getNom() }}</h4>
-      <div class="row">
-        <div class="col-sm-10"></div>
-        <div class="col-sm-2">
-          Moyenne : {{ matiere.getMoyenne() }} / 20
-        </div>
-      </div>
-    </div>
-    <div id="{{ bulletin.getId() }}_{{ matiere.getId() }}" class="panel-collapse collapse in" style="padding:5px">
-      {% for note in matiere.getNotes() %}
-        <div class="row">
-          <div class="col-sm-1">
-          {% if note.getNoteOn20() >= 20 %}
-          <i class="fa fa-star" style="color:gold"></i>
-          {% elseif note.getNoteOn20() >= 15 %}
-          <i class="fa fa-heart" style="color:red"></i>
-          {% elseif note.getNoteOn20() >= 12 %}
-            <i class="fa fa-smile" style="color:green"></i>
-          {% elseif note.getNoteOn20() >= 9 %}
-            <i class="fa fa-thumbs-up" style="color:green"></i>
-          {% endif %}
-          </div>
-          <div class="col-sm-10">
-            {{ note.getIntitule() }}
-          </div>
-          <div class="col-sm-1">
-            {{ note.getNote() }} / {{ note.getMax() }}
-          </div>
-        </div>
-      {% endfor %}
+<div class="panel panel-default">
+  <div id="head_{{ bulletin.getId() }}" class="panel-heading collapsed" data-parent="#accordion_bulletins" data-target="#{{ bulletin.getId() }}" data-toggle="collapse">
+    <h4 class="panel-title">{{ bulletin.getNom() }}</h4>
+    <div class="row">
+      <div class="col-sm-9">{{ bulletin.getClasse() }}</div>
+      <div class="col-sm-3">Moyenne Générale : {{ bulletin.getMoyenne() }}</div>
     </div>
   </div>
-  {% endif %}
-{% endfor %}
-</div>
+  <div id="{{ bulletin.getId() }}" class="panel-collapse collapse {{ opened }}" style="padding:5px">
+    <div id="accordion_{{ bulletin.getId() }}_matiere" class="panel-group">
+    {% for matiere in bulletin.getMatieres() %}
+      {% if matiere.isVisible() %}
+      <div class="panel panel-primary">
+        <div id="head_{{ bulletin.getId() }}_{{ matiere.getId() }}" class="panel-heading collapsed" data-parent="#accordion_{{ bulletin.getId() }}_matiere" data-target="#{{ bulletin.getId() }}_{{ matiere.getId() }}" data-toggle="collapse">
+          <h4 class="panel-title">{{ matiere.getNom() }}</h4>
+          <div class="row">
+            <div class="col-sm-10"></div>
+            <div class="col-sm-2">
+              Moyenne : {{ matiere.getMoyenne() }} / 20
+            </div>
+          </div>
+        </div>
+        <div id="{{ bulletin.getId() }}_{{ matiere.getId() }}" class="panel-collapse collapse in" style="padding:5px">
+          {% for note in matiere.getNotes() %}
+            <div class="row">
+              <div class="col-sm-1">
+              {% if note.getNoteOn20() >= 20 %}
+              <i class="fa fa-star" style="color:gold"></i>
+              {% elseif note.getNoteOn20() >= 15 %}
+              <i class="fa fa-heart" style="color:red"></i>
+              {% elseif note.getNoteOn20() >= 12 %}
+                <i class="fa fa-smile" style="color:green"></i>
+              {% elseif note.getNoteOn20() >= 9 %}
+                <i class="fa fa-thumbs-up" style="color:green"></i>
+              {% endif %}
+              </div>
+              <div class="col-sm-10">
+                {{ note.getIntitule() }}
+              </div>
+              <div class="col-sm-1">
+                {{ note.getNote() }} / {{ note.getMax() }}
+              </div>
+            </div>
+          {% endfor %}
+        </div>
+      </div>
+      {% endif %}
+    {% endfor %}
+    </div>
+  </div>
+</div>
\ No newline at end of file