added colors to tags (#1631)

2020-04-14 14:18:11 +02:00
parent 1dfceeea99
commit 0bc9e74853
9 changed files with 55 additions and 7 deletions
--- a/src/Repository/TagRepository.php
+++ b/src/Repository/TagRepository.php
@@ -108,10 +108,11 @@ class TagRepository extends EntityRepository
        $qb = $this->createQueryBuilder('tag');

        $qb
-            ->select('tag.id, tag.name, count(timesheets.id) as amount')
+            ->select('tag.id, tag.name, tag.color, count(timesheets.id) as amount')
            ->leftJoin('tag.timesheets', 'timesheets')
            ->addGroupBy('tag.id')
            ->addGroupBy('tag.name')
+            ->addGroupBy('tag.color')
        ;

        $orderBy = $query->getOrderBy();