Chill-project/chill-bundles
6
0
Fork 0
mirror of https://gitlab.com/Chill-Projet/chill-bundles.git synced 2025-06-07 18:44:08 +00:00
Code Issues Actions Projects Releases Wiki Activity

[activity report count] do not count activities from centers not selected

Browse Source
This commit is contained in:
Julien Fastré 2018-09-12 10:54:00 +02:00
parent 8503628d96
commit efe27bf100
2 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CHANGELOG.md Normal file
View File

@ -0,0 +1,6 @@
Master branch
=============
- [report activity count] fix error: do not show centers which are not selected in results.

5
Export/Export/CountActivity.php
View File

@ -69,6 +69,7 @@ class CountActivity implements ExportInterface
public function initiateQuery(array $requiredModifiers, array $acl, array $data = array()) public function initiateQuery(array $requiredModifiers, array $acl, array $data = array())
{ {
$qb = $this->entityManager->createQueryBuilder(); $qb = $this->entityManager->createQueryBuilder();
$centers = array_map(function($el) { return $el['center']; }, $acl);
$qb->select('COUNT(activity.id) as export_count_activity') $qb->select('COUNT(activity.id) as export_count_activity')
->from('ChillActivityBundle:Activity', 'activity') ->from('ChillActivityBundle:Activity', 'activity')
@ -78,6 +79,10 @@ class CountActivity implements ExportInterface
$qb->join('activity.person', 'person'); $qb->join('activity.person', 'person');
} }
$qb->where($qb->expr()->in('person.center', ':centers'))
->setParameter('centers', $centers)
;
return $qb; return $qb;
} }