kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-12 15:35:15 +00:00
Code Issues Projects Releases Wiki Activity

Improve code for recurring transactions.

Browse Source
This commit is contained in:
James Cole
2018-06-21 18:57:51 +02:00
parent 7bdd4ddeab
commit 1d162edb59
15 changed files with 431 additions and 153 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
public/js/ff/recurring/create.js vendored
View File

@@ -104,7 +104,14 @@ function respondToFirstDateChange() {
var select = $('#ffInput_repetition_type');
var date = obj.val();
select.prop('disabled', true);
$.getJSON(suggestUri, {date: date}).fail(function () {
// preselected value:
var preSelected = oldRepetitionType;
if(preSelected === '') {
preSelected = select.val();
}
$.getJSON(suggestUri, {date: date,pre_select: preSelected}).fail(function () {
console.error('Could not load repetition suggestions');
alert('Could not load repetition suggestions');
}).done(parseRepetitionSuggestions);
@@ -117,8 +124,9 @@ function parseRepetitionSuggestions(data) {
var opt;
for (var k in data) {
if (data.hasOwnProperty(k)) {
opt = $('<option>').val(k).attr('label', data[k]).text(data[k]);
if(k === oldRepetitionType) {
console.log('label: ' + data[k].label + ', selected: ' + data[k].selected);
opt = $('<option>').val(k).attr('label', data[k].label).text(data[k].label);
if(data[k].selected) {
opt.attr('selected','selected');
}
select.append(opt);