jjsm01/kimai2
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

fix random order in recent activities (#631)

Browse Source
This commit is contained in:
Kevin Papst
2019-03-08 16:09:37 +01:00
committed by GitHub
parent 76c3c5f2f6
commit e8bc45f7dd
1 changed files with 3 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/Repository/ActivityRepository.php
View File

@@ -20,9 +20,6 @@ use Doctrine\ORM\Query;
use Doctrine\ORM\QueryBuilder; use Doctrine\ORM\QueryBuilder;
use Pagerfanta\Pagerfanta; use Pagerfanta\Pagerfanta;
/**
* Class ActivityRepository
*/
class ActivityRepository extends AbstractRepository class ActivityRepository extends AbstractRepository
{ {
/** /**
@@ -44,7 +41,7 @@ class ActivityRepository extends AbstractRepository
{ {
$qb = $this->getEntityManager()->createQueryBuilder(); $qb = $this->getEntityManager()->createQueryBuilder();
$qb->select($qb->expr()->max('t.id')) $qb->select($qb->expr()->max('t.id') . ' AS maxid')
->from(Timesheet::class, 't') ->from(Timesheet::class, 't')
->indexBy('t', 't.id') ->indexBy('t', 't.id')
->join('t.activity', 'a') ->join('t.activity', 'a')
@@ -55,6 +52,7 @@ class ActivityRepository extends AbstractRepository
->andWhere('p.visible = 1') ->andWhere('p.visible = 1')
->andWhere('c.visible = 1') ->andWhere('c.visible = 1')
->groupBy('a.id', 'p.id') ->groupBy('a.id', 'p.id')
->orderBy('maxid', 'DESC')
->setMaxResults(10) ->setMaxResults(10)
; ;
@@ -74,10 +72,7 @@ class ActivityRepository extends AbstractRepository
return []; return [];
} }
$ids = []; $ids = array_column($results, 'maxid');
foreach ($results as $result) {
$ids[] = $result[1];
}
$qb = $this->getEntityManager()->createQueryBuilder(); $qb = $this->getEntityManager()->createQueryBuilder();
$qb->select('t', 'a', 'p', 'c') $qb->select('t', 'a', 'p', 'c')