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

Join two charts, simpler code.

Browse Source
This commit is contained in:
James Cole
2016-11-19 07:27:54 +01:00
parent 73f0cc705b
commit e15ea04186
12 changed files with 104 additions and 220 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
public/js/ff/reports/default/multi-year.js
View File

@@ -5,7 +5,7 @@ $(function () {
"use strict";
drawChart();
loadAjaxPartial('budgetMultiYear', budgetMultiUri);
loadAjaxPartial('budgetPeriodReport', budgetPeriodReportUri);
});
function drawChart() {

6
public/js/ff/reports/default/year.js
View File

@@ -1,16 +1,16 @@
/* globals google, accountIds, budgetYearOverviewUri */
/* globals google, accountIds, budgetPeriodReportUri */
$(function () {
"use strict";
drawChart();
loadAjaxPartial('budgetOverview',budgetYearOverviewUri);
loadAjaxPartial('budgetPeriodReport', budgetPeriodReportUri);
});
function drawChart() {
"use strict";
lineChart('chart/report/net-worth/' + reportType + '/' + startDate + '/' + endDate + '/' + accountIds, 'net-worth');
lineChart('chart/report/net-worth/' + startDate + '/' + endDate + '/' + accountIds, 'net-worth');
columnChart('chart/report/in-out/' + startDate + '/' + endDate + '/' + accountIds, 'income-expenses-chart');
columnChart('chart/report/in-out-sum/' + startDate + '/' + endDate + '/' + accountIds, 'income-expenses-sum-chart');