X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=src%2FWallabag%2FCoreBundle%2FFilter%2FEntryFilterType.php;h=4430c971a67e4046ccff0fe0fd72fb89e2efbb12;hb=5c895a7fd15822856fb407910264c5d95e1e223c;hp=636ba3246e3a819fd8edc781704629b85d66f599;hpb=a15692b1b736a6a1d3c50a5daffe08c16e6cc93b;p=github%2Fwallabag%2Fwallabag.git diff --git a/src/Wallabag/CoreBundle/Filter/EntryFilterType.php b/src/Wallabag/CoreBundle/Filter/EntryFilterType.php index 636ba324..4430c971 100644 --- a/src/Wallabag/CoreBundle/Filter/EntryFilterType.php +++ b/src/Wallabag/CoreBundle/Filter/EntryFilterType.php @@ -2,18 +2,88 @@ namespace Wallabag\CoreBundle\Filter; +use Doctrine\ORM\EntityRepository; +use Lexik\Bundle\FormFilterBundle\Filter\Query\QueryInterface; +use Lexik\Bundle\FormFilterBundle\Filter\Form\Type\NumberRangeFilterType; +use Lexik\Bundle\FormFilterBundle\Filter\Form\Type\DateRangeFilterType; +use Lexik\Bundle\FormFilterBundle\Filter\Form\Type\TextFilterType; +use Lexik\Bundle\FormFilterBundle\Filter\Form\Type\CheckboxFilterType; +use Lexik\Bundle\FormFilterBundle\Filter\Form\Type\ChoiceFilterType; use Symfony\Component\Form\AbstractType; use Symfony\Component\Form\FormBuilderInterface; use Symfony\Component\OptionsResolver\OptionsResolver; +use Wallabag\UserBundle\Entity\User; class EntryFilterType extends AbstractType { + private $user; + private $repository; + + /** + * Repository & user are used to get a list of language entries for this user. + * + * @param EntityRepository $entryRepository + * @param User $user + */ + public function __construct(EntityRepository $entryRepository, User $user) + { + $this->repository = $entryRepository; + $this->user = $user; + } + public function buildForm(FormBuilderInterface $builder, array $options) { - $builder->add('readingTime', 'filter_number_range'); + $builder + ->add('readingTime', NumberRangeFilterType::class) + ->add('createdAt', DateRangeFilterType::class, array( + 'left_date_options' => array( + 'attr' => array( + 'placeholder' => 'dd/mm/yyyy', + ), + 'format' => 'dd/MM/yyyy', + 'widget' => 'single_text', + ), + 'right_date_options' => array( + 'attr' => array( + 'placeholder' => 'dd/mm/yyyy', + ), + 'format' => 'dd/MM/yyyy', + 'widget' => 'single_text', + ), + ) + ) + ->add('domainName', TextFilterType::class, array( + 'apply_filter' => function (QueryInterface $filterQuery, $field, $values) { + $value = $values['value']; + if (strlen($value) <= 2 || empty($value)) { + return; + } + $expression = $filterQuery->getExpr()->like($field, $filterQuery->getExpr()->literal('%'.$value.'%')); + + return $filterQuery->createCondition($expression); + }, + )) + ->add('isArchived', CheckboxFilterType::class) + ->add('isStarred', CheckboxFilterType::class) + ->add('previewPicture', CheckboxFilterType::class, array( + 'apply_filter' => function (QueryInterface $filterQuery, $field, $values) { + if (false === $values['value']) { + return; + } + + $expression = $filterQuery->getExpr()->isNotNull($field); + + return $filterQuery->createCondition($expression); + }, + )) + ->add('language', ChoiceFilterType::class, array( + 'choices' => array_flip($this->repository->findDistinctLanguageByUser($this->user->getId())), + 'choices_as_values' => true, + )) + ; } - public function getName() + public function getBlockPrefix() { return 'entry_filter'; } @@ -21,8 +91,8 @@ class EntryFilterType extends AbstractType public function configureOptions(OptionsResolver $resolver) { $resolver->setDefaults(array( - 'csrf_protection' => false, - 'validation_groups' => array('filtering') + 'csrf_protection' => false, + 'validation_groups' => array('filtering'), )); } }