Chill-project/chill-bundles
6
0
Fork 0
mirror of https://gitlab.com/Chill-Projet/chill-bundles.git synced 2025-09-28 01:25:00 +00:00
Code Issues Actions Projects Releases Wiki Activity

exports evaluation: fix root query from acp

Browse Source
This commit is contained in:
Mathieu Jaumotte
2022-08-11 14:04:15 +02:00
parent 6e467a62d4
commit b8d187c82b
3 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/Bundle/ChillPersonBundle/Export/Aggregator/EvaluationAggregators/EvaluationTypeAggregator.php
View File

@@ -76,8 +76,7 @@ class EvaluationTypeAggregator implements AggregatorInterface
*/ */
public function alterQuery(QueryBuilder $qb, $data) public function alterQuery(QueryBuilder $qb, $data)
{ {
$qb->join('eval.evaluation', 'ev'); $qb->addSelect('IDENTITY(eval.evaluation) AS evaluationtype_aggregator');
$qb->addSelect('ev.id AS evaluationtype_aggregator');
$groupBy = $qb->getDQLPart('groupBy'); $groupBy = $qb->getDQLPart('groupBy');

11
src/Bundle/ChillPersonBundle/Export/Export/CountEvaluation.php
View File

@@ -5,7 +5,7 @@ namespace Chill\PersonBundle\Export\Export;
use Chill\MainBundle\Export\ExportInterface; use Chill\MainBundle\Export\ExportInterface;
use Chill\MainBundle\Export\FormatterInterface; use Chill\MainBundle\Export\FormatterInterface;
use Chill\MainBundle\Export\GroupedExportInterface; use Chill\MainBundle\Export\GroupedExportInterface;
use Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWorkEvaluation; use Chill\PersonBundle\Entity\AccompanyingPeriod;
use Chill\PersonBundle\Export\Declarations; use Chill\PersonBundle\Export\Declarations;
use Chill\PersonBundle\Security\Authorization\AccompanyingPeriodVoter; use Chill\PersonBundle\Security\Authorization\AccompanyingPeriodVoter;
use Doctrine\ORM\EntityManagerInterface; use Doctrine\ORM\EntityManagerInterface;
@@ -17,12 +17,12 @@ use Symfony\Component\Security\Core\Role\Role;
class CountEvaluation implements ExportInterface, GroupedExportInterface class CountEvaluation implements ExportInterface, GroupedExportInterface
{ {
private EntityRepository $evaluationRepository; private EntityRepository $acpRepository;
public function __construct( public function __construct(
EntityManagerInterface $em EntityManagerInterface $em
) { ) {
$this->evaluationRepository = $em->getRepository(AccompanyingPeriodWorkEvaluation::class); $this->acpRepository = $em->getRepository(AccompanyingPeriod::class);
} }
/** /**
@@ -103,7 +103,10 @@ class CountEvaluation implements ExportInterface, GroupedExportInterface
*/ */
public function initiateQuery(array $requiredModifiers, array $acl, array $data = []) public function initiateQuery(array $requiredModifiers, array $acl, array $data = [])
{ {
$qb = $this->evaluationRepository->createQueryBuilder('eval'); $qb = $this->acpRepository->createQueryBuilder('acp')
->join('acp.works', 'acpw')
->join('acpw.accompanyingPeriodWorkEvaluations', 'eval')
;
$qb->select('COUNT(eval.id) AS export_result'); $qb->select('COUNT(eval.id) AS export_result');

3
src/Bundle/ChillPersonBundle/Export/Filter/EvaluationFilters/MaxDateFilter.php
View File

@@ -12,7 +12,6 @@ use Symfony\Contracts\Translation\TranslatorInterface;
class MaxDateFilter implements FilterInterface class MaxDateFilter implements FilterInterface
{ {
private const MAXDATE_CHOICES = [ private const MAXDATE_CHOICES = [
'is specified' => true, 'is specified' => true,
'is not specified' => false, 'is not specified' => false,
@@ -89,8 +88,6 @@ class MaxDateFilter implements FilterInterface
} }
$qb->add('where', $where); $qb->add('where', $where);
dump($data['maxdate']);
} }
/** /**