kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-09-21 19:47:48 +00:00
Code Issues Projects Releases Wiki Activity

Refactor rule creation.

Browse Source
This commit is contained in:
James Cole
2018-08-05 15:34:20 +02:00
parent 07a8c69ba8
commit 422e80530b
12 changed files with 337 additions and 337 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -22,20 +22,26 @@
$(function () {
"use strict";
if (triggerCount === 0) {
addNewTrigger();
}
if (actionCount === 0) {
addNewAction();
}
if (triggerCount > 0) {
console.log('trigger count is larger than zero, call onAddNewTrigger.');
onAddNewTrigger();
}
if (actionCount > 0) {
console.log('action count is larger than zero, call onAddNewAction.');
onAddNewAction();
}
if (triggerCount === 0) {
console.log('trigger count is zero, add trigger.');
addNewTrigger();
}
if (actionCount === 0) {
console.log('action count is zero, add action.');
addNewAction();
}
$('.add_rule_trigger').click(addNewTrigger);
$('.add_rule_action').click(addNewAction);
$('.test_rule_triggers').click(testRuleTriggers);
@@ -49,7 +55,7 @@ $(function () {
function addNewTrigger() {
"use strict";
triggerCount++;
console.log('In addNewTrigger(), count is now ' + triggerCount);
// disable the button
$('.add_rule_trigger').attr('disabled', 'disabled');
@@ -81,7 +87,7 @@ function addNewTrigger() {
function addNewAction() {
"use strict";
actionCount++;
console.log('In addNewAction(), count is now ' + actionCount);
// disable the button
$('.add_rule_action').attr('disabled', 'disabled');
@@ -154,18 +160,24 @@ function removeAction(e) {
*/
function onAddNewAction() {
"use strict";
console.log('Now in onAddNewAction()');
var selectQuery = 'select[name^="rule_actions["][name$="][name]"]';
var selectResult = $(selectQuery);
console.log('Select query is "' + selectQuery + '" and the result length is ' + selectResult.length);
// update all "select action type" dropdown buttons so they will respond correctly
$('select[name^="rule-action["]').unbind('change').change(function (e) {
selectResult.unbind('change').change(function (e) {
var target = $(e.target);
updateActionInput(target)
});
$.each($('.rule-action-holder'), function (i, v) {
var holder = $(v);
var select = holder.find('select');
updateActionInput(select);
});
// $.each($('.rule-action-holder'), function (i, v) {
// var holder = $(v);
// var select = holder.find('select');
// updateActionInput(select);
// });
}
/**
@@ -173,18 +185,24 @@ function onAddNewAction() {
*/
function onAddNewTrigger() {
"use strict";
console.log('Now in onAddNewTrigger()');
// update all "select trigger type" dropdown buttons so they will respond correctly
$('select[name^="rule-trigger["]').unbind('change').change(function (e) {
var selectQuery = 'select[name^="rule_triggers["][name$="][name]"]';
var selectResult = $(selectQuery);
console.log('Select query is "' + selectQuery + '" and the result length is ' + selectResult.length);
// trigger when user changes the trigger type.
selectResult.unbind('change').change(function (e) {
var target = $(e.target);
updateTriggerInput(target)
});
$.each($('.rule-trigger-holder'), function (i, v) {
var holder = $(v);
var select = holder.find('select');
updateTriggerInput(select);
});
// $.each($('.rule-trigger-holder'), function (i, v) {
// var holder = $(v);
// var select = holder.find('select');
// updateTriggerInput(select);
// });
}
/**
@@ -193,42 +211,56 @@ function onAddNewTrigger() {
* @param selectList
*/
function updateActionInput(selectList) {
console.log('Now in updateActionInput() for a select list, currently with value "' + selectList.val() + '".');
// the actual row this select list is in:
var parent = selectList.parent().parent();
// the text input we're looking for:
var input = parent.find('input[name^="rule-action-value["]');
input.removeAttr('disabled');
var inputQuery = 'input[name^="rule_actions["][name$="][value]"]';
var inputResult = parent.find(inputQuery);
console.log('Searching for children in this row with query "' + inputQuery + '" resulted in ' + inputResult.length + ' results.');
inputResult.removeAttr('disabled');
switch (selectList.val()) {
case 'set_category':
createAutoComplete(input, 'json/categories');
console.log('Select list value is ' + selectList.val() +', so input needs auto complete.');
createAutoComplete(inputResult, 'json/categories');
break;
case 'clear_category':
case 'clear_budget':
case 'clear_notes':
case 'remove_all_tags':
input.attr('disabled', 'disabled');
console.log('Select list value is ' + selectList.val() +', so input needs to be disabled.');
inputResult.attr('disabled', 'disabled');
break;
case 'set_budget':
createAutoComplete(input, 'json/budgets');
console.log('Select list value is ' + selectList.val() +', so input needs auto complete.');
createAutoComplete(inputResult, 'json/budgets');
break;
case 'add_tag':
case 'remove_tag':
createAutoComplete(input, 'json/tags');
console.log('Select list value is ' + selectList.val() +', so input needs auto complete.');
createAutoComplete(inputResult, 'json/tags');
break;
case 'set_description':
createAutoComplete(input, 'json/transaction-journals/all');
console.log('Select list value is ' + selectList.val() +', so input needs auto complete.');
createAutoComplete(inputResult, 'json/transaction-journals/all');
break;
case 'set_source_account':
createAutoComplete(input, 'json/all-accounts');
console.log('Select list value is ' + selectList.val() +', so input needs auto complete.');
createAutoComplete(inputResult, 'json/all-accounts');
break;
case 'set_destination_account':
createAutoComplete(input, 'json/all-accounts');
console.log('Select list value is ' + selectList.val() +', so input needs auto complete.');
createAutoComplete(inputResult, 'json/all-accounts');
break;
case 'link_to_bill':
createAutoComplete(input, 'json/bills');
console.log('Select list value is ' + selectList.val() +', so input needs auto complete.');
createAutoComplete(inputResult, 'json/bills');
break;
default:
input.typeahead('destroy');
console.log('Select list value is ' + selectList.val() +', destroy auto complete, do nothing else.');
inputResult.typeahead('destroy');
break;
}
}
@@ -239,11 +271,15 @@ function updateActionInput(selectList) {
* @param selectList
*/
function updateTriggerInput(selectList) {
console.log('Now in updateTriggerInput() for a select list, currently with value "' + selectList.val() + '".');
// the actual row this select list is in:
var parent = selectList.parent().parent();
// the text input we're looking for:
var input = parent.find('input[name^="rule-trigger-value["]');
input.prop('disabled', false);
var inputQuery = 'input[name^="rule_triggers["][name$="][value]"]';
var inputResult = parent.find(inputQuery);
console.log('Searching for children in this row with query "' + inputQuery + '" resulted in ' + inputResult.length + ' results.');
inputResult.prop('disabled', false);
switch (selectList.val()) {
case 'from_account_starts':
case 'from_account_ends':
@@ -253,26 +289,31 @@ function updateTriggerInput(selectList) {
case 'to_account_ends':
case 'to_account_is':
case 'to_account_contains':
createAutoComplete(input, 'json/all-accounts');
console.log('Select list value is ' + selectList.val() +', so input needs auto complete.');
createAutoComplete(inputResult, 'json/all-accounts');
break;
case 'tag_is':
// also make tag thing?
createAutoComplete(input, 'json/tags');
console.log('Select list value is ' + selectList.val() +', so input needs auto complete.');
createAutoComplete(inputResult, 'json/tags');
break;
case 'budget_is':
createAutoComplete(input, 'json/budgets');
console.log('Select list value is ' + selectList.val() +', so input needs auto complete.');
createAutoComplete(inputResult, 'json/budgets');
break;
case 'category_is':
createAutoComplete(input, 'json/categories');
console.log('Select list value is ' + selectList.val() +', so input needs auto complete.');
createAutoComplete(inputResult, 'json/categories');
break;
case 'transaction_type':
createAutoComplete(input, 'json/transaction-types');
console.log('Select list value is ' + selectList.val() +', so input needs auto complete.');
createAutoComplete(inputResult, 'json/transaction-types');
break;
case 'description_starts':
case 'description_ends':
case 'description_contains':
case 'description_is':
createAutoComplete(input, 'json/transaction-journals/all');
console.log('Select list value is ' + selectList.val() +', so input needs auto complete.');
createAutoComplete(inputResult, 'json/transaction-journals/all');
break;
case 'has_no_category':
case 'has_any_category':
@@ -282,14 +323,17 @@ function updateTriggerInput(selectList) {
case 'no_notes':
case 'any_notes':
case 'has_any_tag':
input.prop('disabled', true);
input.typeahead('destroy');
console.log('Select list value is ' + selectList.val() +', so input needs to be disabled.');
inputResult.prop('disabled', true);
inputResult.typeahead('destroy');
break;
case 'currency_is':
createAutoComplete(input, 'json/currency-names');
console.log('Select list value is ' + selectList.val() +', so input needs auto complete.');
createAutoComplete(inputResult, 'json/currency-names');
break;
default:
input.typeahead('destroy');
console.log('Select list value is ' + selectList.val() +', destroy auto complete, do nothing else.');
inputResult.typeahead('destroy');
break;
}
}
@@ -300,9 +344,13 @@ function updateTriggerInput(selectList) {
* @param URI
*/
function createAutoComplete(input, URI) {
console.log('Now in createAutoComplete().')
input.typeahead('destroy');
$.getJSON(URI).done(function (data) {
console.log('Input now has auto complete from URI ' + URI);
input.typeahead({source: data, autoSelect: false});
}).fail(function() {
console.log('Could not grab URI ' + URI + ' so autocomplete will not work');
});
}
@@ -319,6 +367,7 @@ function testRuleTriggers() {
// Serialize all trigger data
var triggerData = $(".rule-trigger-tbody").find("input[type=text], input[type=checkbox], select").serializeArray();
console.log('Found the following trigger data: ' + triggerData);
// Find a list of existing transactions that match these triggers
$.get('rules/test', triggerData).done(function (data) {