From 9604ce80ef3db58288176a6bb4587f8a8c28e179 Mon Sep 17 00:00:00 2001
From: Matthieu Lamalle <mlamalle@cadoles.com>
Date: Thu, 30 Jul 2020 10:06:00 +0200
Subject: [PATCH 1/2] =?UTF-8?q?list=20les=20r=C3=A9f=C3=A9rents=20projet?=
 =?UTF-8?q?=20dans=20un=20tooltip?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/schedule-2.0/templates/Project/list.html.twig | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/schedule-2.0/templates/Project/list.html.twig b/src/schedule-2.0/templates/Project/list.html.twig
index 6a8571b..80b4b93 100644
--- a/src/schedule-2.0/templates/Project/list.html.twig
+++ b/src/schedule-2.0/templates/Project/list.html.twig
@@ -12,7 +12,7 @@
         thead {
 	        display: table-header-group;
         }
-        tr { page-break-inside: avoid; }        
+        tr { page-break-inside: avoid; }
     {%endif%}
 
 {% endblock %}
@@ -69,7 +69,12 @@
                                             <tr>
                                                 <td class="no-print">
                                                     <a href="{{path("app_project_update",{id:project.id})}}"><i class="fa fa-file"></i></a>
-                                                    <a href="{{path("app_project_users",{id:project.id})}}"><i class="fa fa-users"></i></a>
+                                                    <a href="{{path("app_project_users",{id:project.id})}}" 
+                                                        data-toggle="tooltip" 
+                                                        data-placement="right" 
+                                                        data-html="true"
+                                                        title="{% for user in project.userprojects %}<b>{{user.user.username}}:</b> {{user.job.name}} <br />{% endfor %}"
+                                                    ><i class="fa fa-users"></i></a>
 
                                                 </td>
                                                 <td>{{project.customer.name}}</td>
@@ -130,6 +135,9 @@
 {% endblock %}
 
 {% block localjavascript %}
+    $(function () {
+    $('[data-toggle="tooltip"]').tooltip()
+    })
     $(document).ready(function() {
         {% if not fgprint is defined or not fgprint %}
             $('.table').DataTable({

From 756f946ce89eb84a24904fdc8767d0db5914013c Mon Sep 17 00:00:00 2001
From: Matthieu Lamalle <mlamalle@cadoles.com>
Date: Thu, 30 Jul 2020 10:26:39 +0200
Subject: [PATCH 2/2] affichage des affectations sur le profil utilisateur

---
 .../templates/User/edit.html.twig             | 28 ++++++++++++++++++-
 1 file changed, 27 insertions(+), 1 deletion(-)

diff --git a/src/schedule-2.0/templates/User/edit.html.twig b/src/schedule-2.0/templates/User/edit.html.twig
index 3bbfbdd..07ae6ad 100755
--- a/src/schedule-2.0/templates/User/edit.html.twig
+++ b/src/schedule-2.0/templates/User/edit.html.twig
@@ -94,7 +94,33 @@
                         {{ form_row(form.roles) }}
                     {%endif%}
                 </div>
-            </div>    
+            </div>   
+            <p></p> 
+            <div class="card">
+                <div class="card-header">
+                    <i class="fas fa-list-ul"></i> Affectations
+                </div>
+
+                <div class="card-body">
+                    <table class="table table-striped table-bordered table-hover" id="dataTables" style="width:100%">
+                    <thead>
+                    <tr>
+                        <th>Projet</th>
+                        <th>Rôle</th>
+                    </tr>
+                    </thead>
+                    <tbody>
+                        {% for userproject in user.userprojects %}
+                            <tr>
+                                <td>{{userproject.project.displayname}}</td>
+                                <td>{{userproject.job.name}}</td>
+                            </tr>
+                        {% endfor %}
+                    </tbody>
+                </table>
+                  
+                </div>
+            </div> 
         </div>
     </div>
 {{ form_end(form) }}