back to the list keep the query parameters required by the list

Menu/UserMenuBuilder.php

@@ -23,6 +23,7 @@ use Chill\TaskBundle\Templating\UI\CountNotificationTask;
 use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
 use Chill\TaskBundle\Repository\SingleTaskRepository;
 use Symfony\Component\Translation\TranslatorInterface;
+use Chill\MainBundle\Entity\User;
 
 /**
  * 
@@ -66,19 +67,28 @@ class UserMenuBuilder implements LocalMenuBuilderInterface
     
     public function buildMenu($menuId, MenuItem $menu, array $parameters)
     {
-        $number = $this->counter->countNotification($this->tokenStorage->getToken()
-            ->getUser());
+        $user = $this->tokenStorage->getToken()->getUser();
+        $ended = $this->counter->countNotificationEnded($user);
+        $warning = $this->counter->countNotificationWarning($user);
         
+        if ($ended > 0) {
+            $this->addItemInMenu($menu, $user, '%number% tasks over deadline', $ended, -15);
+        }
+        
+        if ($warning > 0) {
+            $this->addItemInMenu($menu, $user, '%number% tasks near deadline', $warning, -14);
+        }
+    }
+    
+    protected function addItemInMenu(MenuItem $menu, User $u, $message, $number, $order)
+    {
         if ($number > 0) {
             $menu->addChild(
-                $this->translator->transChoice('%number% tasks near deadline', $number), 
+                $this->translator->transChoice($message, $number), 
                 [
                     'route' => 'chill_task_singletask_list',
                     'routeParameters' => [
-                        'user_id' => $this->tokenStorage
-                                ->getToken()
-                                ->getUser()
-                                ->getId(),
+                        'user_id' => $u->getId(),
                         'status' => [
                             SingleTaskRepository::DATE_STATUS_WARNING, 
                             SingleTaskRepository::DATE_STATUS_ENDED
@@ -87,7 +97,7 @@ class UserMenuBuilder implements LocalMenuBuilderInterface
                 ]
             ])
                 ->setExtras([
-                    'order'=> -15,
+                    'order'=> $order,
                     'icon' => 'exclamation-triangle',
                     'entryclass' => 'user_menu__entry--warning-entry'
                 ]);