Chill-project/chill-bundles
6
0
Fork 0
mirror of https://gitlab.com/Chill-Projet/chill-bundles.git synced 2025-06-13 13:54:23 +00:00
Code Issues Actions Projects Releases Wiki Activity

rename filters to avoid confusion

Browse Source
This commit is contained in:
Julie Lenaerts 2022-07-27 16:02:11 +02:00
parent ab2b2bc235
commit a40e2de91d
3 changed files with 10 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/Bundle/ChillPersonBundle/Export/Filter/UserJobFilter.php → src/Bundle/ChillPersonBundle/Export/Filter/CurrentUserJobFilter.php
View File

@ -11,8 +11,6 @@ declare(strict_types=1);
namespace Chill\PersonBundle\Export\Filter; namespace Chill\PersonBundle\Export\Filter;
use Chill\CustomFieldsBundle\Form\Type\ChoicesType;
use Chill\MainBundle\Entity\Scope;
use Chill\MainBundle\Entity\User; use Chill\MainBundle\Entity\User;
use Chill\MainBundle\Entity\UserJob; use Chill\MainBundle\Entity\UserJob;
use Chill\MainBundle\Export\FilterInterface; use Chill\MainBundle\Export\FilterInterface;
@ -20,23 +18,17 @@ use Chill\MainBundle\Templating\TranslatableStringHelper;
use Chill\PersonBundle\Export\Declarations; use Chill\PersonBundle\Export\Declarations;
use Doctrine\ORM\Query\Expr\Andx; use Doctrine\ORM\Query\Expr\Andx;
use Doctrine\ORM\QueryBuilder; use Doctrine\ORM\QueryBuilder;
use Symfony\Bridge\Doctrine\Form\Type\EntityType;
use Symfony\Component\Form\FormBuilderInterface; use Symfony\Component\Form\FormBuilderInterface;
use Symfony\Component\Security\Core\Security; use Symfony\Component\Security\Core\Security;
use Symfony\Contracts\Translation\TranslatorInterface; use Symfony\Contracts\Translation\TranslatorInterface;
class UserJobFilter implements FilterInterface class CurrentUserJobFilter implements FilterInterface
{ {
/**
* @var TranslatorInterface protected TranslatorInterface $translator;
*/
protected $translator;
private Security $security; private Security $security;
/**
* @var TranslatableStringHelper
*/
private TranslatableStringHelper $translatableStringHelper; private TranslatableStringHelper $translatableStringHelper;
public function __construct( public function __construct(

2
src/Bundle/ChillPersonBundle/Export/Filter/UserScopeFilter.php → src/Bundle/ChillPersonBundle/Export/Filter/CurrentUserScopeFilter.php
View File

@ -24,7 +24,7 @@ use Symfony\Component\Form\FormBuilderInterface;
use Symfony\Component\Security\Core\Security; use Symfony\Component\Security\Core\Security;
use Symfony\Contracts\Translation\TranslatorInterface; use Symfony\Contracts\Translation\TranslatorInterface;
class UserScopeFilter implements FilterInterface class CurrentUserScopeFilter implements FilterInterface
{ {
/** /**
* @var TranslatorInterface * @var TranslatorInterface

12
src/Bundle/ChillPersonBundle/config/services/exports_accompanying_period.yaml
View File

@ -32,19 +32,19 @@ services:
- { name: chill.export, alias: avg_accompanyingcourse_duration } - { name: chill.export, alias: avg_accompanyingcourse_duration }
## Filters ## Filters
chill.person.export.filter_userscope: chill.person.export.filter_current_userscope:
class: Chill\PersonBundle\Export\Filter\UserScopeFilter class: Chill\PersonBundle\Export\Filter\CurrentUserScopeFilter
autowire: true autowire: true
autoconfigure: true autoconfigure: true
tags: tags:
- { name: chill.export_filter, alias: accompanyingcourse_userscope_filter } - { name: chill.export_filter, alias: accompanyingcourse_current_userscope_filter }
chill.person.export.filter_userjob: chill.person.export.filter_current_userjob:
class: Chill\PersonBundle\Export\Filter\UserJobFilter class: Chill\PersonBundle\Export\Filter\CurrentUserJobFilter
autowire: true autowire: true
autoconfigure: true autoconfigure: true
tags: tags:
- { name: chill.export_filter, alias: accompanyingcourse_userjob_filter } - { name: chill.export_filter, alias: accompanyingcourse_current_userjob_filter }
chill.person.export.filter_socialissue: chill.person.export.filter_socialissue:
class: Chill\PersonBundle\Export\Filter\SocialIssueFilter class: Chill\PersonBundle\Export\Filter\SocialIssueFilter