diff --git a/app/Abstracts/Listeners/Report.php b/app/Abstracts/Listeners/Report.php index 020e437db..eee1f4715 100644 --- a/app/Abstracts/Listeners/Report.php +++ b/app/Abstracts/Listeners/Report.php @@ -132,9 +132,6 @@ abstract class Report $input = request('search'); // Remove year as it's handled based on financial start - $search_not_year = 'not year:' . $this->getSearchStringValue('year', '', $input); - $input = str_replace($search_not_year, '', $input); - $search_year = 'year:' . $this->getSearchStringValue('year', '', $input); $input = str_replace($search_year, '', $input); diff --git a/app/Listeners/Report/AddBasis.php b/app/Listeners/Report/AddBasis.php index 31de87864..743338089 100644 --- a/app/Listeners/Report/AddBasis.php +++ b/app/Listeners/Report/AddBasis.php @@ -30,5 +30,10 @@ class AddBasis extends Listener $event->class->filters['basis'] = $this->getBasis(); $event->class->filters['keys']['basis'] = 'basis'; $event->class->filters['defaults']['basis'] = $event->class->getSetting('basis', 'accrual'); + $event->class->filters['operators']['basis'] = [ + 'equal' => true, + 'not_equal' => false, + 'rande' => false, + ]; } } diff --git a/app/Traits/DateTime.php b/app/Traits/DateTime.php index 700244e69..07a76487a 100644 --- a/app/Traits/DateTime.php +++ b/app/Traits/DateTime.php @@ -5,7 +5,6 @@ namespace App\Traits; use App\Traits\SearchString; use Carbon\CarbonPeriod; use Date; -use Lorisleiva\LaravelSearchString\SearchStringManager; trait DateTime { @@ -56,31 +55,7 @@ trait DateTime $end = $financial_start->addYear(1)->subDays(1)->endOfDay()->format('Y-m-d H:i:s'); } - // Looking year or not year - $query_type = 'whereBetween'; - - if (request('search')) { - $search_string_manager = new SearchStringManager($query->getModel()); - $parse = $search_string_manager->parse(request('search')); - - if (! empty($parse->expressions)) { - foreach ($parse->expressions as $filter) { - if (! $filter instanceof \Lorisleiva\LaravelSearchString\AST\NotSymbol) { - continue; - } - - if ($filter->expression->key != 'year') { - continue; - } - - $query_type = 'whereNotBetween'; - - break; - } - } - } - - return $query->{$query_type}($field, [$start, $end]); + return $query->whereBetween($field, [$start, $end]); } public function getTimezones() diff --git a/resources/assets/js/components/AkauntingSearch.vue b/resources/assets/js/components/AkauntingSearch.vue index 3cd583b70..f780b45ae 100644 --- a/resources/assets/js/components/AkauntingSearch.vue +++ b/resources/assets/js/components/AkauntingSearch.vue @@ -15,7 +15,7 @@ drag_handle height - + @@ -80,7 +80,7 @@
-
  • +
    • -
  • +
    • @@ -202,6 +202,8 @@ export default { values: false, }, + equal: true, + not_equal: true, range: false, option_values: [], selected_options: [], @@ -212,7 +214,7 @@ export default { show_date: false, show_close_icon: false, show_icon: true, - equal_image: app_url + "/public/img/tailwind_icons/not-equal.svg", + not_equal_image: app_url + "/public/img/tailwind_icons/not-equal.svg", input_focus: false, defaultPlaceholder: this.placeholder, dynamicPlaceholder: this.placeholder, @@ -413,6 +415,12 @@ export default { this.range = true; } + if (typeof this.filter_list[i].operators !== 'undefined' && Object.keys(this.filter_list[i].operators).length) { + this.equal = (typeof this.filter_list[i].operators.equal) ? this.filter_list[i].operators.equal : this.equal; + this.not_equal = (typeof this.filter_list[i].operators['not_equal']) ? this.filter_list[i].operators['not_equal'] : this.not_equal; + this.range = (typeof this.filter_list[i].operators['range']) ? this.filter_list[i].operators['range'] : this.range; + } + this.selected_options.push(this.filter_list[i]); this.filter_list.splice(i, 1); break; diff --git a/resources/views/components/reports/filter.blade.php b/resources/views/components/reports/filter.blade.php index 1e64d17d8..2ee5c5279 100644 --- a/resources/views/components/reports/filter.blade.php +++ b/resources/views/components/reports/filter.blade.php @@ -4,7 +4,7 @@ $filtered = []; $skipped = [ - 'keys', 'names', 'types', 'routes', 'defaults' + 'keys', 'names', 'types', 'routes', 'defaults', 'operators', ]; foreach ($class->filters as $filter_name => $filter_values) { @@ -58,31 +58,46 @@ $default_value = $class->filters['defaults'][$filter_name]; } + $operators = []; + + if (isset($class->filters['operators']) && !empty($class->filters['operators'][$filter_name])) { + $operators = $class->filters['operators'][$filter_name]; + } + if ($key == 'year') { $default_value = \Date::now()->year; + + $operators = [ + 'equal' => true, + 'not_equal' => false, + 'range' => false, + ]; } $filters[] = [ - 'key' => $key, - 'value' => $value, - 'type' => $type, - 'url' => $url, - 'values' => $filter_values, + 'key' => $key, + 'value' => $value, + 'type' => $type, + 'url' => $url, + 'values' => $filter_values, + 'operators' => $operators, ]; - if (!is_null($default_value)) { + if (! is_null($default_value)) { $filtered[] = [ - 'option' => $key, - 'operator' => '=', - 'value' => $default_value, + 'option' => $key, + 'operator' => '=', + 'value' => $default_value, + 'operators' => $operators, ]; } if (old($key) || request()->get($key)) { $filtered[] = [ - 'option' => $key, - 'operator' => '=', - 'value' => old($key, request()->get($key)), + 'option' => $key, + 'operator' => '=', + 'value' => old($key, request()->get($key)), + 'operators' => $operators, ]; } }