added tags for timesheets (#604)

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