Chill-project/chill-bundles
6
0
Fork 0
mirror of https://gitlab.com/Chill-Projet/chill-bundles.git synced 2025-08-20 14:43:49 +00:00
Code Issues Actions Projects Releases Wiki Activity

last processing of review remarks

Browse Source
This commit is contained in:
Julie Lenaerts
2023-10-04 11:19:39 +02:00
parent af4bee4d50
commit dac48ea4e0
22 changed files with 22 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -31,14 +31,10 @@ class AvgActivityDuration implements ExportInterface, GroupedExportInterface
{
protected EntityRepository $repository;
private AccompanyingCourseExportHelper $accompanyingCourseExportHelper;
public function __construct(
EntityManagerInterface $em,
AccompanyingCourseExportHelper $accompanyingCourseExportHelper
) {
$this->repository = $em->getRepository(Activity::class);
$this->accompanyingCourseExportHelper = $accompanyingCourseExportHelper;
}
public function buildForm(FormBuilderInterface $builder) {}
@@ -113,7 +109,7 @@ class AvgActivityDuration implements ExportInterface, GroupedExportInterface
)
->setParameter('authorized_centers', $centers);
$this->accompanyingCourseExportHelper::addClosingMotiveExclusionClause($qb);
AccompanyingCourseExportHelper::addClosingMotiveExclusionClause($qb);
return $qb;
}

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

@@ -31,14 +31,10 @@ class AvgActivityVisitDuration implements ExportInterface, GroupedExportInterfac
{
protected EntityRepository $repository;
private AccompanyingCourseExportHelper $accompanyingCourseExportHelper;
public function __construct(
EntityManagerInterface $em,
AccompanyingCourseExportHelper $accompanyingCourseExportHelper
) {
$this->repository = $em->getRepository(Activity::class);
$this->accompanyingCourseExportHelper = $accompanyingCourseExportHelper;
}
public function buildForm(FormBuilderInterface $builder)
@@ -116,7 +112,7 @@ class AvgActivityVisitDuration implements ExportInterface, GroupedExportInterfac
)
->setParameter('authorized_centers', $centers);
$this->accompanyingCourseExportHelper::addClosingMotiveExclusionClause($qb);
AccompanyingCourseExportHelper::addClosingMotiveExclusionClause($qb);
return $qb;
}

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

@@ -31,14 +31,10 @@ class CountActivity implements ExportInterface, GroupedExportInterface
{
protected EntityRepository $repository;
private AccompanyingCourseExportHelper $accompanyingCourseExportHelper;
public function __construct(
EntityManagerInterface $em,
AccompanyingCourseExportHelper $accompanyingCourseExportHelper
) {
$this->repository = $em->getRepository(Activity::class);
$this->accompanyingCourseExportHelper = $accompanyingCourseExportHelper;
}
public function buildForm(FormBuilderInterface $builder) {}
@@ -110,7 +106,7 @@ class CountActivity implements ExportInterface, GroupedExportInterface
)
->setParameter('authorized_centers', $centers);
$this->accompanyingCourseExportHelper::addClosingMotiveExclusionClause($qb);
AccompanyingCourseExportHelper::addClosingMotiveExclusionClause($qb);
$qb->select('COUNT(DISTINCT activity.id) as export_count_activity');

6
src/Bundle/ChillActivityBundle/Export/Export/LinkedToACP/ListActivity.php
View File

@@ -31,18 +31,14 @@ class ListActivity implements ListInterface, GroupedExportInterface
private TranslatableStringExportLabelHelper $translatableStringExportLabelHelper;
private AccompanyingCourseExportHelper $accompanyingCourseExportHelper;
public function __construct(
ListActivityHelper $helper,
EntityManagerInterface $entityManager,
TranslatableStringExportLabelHelper $translatableStringExportLabelHelper,
AccompanyingCourseExportHelper $accompanyingCourseExportHelper
) {
$this->helper = $helper;
$this->entityManager = $entityManager;
$this->translatableStringExportLabelHelper = $translatableStringExportLabelHelper;
$this->accompanyingCourseExportHelper = $accompanyingCourseExportHelper;
}
public function buildForm(FormBuilderInterface $builder)
@@ -152,7 +148,7 @@ class ListActivity implements ListInterface, GroupedExportInterface
->addSelect('(SELECT AGGREGATE(acpScope.name) FROM ' . Scope::class . ' acpScope WHERE acpScope MEMBER OF acp.scopes) AS scopesNames')
->addGroupBy('scopesNames');
$this->accompanyingCourseExportHelper::addClosingMotiveExclusionClause($qb);
AccompanyingCourseExportHelper::addClosingMotiveExclusionClause($qb);
return $qb;
}

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

@@ -31,14 +31,10 @@ class SumActivityDuration implements ExportInterface, GroupedExportInterface
{
protected EntityRepository $repository;
private AccompanyingCourseExportHelper $accompanyingCourseExportHelper;
public function __construct(
EntityManagerInterface $em,
AccompanyingCourseExportHelper $accompanyingCourseExportHelper
) {
$this->repository = $em->getRepository(Activity::class);
$this->accompanyingCourseExportHelper = $accompanyingCourseExportHelper;
}
public function buildForm(FormBuilderInterface $builder)
@@ -116,7 +112,7 @@ class SumActivityDuration implements ExportInterface, GroupedExportInterface
)
->setParameter('authorized_centers', $centers);
$this->accompanyingCourseExportHelper::addClosingMotiveExclusionClause($qb);
AccompanyingCourseExportHelper::addClosingMotiveExclusionClause($qb);
return $qb;
}

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

@@ -31,14 +31,10 @@ class SumActivityVisitDuration implements ExportInterface, GroupedExportInterfac
{
protected EntityRepository $repository;
private AccompanyingCourseExportHelper $accompanyingCourseExportHelper;
public function __construct(
EntityManagerInterface $em,
AccompanyingCourseExportHelper $accompanyingCourseExportHelper
) {
$this->repository = $em->getRepository(Activity::class);
$this->accompanyingCourseExportHelper = $accompanyingCourseExportHelper;
}
public function buildForm(FormBuilderInterface $builder)
@@ -116,7 +112,7 @@ class SumActivityVisitDuration implements ExportInterface, GroupedExportInterfac
)
->setParameter('authorized_centers', $centers);
$this->accompanyingCourseExportHelper::addClosingMotiveExclusionClause($qb);
AccompanyingCourseExportHelper::addClosingMotiveExclusionClause($qb);
return $qb;
}