added tags for timesheets (#604)
This commit is contained in:
@@ -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);
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user