EP/myep-team
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: properly filter by date range, improve filter handlers

Browse Source
This commit is contained in:
Björn Fromme
2025-03-21 12:38:55 +01:00
parent 06c32fd597
commit f2b60570a9
11 changed files with 98 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Form/TimelineFilterType.php
+24 -23
View File
@@ -3,6 +3,7 @@
namespace App\Form;
use App\Model\TimelineFilterDto;
use App\Service\Assignment\TimelineService;
use Symfony\Component\Form\AbstractType;
use Symfony\Component\Form\Extension\Core\Type\SubmitType;
use Symfony\Component\Form\FormBuilderInterface;
@@ -10,25 +11,24 @@ use Symfony\Component\OptionsResolver\OptionsResolver;
class TimelineFilterType extends AbstractType
{
private array $hotelChoices = [];
public function __construct(private readonly array $destinations)
{
$destinations = $this->destinations;
sort($destinations);
foreach ($destinations as $item) {
$this->hotelChoices[$item] = $item;
}
public function __construct(
private readonly TimelineService $timelineService,
private readonly array $destinations
) {
}
public function buildForm(FormBuilderInterface $builder, array $options): void
{
$period = $this->timelineService->getActiveWindow();
$periodFrom = $period->first()->toDateTimeImmutable();
$periodTo = $period->last()->toDateTimeImmutable();
$builder
->add('dateFrom', DatepickerType::class, [
'label' => 'Zeitraum von',
'required' => false,
'min_date' => $options['min_date'],
'max_date' => $options['max_date'],
'min_date' => $periodFrom,
'max_date' => $periodTo,
'attr' => [
'placeholder' => 'nicht filtern',
],
@@ -36,8 +36,8 @@ class TimelineFilterType extends AbstractType
->add('dateTo', DatepickerType::class, [
'label' => 'Zeitraum bis',
'required' => false,
'min_date' => $options['min_date'],
'max_date' => $options['max_date'],
'min_date' => $periodFrom,
'max_date' => $periodTo,
'attr' => [
'placeholder' => 'nicht filtern',
],
@@ -50,26 +50,27 @@ class TimelineFilterType extends AbstractType
])
;
$destinations = $this->destinations;
$hotelChoices = [];
sort($destinations);
foreach ($destinations as $item) {
$hotelChoices[$item] = $item;
}
$builder
->add('hotels', MultiselectType::class, [
'label' => 'Haus/Destination',
'required' => false,
'empty_label' => 'nicht filtern',
'choices' => $this->hotelChoices,
'choices' => $hotelChoices,
])
;
}
public function configureOptions(OptionsResolver $resolver): void
{
$resolver
->setDefaults([
'data_class' => TimelineFilterDto::class,
'min_date' => null,
'max_date' => null,
])
->setAllowedTypes('min_date', [\DateTimeImmutable::class, 'null'])
->setAllowedTypes('max_date', [\DateTimeImmutable::class, 'null'])
;
$resolver->setDefaults([
'data_class' => TimelineFilterDto::class,
]);
}
}