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

Refactor some JS functions.

Browse Source
This commit is contained in:
James Cole 2017-06-02 13:00:43 +02:00
parent 74664afa68
commit 8273f467b6
No known key found for this signature in database
GPG Key ID: C16961E655E74B5E
2 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
public/js/ff/charts.js
View File

@ -75,7 +75,7 @@ function lineChart(URI, container) {
"use strict"; "use strict";
var colorData = true; var colorData = true;
var options = defaultChartOptions; var options = $.extend(true, {}, defaultChartOptions);
var chartType = 'line'; var chartType = 'line';
drawAChart(URI, container, chartType, options, colorData); drawAChart(URI, container, chartType, options, colorData);
@ -188,7 +188,7 @@ function columnChart(URI, container) {
"use strict"; "use strict";
console.log('Going to draw column chart for ' + URI + ' in ' + container); console.log('Going to draw column chart for ' + URI + ' in ' + container);
var colorData = true; var colorData = true;
var options = defaultChartOptions; var options = $.extend(true, {}, defaultChartOptions);
var chartType = 'bar'; var chartType = 'bar';
drawAChart(URI, container, chartType, options, colorData); drawAChart(URI, container, chartType, options, colorData);
@ -224,7 +224,7 @@ function pieChart(URI, container) {
"use strict"; "use strict";
var colorData = false; var colorData = false;
var options = defaultPieOptions; var options = $.extend(true, {}, defaultPieOptions);
var chartType = 'pie'; var chartType = 'pie';
drawAChart(URI, container, chartType, options, colorData); drawAChart(URI, container, chartType, options, colorData);

20
public/js/ff/reports/category/month.js
View File

@ -15,19 +15,19 @@ $(function () {
drawChart(); drawChart();
$('#categories-in-pie-chart-checked').on('change', function () { $('#categories-in-pie-chart-checked').on('change', function () {
redrawPieChart('categories-in-pie-chart', categoryIncomeUri); redrawPieChart(categoryIncomeUri, 'categories-in-pie-chart');
}); });
$('#categories-out-pie-chart-checked').on('change', function () { $('#categories-out-pie-chart-checked').on('change', function () {
redrawPieChart('categories-out-pie-chart', categoryExpenseUri); redrawPieChart(categoryExpenseUri, 'categories-out-pie-chart');
}); });
$('#accounts-in-pie-chart-checked').on('change', function () { $('#accounts-in-pie-chart-checked').on('change', function () {
redrawPieChart('accounts-in-pie-chart', accountIncomeUri); redrawPieChart(accountIncomeUri, 'accounts-in-pie-chart');
}); });
$('#accounts-out-pie-chart-checked').on('change', function () { $('#accounts-out-pie-chart-checked').on('change', function () {
redrawPieChart('accounts-out-pie-chart', accountExpenseUri); redrawPieChart(accountExpenseUri, 'accounts-out-pie-chart');
}); });
}); });
@ -40,15 +40,17 @@ function drawChart() {
doubleYChart(mainUri, 'in-out-chart'); doubleYChart(mainUri, 'in-out-chart');
// draw pie chart of income, depending on "show other transactions too": // draw pie chart of income, depending on "show other transactions too":
redrawPieChart('categories-in-pie-chart', categoryIncomeUri); redrawPieChart(categoryIncomeUri, 'categories-in-pie-chart');
redrawPieChart('categories-out-pie-chart', categoryExpenseUri); redrawPieChart(categoryExpenseUri, 'categories-out-pie-chart');
redrawPieChart('accounts-in-pie-chart', accountIncomeUri); redrawPieChart(accountIncomeUri, 'accounts-in-pie-chart');
redrawPieChart('accounts-out-pie-chart', accountExpenseUri); redrawPieChart(accountExpenseUri, 'accounts-out-pie-chart');
stackedColumnChart(expenseAccountTimeUri, 'expense-time-chart');
stackedColumnChart(revenueAccountTimeUri, 'revenue-time-chart');
} }
function redrawPieChart(container, uri) { function redrawPieChart(uri, container) {
"use strict"; "use strict";
var checkbox = $('#' + container + '-checked'); var checkbox = $('#' + container + '-checked');