X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=src%2FWallabag%2FCoreBundle%2FForm%2FType%2FEntryFilterType.php;h=a3e36fddd344304ed9c5630a38a905fba27f8bf8;hb=94766a89627df74449b9e34d31a06db386a1b07a;hp=ee10bc8b517135deac7303beea15fa7c00e2d11b;hpb=e43d27f8450dcdf79850e935b762ac390a19dd63;p=github%2Fwallabag%2Fwallabag.git

diff --git a/src/Wallabag/CoreBundle/Form/Type/EntryFilterType.php b/src/Wallabag/CoreBundle/Form/Type/EntryFilterType.php
index ee10bc8b..a3e36fdd 100644
--- a/src/Wallabag/CoreBundle/Form/Type/EntryFilterType.php
+++ b/src/Wallabag/CoreBundle/Form/Type/EntryFilterType.php
@@ -12,7 +12,7 @@ use Lexik\Bundle\FormFilterBundle\Filter\Form\Type\ChoiceFilterType;
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
-use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorage;
+use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
 
 class EntryFilterType extends AbstractType
 {
@@ -22,37 +22,68 @@ class EntryFilterType extends AbstractType
     /**
      * Repository & user are used to get a list of language entries for this user.
      *
-     * @param EntityRepository $entryRepository
-     * @param TokenStorage     $token
+     * @param EntityRepository      $entryRepository
+     * @param TokenStorageInterface $tokenStorage
      */
-    public function __construct(EntityRepository $entryRepository, TokenStorage $token)
+    public function __construct(EntityRepository $entryRepository, TokenStorageInterface $tokenStorage)
     {
         $this->repository = $entryRepository;
-        $this->user = $token->getToken()->getUser();
+
+        $this->user = $tokenStorage->getToken() ? $tokenStorage->getToken()->getUser() : null;
+
+        if (null === $this->user || !is_object($this->user)) {
+            return null;
+        }
     }
 
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
         $builder
-            ->add('readingTime', NumberRangeFilterType::class)
-            ->add('createdAt', DateRangeFilterType::class, array(
-                    'left_date_options' => array(
-                        'attr' => array(
+            ->add('readingTime', NumberRangeFilterType::class, [
+                'apply_filter' => function (QueryInterface $filterQuery, $field, $values) {
+                    $lower = $values['value']['left_number'][0];
+                    $upper = $values['value']['right_number'][0];
+
+                    $min = (int) ($lower * $this->user->getConfig()->getReadingSpeed());
+                    $max = (int) ($upper * $this->user->getConfig()->getReadingSpeed());
+
+                    if (null === $lower && null === $upper) {
+                        // no value? no filter
+                        return;
+                    } elseif (null === $lower && null !== $upper) {
+                        // only lower value is defined: query all entries with reading LOWER THAN this value
+                        $expression = $filterQuery->getExpr()->lte($field, $max);
+                    } elseif (null !== $lower && null === $upper) {
+                        // only upper value is defined: query all entries with reading GREATER THAN this value
+                        $expression = $filterQuery->getExpr()->gte($field, $min);
+                    } else {
+                        // both value are defined, perform a between
+                        $expression = $filterQuery->getExpr()->between($field, $min, $max);
+                    }
+
+                    return $filterQuery->createCondition($expression);
+                },
+                'label' => 'entry.filters.reading_time.label',
+            ])
+            ->add('createdAt', DateRangeFilterType::class, [
+                    'left_date_options' => [
+                        'attr' => [
                             'placeholder' => 'dd/mm/yyyy',
-                        ),
+                        ],
                         'format' => 'dd/MM/yyyy',
                         'widget' => 'single_text',
-                    ),
-                    'right_date_options' => array(
-                        'attr' => array(
+                    ],
+                    'right_date_options' => [
+                        'attr' => [
                             'placeholder' => 'dd/mm/yyyy',
-                        ),
+                        ],
                         'format' => 'dd/MM/yyyy',
                         'widget' => 'single_text',
-                    ),
-                )
+                    ],
+                    'label' => 'entry.filters.created_at.label',
+                ]
             )
-            ->add('domainName', TextFilterType::class, array(
+            ->add('domainName', TextFilterType::class, [
                 'apply_filter' => function (QueryInterface $filterQuery, $field, $values) {
                     $value = $values['value'];
                     if (strlen($value) <= 2 || empty($value)) {
@@ -62,10 +93,27 @@ class EntryFilterType extends AbstractType
 
                     return $filterQuery->createCondition($expression);
                 },
-            ))
-            ->add('isArchived', CheckboxFilterType::class)
-            ->add('isStarred', CheckboxFilterType::class)
-            ->add('previewPicture', CheckboxFilterType::class, array(
+                'label' => 'entry.filters.domain_label',
+            ])
+            ->add('isArchived', CheckboxFilterType::class, [
+                'label' => 'entry.filters.archived_label',
+            ])
+            ->add('isStarred', CheckboxFilterType::class, [
+                'label' => 'entry.filters.starred_label',
+            ])
+            ->add('isUnread', CheckboxFilterType::class, [
+                'label' => 'entry.filters.unread_label',
+                'apply_filter' => function (QueryInterface $filterQuery, $field, $values) {
+                    if (false === $values['value']) {
+                        return;
+                    }
+
+                    $expression = $filterQuery->getExpr()->eq('e.isArchived', 'false');
+
+                    return $filterQuery->createCondition($expression);
+                },
+            ])
+            ->add('previewPicture', CheckboxFilterType::class, [
                 'apply_filter' => function (QueryInterface $filterQuery, $field, $values) {
                     if (false === $values['value']) {
                         return;
@@ -75,11 +123,12 @@ class EntryFilterType extends AbstractType
 
                     return $filterQuery->createCondition($expression);
                 },
-            ))
-            ->add('language', ChoiceFilterType::class, array(
+                'label' => 'entry.filters.preview_picture_label',
+            ])
+            ->add('language', ChoiceFilterType::class, [
                 'choices' => array_flip($this->repository->findDistinctLanguageByUser($this->user->getId())),
-                'choices_as_values' => true,
-            ))
+                'label' => 'entry.filters.language_label',
+            ])
         ;
     }
 
@@ -90,9 +139,9 @@ class EntryFilterType extends AbstractType
 
     public function configureOptions(OptionsResolver $resolver)
     {
-        $resolver->setDefaults(array(
+        $resolver->setDefaults([
             'csrf_protection' => false,
-            'validation_groups' => array('filtering'),
-        ));
+            'validation_groups' => ['filtering'],
+        ]);
     }
 }