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 "
".var_dump($loggedUser)."
";
- 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 @@
{% for bulletin in bulletins|sort %}
{% if bulletin.isVisible() %}
-
-
-
{{ bulletin.getNom() }}
-
-
{{ bulletin.getClasse() }}
-
Moyenne Générale : {{ bulletin.getMoyenne() }}
-
-
-
- {% include '@meeo/eleve_notes.twig' with { 'bulletin' : bulletin } %}
-
-
+ {% include '@meeo/eleve_notes.twig' with { 'bulletin' : bulletin } %}
{% endif %}
{% endfor %}
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 @@
-
-{% for matiere in bulletin.getMatieres() %}
- {% if matiere.isVisible() %}
-
-
-
{{ matiere.getNom() }}
-
-
-
- Moyenne : {{ matiere.getMoyenne() }} / 20
-
-
-
-
- {% for note in matiere.getNotes() %}
-
-
- {% if note.getNoteOn20() >= 20 %}
-
- {% elseif note.getNoteOn20() >= 15 %}
-
- {% elseif note.getNoteOn20() >= 12 %}
-
- {% elseif note.getNoteOn20() >= 9 %}
-
- {% endif %}
-
-
- {{ note.getIntitule() }}
-
-
- {{ note.getNote() }} / {{ note.getMax() }}
-
-
- {% endfor %}
+
+
+
{{ bulletin.getNom() }}
+
+
{{ bulletin.getClasse() }}
+
Moyenne Générale : {{ bulletin.getMoyenne() }}
- {% endif %}
-{% endfor %}
-
+
+
+ {% for matiere in bulletin.getMatieres() %}
+ {% if matiere.isVisible() %}
+
+
+
{{ matiere.getNom() }}
+
+
+
+ Moyenne : {{ matiere.getMoyenne() }} / 20
+
+
+
+
+ {% for note in matiere.getNotes() %}
+
+
+ {% if note.getNoteOn20() >= 20 %}
+
+ {% elseif note.getNoteOn20() >= 15 %}
+
+ {% elseif note.getNoteOn20() >= 12 %}
+
+ {% elseif note.getNoteOn20() >= 9 %}
+
+ {% endif %}
+
+
+ {{ note.getIntitule() }}
+
+
+ {{ note.getNote() }} / {{ note.getMax() }}
+
+
+ {% endfor %}
+
+
+ {% endif %}
+ {% endfor %}
+
+
+
\ No newline at end of file