From 4ed3805d7fd3f404c23d7e57b614f26c500c5bc1 Mon Sep 17 00:00:00 2001 From: Danilo Andrade Date: Fri, 8 Apr 2022 20:50:21 -0300 Subject: [PATCH] fix: Update translations/filter clause and add image to readme --- README.md | 2 ++ images/advancedfilters.png | Bin 0 -> 30798 bytes resources/lang/en/clauses.php | 6 ++++-- resources/lang/pt-BR/clauses.php | 6 ++++-- src/Filters/DateFilter.php | 12 ++++++------ 5 files changed, 16 insertions(+), 10 deletions(-) create mode 100644 images/advancedfilters.png diff --git a/README.md b/README.md index 0c9fe82..31eb1c0 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,8 @@ # Filament Advanced Filter +![AdvancedFilters](./images/advancedfilters.png) + A collection of easy-to-use filters with clause conditions to [Filament](https://filamentphp.com) ## Installation diff --git a/images/advancedfilters.png b/images/advancedfilters.png new file mode 100644 index 0000000000000000000000000000000000000000..5a5d218418b06b85539a8eaa3ec3a8d87dcc6afe GIT binary patch literal 30798 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 'Is not set', 'equal' => 'Is equal to', 'not_equal' => 'Is not equal to', - 'greater_equal' => 'Is on or after', - 'less_equal' => 'Is on or before', + 'on_after' => 'Is on or after', + 'on_before' => 'Is on or before', + 'greater_equal' => 'Is greater than or equal to', + 'less_equal' => 'Is less than or equal to', 'greater_than' => 'Is more than', 'less_than' => 'Is less than', 'between' => 'Is between', diff --git a/resources/lang/pt-BR/clauses.php b/resources/lang/pt-BR/clauses.php index 00e7e26..1f5046e 100644 --- a/resources/lang/pt-BR/clauses.php +++ b/resources/lang/pt-BR/clauses.php @@ -7,8 +7,10 @@ 'not_set' => 'Não está definido', 'equal' => 'É igual a', 'not_equal' => 'Não é igual a', - 'greater_equal' => 'É igual ou depois', - 'less_equal' => 'É igual ou antes', + 'on_after' => 'É igual ou depois', + 'on_before' => 'É igual ou antes', + 'greater_equal' => 'É maior ou igual a', + 'less_equal' => 'É menor ou igual a', 'greater_than' => 'É mais que', 'less_than' => 'É menos do que', 'between' => 'Está entre', diff --git a/src/Filters/DateFilter.php b/src/Filters/DateFilter.php index 38c8744..d74eac0 100644 --- a/src/Filters/DateFilter.php +++ b/src/Filters/DateFilter.php @@ -16,8 +16,8 @@ class DateFilter extends Filter const CLAUSE_EQUAL = 'equal'; const CLAUSE_NOT_EQUAL = 'not_equal'; - const CLAUSE_GREATER_OR_EQUAL = 'greater_equal'; - const CLAUSE_LESS_OR_EQUAL = 'less_equal'; + const CLAUSE_ON_AFTER = 'on_after'; + const CLAUSE_ON_BEFORE = 'on_before'; const CLAUSE_GREATER_THAN = 'greater_than'; const CLAUSE_LESS_THAN = 'less_than'; const CLAUSE_BETWEEN = 'between'; @@ -29,8 +29,8 @@ protected function clauses(): array return [ static::CLAUSE_EQUAL => __('filament-advancedfilter::clauses.equal'), static::CLAUSE_NOT_EQUAL => __('filament-advancedfilter::clauses.not_equal'), - static::CLAUSE_GREATER_OR_EQUAL => __('filament-advancedfilter::clauses.greater_equal'), - static::CLAUSE_LESS_OR_EQUAL => __('filament-advancedfilter::clauses.less_equal'), + static::CLAUSE_ON_AFTER => __('filament-advancedfilter::clauses.on_after'), + static::CLAUSE_ON_BEFORE => __('filament-advancedfilter::clauses.on_before'), static::CLAUSE_GREATER_THAN => __('filament-advancedfilter::clauses.greater_than'), static::CLAUSE_LESS_THAN => __('filament-advancedfilter::clauses.less_than'), static::CLAUSE_BETWEEN => __('filament-advancedfilter::clauses.between'), @@ -44,8 +44,8 @@ protected function applyClause(Builder $query, string $column, string $clause, a $operator = match ($clause) { static::CLAUSE_EQUAL, static::CLAUSE_NOT_SET => '=', static::CLAUSE_NOT_EQUAL, static::CLAUSE_SET => '!=', - static::CLAUSE_GREATER_OR_EQUAL => '>=', - static::CLAUSE_LESS_OR_EQUAL => '<=', + static::CLAUSE_ON_AFTER => '>=', + static::CLAUSE_ON_BEFORE => '<=', static::CLAUSE_GREATER_THAN => '>', static::CLAUSE_LESS_THAN => '<', default => $clause