added toolbar for activity screen #2 (#51)

* merged toolbar javascripts #2
* added activity toolbar #2

src/TimesheetBundle/Controller/Admin/ActivityController.php

@@ -19,7 +19,10 @@ use Sensio\Bundle\FrameworkExtraBundle\Configuration\Method;
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\Security;
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\Cache;
+use TimesheetBundle\Entity\Customer;
+use TimesheetBundle\Entity\Project;
 use TimesheetBundle\Form\ActivityEditForm;
+use TimesheetBundle\Form\ActivityToolbarForm;
 use TimesheetBundle\Repository\Query\ActivityQuery;
 
 /**
@@ -32,22 +35,65 @@ use TimesheetBundle\Repository\Query\ActivityQuery;
  */
 class ActivityController extends AbstractController
 {
+    /**
+     * @param Request $request
+     * @return ActivityQuery
+     */
+    protected function getQueryForRequest(Request $request)
+    {
+        $visibility = $request->get('visibility');
+        if (strlen($visibility) == 0 || (int)$visibility != $visibility) {
+            $visibility = ActivityQuery::SHOW_BOTH;
+        }
+        $pageSize = (int) $request->get('pageSize');
+        $customer = $request->get('customer');
+        $customer = !empty(trim($customer)) ? trim($customer) : null;
+        $project = $request->get('project');
+        $project = !empty(trim($project)) ? trim($project) : null;
+
+        if ($project !== null) {
+            $repo = $this->getDoctrine()->getRepository(Project::class);
+            $project = $repo->getById($project);
+            if ($project !== null) {
+                $customer = $project->getCustomer();
+            } else {
+                $customer = null;
+            }
+        } elseif ($customer !== null) {
+            $repo = $this->getDoctrine()->getRepository(Customer::class);
+            $customer = $repo->getById($customer);
+        }
+
+        $query = new ActivityQuery();
+        $query
+            ->setPageSize($pageSize)
+            ->setVisibility($visibility)
+            ->setCustomer($customer)
+            ->setProject($project)
+        ;
+
+        return $query ;
+    }
+
     /**
      * @Route("/", defaults={"page": 1}, name="admin_activity")
      * @Route("/page/{page}", requirements={"page": "[1-9]\d*"}, name="admin_activity_paginated")
      * @Method("GET")
      * @Cache(smaxage="10")
      */
-    public function indexAction($page)
+    public function indexAction($page, Request $request)
     {
-        $query = new ActivityQuery();
-        $query->setVisibility(ActivityQuery::SHOW_BOTH);
+        $query = $this->getQueryForRequest($request);
         $query->setPage($page);
 
         /* @var $entries Pagerfanta */
         $entries = $this->getDoctrine()->getRepository(Activity::class)->findByQuery($query);
 
-        return $this->render('TimesheetBundle:admin:activity.html.twig', ['entries' => $entries]);
+        return $this->render('TimesheetBundle:admin:activity.html.twig', [
+            'entries' => $entries,
+            'query' => $query,
+            'toolbarForm' => $this->getToolbarForm($query)->createView(),
+        ]);
     }
 
     /**
@@ -99,6 +145,24 @@ class ActivityController extends AbstractController
         );
     }
 
+    /**
+     * @param ActivityQuery $query
+     * @return \Symfony\Component\Form\FormInterface
+     */
+    protected function getToolbarForm(ActivityQuery $query)
+    {
+        return $this->createForm(
+            ActivityToolbarForm::class,
+            $query,
+            [
+                'action' => $this->generateUrl('admin_activity_paginated', [
+                    'page' => $query->getPage(),
+                ]),
+                'method' => 'GET',
+            ]
+        );
+    }
+
     /**
      * @param Activity $activity
      * @return \Symfony\Component\Form\FormInterface

src/TimesheetBundle/Form/ActivityToolbarForm.php

@@ -0,0 +1,63 @@
+<?php
+
+/*
+ * This file is part of the Kimai package.
+ *
+ * (c) Kevin Papst <kevin@kevinpapst.de>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace TimesheetBundle\Form;
+
+use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Component\OptionsResolver\OptionsResolver;
+use TimesheetBundle\Form\Type\ProjectType;
+use TimesheetBundle\Repository\Query\ActivityQuery;
+
+/**
+ * Defines the form used for filtering the activities.
+ *
+ * @author Kevin Papst <kevin@kevinpapst.de>
+ */
+class ActivityToolbarForm extends ProjectToolbarForm
+{
+
+    /**
+     * {@inheritdoc}
+     */
+    public function buildForm(FormBuilderInterface $builder, array $options)
+    {
+        /** @var ActivityQuery $query */
+        $query = $options['data'];
+
+        parent::buildForm($builder, $options);
+
+        if ($query->getCustomer() === null) {
+            return;
+        }
+
+        $choices = [];
+        foreach ($query->getCustomer()->getProjects() as $project) {
+            $choices[] = $project;
+        }
+
+        $builder
+            ->add('project', ProjectType::class, [
+                'required' => false,
+                'choices' => $choices,
+            ]);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function configureOptions(OptionsResolver $resolver)
+    {
+        $resolver->setDefaults([
+            'data_class' => ActivityQuery::class,
+            'csrf_protection' => false,
+        ]);
+    }
+}

src/TimesheetBundle/Repository/ActivityRepository.php

@@ -115,6 +115,14 @@ class ActivityRepository extends AbstractRepository
             // TODO check for visibility of customer and project
         }
 
+        if ($query->getProject() !== null) {
+            $qb->andWhere('a.project = :project')
+                ->setParameter('project', $query->getProject());
+        } elseif ($query->getCustomer() !== null) {
+            $qb->andWhere('p.customer = :customer')
+                ->setParameter('customer', $query->getCustomer());
+        }
+
         return $this->getBaseQueryResult($qb, $query);
     }
 }

src/TimesheetBundle/Repository/Query/ActivityQuery.php

@@ -14,6 +14,8 @@ namespace TimesheetBundle\Repository\Query;
 use AppBundle\Repository\Query\BaseQuery;
 use AppBundle\Repository\Query\VisibilityInterface;
 use AppBundle\Repository\Query\VisibilityTrait;
+use TimesheetBundle\Entity\Customer;
+use TimesheetBundle\Entity\Project;
 
 /**
  * Can be used for advanced queries with the: ActivityRepository
@@ -23,4 +25,51 @@ use AppBundle\Repository\Query\VisibilityTrait;
 class ActivityQuery extends BaseQuery implements VisibilityInterface
 {
     use VisibilityTrait;
+
+    /**
+     * @var Project
+     */
+    protected $project;
+
+    /**
+     * @var Customer
+     */
+    protected $customer;
+
+    /**
+     * @return Customer
+     */
+    public function getCustomer()
+    {
+        return $this->customer;
+    }
+
+    /**
+     * @param Customer $customer
+     * @return $this
+     */
+    public function setCustomer(Customer $customer = null)
+    {
+        $this->customer = $customer;
+        return $this;
+    }
+
+    /**
+     * @return Project
+     */
+    public function getProject()
+    {
+        return $this->project;
+    }
+
+    /**
+     * @param Project $project
+     * @return $this
+     */
+    public function setProject(Project $project = null)
+    {
+        $this->project = $project;
+        return $this;
+    }
+
 }

src/TimesheetBundle/Resources/views/admin/activity.html.twig

@@ -4,6 +4,7 @@
 
 {% block page_title %}{{ 'admin_activity.title'|trans }}{% endblock %}
 {% block page_subtitle %}{{ 'admin_activity.subtitle'|trans }} {{ 'subtitle.amount'|trans({'%count%': entries.count}) }}{% endblock %}
+{% block javascript_imports %}<script src="{{ asset('js/toolbar.js') }}"></script>{% endblock %}
 
 {% block main %}
     {% if entries.count == 0 %}
@@ -13,22 +14,22 @@
     {{ tables.data_table_header({
         'label.id': 'hidden-xs',
         'label.name': '',
-        'label.project': '',
         'label.customer': '',
+        'label.project': '',
         'label.comment': 'hidden-xs',
         'label.visible': '',
         'label.actions': '',
-    }, null, {'plus-square': path('admin_activity_create')}) }}
+    }, toolbarForm, {'plus-square': path('admin_activity_create')}) }}
 
     {% for entry in entries %}
         <tr>
             <td class="hidden-xs">{{ entry.id }}</td>
             <td>{{ entry.name }}</td>
             <td>
-                <a href="{{ path('admin_project_edit', {'id' : entry.project.id}) }}">{{ widgets.label_project(entry.project) }}</a>
+                <a href="{{ path('admin_customer_edit', {'id' : entry.project.customer.id}) }}">{{ widgets.label_customer(entry.project.customer) }}</a>
             </td>
             <td>
-                <a href="{{ path('admin_customer_edit', {'id' : entry.project.customer.id}) }}">{{ widgets.label_customer(entry.project.customer) }}</a>
+                <a href="{{ path('admin_project_edit', {'id' : entry.project.id}) }}">{{ widgets.label_project(entry.project) }}</a>
             </td>
             <td class="hidden-xs">{{ entry.comment }}</td>
             <td>{{ widgets.label_visible(entry.visible) }}</td>

src/TimesheetBundle/Resources/views/admin/project.html.twig

@@ -4,7 +4,7 @@
 
 {% block page_title %}{{ 'admin_project.title'|trans }}{% endblock %}
 {% block page_subtitle %}{{ 'admin_project.subtitle'|trans }} {{ 'subtitle.amount'|trans({'%count%': entries.count}) }}{% endblock %}
-{% block javascript_imports %}<script src="{{ asset('js/timesheet.js') }}"></script>{% endblock %}
+{% block javascript_imports %}<script src="{{ asset('js/toolbar.js') }}"></script>{% endblock %}
 
 {% block main %}
     {% if entries.count == 0 %}

src/TimesheetBundle/Resources/views/admin/timesheet.html.twig

@@ -4,7 +4,7 @@
 
 {% block page_title %}{{ 'admin_timesheet.title'|trans }}{% endblock %}
 {% block page_subtitle %}{{ 'admin_timesheet.subtitle'|trans }}{% endblock %}
-{% block javascript_imports %}<script src="{{ asset('js/timesheet.js') }}"></script>{% endblock %}
+{% block javascript_imports %}<script src="{{ asset('js/toolbar.js') }}"></script>{% endblock %}
 
 {% block main %}
     {% if entries.count == 0 %}

src/TimesheetBundle/Resources/views/timesheet/index.html.twig

@@ -4,7 +4,7 @@
 
 {% block page_title %}{{ 'timesheet.title'|trans }}{% endblock %}
 {% block page_subtitle %}{{ 'timesheet.subtitle'|trans }}{% endblock %}
-{% block javascript_imports %}<script src="{{ asset('js/timesheet.js') }}"></script>{% endblock %}
+{% block javascript_imports %}<script src="{{ asset('js/toolbar.js') }}"></script>{% endblock %}
 
 {% block main %}
     {% if entries.count == 0 %}

web/js/timesheet.js

@@ -1,24 +0,0 @@
-$(document).ready(function () {
-
-    $('.toolbar form select').change(function (event) {
-        switch (event.target.id) {
-            case 'customer':
-                if ($(this).val() === '') {
-                    $('.toolbar form select#project').parent().remove();
-                } else {
-                    $('.toolbar form select#project').val('');
-                }
-                $('.toolbar form select#activity').parent().remove();
-                break;
-            case 'project':
-                if ($(this).val() === '') {
-                    $('.toolbar form select#activity').parent().remove();
-                } else {
-                    $('.toolbar form select#activity').val('');
-                }
-                break;
-        }
-        $('.toolbar form').submit();
-    });
-
-});

web/js/toolbar.js

@@ -1,6 +1,23 @@
 $(document).ready(function () {
 
     $('.toolbar form select').change(function (event) {
+        switch (event.target.id) {
+            case 'customer':
+                if ($(this).val() === '') {
+                    $('.toolbar form select#project').parent().remove();
+                } else {
+                    $('.toolbar form select#project').val('');
+                }
+                $('.toolbar form select#activity').parent().remove();
+                break;
+            case 'project':
+                if ($(this).val() === '') {
+                    $('.toolbar form select#activity').parent().remove();
+                } else {
+                    $('.toolbar form select#activity').val('');
+                }
+                break;
+        }
         $('.toolbar form').submit();
     });