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

Merge remote-tracking branch 'origin/master' into rector/rules-symfony

Browse Source
This commit is contained in:
Julien Fastré
2023-10-17 09:29:10 +02:00
parent a6fcdb5256 f0b3e3af14
commit adf1110340
17 changed files with 203 additions and 148 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/Bundle/ChillPersonBundle/Export/Declarations.php
View File

@@ -22,7 +22,10 @@ abstract class Declarations
final public const HOUSEHOLD_TYPE = 'household';
final public const PERSON_IMPLIED_IN = 'person_implied_in';
/**
* @deprecated consider using the PERSON_TYPE instead
*/
public const PERSON_IMPLIED_IN = 'person_implied_in';
final public const PERSON_TYPE = 'person';

4
src/Bundle/ChillPersonBundle/Export/Export/CountPerson.php
View File

@@ -114,9 +114,7 @@ class CountPerson implements ExportInterface, GroupedExportInterface
public function supportsModifiers()
{
return [
'abcde',
//Declarations::PERSON_TYPE,
//Declarations::PERSON_IMPLIED_IN,
Declarations::PERSON_TYPE,
];
}
}

2
src/Bundle/ChillPersonBundle/Export/Export/ListPerson.php
View File

@@ -250,7 +250,7 @@ class ListPerson implements ExportElementValidatedInterface, ListInterface, Grou
public function supportsModifiers()
{
return [Declarations::PERSON_TYPE, Declarations::PERSON_IMPLIED_IN];
return [Declarations::PERSON_TYPE];
}
public function validateForm($data, ExecutionContextInterface $context)

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

@@ -194,7 +194,7 @@ class ListPersonHavingAccompanyingPeriod implements ExportElementValidatedInterf
public function supportsModifiers()
{
return [Declarations::PERSON_TYPE, Declarations::PERSON_IMPLIED_IN, Declarations::ACP_TYPE];
return [Declarations::PERSON_TYPE, Declarations::ACP_TYPE];
}
public function validateForm($data, ExecutionContextInterface $context)

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

@@ -152,6 +152,6 @@ final readonly class ListPersonWithAccompanyingPeriodDetails implements ListInte
public function supportsModifiers()
{
return [Declarations::PERSON_TYPE, Declarations::PERSON_IMPLIED_IN, Declarations::ACP_TYPE];
return [Declarations::PERSON_TYPE, Declarations::ACP_TYPE];
}
}

30
src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/SocialActionFilter.php
View File

@@ -12,7 +12,7 @@ declare(strict_types=1);
namespace Chill\PersonBundle\Export\Filter\AccompanyingCourseFilters;
use Chill\MainBundle\Export\FilterInterface;
use Chill\MainBundle\Templating\TranslatableStringHelper;
use Chill\PersonBundle\Entity\AccompanyingPeriod;
use Chill\PersonBundle\Entity\SocialWork\SocialAction;
use Chill\PersonBundle\Export\Declarations;
use Chill\PersonBundle\Form\Type\PickSocialActionType;
@@ -21,9 +21,9 @@ use Doctrine\ORM\QueryBuilder;
use Symfony\Component\Form\FormBuilderInterface;
use function in_array;
class SocialActionFilter implements FilterInterface
final readonly class SocialActionFilter implements FilterInterface
{
public function __construct(private readonly TranslatableStringHelper $translatableStringHelper, private readonly SocialActionRender $actionRender) {}
public function __construct(private SocialActionRender $actionRender) {}
public function addRole(): ?string
{
@@ -32,21 +32,17 @@ class SocialActionFilter implements FilterInterface
public function alterQuery(QueryBuilder $qb, $data)
{
if (!in_array('acpw', $qb->getAllAliases(), true)) {
$qb->join('acp.works', 'acpw');
}
$qb->andWhere(
$qb->expr()->exists(
sprintf(
"SELECT 1 FROM %s acp_by_social_action_filter WHERE acp_by_social_action_filter.socialAction "
. "IN (:acp_by_social_action_filter_actions) AND acp_by_social_action_filter.accompanyingPeriod = acp",
AccompanyingPeriod\AccompanyingPeriodWork::class
)
)
);
if (!in_array('acpwsocialaction', $qb->getAllAliases(), true)) {
$qb->join('acpw.socialAction', 'acpwsocialaction');
}
$clause = $qb->expr()->in('acpwsocialaction.id', ':socialactions');
$qb->andWhere($clause)
->setParameter(
'socialactions',
SocialAction::getDescendantsWithThisForActions($data['accepted_socialactions'])->toArray()
);
$qb->setParameter('acp_by_social_action_filter_actions', SocialAction::getDescendantsWithThisForActions($data['accepted_socialactions']));
}
public function applyOn(): string