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

Make report budget charts multi-currency

Browse Source
This commit is contained in:
James Cole
2019-09-01 16:52:49 +02:00
parent ce06fb73b1
commit 5c099008e8
15 changed files with 211 additions and 236 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
public/v1/js/ff/reports/all.js vendored
View File

@@ -147,9 +147,10 @@ function clickBudgetChart(e) {
"use strict";
var link = $(e.target);
var budgetId = link.data('budget');
var currencyId = parseInt(link.data('currency'));
$('#budget_help').remove();
var URL = 'chart/budget/period/' + budgetId + '/' + accountIds + '/' + startDate + '/' + endDate;
var URL = 'chart/budget/period/' + budgetId + '/' + currencyId + '/' + accountIds + '/' + startDate + '/' + endDate;
var container = 'budget_chart';
columnChart(URL, container);
return false;

3
public/v1/js/ff/reports/default/multi-year.js vendored
View File

@@ -18,13 +18,12 @@
* along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
*/
/** global: budgetPeriodReportUri, categoryExpenseUri, categoryIncomeUri, netWorthUri, opChartUri, sumChartUri */
/** global: budgetPeriodReportUri, categoryExpenseUri, categoryIncomeUri, netWorthUri, opChartUri */
$(function () {
"use strict";
lineChart(netWorthUri, 'net-worth');
columnChartCustomColours(opChartUri, 'income-expenses-chart');
columnChartCustomColours(sumChartUri, 'income-expenses-sum-chart');
loadAjaxPartial('budgetPeriodReport', budgetPeriodReportUri);
loadAjaxPartial('categoryExpense', categoryExpenseUri);

3
public/v1/js/ff/reports/default/year.js vendored
View File

@@ -18,13 +18,12 @@
* along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
*/
/** global: budgetPeriodReportUri, categoryExpenseUri, categoryIncomeUri, netWorthUri, opChartUri, sumChartUri */
/** global: budgetPeriodReportUri, categoryExpenseUri, categoryIncomeUri, netWorthUri, opChartUri */
$(function () {
"use strict";
lineChart(netWorthUri, 'net-worth');
columnChartCustomColours(opChartUri, 'income-expenses-chart');
columnChartCustomColours(sumChartUri, 'income-expenses-sum-chart');
loadAjaxPartial('budgetPeriodReport', budgetPeriodReportUri);
loadAjaxPartial('categoryExpense', categoryExpenseUri);