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

[activity][export]: Fixed: rename the alias for accompanying period, to

Browse Source 
be suitable for usage with acp filters
This commit is contained in:
Julien Fastré
2022-09-21 12:08:00 +02:00
parent 683717e572
commit 8b64933565
8 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Bundle/ChillActivityBundle/Export/Export/LinkedToACP/AvgActivityDuration.php
View File

@@ -84,7 +84,7 @@ class AvgActivityDuration implements ExportInterface, GroupedExportInterface
public function initiateQuery(array $requiredModifiers, array $acl, array $data = [])
{
$qb = $this->repository->createQueryBuilder('activity')
->join('activity.accompanyingPeriod', 'actacp');
->join('activity.accompanyingPeriod', 'acp');
$qb->select('AVG(activity.durationTime) as export_avg_activity_duration');

2
src/Bundle/ChillActivityBundle/Export/Export/LinkedToACP/AvgActivityVisitDuration.php
View File

@@ -84,7 +84,7 @@ class AvgActivityVisitDuration implements ExportInterface, GroupedExportInterfac
public function initiateQuery(array $requiredModifiers, array $acl, array $data = [])
{
$qb = $this->repository->createQueryBuilder('activity')
->join('activity.accompanyingPeriod', 'actacp');
->join('activity.accompanyingPeriod', 'acp');
$qb->select('AVG(activity.travelTime) as export_avg_activity_visit_duration');

2
src/Bundle/ChillActivityBundle/Export/Export/LinkedToACP/CountActivity.php
View File

@@ -87,7 +87,7 @@ class CountActivity implements ExportInterface, GroupedExportInterface
$qb = $this->repository->createQueryBuilder('activity');
if (!in_array('actacp', $qb->getAllAliases(), true)) {
$qb->join('activity.accompanyingPeriod', 'actacp');
$qb->join('activity.accompanyingPeriod', 'acp');
}
$qb->select('COUNT(activity.id) as export_count_activity');

2
src/Bundle/ChillActivityBundle/Export/Export/LinkedToACP/SumActivityDuration.php
View File

@@ -86,7 +86,7 @@ class SumActivityDuration implements ExportInterface, GroupedExportInterface
$qb = $this->repository->createQueryBuilder('activity');
if (!in_array('actacp', $qb->getAllAliases(), true)) {
$qb->join('activity.accompanyingPeriod', 'actacp');
$qb->join('activity.accompanyingPeriod', 'acp');
}
$qb->select('SUM(activity.durationTime) as export_sum_activity_duration');

2
src/Bundle/ChillActivityBundle/Export/Export/LinkedToACP/SumActivityVisitDuration.php
View File

@@ -86,7 +86,7 @@ class SumActivityVisitDuration implements ExportInterface, GroupedExportInterfac
$qb = $this->repository->createQueryBuilder('activity');
if (!in_array('actacp', $qb->getAllAliases(), true)) {
$qb->join('activity.accompanyingPeriod', 'actacp');
$qb->join('activity.accompanyingPeriod', 'acp');
}
$qb->select('SUM(activity.travelTime) as export_sum_activity_visit_duration');

4
src/Bundle/ChillActivityBundle/Export/Export/LinkedToPerson/CountActivity.php
View File

@@ -86,8 +86,8 @@ class CountActivity implements ExportInterface, GroupedExportInterface
$qb = $this->activityRepository->createQueryBuilder('activity');
if (!in_array('actperson', $qb->getAllAliases(), true)) {
$qb->join('activity.person', 'actperson');
if (!in_array('person', $qb->getAllAliases(), true)) {
$qb->join('activity.person', 'person');
}
$qb->select('COUNT(activity.id) as export_count_activity');

2
src/Bundle/ChillActivityBundle/Export/Export/LinkedToPerson/ListActivity.php
View File

@@ -210,7 +210,7 @@ class ListActivity implements ListInterface, GroupedExportInterface
$qb
->from('ChillActivityBundle:Activity', 'activity')
->join('activity.person', 'actperson')
->join('activity.person', 'person')
->join('actperson.center', 'actcenter')
->andWhere('actcenter IN (:authorized_centers)')
->setParameter('authorized_centers', $centers);

2
src/Bundle/ChillActivityBundle/Export/Export/LinkedToPerson/StatActivityDuration.php
View File

@@ -120,7 +120,7 @@ class StatActivityDuration implements ExportInterface, GroupedExportInterface
}
return $qb->select($select)
->join('activity.person', 'actperson')
->join('activity.person', 'person')
->join('actperson.center', 'actcenter')
->where($qb->expr()->in('actcenter', ':centers'))
->setParameter(':centers', $centers);