added tags for timesheets (#604)

src/Controller/InvoiceController.php

@@ -345,7 +345,7 @@ class InvoiceController extends AbstractController
             'method' => 'POST',
             'attr' => [
                 'id' => 'invoice-print-form'
-            ]
+            ],
         ]);
     }
 

src/Controller/TagController.php

@@ -0,0 +1,70 @@
+<?php
+
+/*
+ * This file is part of the Kimai time-tracking app.
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace App\Controller;
+
+use App\Form\Toolbar\TagToolbarForm;
+use App\Repository\Query\TagQuery;
+use App\Repository\TagRepository;
+use Sensio\Bundle\FrameworkExtraBundle\Configuration\Security;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\Routing\Annotation\Route;
+
+/**
+ * @Route(path="/admin/tags")
+ * @Security("is_granted('view_tag')")
+ */
+class TagController extends AbstractController
+{
+    /**
+     * @Route(path="/", defaults={"page": 1}, name="tags", methods={"GET"})
+     * @Route(path="/page/{page}", requirements={"page": "[1-9]\d*"}, name="tags_paginated", methods={"GET"})
+     *
+     * @param TagRepository $repository
+     * @param Request $request
+     * @param int $page
+     * @return Response
+     */
+    public function listTags(TagRepository $repository, Request $request, $page)
+    {
+        $query = new TagQuery();
+        $query->setPage($page);
+
+        $form = $this->getToolbarForm($query);
+        $form->handleRequest($request);
+        if ($form->isSubmitted() && $form->isValid()) {
+            /** @var TagQuery $query */
+            $query = $form->getData();
+        }
+
+        $tags = $repository->getTagCount($query);
+
+        return $this->render('tags/index.html.twig', [
+            'tags' => $tags,
+            'query' => $query,
+            'showFilter' => $form->isSubmitted(),
+            'toolbarForm' => $form->createView(),
+        ]);
+    }
+
+    /**
+     * @param TagQuery $query
+     * @return \Symfony\Component\Form\FormInterface
+     */
+    protected function getToolbarForm(TagQuery $query)
+    {
+        return $this->createForm(TagToolbarForm::class, $query, [
+            'action' => $this->generateUrl('tags', [
+                'page' => $query->getPage(),
+            ]),
+            'method' => 'GET',
+        ]);
+    }
+}

src/Controller/TimesheetController.php

@@ -9,12 +9,14 @@
 
 namespace App\Controller;
 
+use App\Entity\Tag;
 use App\Entity\Timesheet;
 use App\Form\TimesheetEditForm;
 use App\Form\Toolbar\TimesheetToolbarForm;
 use App\Repository\ActivityRepository;
 use App\Repository\ProjectRepository;
 use App\Repository\Query\TimesheetQuery;
+use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\ORM\ORMException;
 use Pagerfanta\Pagerfanta;
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\Security;
@@ -61,6 +63,14 @@ class TimesheetController extends AbstractController
 
         $query->setUser($this->getUser());
 
+        if ($query->hasTags()) {
+            $query->setTags(
+                new ArrayCollection(
+                    $this->getDoctrine()->getRepository(Tag::class)->findIdsByTagNameList(implode(',', $query->getTags()->toArray()))
+                )
+            );
+        }
+
         /* @var $entries Pagerfanta */
         $entries = $this->getRepository()->findByQuery($query);
 
@@ -149,8 +159,7 @@ class TimesheetController extends AbstractController
                 ->setBegin($this->dateTime->createDateTime())
                 ->setUser($user)
                 ->setActivity($timesheet->getActivity())
-                ->setProject($timesheet->getProject())
-            ;
+                ->setProject($timesheet->getProject());
 
             $errors = $validator->validate($entry);
 
@@ -213,7 +222,7 @@ class TimesheetController extends AbstractController
     }
 
     /**
-     * @Route(path="/{id}/delete", defaults={"page": 1}, name="timesheet_delete", methods={"GET", "POST"})
+     * @Route(path="/{id}/delete", name="timesheet_delete", methods={"GET", "POST"})
      * @Security("is_granted('delete', entry)")
      *
      * @param Timesheet $entry

src/Controller/TimesheetTeamController.php

@@ -9,13 +9,14 @@
 
 namespace App\Controller;
 
+use App\Entity\Tag;
 use App\Entity\Timesheet;
-use App\Form\DeleteType;
 use App\Form\TimesheetEditForm;
 use App\Form\Toolbar\TimesheetToolbarForm;
 use App\Repository\ActivityRepository;
 use App\Repository\ProjectRepository;
 use App\Repository\Query\TimesheetQuery;
+use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\ORM\ORMException;
 use Pagerfanta\Pagerfanta;
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\Security;
@@ -59,6 +60,14 @@ class TimesheetTeamController extends AbstractController
             }
         }
 
+        if ($query->hasTags()) {
+            $query->setTags(
+                new ArrayCollection(
+                    $this->getDoctrine()->getRepository(Tag::class)->findIdsByTagNameList(implode(',', $query->getTags()->toArray()))
+                )
+            );
+        }
+
         /* @var $entries Pagerfanta */
         $entries = $this->getRepository()->findByQuery($query);
 
@@ -137,7 +146,7 @@ class TimesheetTeamController extends AbstractController
     }
 
     /**
-     * @Route(path="/{id}/delete", defaults={"page": 1}, name="admin_timesheet_delete", methods={"GET", "POST"})
+     * @Route(path="/{id}/delete", name="admin_timesheet_delete", methods={"GET", "POST"})
      * @Security("is_granted('delete', entry)")
      *
      * @param Timesheet $entry