From cdfe44d678756859dede5b536108779ce9bd44c6 Mon Sep 17 00:00:00 2001
From: Aymeric SERRA <aymeric.serra@etu.univ-orleans.fr>
Date: Thu, 9 Feb 2023 22:21:29 +0100
Subject: [PATCH 1/2] Ammelioration apparance show

---
 templates/atelier/show.html.twig | 101 +++++++++++++------------------
 1 file changed, 43 insertions(+), 58 deletions(-)

diff --git a/templates/atelier/show.html.twig b/templates/atelier/show.html.twig
index e8d199e..cb4b88c 100644
--- a/templates/atelier/show.html.twig
+++ b/templates/atelier/show.html.twig
@@ -3,65 +3,50 @@
 {% block title %}Atelier{% endblock %}
 
 {% block body %}
-    <h1>Atelier</h1>
+    <div class="card mb-4">
+        <div class="card-header">
+            <h1 class="card-title">Atelier : "{{ atelier.nom }}"</h1>
+            <h6 class="card-subtitle mb-2 text-muted">Instructeur : <a href="mailto:{{ atelier.instructeur.email }}"
+                                                                       class="card-link">{{ atelier.instructeur.prenom }} {{ atelier.instructeur.nom }}</a>
+                - Moyenne des notes : {{ note }}</h6>
+        </div>
+        <div class="card-body">
+            <div class="card-text">
+                {{ atelier.description | raw }}
+            </div>
 
-    <table class="table">
-        <tbody>
-        <tr>
-            <th>Id</th>
-            <td>{{ atelier.id }}</td>
-        </tr>
-        <tr>
-            <th>Nom</th>
-            <td>{{ atelier.nom }}</td>
-        </tr>
-        <tr>
-            <th>Description</th>
-            <td>{{ atelier.description | raw }}</td>
-        </tr>
-        <tr>
-            <th>Email instructeur</th>
-            <td>{{ atelier.instructeur.email }}</td>
-        </tr>
-        <tr>
-            <th>Note</th>
-            <td>
-                {{ note }}
-            </td>
-        </tr>
-        <tr>
-            <th>Elèves inscrits</th>
-            <td>
-                <ul>
-                    {% for eleve in eleves %}
-                        <li>{{ eleve.prenom }} {{ eleve.nom }} - {{ eleve.email }}</li>
-                    {% endfor %}
-                </ul>
-            </td>
-        </tr>
-        </tbody>
-    </table>
+            {% if is_granted('ROLE_INSTRUCTEUR') %}
+            <details class="card">
+            <summary class="card-header">Eleves inscrits</summary>
+            <ul class="list-group list-group-flush">
+                {% for eleve in eleves %}
+                    <li class="list-group-item">{{ eleve.prenom }} {{ eleve.nom }} - {{ eleve.email }}</li>
+                {% endfor %}
+            </ul>
+            </details>
+            {% endif %}
+        </div>
+        <div class="d-flex flex-row card-footer">
+            {% if app.user and app.user == atelier.instructeur %}
+                <a class="btn btn-outline-primary m-2"
+                   href="{{ path('app_atelier_edit', {'id': atelier.id}) }}">Modifier</a>
+            {% endif %}
+            <a class="btn btn-outline-primary m-2" href="{{ path('app_atelier_index') }}">Retour à la liste</a>
+            {% if app.user and app.user == atelier.instructeur %}
+                {{ include('atelier/_delete_form.html.twig') }}
+            {% endif %}
+            {% if not inscrit %}
+                <form method="post" action="{{ path('app_atelier_inscription', {'id': atelier.id}) }}">
+                    <button class="btn btn-outline-success m-2">S'inscrire</button>
+                </form>
+            {% else %}
+                <form method="post" action="{{ path('app_atelier_desinscrire', {'id': atelier.id}) }}">
+                    <button class="btn btn-outline-danger m-2">Se désinscrire</button>
+                </form>
 
-    <div class="d-flex flex-row">
-        {% if app.user and app.user == atelier.instructeur %}
-            <a class="btn btn-outline-primary m-2"
-               href="{{ path('app_atelier_edit', {'id': atelier.id}) }}">Modifier</a>
-        {% endif %}
-        <a class="btn btn-outline-primary m-2" href="{{ path('app_atelier_index') }}">Retour à la liste</a>
-        {% if app.user and app.user == atelier.instructeur %}
-            {{ include('atelier/_delete_form.html.twig') }}
-        {% endif %}
-        {% if not inscrit %}
-            <form method="post" action="{{ path('app_atelier_inscription', {'id': atelier.id}) }}">
-                <button class="btn btn-outline-success m-2">S'inscrire</button>
-            </form>
-        {% else %}
-            <form method="post" action="{{ path('app_atelier_desinscrire', {'id': atelier.id}) }}">
-                <button class="btn btn-outline-danger m-2">Se désinscrire</button>
-            </form>
-
-            <a class="btn btn-outline-primary m-2"
-               href="{{ path('app_atelier_noter', {'id': atelier.id}) }}">Noter</a>
-        {% endif %}
+                <a class="btn btn-outline-primary m-2"
+                   href="{{ path('app_atelier_noter', {'id': atelier.id}) }}">Noter</a>
+            {% endif %}
+        </div>
     </div>
 {% endblock %}
\ No newline at end of file

From 13346abd0eb71e3b6f952493038642ce778fb188 Mon Sep 17 00:00:00 2001
From: Aymeric SERRA <aymeric.serra@etu.univ-orleans.fr>
Date: Thu, 9 Feb 2023 22:34:28 +0100
Subject: [PATCH 2/2] Changement affichage si eleve ou instructeur dans show

---
 templates/atelier/show.html.twig | 38 +++++++++++++++++---------------
 1 file changed, 20 insertions(+), 18 deletions(-)

diff --git a/templates/atelier/show.html.twig b/templates/atelier/show.html.twig
index cb4b88c..26b4ce9 100644
--- a/templates/atelier/show.html.twig
+++ b/templates/atelier/show.html.twig
@@ -16,14 +16,14 @@
             </div>
 
             {% if is_granted('ROLE_INSTRUCTEUR') %}
-            <details class="card">
-            <summary class="card-header">Eleves inscrits</summary>
-            <ul class="list-group list-group-flush">
-                {% for eleve in eleves %}
-                    <li class="list-group-item">{{ eleve.prenom }} {{ eleve.nom }} - {{ eleve.email }}</li>
-                {% endfor %}
-            </ul>
-            </details>
+                <details class="card">
+                    <summary class="card-header">Eleves inscrits</summary>
+                    <ul class="list-group list-group-flush">
+                        {% for eleve in eleves %}
+                            <li class="list-group-item">{{ eleve.prenom }} {{ eleve.nom }} - {{ eleve.email }}</li>
+                        {% endfor %}
+                    </ul>
+                </details>
             {% endif %}
         </div>
         <div class="d-flex flex-row card-footer">
@@ -35,17 +35,19 @@
             {% if app.user and app.user == atelier.instructeur %}
                 {{ include('atelier/_delete_form.html.twig') }}
             {% endif %}
-            {% if not inscrit %}
-                <form method="post" action="{{ path('app_atelier_inscription', {'id': atelier.id}) }}">
-                    <button class="btn btn-outline-success m-2">S'inscrire</button>
-                </form>
-            {% else %}
-                <form method="post" action="{{ path('app_atelier_desinscrire', {'id': atelier.id}) }}">
-                    <button class="btn btn-outline-danger m-2">Se désinscrire</button>
-                </form>
+            {% if is_granted('ROLE_APPRENTI') %}
+                {% if not inscrit %}
+                    <form method="post" action="{{ path('app_atelier_inscription', {'id': atelier.id}) }}">
+                        <button class="btn btn-outline-success m-2">S'inscrire</button>
+                    </form>
+                {% else %}
+                    <form method="post" action="{{ path('app_atelier_desinscrire', {'id': atelier.id}) }}">
+                        <button class="btn btn-outline-danger m-2">Se désinscrire</button>
+                    </form>
 
-                <a class="btn btn-outline-primary m-2"
-                   href="{{ path('app_atelier_noter', {'id': atelier.id}) }}">Noter</a>
+                    <a class="btn btn-outline-primary m-2"
+                       href="{{ path('app_atelier_noter', {'id': atelier.id}) }}">Noter</a>
+                {% endif %}
             {% endif %}
         </div>
     </div>