IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-02-25 18:45:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

Add more stuff to ajax controllers, making report controller simpler.

Browse Source
This commit is contained in:
James Cole
2016-10-26 16:46:43 +02:00
parent 01de147900
commit fe3f015171
9 changed files with 158 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
public/js/ff/reports/default/all.js
View File

@@ -10,8 +10,7 @@
$(function () {
"use strict";
// find the little info buttons and respond to them.
$('.firefly-info-button').click(clickInfoButton);
// load the account report, which this report shows:
loadAccountReport();
@@ -19,11 +18,20 @@ $(function () {
// load income / expense / difference:
loadInOutReport();
// trigger info click
triggerInfoClick();
// trigger list length things:
listLengthInitial();
});
function triggerInfoClick() {
"use strict";
// find the little info buttons and respond to them.
$('.firefly-info-button').unbind('clicl').click(clickInfoButton);
}
function listLengthInitial() {
"use strict";
$('.overListLength').hide();
@@ -62,6 +70,7 @@ function placeInOutReport(data) {
$('#expenseReport').removeClass('loading').html(data.expenses);
$('#incomeVsExpenseReport').removeClass('loading').html(data.incomes_expenses);
listLengthInitial();
triggerInfoClick();
}
function failInOutReport() {

23
public/js/ff/reports/default/month.js
View File

@@ -1,11 +1,32 @@
/* globals google, startDate ,reportURL, endDate , reportType ,accountIds , picker:true, minDate, year, month, columnChart, lineChart, stackedColumnChart */
/* globals google, startDate ,reportURL, endDate , reportType ,accountIds, lineChart, categoryReportUrl */
$(function () {
"use strict";
drawChart();
loadCategoryReport();
});
function loadCategoryReport() {
"use strict";
console.log('Going to grab ' + categoryReportUrl);
$.get(categoryReportUrl).done(placeCategoryReport).fail(failCategoryReport);
}
function placeCategoryReport(data) {
"use strict";
$('#categoryReport').removeClass('loading').html(data);
listLengthInitial();
triggerInfoClick();
}
function failCategoryReport() {
"use strict";
console.log('Fail category report data!');
$('#categoryReport').removeClass('loading').addClass('general-chart-error');
}
function drawChart() {
"use strict";