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

AkauntingSearch.vue is not operator fixed..

Browse Source
This commit is contained in:
Cüneyt Şentürk
2021-01-12 01:26:03 +03:00
parent de27dbf116
commit 63e7c83160
1 changed files with 42 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -157,6 +157,7 @@ export default {
option_values: [], option_values: [],
selected_options: [], selected_options: [],
selected_operator: [],
selected_values: [], selected_values: [],
values: [], values: [],
current_value: null, current_value: null,
@ -278,11 +279,16 @@ export default {
args += '?search='; args += '?search=';
} }
if (this.selected_operator[index].key == '!=') {
args += 'not ';
}
args += this.selected_options[index].key + ':' + this.selected_values[index].key + ' '; args += this.selected_options[index].key + ':' + this.selected_values[index].key + ' ';
search_string[path][this.selected_options[index].key] = { search_string[path][this.selected_options[index].key] = {
'key': this.selected_values[index].key, 'key': this.selected_values[index].key,
'value': this.selected_values[index].value 'value': this.selected_values[index].value,
'operator': this.selected_operator[index].key,
}; };
}, this); }, this);
@ -327,7 +333,11 @@ export default {
this.search = ''; this.search = '';
if (option_url) { if (option_url) {
option_url += '?search=limit:10'; if (option_url.indexOf('?') === -1) {
option_url += '?search=limit:10';
} else {
option_url += ' limit:10';
}
} }
if (!this.option_values[value] && option_url) { if (!this.option_values[value] && option_url) {
@ -335,6 +345,8 @@ export default {
.then(response => { .then(response => {
let data = response.data.data; let data = response.data.data;
this.values = [];
data.forEach(function (item) { data.forEach(function (item) {
this.values.push({ this.values.push({
key: (item.code) ? item.code : item.id, key: (item.code) ? item.code : item.id,
@ -393,6 +405,10 @@ export default {
}; };
} }
this.selected_operator.push({
key: value
});
this.filter_last_step = 'values'; this.filter_last_step = 'values';
}, },
@ -442,10 +458,15 @@ export default {
onFilterDelete(index) { onFilterDelete(index) {
this.filter_list.push(this.selected_options[index]); this.filter_list.push(this.selected_options[index]);
this.filter_index--; if (this.filter_last_step == 'options') {
this.filter_index--;
}
this.filtered.splice(index, 1); this.filtered.splice(index, 1);
this.selected_options.splice(index, 1); this.selected_options.splice(index, 1);
this.selected_operator.splice(index, 1);
this.selected_values.splice(index, 1);
this.filter_last_step = 'options'; this.filter_last_step = 'options';
}, },
@ -479,8 +500,12 @@ export default {
cookie = JSON.parse(cookie)[path]; cookie = JSON.parse(cookie)[path];
} }
if (this.value) { if (this.value) {""
let search_string = this.value.split(' '); let search_string = this.value.replace(' not ', ' ');
console.log(search_string);
search_string = search_string.split(' ');
search_string.forEach(function (string) { search_string.forEach(function (string) {
if (string.search(':') === -1) { if (string.search(':') === -1) {
@ -488,11 +513,13 @@ export default {
} else { } else {
let filter = string.split(':'); let filter = string.split(':');
let option = ''; let option = '';
let operator = '=';
let value = ''; let value = '';
this.filter_list.forEach(function (_filter, i) { this.filter_list.forEach(function (_filter, i) {
if (_filter.key == filter[0]) { if (_filter.key == filter[0]) {
option = _filter.value; option = _filter.value;
operator = _filter.operator;
_filter.values.forEach(function (_value) { _filter.values.forEach(function (_value) {
if (_value.key == filter[1]) { if (_value.key == filter[1]) {
@ -504,7 +531,16 @@ export default {
value = cookie[_filter.key].value; value = cookie[_filter.key].value;
} }
if (cookie != undefined && cookie[_filter.key]) {
operator = cookie[_filter.key].operator;
}
this.selected_options.push(this.filter_list[i]); this.selected_options.push(this.filter_list[i]);
this.selected_operator.push({
key: operator,
});
this.filter_list.splice(i, 1); this.filter_list.splice(i, 1);
this.option_values[_filter.key] = _filter.values; this.option_values[_filter.key] = _filter.values;
@ -525,7 +561,7 @@ export default {
this.filtered.push({ this.filtered.push({
option: option, option: option,
operator: '=', operator: operator,
value: value value: value
}); });