From 3f429a3663cf0a105c9ee04502ca210f6e71821f Mon Sep 17 00:00:00 2001
From: Kevin Papst <kpapst@gmx.net>
Date: Tue, 2 Jan 2018 14:24:11 +0100
Subject: [PATCH] cross linking and display amount of entries

---
 app/Resources/views/admin/user.html.twig               |  2 +-
 .../Resources/views/admin/activity.html.twig           | 10 ++++++++--
 .../Resources/views/admin/project.html.twig            |  6 ++++--
 3 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/app/Resources/views/admin/user.html.twig b/app/Resources/views/admin/user.html.twig
index 3c89b4d9..31a3a081 100644
--- a/app/Resources/views/admin/user.html.twig
+++ b/app/Resources/views/admin/user.html.twig
@@ -4,7 +4,7 @@
 {% import "AvanzuAdminThemeBundle:layout:macros.html.twig" as macro %}
 
 {% block page_title %}{{ 'admin_user.title'|trans }}{% endblock %}
-{% block page_subtitle %}{{ 'admin_user.subtitle'|trans }}{% endblock %}
+{% block page_subtitle %}{{ 'admin_user.subtitle'|trans }} {{ 'subtitle.amount'|trans({'%count%': entries.count}) }}{% endblock %}
 
 {% block main %}
     {% if entries.count > 0 %}
diff --git a/src/TimesheetBundle/Resources/views/admin/activity.html.twig b/src/TimesheetBundle/Resources/views/admin/activity.html.twig
index d7e28e8b..c7282345 100644
--- a/src/TimesheetBundle/Resources/views/admin/activity.html.twig
+++ b/src/TimesheetBundle/Resources/views/admin/activity.html.twig
@@ -3,7 +3,7 @@
 {% import "macros/datatables.html.twig" as tables %}
 
 {% block page_title %}{{ 'admin_activity.title'|trans }}{% endblock %}
-{% block page_subtitle %}{{ 'admin_activity.subtitle'|trans }}{% endblock %}
+{% block page_subtitle %}{{ 'admin_activity.subtitle'|trans }} {{ 'subtitle.amount'|trans({'%count%': entries.count}) }}{% endblock %}
 
 {% block main %}
     {{ include('default/_flash_messages.html.twig') }}
@@ -13,6 +13,7 @@
             'label.id': 'hidden-xs',
             'label.name': '',
             'label.project': '',
+            'label.customer': '',
             'label.comment': 'hidden-xs',
             'label.visible': '',
             'label.actions': '',
@@ -22,7 +23,12 @@
             <tr>
                 <td class="hidden-xs">{{ entry.id }}</td>
                 <td>{{ entry.name }}</td>
-                <td>{{ entry.project }}</td>
+                <td>
+                    <a href="{{ path('admin_project_edit', {'id' : entry.project.id}) }}">{{ widgets.label_project(entry.project) }}</a>
+                </td>
+                <td>
+                    <a href="{{ path('admin_customer_edit', {'id' : entry.project.customer.id}) }}">{{ widgets.label_customer(entry.project.customer) }}</a>
+                </td>
                 <td class="hidden-xs">{{ entry.comment }}</td>
                 <td>{{ widgets.label_visible(entry.visible) }}</td>
                 <td>
diff --git a/src/TimesheetBundle/Resources/views/admin/project.html.twig b/src/TimesheetBundle/Resources/views/admin/project.html.twig
index 64149696..393eee58 100644
--- a/src/TimesheetBundle/Resources/views/admin/project.html.twig
+++ b/src/TimesheetBundle/Resources/views/admin/project.html.twig
@@ -3,7 +3,7 @@
 {% import "macros/datatables.html.twig" as tables %}
 
 {% block page_title %}{{ 'admin_project.title'|trans }}{% endblock %}
-{% block page_subtitle %}{{ 'admin_project.subtitle'|trans }}{% endblock %}
+{% block page_subtitle %}{{ 'admin_project.subtitle'|trans }} {{ 'subtitle.amount'|trans({'%count%': entries.count}) }}{% endblock %}
 
 {% block main %}
     {{ include('default/_flash_messages.html.twig') }}
@@ -24,7 +24,9 @@
             <tr>
                 <td class="hidden-xs">{{ entry.id }}</td>
                 <td>{{ entry.name }}</td>
-                <td>{{ entry.customer.name }}</td>
+                <td>
+                    <a href="{{ path('admin_customer_edit', {'id' : entry.customer.id}) }}">{{ widgets.label_customer(entry.customer) }}</a>
+                </td>
                 <td class="hidden-xs hidden-sm">{{ entry.comment }}</td>
                 <td class="hidden-xs hidden-sm">{{ widgets.badge_counter(entry.activities.count) }}</td>
                 <td class="hidden-xs">{{ entry.budget|money(entry.currency) }}</td>