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

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
Show Stats 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;
}

6
src/Bundle/ChillCalendarBundle/Export/Export/CountCalendars.php
View File

@ -28,14 +28,10 @@ class CountCalendars implements ExportInterface, GroupedExportInterface
{
private CalendarRepository $calendarRepository;
private AccompanyingCourseExportHelper $accompanyingCourseExportHelper;
public function __construct(
CalendarRepository $calendarRepository,
AccompanyingCourseExportHelper $accompanyingCourseExportHelper
) {
$this->calendarRepository = $calendarRepository;
$this->accompanyingCourseExportHelper = $accompanyingCourseExportHelper;
}
public function buildForm(FormBuilderInterface $builder)
@ -106,7 +102,7 @@ class CountCalendars implements ExportInterface, GroupedExportInterface
$qb->select('COUNT(cal.id) AS export_result');
$qb->join('cal.accompanyingPeriod', 'acp');
$this->accompanyingCourseExportHelper::addClosingMotiveExclusionClause($qb);
AccompanyingCourseExportHelper::addClosingMotiveExclusionClause($qb);
return $qb;
}

6
src/Bundle/ChillCalendarBundle/Export/Export/StatCalendarAvgDuration.php
View File

@ -27,14 +27,10 @@ class StatCalendarAvgDuration implements ExportInterface, GroupedExportInterface
{
private CalendarRepository $calendarRepository;
private AccompanyingCourseExportHelper $accompanyingCourseExportHelper;
public function __construct(
CalendarRepository $calendarRepository,
AccompanyingCourseExportHelper $accompanyingCourseExportHelper
) {
$this->calendarRepository = $calendarRepository;
$this->accompanyingCourseExportHelper = $accompanyingCourseExportHelper;
}
public function buildForm(FormBuilderInterface $builder): void
@ -100,7 +96,7 @@ class StatCalendarAvgDuration implements ExportInterface, GroupedExportInterface
$qb->select('AVG(cal.endDate - cal.startDate) AS export_result');
$qb->join('cal.accompanyingPeriod', 'acp');
$this->accompanyingCourseExportHelper::addClosingMotiveExclusionClause($qb);
AccompanyingCourseExportHelper::addClosingMotiveExclusionClause($qb);
return $qb;
}

6
src/Bundle/ChillCalendarBundle/Export/Export/StatCalendarSumDuration.php
View File

@ -27,14 +27,10 @@ class StatCalendarSumDuration implements ExportInterface, GroupedExportInterface
{
private CalendarRepository $calendarRepository;
private AccompanyingCourseExportHelper $accompanyingCourseExportHelper;
public function __construct(
CalendarRepository $calendarRepository,
AccompanyingCourseExportHelper $accompanyingCourseExportHelper
) {
$this->calendarRepository = $calendarRepository;
$this->accompanyingCourseExportHelper = $accompanyingCourseExportHelper;
}
public function buildForm(FormBuilderInterface $builder): void
@ -100,7 +96,7 @@ class StatCalendarSumDuration implements ExportInterface, GroupedExportInterface
$qb->select('SUM(cal.endDate - cal.startDate) AS export_result');
$qb->join('cal.accompanyingPeriod', 'acp');
$this->accompanyingCourseExportHelper::addClosingMotiveExclusionClause($qb);
AccompanyingCourseExportHelper::addClosingMotiveExclusionClause($qb);
return $qb;
}

4
src/Bundle/ChillMainBundle/config/services.yaml
View File

@ -125,7 +125,3 @@ services:
Chill\MainBundle\Service\EntityInfo\ViewEntityInfoManager:
arguments:
$vienEntityInfoProviders: !tagged_iterator chill_main.entity_info_provider
Chill\MainBundle\Export\AccompanyingCourseExportHelper:
autoconfigure: true
autowire: true

2
src/Bundle/ChillMainBundle/config/services/export.yaml
View File

@ -52,3 +52,5 @@ services:
$exportManager: '@Chill\MainBundle\Export\ExportManager'
tags:
- { name: chill.export_formatter, alias: 'csv_pivoted_list' }
Chill\MainBundle\Export\AccompanyingCourseExportHelper: ~

3
src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/ClosingMotive.php
View File

@ -70,8 +70,7 @@ class ClosingMotive
private ?ClosingMotive $parent = null;
/**
* @var bool
* @ORM\Column(type="boolean")
* @ORM\Column(type="boolean", nullable=false, options={"default": false})
*/
private bool $isCanceledAccompanyingPeriod = false;

6
src/Bundle/ChillPersonBundle/Export/Export/CountAccompanyingCourse.php
View File

@ -30,14 +30,10 @@ class CountAccompanyingCourse implements ExportInterface, GroupedExportInterface
{
protected EntityRepository $repository;
private AccompanyingCourseExportHelper $accompanyingCourseExportHelper;
public function __construct(
EntityManagerInterface $em,
AccompanyingCourseExportHelper $accompanyingCourseExportHelper
) {
$this->repository = $em->getRepository(AccompanyingPeriod::class);
$this->accompanyingCourseExportHelper = $accompanyingCourseExportHelper;
}
public function buildForm(FormBuilderInterface $builder): void
@ -116,7 +112,7 @@ class CountAccompanyingCourse implements ExportInterface, GroupedExportInterface
->setParameter('count_acp_step', AccompanyingPeriod::STEP_DRAFT)
->setParameter('authorized_centers', $centers);
$this->accompanyingCourseExportHelper::addClosingMotiveExclusionClause($qb);
AccompanyingCourseExportHelper::addClosingMotiveExclusionClause($qb);
$qb->select('COUNT(DISTINCT acp.id) AS export_result');

6
src/Bundle/ChillPersonBundle/Export/Export/CountAccompanyingPeriodWork.php
View File

@ -29,14 +29,10 @@ class CountAccompanyingPeriodWork implements ExportInterface, GroupedExportInter
{
protected EntityManagerInterface $em;
private AccompanyingCourseExportHelper $accompanyingCourseExportHelper;
public function __construct(
EntityManagerInterface $em,
AccompanyingCourseExportHelper $accompanyingCourseExportHelper
) {
$this->em = $em;
$this->accompanyingCourseExportHelper = $accompanyingCourseExportHelper;
}
public function buildForm(FormBuilderInterface $builder): void
@ -117,7 +113,7 @@ class CountAccompanyingPeriodWork implements ExportInterface, GroupedExportInter
$qb->select('COUNT(DISTINCT acpw.id) as export_result');
$this->accompanyingCourseExportHelper::addClosingMotiveExclusionClause($qb);
AccompanyingCourseExportHelper::addClosingMotiveExclusionClause($qb);
return $qb;
}

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

@ -28,14 +28,10 @@ class CountEvaluation implements ExportInterface, GroupedExportInterface
{
private EntityManagerInterface $entityManager;
private AccompanyingCourseExportHelper $accompanyingCourseExportHelper;
public function __construct(
EntityManagerInterface $em,
AccompanyingCourseExportHelper $accompanyingCourseExportHelper
) {
$this->entityManager = $em;
$this->accompanyingCourseExportHelper = $accompanyingCourseExportHelper;
}
public function buildForm(FormBuilderInterface $builder)
@ -115,7 +111,7 @@ class CountEvaluation implements ExportInterface, GroupedExportInterface
)
->setParameter('authorized_centers', $centers);
$this->accompanyingCourseExportHelper::addClosingMotiveExclusionClause($qb);
AccompanyingCourseExportHelper::addClosingMotiveExclusionClause($qb);
$qb->select('COUNT(DISTINCT workeval.id) AS export_result');

6
src/Bundle/ChillPersonBundle/Export/Export/CountPersonWithAccompanyingCourse.php
View File

@ -30,14 +30,10 @@ class CountPersonWithAccompanyingCourse implements ExportInterface, GroupedExpor
{
private EntityRepository $repository;
private AccompanyingCourseExportHelper $accompanyingCourseExportHelper;
public function __construct(
EntityManagerInterface $em,
AccompanyingCourseExportHelper $accompanyingCourseExportHelper
) {
$this->repository = $em->getRepository(AccompanyingPeriod::class);
$this->accompanyingCourseExportHelper = $accompanyingCourseExportHelper;
}
public function buildForm(FormBuilderInterface $builder)
@ -116,7 +112,7 @@ class CountPersonWithAccompanyingCourse implements ExportInterface, GroupedExpor
)
)->setParameter('authorized_centers', $centers);
$this->accompanyingCourseExportHelper::addClosingMotiveExclusionClause($qb);
AccompanyingCourseExportHelper::addClosingMotiveExclusionClause($qb);
$qb->select('COUNT(DISTINCT person.id) AS export_result');

3
src/Bundle/ChillPersonBundle/Export/Export/ListAccompanyingPeriod.php
View File

@ -53,7 +53,6 @@ final readonly class ListAccompanyingPeriod implements ListInterface, GroupedExp
private EntityManagerInterface $entityManager,
private RollingDateConverterInterface $rollingDateConverter,
private ListAccompanyingPeriodHelper $listAccompanyingPeriodHelper,
private AccompanyingCourseExportHelper $accompanyingCourseExportHelper
) {}
public function buildForm(FormBuilderInterface $builder)
@ -134,7 +133,7 @@ final readonly class ListAccompanyingPeriod implements ListInterface, GroupedExp
$this->listAccompanyingPeriodHelper->addSelectClauses($qb, $this->rollingDateConverter->convert($data['calc_date']));
$this->accompanyingCourseExportHelper::addClosingMotiveExclusionClause($qb);
AccompanyingCourseExportHelper::addClosingMotiveExclusionClause($qb);
$qb
->addOrderBy('acp.openingDate')

6
src/Bundle/ChillPersonBundle/Export/Export/ListAccompanyingPeriodWork.php
View File

@ -101,8 +101,6 @@ class ListAccompanyingPeriodWork implements ListInterface, GroupedExportInterfac
private UserHelper $userHelper;
private AccompanyingCourseExportHelper $accompanyingCourseExportHelper;
public function __construct(
EntityManagerInterface $entityManager,
DateTimeHelper $dateTimeHelper,
@ -116,7 +114,6 @@ class ListAccompanyingPeriodWork implements ListInterface, GroupedExportInterfac
RollingDateConverterInterface $rollingDateConverter,
AggregateStringHelper $aggregateStringHelper,
SocialActionRepository $socialActionRepository,
AccompanyingCourseExportHelper $accompanyingCourseExportHelper
) {
$this->entityManager = $entityManager;
$this->dateTimeHelper = $dateTimeHelper;
@ -130,7 +127,6 @@ class ListAccompanyingPeriodWork implements ListInterface, GroupedExportInterfac
$this->rollingDateConverter = $rollingDateConverter;
$this->aggregateStringHelper = $aggregateStringHelper;
$this->socialActionRepository = $socialActionRepository;
$this->accompanyingCourseExportHelper = $accompanyingCourseExportHelper;
}
public function buildForm(FormBuilderInterface $builder)
@ -296,7 +292,7 @@ class ListAccompanyingPeriodWork implements ListInterface, GroupedExportInterfac
->setParameter('authorized_centers', $centers)
->setParameter('calc_date', $this->rollingDateConverter->convert($data['calc_date']));
$this->accompanyingCourseExportHelper::addClosingMotiveExclusionClause($qb);
AccompanyingCourseExportHelper::addClosingMotiveExclusionClause($qb);
$this->addSelectClauses($qb, $this->rollingDateConverter->convert($data['calc_date']));

6
src/Bundle/ChillPersonBundle/Export/Export/ListEvaluation.php
View File

@ -91,8 +91,6 @@ class ListEvaluation implements ListInterface, GroupedExportInterface
private UserHelper $userHelper;
private AccompanyingCourseExportHelper $accompanyingCourseExportHelper;
public function __construct(
EntityManagerInterface $entityManager,
SocialIssueRender $socialIssueRender,
@ -105,7 +103,6 @@ class ListEvaluation implements ListInterface, GroupedExportInterface
TranslatableStringExportLabelHelper $translatableStringExportLabelHelper,
AggregateStringHelper $aggregateStringHelper,
RollingDateConverterInterface $rollingDateConverter,
AccompanyingCourseExportHelper $accompanyingCourseExportHelper
) {
$this->entityManager = $entityManager;
$this->socialIssueRender = $socialIssueRender;
@ -118,7 +115,6 @@ class ListEvaluation implements ListInterface, GroupedExportInterface
$this->translatableStringExportLabelHelper = $translatableStringExportLabelHelper;
$this->aggregateStringHelper = $aggregateStringHelper;
$this->rollingDateConverter = $rollingDateConverter;
$this->accompanyingCourseExportHelper = $accompanyingCourseExportHelper;
}
public function buildForm(FormBuilderInterface $builder)
@ -275,7 +271,7 @@ class ListEvaluation implements ListInterface, GroupedExportInterface
->setParameter('authorized_centers', $centers)
->setParameter('calc_date', $this->rollingDateConverter->convert($data['calc_date']));
$this->accompanyingCourseExportHelper::addClosingMotiveExclusionClause($qb);
AccompanyingCourseExportHelper::addClosingMotiveExclusionClause($qb);
$this->addSelectClauses($qb, $this->rollingDateConverter->convert($data['calc_date']));

6
src/Bundle/ChillPersonBundle/Export/Export/ListPersonHavingAccompanyingPeriod.php
View File

@ -49,18 +49,14 @@ class ListPersonHavingAccompanyingPeriod implements ExportElementValidatedInterf
private ListPersonHelper $listPersonHelper;
private AccompanyingCourseExportHelper $accompanyingCourseExportHelper;
public function __construct(
ExportAddressHelper $addressHelper,
ListPersonHelper $listPersonHelper,
EntityManagerInterface $em,
AccompanyingCourseExportHelper $accompanyingCourseExportHelper
) {
$this->addressHelper = $addressHelper;
$this->listPersonHelper = $listPersonHelper;
$this->entityManager = $em;
$this->accompanyingCourseExportHelper = $accompanyingCourseExportHelper;
}
public function buildForm(FormBuilderInterface $builder)
@ -195,7 +191,7 @@ class ListPersonHavingAccompanyingPeriod implements ExportElementValidatedInterf
$this->listPersonHelper->addSelect($qb, $fields, $data['address_date']);
$this->accompanyingCourseExportHelper::addClosingMotiveExclusionClause($qb);
AccompanyingCourseExportHelper::addClosingMotiveExclusionClause($qb);
$qb
->addOrderBy('person.lastName')

3
src/Bundle/ChillPersonBundle/Export/Export/ListPersonWithAccompanyingPeriodDetails.php
View File

@ -51,7 +51,6 @@ final readonly class ListPersonWithAccompanyingPeriodDetails implements ListInte
private ListAccompanyingPeriodHelper $listAccompanyingPeriodHelper,
private EntityManagerInterface $entityManager,
private RollingDateConverterInterface $rollingDateConverter,
private AccompanyingCourseExportHelper $accompanyingCourseExportHelper
) {}
public function buildForm(FormBuilderInterface $builder)
@ -135,7 +134,7 @@ final readonly class ListPersonWithAccompanyingPeriodDetails implements ListInte
$this->listPersonHelper->addSelect($qb, ListPersonHelper::FIELDS, $this->rollingDateConverter->convert($data['address_date']));
$this->listAccompanyingPeriodHelper->addSelectClauses($qb, $this->rollingDateConverter->convert($data['address_date']));
$this->accompanyingCourseExportHelper::addClosingMotiveExclusionClause($qb);
AccompanyingCourseExportHelper::addClosingMotiveExclusionClause($qb);
$qb
->addOrderBy('person.lastName')

6
src/Bundle/ChillPersonBundle/Export/Export/StatAccompanyingCourseDuration.php
View File

@ -32,14 +32,10 @@ class StatAccompanyingCourseDuration implements ExportInterface, GroupedExportIn
{
private EntityRepository $repository;
private AccompanyingCourseExportHelper $accompanyingCourseExportHelper;
public function __construct(
EntityManagerInterface $em,
AccompanyingCourseExportHelper $accompanyingCourseExportHelper
) {
$this->repository = $em->getRepository(AccompanyingPeriod::class);
$this->accompanyingCourseExportHelper = $accompanyingCourseExportHelper;
}
public function buildForm(FormBuilderInterface $builder): void
@ -147,7 +143,7 @@ class StatAccompanyingCourseDuration implements ExportInterface, GroupedExportIn
->setParameter('count_acp_step', AccompanyingPeriod::STEP_DRAFT)
->setParameter('authorized_centers', $centers);
$this->accompanyingCourseExportHelper::addClosingMotiveExclusionClause($qb);
AccompanyingCourseExportHelper::addClosingMotiveExclusionClause($qb);
return $qb;
}