diff --git a/src/Bundle/ChillActivityBundle/Export/Aggregator/ACPAggregators/ByActivityNumberAggregator.php b/src/Bundle/ChillActivityBundle/Export/Aggregator/ACPAggregators/ByActivityNumberAggregator.php index ae7492724..44a3fd8f0 100644 --- a/src/Bundle/ChillActivityBundle/Export/Aggregator/ACPAggregators/ByActivityNumberAggregator.php +++ b/src/Bundle/ChillActivityBundle/Export/Aggregator/ACPAggregators/ByActivityNumberAggregator.php @@ -25,8 +25,8 @@ class ByActivityNumberAggregator implements AggregatorInterface public function alterQuery(QueryBuilder $qb, $data) { - $qb->addSelect('AS _aggregator') - ->addGroupBy('_aggregator'); + $qb->addSelect('AS activity_by_number_aggregator') + ->addGroupBy('activity_by_number_aggregator'); } public function applyOn(): string @@ -50,7 +50,7 @@ class ByActivityNumberAggregator implements AggregatorInterface public function getQueryKeys($data): array { - return ['_aggregator']; + return ['activity_by_number_aggregator']; } public function getTitle(): string diff --git a/src/Bundle/ChillActivityBundle/Export/Aggregator/SentReceivedAggregator.php b/src/Bundle/ChillActivityBundle/Export/Aggregator/SentReceivedAggregator.php index 85c37454f..bf848d5e1 100644 --- a/src/Bundle/ChillActivityBundle/Export/Aggregator/SentReceivedAggregator.php +++ b/src/Bundle/ChillActivityBundle/Export/Aggregator/SentReceivedAggregator.php @@ -25,8 +25,8 @@ class SentReceivedAggregator implements AggregatorInterface public function alterQuery(QueryBuilder $qb, $data) { - $qb->addSelect('AS _aggregator') - ->addGroupBy('_aggregator'); + $qb->addSelect('AS activity_sent_received_aggregator') + ->addGroupBy('activity_sent_received_aggregator'); } public function applyOn(): string @@ -50,7 +50,7 @@ class SentReceivedAggregator implements AggregatorInterface public function getQueryKeys($data): array { - return ['_aggregator']; + return ['activity_sent_received_aggregator']; } public function getTitle(): string diff --git a/src/Bundle/ChillAsideActivityBundle/src/Export/Aggregator/ByActivityTypeAggregator.php b/src/Bundle/ChillAsideActivityBundle/src/Export/Aggregator/ByActivityTypeAggregator.php index 36b643d53..bbbdb6284 100644 --- a/src/Bundle/ChillAsideActivityBundle/src/Export/Aggregator/ByActivityTypeAggregator.php +++ b/src/Bundle/ChillAsideActivityBundle/src/Export/Aggregator/ByActivityTypeAggregator.php @@ -25,8 +25,8 @@ class ByActivityTypeAggregator implements AggregatorInterface public function alterQuery(QueryBuilder $qb, $data) { - $qb->addSelect('AS _aggregator') - ->addGroupBy('_aggregator'); + $qb->addSelect('AS aside_by_activity_type_aggregator') + ->addGroupBy('aside_by_activity_type_aggregator'); } public function applyOn(): string @@ -50,7 +50,7 @@ class ByActivityTypeAggregator implements AggregatorInterface public function getQueryKeys($data): array { - return ['_aggregator']; + return ['aside_by_activity_type_aggregator']; } public function getTitle(): string diff --git a/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/ByActionNumberAggregator.php b/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/ByActionNumberAggregator.php index c3f94b947..3c16aa161 100644 --- a/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/ByActionNumberAggregator.php +++ b/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/ByActionNumberAggregator.php @@ -25,8 +25,8 @@ class ByActionNumberAggregator implements AggregatorInterface public function alterQuery(QueryBuilder $qb, $data) { - $qb->addSelect('AS _aggregator') - ->addGroupBy('_aggregator'); + $qb->addSelect('AS acp_by_action_number_aggregator') + ->addGroupBy('acp_by_action_number_aggregator'); } public function applyOn(): string @@ -50,7 +50,7 @@ class ByActionNumberAggregator implements AggregatorInterface public function getQueryKeys($data): array { - return ['_aggregator']; + return ['acp_by_action_number_aggregator']; } public function getTitle(): string diff --git a/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/CreatorJobAggregator.php b/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/CreatorJobAggregator.php index 0eb98b0d4..1449091e7 100644 --- a/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/CreatorJobAggregator.php +++ b/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/CreatorJobAggregator.php @@ -25,8 +25,8 @@ class CreatorJobAggregator implements AggregatorInterface public function alterQuery(QueryBuilder $qb, $data) { - $qb->addSelect('AS _aggregator') - ->addGroupBy('_aggregator'); + $qb->addSelect('AS acp_creator_job_aggregator') + ->addGroupBy('acp_creator_job_aggregator'); } public function applyOn(): string @@ -50,7 +50,7 @@ class CreatorJobAggregator implements AggregatorInterface public function getQueryKeys($data): array { - return ['_aggregator']; + return ['acp_creator_job_aggregator']; } public function getTitle(): string diff --git a/src/Bundle/ChillPersonBundle/Export/Aggregator/EvaluationAggregators/ByEndDateAggregator.php b/src/Bundle/ChillPersonBundle/Export/Aggregator/EvaluationAggregators/ByEndDateAggregator.php index 46c3b460f..9c90c8dd3 100644 --- a/src/Bundle/ChillPersonBundle/Export/Aggregator/EvaluationAggregators/ByEndDateAggregator.php +++ b/src/Bundle/ChillPersonBundle/Export/Aggregator/EvaluationAggregators/ByEndDateAggregator.php @@ -25,8 +25,8 @@ class ByEndDateAggregator implements AggregatorInterface public function alterQuery(QueryBuilder $qb, $data) { - $qb->addSelect('AS _aggregator') - ->addGroupBy('_aggregator'); + $qb->addSelect('AS eval_by_end_date_aggregator') + ->addGroupBy('eval_by_end_date_aggregator'); } public function applyOn(): string @@ -50,7 +50,7 @@ class ByEndDateAggregator implements AggregatorInterface public function getQueryKeys($data): array { - return ['_aggregator']; + return ['eval_by_end_date_aggregator']; } public function getTitle(): string diff --git a/src/Bundle/ChillPersonBundle/Export/Aggregator/EvaluationAggregators/ByMaxDateAggregator.php b/src/Bundle/ChillPersonBundle/Export/Aggregator/EvaluationAggregators/ByMaxDateAggregator.php index 689b6fea3..ded9fb685 100644 --- a/src/Bundle/ChillPersonBundle/Export/Aggregator/EvaluationAggregators/ByMaxDateAggregator.php +++ b/src/Bundle/ChillPersonBundle/Export/Aggregator/EvaluationAggregators/ByMaxDateAggregator.php @@ -25,8 +25,8 @@ class ByMaxDateAggregator implements AggregatorInterface public function alterQuery(QueryBuilder $qb, $data) { - $qb->addSelect('AS _aggregator') - ->addGroupBy('_aggregator'); + $qb->addSelect('AS eval_by_max_date_aggregator') + ->addGroupBy('eval_by_max_date_aggregator'); } public function applyOn(): string @@ -50,7 +50,7 @@ class ByMaxDateAggregator implements AggregatorInterface public function getQueryKeys($data): array { - return ['_aggregator']; + return ['eval_by_max_date_aggregator']; } public function getTitle(): string diff --git a/src/Bundle/ChillPersonBundle/Export/Aggregator/EvaluationAggregators/ByStartDateAggregator.php b/src/Bundle/ChillPersonBundle/Export/Aggregator/EvaluationAggregators/ByStartDateAggregator.php index 656054250..121171d8c 100644 --- a/src/Bundle/ChillPersonBundle/Export/Aggregator/EvaluationAggregators/ByStartDateAggregator.php +++ b/src/Bundle/ChillPersonBundle/Export/Aggregator/EvaluationAggregators/ByStartDateAggregator.php @@ -25,8 +25,8 @@ class ByStartDateAggregator implements AggregatorInterface public function alterQuery(QueryBuilder $qb, $data) { - $qb->addSelect('AS _aggregator') - ->addGroupBy('_aggregator'); + $qb->addSelect('AS eval_by_start_date_aggregator') + ->addGroupBy('eval_by_start_date_aggregator'); } public function applyOn(): string @@ -50,7 +50,7 @@ class ByStartDateAggregator implements AggregatorInterface public function getQueryKeys($data): array { - return ['_aggregator']; + return ['eval_by_start_date_aggregator']; } public function getTitle(): string diff --git a/src/Bundle/ChillPersonBundle/Export/Aggregator/SocialWorkAggregators/CurrentActionAggregator.php b/src/Bundle/ChillPersonBundle/Export/Aggregator/SocialWorkAggregators/CurrentActionAggregator.php index c69cda35d..9a9c56afc 100644 --- a/src/Bundle/ChillPersonBundle/Export/Aggregator/SocialWorkAggregators/CurrentActionAggregator.php +++ b/src/Bundle/ChillPersonBundle/Export/Aggregator/SocialWorkAggregators/CurrentActionAggregator.php @@ -25,8 +25,8 @@ class CurrentActionAggregator implements AggregatorInterface public function alterQuery(QueryBuilder $qb, $data) { - $qb->addSelect('AS _aggregator') - ->addGroupBy('_aggregator'); + $qb->addSelect('AS acpw_current_action_aggregator') + ->addGroupBy('acpw_current_action_aggregator'); } public function applyOn(): string @@ -50,7 +50,7 @@ class CurrentActionAggregator implements AggregatorInterface public function getQueryKeys($data): array { - return ['_aggregator']; + return ['acpw_current_action_aggregator']; } public function getTitle(): string