Cadoles/schedule
21
0
Fork 0
Code Issues 3 Pull Requests Releases Wiki Activity

Merge branch 'referent_projet' into timetracking

Browse Source
This commit is contained in:
Matthieu Lamalle
2020-07-30 13:57:36 +02:00
parent f54f582d25 756f946ce8
commit 016d209d43
2 changed files with 37 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/schedule-2.0/templates/Project/list.html.twig
View File

@@ -12,7 +12,7 @@
thead { thead {
display: table-header-group; display: table-header-group;
} }
tr { page-break-inside: avoid; } tr { page-break-inside: avoid; }
{%endif%} {%endif%}
{% endblock %} {% endblock %}
@@ -69,7 +69,12 @@
<tr> <tr>
<td class="no-print"> <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_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>
<td>{{project.customer.name}}</td> <td>{{project.customer.name}}</td>
@@ -130,6 +135,9 @@
{% endblock %} {% endblock %}
{% block localjavascript %} {% block localjavascript %}
$(function () {
$('[data-toggle="tooltip"]').tooltip()
})
$(document).ready(function() { $(document).ready(function() {
{% if not fgprint is defined or not fgprint %} {% if not fgprint is defined or not fgprint %}
$('.table').DataTable({ $('.table').DataTable({

28
src/schedule-2.0/templates/User/edit.html.twig
View File

@@ -94,7 +94,33 @@
{{ form_row(form.roles) }} {{ form_row(form.roles) }}
{%endif%} {%endif%}
</div> </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>
</div> </div>
{{ form_end(form) }} {{ form_end(form) }}