shihaam/akaunting
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

close #2543 Fixed: remove not equal report basis and financial year option. ( #363b0t5 )

Browse Source
This commit is contained in:
Cüneyt Şentürk
2022-07-21 15:11:52 +03:00
parent 9ca9a5c94a
commit 766c6faea3
5 changed files with 47 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
resources/assets/js/components/AkauntingSearch.vue
View File

@@ -15,7 +15,7 @@
<span v-if="filter.operator == '='" class="material-icons text-2xl">drag_handle</span>
<span v-else-if="filter.operator == '><'" class="material-icons text-2xl transform rotate-90">height</span>
<img v-else :src="equal_image" class="w-5 h-5 object-cover block" />
<img v-else :src="not_equal_image" class="w-5 h-5 object-cover block" />
<i v-if="!filter.value" class="mt-1 ltr:-right-2 rtl:left-0 rtl:right-0 el-tag__close el-icon-close " style="font-size: 16px;" @click="onFilterDelete(index)"></i>
</span>
@@ -80,7 +80,7 @@
</div>
<div :id="'search-field-operator-' + _uid" class="absolute top-12 ltr:left-8 rtl:right-8 py-2 bg-white rounded-md border border-gray-200 shadow-xl z-20 list-none dropdown-menu operator" :class="[{'show': visible.operator}]">
<li ref="" class="w-full flex items-center px-2 h-9 leading-9 whitespace-nowrap">
<li v-if="equal" ref="" class="w-full flex items-center px-2 h-9 leading-9 whitespace-nowrap">
<button type="button" class="w-full h-full flex items-center rounded-md px-2 text-sm hover:bg-lilac-100" @click="onOperatorSelected('=')">
<span class="material-icons text-2xl transform">drag_handle</span>
<span class="text-gray hidden">{{ operatorIsText }}
@@ -88,9 +88,9 @@
</button>
</li>
<li ref="" class="w-full flex items-center px-2 h-9 leading-9 whitespace-nowrap">
<li v-if="not_equal" ref="" class="w-full flex items-center px-2 h-9 leading-9 whitespace-nowrap">
<button type="button" class="w-full h-full flex items-center rounded-md px-2 text-sm hover:bg-lilac-100" @click="onOperatorSelected('!=')">
<img :src="equal_image" class="w-6 h-6 block m-auto" />
<img :src="not_equal_image" class="w-6 h-6 block m-auto" />
<span class="text-gray hidden">{{ operatorIsNotText }}</span>
</button>
</li>
@@ -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;

41
resources/views/components/reports/filter.blade.php
View File

@@ -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,
];
}
}