added tags for timesheets (#604)

This commit is contained in:
Mathias
2019-05-12 01:40:04 +02:00
committed by Kevin Papst
parent f31118292c
commit e29e183e84
84 changed files with 2132 additions and 158 deletions

View File

@@ -332,12 +332,13 @@ class TimesheetRepository extends AbstractRepository
{
$qb = $this->getEntityManager()->createQueryBuilder();
$qb->select('t', 'a', 'p', 'c', 'u')
$qb->select('t', 'a', 'p', 'c', 'u', 'tags')
->from(Timesheet::class, 't')
->leftJoin('t.activity', 'a')
->leftJoin('t.user', 'u')
->leftJoin('t.project', 'p')
->leftJoin('p.customer', 'c')
->leftJoin('t.tags', 'tags')
->orderBy('t.' . $query->getOrderBy(), $query->getOrder());
if (null !== $query->getUser()) {
@@ -382,6 +383,11 @@ class TimesheetRepository extends AbstractRepository
}
}
if ($query->hasTags()) {
$qb->andWhere('tags.id IN (:tags)')
->setParameter('tags', $query->getTags()->toArray());
}
return $this->getBaseQueryResult($qb, $query);
}