From 27754e913404a3a85e05bb280f14e467daea5583 Mon Sep 17 00:00:00 2001
From: Alexey Skobkin <x@skobkin.ru>
Date: Tue, 23 Jun 2015 14:20:21 +0300
Subject: [PATCH] Separate last events page.

---
 app/Resources/views/base.html.twig            |  1 +
 .../Controller/EventsController.php           | 20 +++++++
 .../Resources/config/routing.yml              |  6 +-
 .../Resources/translations/messages.ru.yml    |  1 +
 .../Resources/views/Events/last.html.twig     | 55 +++++++++++++++++++
 .../Resources/views/Main/index.html.twig      | 52 ------------------
 6 files changed, 82 insertions(+), 53 deletions(-)
 create mode 100644 src/Skobkin/Bundle/PointToolsBundle/Controller/EventsController.php
 create mode 100644 src/Skobkin/Bundle/PointToolsBundle/Resources/views/Events/last.html.twig

diff --git a/app/Resources/views/base.html.twig b/app/Resources/views/base.html.twig
index 9afff0b..a5731f9 100644
--- a/app/Resources/views/base.html.twig
+++ b/app/Resources/views/base.html.twig
@@ -26,6 +26,7 @@
                         <ul class="nav navbar-nav">
                             <li><a href="{{ path('index') }}"><span class="glyphicon glyphicon-home"></span> {{ 'Main'|trans }}</a></li>
                             <li><a href="{{ path('users_top') }}"><span class="glyphicon glyphicon-stats"></span> {{ 'Top'|trans }}</a></li>
+                            <li><a href="{{ path('events_last') }}"><span class="glyphicon glyphicon-th-list"></span> {{ 'Last'|trans }}</a></li>
                         </ul>
                         <ul class="nav navbar-nav navbar-right">
                             <li><a href="https://bitbucket.org/skobkin/point-tools/issues?status=new&status=open" target="_blank"><span class="glyphicon glyphicon-envelope"></span> {{ 'Report a bug'|trans }}</a></li>
diff --git a/src/Skobkin/Bundle/PointToolsBundle/Controller/EventsController.php b/src/Skobkin/Bundle/PointToolsBundle/Controller/EventsController.php
new file mode 100644
index 0000000..1eab3e7
--- /dev/null
+++ b/src/Skobkin/Bundle/PointToolsBundle/Controller/EventsController.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace Skobkin\Bundle\PointToolsBundle\Controller;
+
+use Doctrine\ORM\EntityManager;
+use Doctrine\ORM\QueryBuilder;
+use Symfony\Bundle\FrameworkBundle\Controller\Controller;
+
+class EventsController extends Controller
+{
+    public function lastAction()
+    {
+        /** @var EntityManager $em */
+        $em = $this->getDoctrine()->getManager();
+
+        return $this->render('SkobkinPointToolsBundle:Events:last.html.twig', [
+            'last_events' => $em->getRepository('SkobkinPointToolsBundle:SubscriptionEvent')->getLastSubscriptionEvents(20),
+        ]);
+    }
+}
diff --git a/src/Skobkin/Bundle/PointToolsBundle/Resources/config/routing.yml b/src/Skobkin/Bundle/PointToolsBundle/Resources/config/routing.yml
index a84e4ae..f153f20 100644
--- a/src/Skobkin/Bundle/PointToolsBundle/Resources/config/routing.yml
+++ b/src/Skobkin/Bundle/PointToolsBundle/Resources/config/routing.yml
@@ -15,4 +15,8 @@ user_show:
 
 users_top:
     path:     /top
-    defaults: { _controller: SkobkinPointToolsBundle:User:top }
\ No newline at end of file
+    defaults: { _controller: SkobkinPointToolsBundle:User:top }
+
+events_last:
+    path:     /last
+    defaults: { _controller: SkobkinPointToolsBundle:Events:last }
\ No newline at end of file
diff --git a/src/Skobkin/Bundle/PointToolsBundle/Resources/translations/messages.ru.yml b/src/Skobkin/Bundle/PointToolsBundle/Resources/translations/messages.ru.yml
index a46ea28..4b57053 100644
--- a/src/Skobkin/Bundle/PointToolsBundle/Resources/translations/messages.ru.yml
+++ b/src/Skobkin/Bundle/PointToolsBundle/Resources/translations/messages.ru.yml
@@ -5,6 +5,7 @@ Toggle navigation: Переключить навигацию
 Main: Главная
 Top: Топ
 Report a bug: Сообщить об ошибке
+Last: Последнее
 
 # Подвал
 Source code: Исходный код
diff --git a/src/Skobkin/Bundle/PointToolsBundle/Resources/views/Events/last.html.twig b/src/Skobkin/Bundle/PointToolsBundle/Resources/views/Events/last.html.twig
new file mode 100644
index 0000000..8ab37a6
--- /dev/null
+++ b/src/Skobkin/Bundle/PointToolsBundle/Resources/views/Events/last.html.twig
@@ -0,0 +1,55 @@
+{% extends "::base.html.twig" %}
+
+{% block content %}
+    {# TODO classes #}
+    <div class="last-subscriptions-log">
+        {% if last_events|length > 0 %}
+            <div class="panel-group" id="accordion-log">
+                <div class="panel panel-default">
+                    <div class="panel-heading" id="heading-subscriptions-log">
+                        <h4 class="panel-title">
+                            <a data-toggle="collapse" data-parent="#accordion-log" aria-expanded="true" href="#collapse-log">
+                                <span class="glyphicon glyphicon-collapse-down"></span> {{ 'Last events'|trans }}
+                            </a>
+                        </h4>
+                    </div>
+                    <div id="collapse-log" class="panel-collapse collapse in" aria-labelledby="heading-subscriptions-log">
+                        <div class="panel-body">
+                            <table class="table table-striped">
+                                <thead>
+                                <tr>
+                                    <td>{{ 'Subscriber'|trans }}</td>
+                                    <td>{{ 'Author'|trans }}</td>
+                                    <td>{{ 'Action'|trans }}</td>
+                                    <td>{{ 'Date'|trans }}</td>
+                                </tr>
+                                </thead>
+                                <tbody>
+                                {% for event in last_events %}
+                                    <tr>
+                                        <td>
+                                            <a href="{{ url('user_show', {login: event.subscriber.login}) }}">@{{ event.subscriber.login }}</a>
+                                        </td>
+                                        <td>
+                                            <a href="{{ url('user_show', {login: event.author.login}) }}">@{{ event.author.login }}</a>
+                                        </td>
+                                        <td>
+                                            <span class="glyphicon {% if event.action == 'subscribe' %}glyphicon-plus{% elseif event.action == 'unsubscribe' %}glyphicon-minus{% endif %}"></span>
+                                        </td>
+                                        <td>
+                                            {# Use DateTime helper: https://sonata-project.org/bundles/intl/master/doc/reference/datetime.html #}
+                                            {{ event.date|date('d F Y H:i:s') }}
+                                        </td>
+                                    </tr>
+                                {% endfor %}
+                                </tbody>
+                            </table>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        {% else %}
+            <div class="alert alert-warning" role="alert">{{ 'No log data found'|trans }}</div>
+        {% endif %}
+    </div>
+{% endblock %}
diff --git a/src/Skobkin/Bundle/PointToolsBundle/Resources/views/Main/index.html.twig b/src/Skobkin/Bundle/PointToolsBundle/Resources/views/Main/index.html.twig
index 7bfe4cc..2a2c3c9 100644
--- a/src/Skobkin/Bundle/PointToolsBundle/Resources/views/Main/index.html.twig
+++ b/src/Skobkin/Bundle/PointToolsBundle/Resources/views/Main/index.html.twig
@@ -15,58 +15,6 @@
         </form>
     </div>
 
-    {# TODO classes #}
-    <div class="last-subscriptions-log">
-        {% if last_events|length > 0 %}
-            <div class="panel-group" id="accordion-log">
-                <div class="panel panel-default">
-                    <div class="panel-heading" id="heading-subscriptions-log">
-                        <h4 class="panel-title">
-                            <a data-toggle="collapse" data-parent="#accordion-log" aria-expanded="true" href="#collapse-log">
-                                <span class="glyphicon glyphicon-collapse-down"></span> {{ 'Last events'|trans }}
-                            </a>
-                        </h4>
-                    </div>
-                    <div id="collapse-log" class="panel-collapse collapse in" aria-labelledby="heading-subscriptions-log">
-                        <div class="panel-body">
-                            <table class="table table-striped">
-                                <thead>
-                                <tr>
-                                    <td>{{ 'Subscriber'|trans }}</td>
-                                    <td>{{ 'Author'|trans }}</td>
-                                    <td>{{ 'Action'|trans }}</td>
-                                    <td>{{ 'Date'|trans }}</td>
-                                </tr>
-                                </thead>
-                                <tbody>
-                                {% for event in last_events %}
-                                    <tr>
-                                        <td>
-                                            <a href="{{ url('user_show', {login: event.subscriber.login}) }}">@{{ event.subscriber.login }}</a>
-                                        </td>
-                                        <td>
-                                            <a href="{{ url('user_show', {login: event.author.login}) }}">@{{ event.author.login }}</a>
-                                        </td>
-                                        <td>
-                                            <span class="glyphicon {% if event.action == 'subscribe' %}glyphicon-plus{% elseif event.action == 'unsubscribe' %}glyphicon-minus{% endif %}"></span>
-                                        </td>
-                                        <td>
-                                            {# Use DateTime helper: https://sonata-project.org/bundles/intl/master/doc/reference/datetime.html #}
-                                            {{ event.date|date('d F Y H:i:s') }}
-                                        </td>
-                                    </tr>
-                                {% endfor %}
-                                </tbody>
-                            </table>
-                        </div>
-                    </div>
-                </div>
-            </div>
-        {% else %}
-            <div class="alert alert-warning" role="alert">{{ 'No log data found'|trans }}</div>
-        {% endif %}
-    </div>
-
     <div class="container service-stats">
         <div class="row">
             <div class="col-xs-8 col-sm-3"><span class="glyphicon glyphicon-user"></span> {{ 'All users'|trans }}</div>