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

Revamped tag report as well.

Browse Source
This commit is contained in:
James Cole
2019-09-03 15:37:59 +02:00
parent 4872d3e4bc
commit 5a8146aa34
22 changed files with 1917 additions and 992 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
public/v1/js/ff/reports/category/month.js vendored
View File

@@ -19,30 +19,6 @@
*/
$(function () {
"use strict";
drawChart();
// $('#categories-in-pie-chart-checked').on('change', function () {
// redrawPieChart(categoryIncomeUri, 'categories-in-pie-chart');
// });
//
// $('#categories-out-pie-chart-checked').on('change', function () {
// redrawPieChart(categoryExpenseUri, 'categories-out-pie-chart');
// });
//
// $('#accounts-in-pie-chart-checked').on('change', function () {
// redrawPieChart(accountIncomeUri, 'accounts-in-pie-chart');
// });
//
// $('#accounts-out-pie-chart-checked').on('change', function () {
// redrawPieChart(accountExpenseUri, 'accounts-out-pie-chart');
// });
});
function drawChart() {
"use strict";
loadAjaxPartial('accountsHolder', accountsUri);
loadAjaxPartial('categoriesHolder', categoriesUri);
@@ -65,4 +41,5 @@ function drawChart() {
loadAjaxPartial('avgExpensesHolder', avgExpensesUri);
loadAjaxPartial('topIncomeHolder', topIncomeUri);
loadAjaxPartial('avgIncomeHolder', avgIncomeUri);
}
});

68
public/v1/js/ff/reports/tag/month.js vendored
View File

@@ -18,61 +18,31 @@
* along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
*/
/** global: tagIncomeUri, tagExpenseUri, accountIncomeUri, accountExpenseUri, tagBudgetUri, tagCategoryUri, mainUri */
$(function () {
"use strict";
drawChart();
loadAjaxPartial('accountsHolder', accountsUri);
loadAjaxPartial('tagsHolder', tagsUri);
loadAjaxPartial('accountPerTagHolder', accountPerTagUri);
$('#tags-in-pie-chart-checked').on('change', function () {
redrawPieChart('tags-in-pie-chart', tagIncomeUri);
$.each($('.main_tag_canvas'), function (i, v) {
var canvas = $(v);
columnChart(canvas.data('url'), canvas.attr('id'));
});
$('#tags-out-pie-chart-checked').on('change', function () {
redrawPieChart('tags-out-pie-chart', tagExpenseUri);
});
multiCurrencyPieChart(tagOutUri, 'tag-out-pie-chart');
multiCurrencyPieChart(tagInUri, 'tag-in-pie-chart');
multiCurrencyPieChart(categoryOutUri, 'category-out-pie-chart');
multiCurrencyPieChart(categoryInUri, 'category-in-pie-chart');
multiCurrencyPieChart(budgetsOutUri, 'budgets-out-pie-chart');
multiCurrencyPieChart(sourceOutUri, 'source-out-pie-chart');
multiCurrencyPieChart(sourceInUri, 'source-in-pie-chart');
multiCurrencyPieChart(destOutUri, 'dest-out-pie-chart');
multiCurrencyPieChart(destInUri, 'dest-in-pie-chart');
$('#accounts-in-pie-chart-checked').on('change', function () {
redrawPieChart('accounts-in-pie-chart', accountIncomeUri);
});
$('#accounts-out-pie-chart-checked').on('change', function () {
redrawPieChart('accounts-out-pie-chart', accountExpenseUri);
});
// two extra charts:
pieChart(tagBudgetUri, 'budgets-out-pie-chart');
pieChart(tagCategoryUri, 'categories-out-pie-chart');
loadAjaxPartial('topExpensesHolder', topExpensesUri);
loadAjaxPartial('avgExpensesHolder', avgExpensesUri);
loadAjaxPartial('topIncomeHolder', topIncomeUri);
loadAjaxPartial('avgIncomeHolder', avgIncomeUri);
});
function drawChart() {
"use strict";
// month view:
doubleYChart(mainUri, 'in-out-chart');
// draw pie chart of income, depending on "show other transactions too":
redrawPieChart('tags-in-pie-chart', tagIncomeUri);
redrawPieChart('tags-out-pie-chart', tagExpenseUri);
redrawPieChart('accounts-in-pie-chart', accountIncomeUri);
redrawPieChart('accounts-out-pie-chart', accountExpenseUri);
}
function redrawPieChart(container, uri) {
"use strict";
var checkbox = $('#' + container + '-checked');
var others = '0';
// check if box is checked:
if (checkbox.prop('checked')) {
others = '1';
}
uri = uri.replace('OTHERS', others);
pieChart(uri, container);
}