add list by person, user and scope + formatting of submit button in edit

Repository/SingleTaskRepository.php

@@ -14,35 +14,35 @@ use Doctrine\DBAL\Types\Type;
  */
 class SingleTaskRepository extends \Doctrine\ORM\EntityRepository
 {
-    
+
     const DATE_STATUS_ENDED = 'ended';
     const DATE_STATUS_WARNING = 'warning';
     const DATE_STATUS_CURRENT = 'current';
     const DATE_STATUS_NOT_STARTED = 'not_started';
-    
+
     const DATE_STATUSES = [
         self::DATE_STATUS_ENDED,
         self::DATE_STATUS_WARNING,
         self::DATE_STATUS_CURRENT,
         self::DATE_STATUS_NOT_STARTED
     ];
-    
+
     /**
      *
      * @var AuthorizationHelper
      */
     protected $authorizationHelper;
-    
+
     public function setAuthorizationHelper(AuthorizationHelper $authorizationHelper)
     {
         $this->authorizationHelper = $authorizationHelper;
     }
-    
+
     /**
-     * Count the tasks for given parameters. 
-     * 
+     * Count the tasks for given parameters.
+     *
      * The parameters are describe in @see SingleTaskRepository::filterByParameters.
-     * 
+     *
      * @see SingleTaskRepository::filterByParameters
      * @param array $params
      * @param User $currentUser
@@ -52,26 +52,28 @@ class SingleTaskRepository extends \Doctrine\ORM\EntityRepository
     {
         $qb = $this->createQueryBuilder('st')
             ->select('COUNT(st)');
-        
+
         $this->buildQuery($qb, $params, $currentUser);
-        
+
         return (int) $qb
             ->getQuery()
             ->getSingleScalarResult()
             ;
     }
-    
+
     /**
      * Find task for given parameters.
-     * 
-     * Available parameters: 
-     * 
+     *
+     * Available parameters:
+     *
      * - `person` : filter by person associated with the task ;
+     * - `user` : filter by user that created the task ;
+     * - `scope` : filter by scope associated with the task ;
      * - `date_status`: type of task. To choose between :
-     *      `ended`, `warning`, `current`, `not_started`
-     * - `is_closed`: boolean. Indicate if the tasks must be closed (true) or 
+     *      `ended`, `warning`, `current`, `not_started` ;
+     * - `is_closed`: boolean. Indicate if the tasks must be closed (true) or
      *  opened
-     * 
+     *
      * @param type $params
      * @param User $currentUser
      * @param int $firstResult
@@ -81,56 +83,69 @@ class SingleTaskRepository extends \Doctrine\ORM\EntityRepository
     public function findByParameters($params, User $currentUser, int $firstResult = 0, int $maxResults = 50)
     {
         $qb = $this->createQueryBuilder('st');
-        
+
         $this->buildQuery($qb, $params, $currentUser);
-        
+
         $qb
             ->setMaxResults($maxResults)
             ->setFirstResult($firstResult)
             ;
-        
+
         return $qb
             ->getQuery()
             ->getResult()
             ;
     }
-    
+
     protected function buildQuery(QueryBuilder $qb, $params, User $currentUser)
     {
         $this->buildACLQuery($qb, $currentUser);
-        
+
         if (\array_key_exists('person', $params) and !empty($params['person'])) {
             $qb->andWhere($qb->expr()->eq('st.person', ':person'));
             $qb->setParameter('person', $params['person']);
         }
-        
+
+        if (\array_key_exists('user', $params) and !empty($params['user'])) {
+            $qb->andWhere($qb->expr()->eq('st.assignee', ':user'));
+            $qb->setParameter('user', $params['user']);
+        }
+
+        if (\array_key_exists('scope', $params) and !empty($params['scope'])) {
+            $qb->andWhere($qb->expr()->eq('st.circle', ':scope'));
+            $qb->setParameter('scope', $params['scope']);
+        }
+
+
         if (\array_key_exists('date_status', $params) and !empty($params['date_status'])) {
             $this->addTypeFilter($qb, $params);
         }
-        
+
         if (\array_key_exists('is_closed', $params)) {
             $qb->andWhere($this->buildIsClosed($qb, !$params['is_closed']));
         }
+
+
     }
-    
-    protected function addTypeFilter(QueryBuilder $qb, $params) 
+
+    protected function addTypeFilter(QueryBuilder $qb, $params)
     {
         $andWhere = $qb->expr()->andX();
-        
+
         switch ($params['date_status']) {
-            case self::DATE_STATUS_ENDED: 
+            case self::DATE_STATUS_ENDED:
                 $andWhere
                     ->add($this->buildNowIsAfterEndDate($qb))
                     ;
                 break;
-            
+
             case self::DATE_STATUS_WARNING:
                 $andWhere
                     ->add($this->buildNowIsAfterEndDate($qb, true))
                     ->add($this->buildNowIsAfterWarningDate($qb))
                     ;
                 break;
-            
+
             case self::DATE_STATUS_CURRENT:
                 // st.endDate is NULL or (st.endDate is not null and st.endDate < now))
                 $andWhere
@@ -139,7 +154,7 @@ class SingleTaskRepository extends \Doctrine\ORM\EntityRepository
                     ->add($this->buildNowIsAfterStartDate($qb, false))
                     ;
                 break;
-            
+
             case self::DATE_STATUS_NOT_STARTED:
                 $andWhere
                     ->add($this->buildNowIsAfterEndDate($qb, true))
@@ -150,7 +165,7 @@ class SingleTaskRepository extends \Doctrine\ORM\EntityRepository
         $qb->setParameter('now', new \DateTime('today'), Type::DATE);
         $qb->andWhere($andWhere);
     }
-    
+
     private function buildNowIsAfterEndDate(QueryBuilder $qb, $negative = false)
     {
         if ($negative === false) {
@@ -169,7 +184,7 @@ class SingleTaskRepository extends \Doctrine\ORM\EntityRepository
                 ;
         }
     }
-    
+
     private function buildNowIsAfterWarningDate(QueryBuilder $qb, bool $negative = false)
     {
         if ($negative === false) {
@@ -195,7 +210,7 @@ class SingleTaskRepository extends \Doctrine\ORM\EntityRepository
                 ;
         }
     }
-    
+
     private function buildNowIsAfterStartDate(QueryBuilder $qb, bool $negative = false)
     {
         if ($negative === false) {
@@ -211,7 +226,7 @@ class SingleTaskRepository extends \Doctrine\ORM\EntityRepository
                 ;
         }
     }
-    
+
     private function buildIsClosed(QueryBuilder $qb, bool $negative = false)
     {
         if ($negative === false) {
@@ -220,8 +235,8 @@ class SingleTaskRepository extends \Doctrine\ORM\EntityRepository
             return $qb->expr()->eq('st.closed', "'FALSE'");
         }
     }
-    
-    
+
+
     protected function buildACLQuery(QueryBuilder $qb, User $currentUser)
     {
         if (NULL === $this->authorizationHelper) {
@@ -230,23 +245,23 @@ class SingleTaskRepository extends \Doctrine\ORM\EntityRepository
                 . "to initialize this repository or use the method "
                 . "`setAuthorizationHelper`");
         }
-        
+
         $role = new Role(TaskVoter::SHOW);
         $qb->join('st.person', 'p');
-        
+
         $centers = $this->authorizationHelper
             ->getReachableCenters($currentUser, $role)
             ;
-        
+
         $i = 0;
         $where = $qb->expr()->orX();
-        
+
         foreach($centers as $center) {
             $circles = $this->authorizationHelper
                 ->getReachableCircles($currentUser, $role, $center);
-            
+
             $centerWhere = $qb->expr()->andX();
-            
+
             $centerWhere->add($qb->expr()->eq('p.center', ':center_'.$i));
             $qb->setParameter('center_'.$i, $center);
             $centerWhere->add($qb->expr()->in('st.circle', ':circles_'.$i));
@@ -254,7 +269,7 @@ class SingleTaskRepository extends \Doctrine\ORM\EntityRepository
             $where->add($centerWhere);
             $i ++;
         }
-        
+
         $qb->where($where);
     }
 }