kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-11-15 06:08:16 +00:00
Code Issues Projects Releases Wiki Activity

More auto-complete migration.

Browse Source
This commit is contained in:
James Cole
2020-07-19 17:24:29 +02:00
parent fd6f1fbbf0
commit 8a4999406b
16 changed files with 248 additions and 229 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
public/v1/js/ff/rules/create-edit.js vendored
View File

@@ -228,7 +228,7 @@ function updateActionInput(selectList) {
switch (selectList.val()) {
case 'set_category':
console.log('Select list value is ' + selectList.val() + ', so input needs auto complete.');
createAutoComplete(inputResult, 'json/categories');
createAutoComplete(inputResult, 'api/v1/autocomplete/categories');
break;
case 'clear_category':
case 'clear_budget':
@@ -240,7 +240,7 @@ function updateActionInput(selectList) {
break;
case 'set_budget':
console.log('Select list value is ' + selectList.val() + ', so input needs auto complete.');
createAutoComplete(inputResult, 'json/budgets');
createAutoComplete(inputResult, 'api/v1/autocomplete/budgets');
break;
case 'add_tag':
case 'remove_tag':
@@ -253,27 +253,27 @@ function updateActionInput(selectList) {
break;
case 'set_source_account':
console.log('Select list value is ' + selectList.val() + ', so input needs auto complete.');
createAutoComplete(inputResult, 'json/accounts');
createAutoComplete(inputResult, 'api/v1/autocomplete/accounts');
break;
case 'set_destination_account':
console.log('Select list value is ' + selectList.val() + ', so input needs auto complete.');
createAutoComplete(inputResult, 'json/accounts');
createAutoComplete(inputResult, 'api/v1/autocomplete/accounts');
break;
case 'convert_withdrawal':
console.log('Select list value is ' + selectList.val() + ', so input needs expense accounts auto complete.');
createAutoComplete(inputResult, 'json/expense-accounts');
createAutoComplete(inputResult, 'api/v1/autocomplete/accounts?types=Expense account&');
break;
case 'convert_deposit':
console.log('Select list value is ' + selectList.val() + ', so input needs revenue accounts auto complete.');
createAutoComplete(inputResult, 'json/revenue-accounts');
createAutoComplete(inputResult, 'api/v1/autocomplete/accounts?types=Revenue account&');
break;
case 'convert_transfer':
console.log('Select list value is ' + selectList.val() + ', so input needs asset accounts auto complete.');
createAutoComplete(inputResult, 'json/asset-accounts');
createAutoComplete(inputResult, 'api/v1/autocomplete/accounts?types=Asset account&');
break;
case 'link_to_bill':
console.log('Select list value is ' + selectList.val() + ', so input needs auto complete.');
createAutoComplete(inputResult, 'json/bills');
createAutoComplete(inputResult, 'api/v1/autocomplete/bills');
break;
case 'update_piggy':
console.log('Select list value is ' + selectList.val() + ', so input needs auto complete.');
@@ -312,7 +312,7 @@ function updateTriggerInput(selectList) {
case 'to_account_is':
case 'to_account_contains':
console.log('Select list value is ' + selectList.val() + ', so input needs auto complete.');
createAutoComplete(inputResult, 'json/accounts');
createAutoComplete(inputResult, 'api/v1/autocomplete/accounts');
break;
case 'tag_is':
console.log('Select list value is ' + selectList.val() + ', so input needs auto complete.');
@@ -320,11 +320,11 @@ function updateTriggerInput(selectList) {
break;
case 'budget_is':
console.log('Select list value is ' + selectList.val() + ', so input needs auto complete.');
createAutoComplete(inputResult, 'json/budgets');
createAutoComplete(inputResult, 'api/v1/autocomplete/budgets');
break;
case 'category_is':
console.log('Select list value is ' + selectList.val() + ', so input needs auto complete.');
createAutoComplete(inputResult, 'json/categories');
createAutoComplete(inputResult, 'api/v1/autocomplete/categories');
break;
case 'transaction_type':
console.log('Select list value is ' + selectList.val() + ', so input needs auto complete.');
@@ -377,11 +377,17 @@ function createAutoComplete(input, URI) {
console.log('Now in createAutoComplete("' + URI + '").');
input.typeahead('destroy');
// append URI:
var lastChar = URI[URI.length -1];
var urlParamSplit = '?';
if('&' === lastChar) {
urlParamSplit = '';
}
var source = new Bloodhound({
datumTokenizer: Bloodhound.tokenizers.obj.whitespace('name'),
queryTokenizer: Bloodhound.tokenizers.whitespace,
prefetch: {
url: URI + '?uid=' + uid,
url: URI + urlParamSplit + 'uid=' + uid,
filter: function (list) {
return $.map(list, function (item) {
return {name: item.name};
@@ -389,7 +395,7 @@ function createAutoComplete(input, URI) {
}
},
remote: {
url: URI + '?search=%QUERY&uid=' + uid,
url: URI + urlParamSplit + 'query=%QUERY&uid=' + uid,
wildcard: '%QUERY',
filter: function (list) {
return $.map(list, function (item) {