Chill-project/chill-bundles
6
0
Fork 0
mirror of https://gitlab.com/Chill-Projet/chill-bundles.git synced 2025-08-28 02:23:51 +00:00
Code Issues Actions Projects Releases Wiki Activity

improve task list

Browse Source
This commit is contained in:
Julien Fastré
2018-04-20 21:55:56 +02:00
parent 9dfa39ff07
commit 196fc2c38f
4 changed files with 250 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

152
Repository/SingleTaskRepository.php
View File

@@ -7,12 +7,26 @@ use Doctrine\ORM\QueryBuilder;
use Chill\MainBundle\Security\Authorization\AuthorizationHelper;
use Symfony\Component\Security\Core\Role\Role;
use Chill\TaskBundle\Security\Authorization\TaskVoter;
use Doctrine\DBAL\Types\Type;
/**
* SingleTaskRepository
*/
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
@@ -24,6 +38,42 @@ class SingleTaskRepository extends \Doctrine\ORM\EntityRepository
$this->authorizationHelper = $authorizationHelper;
}
/**
* Count the tasks for given parameters.
*
* The parameters are describe in @see SingleTaskRepository::filterByParameters.
*
* @see SingleTaskRepository::filterByParameters
* @param array $params
* @param User $currentUser
* @return int
*/
public function countByParameters($params, User $currentUser)
{
$qb = $this->createQueryBuilder('st')
->select('COUNT(st)');
$this->buildQuery($qb, $params, $currentUser);
return (int) $qb
->getQuery()
->getSingleScalarResult()
;
}
/**
* Find task for given parameters.
*
* Available parameters:
*
* - `person` : filter by person associated with the task ;
* - `date_status`: type of task. To choose between :
* `ended`, `warning`, `current`, `not_started`
*
* @param type $params
* @param User $currentUser
* @return type
*/
public function findByParameters($params, User $currentUser)
{
$qb = $this->createQueryBuilder('st');
@@ -44,8 +94,110 @@ class SingleTaskRepository extends \Doctrine\ORM\EntityRepository
$qb->andWhere($qb->expr()->eq('st.person', ':person'));
$qb->setParameter('person', $params['person']);
}
if (\array_key_exists('date_status', $params)) {
$this->addTypeFilter($qb, $params);
}
}
protected function addTypeFilter(QueryBuilder $qb, $params)
{
$andWhere = $qb->expr()->andX();
switch ($params['date_status']) {
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
->add($this->buildNowIsAfterEndDate($qb, true))
->add($this->buildNowIsAfterWarningDate($qb, true))
->add($this->buildNowIsAfterStartDate($qb, false))
;
break;
case self::DATE_STATUS_NOT_STARTED:
$andWhere
->add($this->buildNowIsAfterEndDate($qb, true))
->add($this->buildNowIsAfterWarningDate($qb, true))
->add($this->buildNowIsAfterStartDate($qb, true))
;
}
$qb->setParameter('now', new \DateTime('today'), Type::DATE);
$qb->andWhere($andWhere);
}
private function buildNowIsAfterEndDate(QueryBuilder $qb, $negative = false)
{
if ($negative === false) {
return $qb->expr()->andX()
->add($qb->expr()->isNotNull('st.endDate'))
->add($qb->expr()->lt('st.endDate', ':now'))
;
} else {
return $qb->expr()->orX()
->add(
$qb->expr()->andX()
->add($qb->expr()->isNotNull('st.endDate'))
->add($qb->expr()->gt('st.endDate', ':now'))
)
->add($qb->expr()->isNull('st.endDate'))
;
}
}
private function buildNowIsAfterWarningDate(QueryBuilder $qb, $negative = false)
{
if ($negative === false) {
return $qb->expr()->andX()
->add($qb->expr()->lt(
$qb->expr()->diff('st.endDate', 'st.warningInterval'), ':now'
)
);
} else {
return $qb->expr()->orX()
->add(
$qb->expr()->andX()
->add($qb->expr()->isNotNull('st.endDate'))
->add($qb->expr()->isNotNull('st.warningInterval'))
->add($qb->expr()->gt(
$qb->expr()->diff('st.endDate', 'st.warningInterval'),
':now'
)
)
)
->add($qb->expr()->isNull('st.endDate'))
->add($qb->expr()->isNull('st.warningInterval'))
;
}
}
private function buildNowIsAfterStartDate(QueryBuilder $qb, $negative = false)
{
if ($negative === false) {
return $qb->expr()->orX()
->add($qb->expr()->lt('st.startDate', ':now'))
->add($qb->expr()->isNull('st.startDate'))
;
} else {
return
$qb->expr()->andX()
->add($qb->expr()->gt('st.startDate', ':now'))
->add($qb->expr()->isNotNull('st.startDate'))
;
}
}
protected function buildACLQuery(QueryBuilder $qb, User $currentUser)
{
if (NULL === $this->authorizationHelper) {