diff options
Diffstat (limited to 'src/Wallabag/CoreBundle/Form')
3 files changed, 32 insertions, 12 deletions
diff --git a/src/Wallabag/CoreBundle/Form/DataTransformer/StringToListTransformer.php b/src/Wallabag/CoreBundle/Form/DataTransformer/StringToListTransformer.php index b712ad15..cb4bee83 100644 --- a/src/Wallabag/CoreBundle/Form/DataTransformer/StringToListTransformer.php +++ b/src/Wallabag/CoreBundle/Form/DataTransformer/StringToListTransformer.php | |||
@@ -16,7 +16,7 @@ class StringToListTransformer implements DataTransformerInterface | |||
16 | private $separator; | 16 | private $separator; |
17 | 17 | ||
18 | /** | 18 | /** |
19 | * @param string $separator The separator used in the list. | 19 | * @param string $separator The separator used in the list |
20 | */ | 20 | */ |
21 | public function __construct($separator = ',') | 21 | public function __construct($separator = ',') |
22 | { | 22 | { |
diff --git a/src/Wallabag/CoreBundle/Form/Type/ConfigType.php b/src/Wallabag/CoreBundle/Form/Type/ConfigType.php index 4cf22200..7d25cc80 100644 --- a/src/Wallabag/CoreBundle/Form/Type/ConfigType.php +++ b/src/Wallabag/CoreBundle/Form/Type/ConfigType.php | |||
@@ -21,7 +21,9 @@ class ConfigType extends AbstractType | |||
21 | { | 21 | { |
22 | $this->themes = array_combine( | 22 | $this->themes = array_combine( |
23 | $themes, | 23 | $themes, |
24 | array_map(function ($s) { return ucwords(strtolower(str_replace('-', ' ', $s))); }, $themes) | 24 | array_map(function ($s) { |
25 | return ucwords(strtolower(str_replace('-', ' ', $s))); | ||
26 | }, $themes) | ||
25 | ); | 27 | ); |
26 | 28 | ||
27 | $this->languages = $languages; | 29 | $this->languages = $languages; |
@@ -32,7 +34,6 @@ class ConfigType extends AbstractType | |||
32 | $builder | 34 | $builder |
33 | ->add('theme', ChoiceType::class, [ | 35 | ->add('theme', ChoiceType::class, [ |
34 | 'choices' => array_flip($this->themes), | 36 | 'choices' => array_flip($this->themes), |
35 | 'choices_as_values' => true, | ||
36 | 'label' => 'config.form_settings.theme_label', | 37 | 'label' => 'config.form_settings.theme_label', |
37 | ]) | 38 | ]) |
38 | ->add('items_per_page', null, [ | 39 | ->add('items_per_page', null, [ |
@@ -49,7 +50,6 @@ class ConfigType extends AbstractType | |||
49 | ]) | 50 | ]) |
50 | ->add('language', ChoiceType::class, [ | 51 | ->add('language', ChoiceType::class, [ |
51 | 'choices' => array_flip($this->languages), | 52 | 'choices' => array_flip($this->languages), |
52 | 'choices_as_values' => true, | ||
53 | 'label' => 'config.form_settings.language_label', | 53 | 'label' => 'config.form_settings.language_label', |
54 | ]) | 54 | ]) |
55 | ->add('save', SubmitType::class, [ | 55 | ->add('save', SubmitType::class, [ |
diff --git a/src/Wallabag/CoreBundle/Form/Type/EntryFilterType.php b/src/Wallabag/CoreBundle/Form/Type/EntryFilterType.php index cd4d3490..3c597b5d 100644 --- a/src/Wallabag/CoreBundle/Form/Type/EntryFilterType.php +++ b/src/Wallabag/CoreBundle/Form/Type/EntryFilterType.php | |||
@@ -36,17 +36,26 @@ class EntryFilterType extends AbstractType | |||
36 | $builder | 36 | $builder |
37 | ->add('readingTime', NumberRangeFilterType::class, [ | 37 | ->add('readingTime', NumberRangeFilterType::class, [ |
38 | 'apply_filter' => function (QueryInterface $filterQuery, $field, $values) { | 38 | 'apply_filter' => function (QueryInterface $filterQuery, $field, $values) { |
39 | $value = $values['value']; | 39 | $lower = $values['value']['left_number'][0]; |
40 | $upper = $values['value']['right_number'][0]; | ||
41 | |||
42 | $min = (int) ($lower * $this->user->getConfig()->getReadingSpeed()); | ||
43 | $max = (int) ($upper * $this->user->getConfig()->getReadingSpeed()); | ||
40 | 44 | ||
41 | if (null === $value['left_number'][0] || null === $value['right_number'][0]) { | 45 | if (null === $lower && null === $upper) { |
46 | // no value? no filter | ||
42 | return; | 47 | return; |
48 | } elseif (null === $lower && null !== $upper) { | ||
49 | // only lower value is defined: query all entries with reading LOWER THAN this value | ||
50 | $expression = $filterQuery->getExpr()->lte($field, $max); | ||
51 | } elseif (null !== $lower && null === $upper) { | ||
52 | // only upper value is defined: query all entries with reading GREATER THAN this value | ||
53 | $expression = $filterQuery->getExpr()->gte($field, $min); | ||
54 | } else { | ||
55 | // both value are defined, perform a between | ||
56 | $expression = $filterQuery->getExpr()->between($field, $min, $max); | ||
43 | } | 57 | } |
44 | 58 | ||
45 | $min = (int) ($value['left_number'][0] * $this->user->getConfig()->getReadingSpeed()); | ||
46 | $max = (int) ($value['right_number'][0] * $this->user->getConfig()->getReadingSpeed()); | ||
47 | |||
48 | $expression = $filterQuery->getExpr()->between($field, $min, $max); | ||
49 | |||
50 | return $filterQuery->createCondition($expression); | 59 | return $filterQuery->createCondition($expression); |
51 | }, | 60 | }, |
52 | 'label' => 'entry.filters.reading_time.label', | 61 | 'label' => 'entry.filters.reading_time.label', |
@@ -87,6 +96,18 @@ class EntryFilterType extends AbstractType | |||
87 | ->add('isStarred', CheckboxFilterType::class, [ | 96 | ->add('isStarred', CheckboxFilterType::class, [ |
88 | 'label' => 'entry.filters.starred_label', | 97 | 'label' => 'entry.filters.starred_label', |
89 | ]) | 98 | ]) |
99 | ->add('isUnread', CheckboxFilterType::class, [ | ||
100 | 'label' => 'entry.filters.unread_label', | ||
101 | 'apply_filter' => function (QueryInterface $filterQuery, $field, $values) { | ||
102 | if (false === $values['value']) { | ||
103 | return; | ||
104 | } | ||
105 | |||
106 | $expression = $filterQuery->getExpr()->eq('e.isArchived', 'false'); | ||
107 | |||
108 | return $filterQuery->createCondition($expression); | ||
109 | }, | ||
110 | ]) | ||
90 | ->add('previewPicture', CheckboxFilterType::class, [ | 111 | ->add('previewPicture', CheckboxFilterType::class, [ |
91 | 'apply_filter' => function (QueryInterface $filterQuery, $field, $values) { | 112 | 'apply_filter' => function (QueryInterface $filterQuery, $field, $values) { |
92 | if (false === $values['value']) { | 113 | if (false === $values['value']) { |
@@ -101,7 +122,6 @@ class EntryFilterType extends AbstractType | |||
101 | ]) | 122 | ]) |
102 | ->add('language', ChoiceFilterType::class, [ | 123 | ->add('language', ChoiceFilterType::class, [ |
103 | 'choices' => array_flip($this->repository->findDistinctLanguageByUser($this->user->getId())), | 124 | 'choices' => array_flip($this->repository->findDistinctLanguageByUser($this->user->getId())), |
104 | 'choices_as_values' => true, | ||
105 | 'label' => 'entry.filters.language_label', | 125 | 'label' => 'entry.filters.language_label', |
106 | ]) | 126 | ]) |
107 | ; | 127 | ; |