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

remove date field

Browse Source
This commit is contained in:
Mathieu Jaumotte 2023-11-14 13:21:33 +01:00
parent 6944773868
commit 3892d1e877
2 changed files with 10 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/Bundle/ChillPersonBundle/Export/Filter/SocialWorkFilters/CreatorFilter.php
View File

@ -11,9 +11,9 @@ declare(strict_types=1);
namespace Chill\PersonBundle\Export\Filter\SocialWorkFilters; namespace Chill\PersonBundle\Export\Filter\SocialWorkFilters;
use Chill\MainBundle\Entity\User;
use Chill\MainBundle\Export\FilterInterface; use Chill\MainBundle\Export\FilterInterface;
use Chill\MainBundle\Form\Type\PickUserDynamicType; use Chill\MainBundle\Form\Type\PickUserDynamicType;
use Chill\MainBundle\Templating\TranslatableStringHelper;
use Chill\PersonBundle\Export\Declarations; use Chill\PersonBundle\Export\Declarations;
use Doctrine\ORM\QueryBuilder; use Doctrine\ORM\QueryBuilder;
use Symfony\Component\Form\FormBuilderInterface; use Symfony\Component\Form\FormBuilderInterface;
@ -22,9 +22,7 @@ class CreatorFilter implements FilterInterface
{ {
private const PREFIX = 'acpw_filter_creator'; private const PREFIX = 'acpw_filter_creator';
public function __construct( public function __construct() {}
private readonly TranslatableStringHelper $translatableStringHelper
) {}
public function addRole(): ?string public function addRole(): ?string
{ {
@ -38,12 +36,7 @@ class CreatorFilter implements FilterInterface
$qb $qb
->join('acpw.createdBy', "{$p}_creator") ->join('acpw.createdBy', "{$p}_creator")
->andWhere($qb->expr()->in("{$p}_creator", ":{$p}_creators")) ->andWhere($qb->expr()->in("{$p}_creator", ":{$p}_creators"))
->setParameter("{$p}_creators", $data['creators']) ->setParameter("{$p}_creators", $data['creators']);
//->setParameter("{$p}_calc_date", $this->rollingDateConverter->convert(
// $data['creator_at'] ?? new RollingDate(RollingDate::T_TODAY)
//))
;
} }
public function applyOn(): string public function applyOn(): string
@ -57,24 +50,22 @@ class CreatorFilter implements FilterInterface
->add('creators', PickUserDynamicType::class, [ ->add('creators', PickUserDynamicType::class, [
'multiple' => true, 'multiple' => true,
'label' => 'export.filter.work.by_creator.Creators', 'label' => 'export.filter.work.by_creator.Creators',
]) ]);
//->add('creator_at', PickRollingDateType::class, [
// 'label' => 'export.filter.work.by_creator.Calc date',
// 'help' => 'export.filter.work.by_creator.calc_date_help',
//])
;
} }
public function describeAction($data, $format = 'string'): array public function describeAction($data, $format = 'string'): array
{ {
return []; return [
'export.filter.work.by_creator.Filtered by creator: only %creators%', [
'%creators%' => implode(', ', array_map(static fn (User $u) => $u->getLabel(), $data['creators'])),
],
];
} }
public function getFormDefaultData(): array public function getFormDefaultData(): array
{ {
return [ return [
'creators' => [], 'creators' => [],
//'creator_at' => new RollingDate(RollingDate::T_TODAY),
]; ];
} }

1
src/Bundle/ChillPersonBundle/translations/messages.fr.yml
View File

@ -1223,6 +1223,7 @@ export:
by_creator: by_creator:
title: Filtrer les actions par créateur title: Filtrer les actions par créateur
Creators: Créateur de l'action Creators: Créateur de l'action
"Filtered by creator: only %creators%": "Filtré par créateur de l'action: uniquement %creators%"
#Calc date: Date à laquelle le créateur ... #Calc date: Date à laquelle le créateur ...
#calc_date_help: Il s'agit de la date à laquelle le créateur ... #calc_date_help: Il s'agit de la date à laquelle le créateur ...
by_creator_job: by_creator_job: