mirror of
				https://github.com/firefly-iii/firefly-iii.git
				synced 2025-10-31 02:36:28 +00:00 
			
		
		
		
	Final set of route changes.
This commit is contained in:
		| @@ -1,4 +1,4 @@ | ||||
| /* globals startDate, showOnlyTop, showFullList, endDate, reportType, expenseReportUri, accountIds, incExpReportUri,accountReportUri, incomeReportUri */ | ||||
| /* globals startDate, showOnlyTop, showFullList, endDate, expenseReportUri, accountIds, incExpReportUri,accountReportUri, incomeReportUri */ | ||||
| /* | ||||
|  * all.js | ||||
|  * Copyright (C) 2016 thegrumpydictator@gmail.com | ||||
| @@ -39,10 +39,9 @@ function clickInfoButton(e) { | ||||
|     // add some more elements: | ||||
|     attributes.startDate = startDate; | ||||
|     attributes.endDate = endDate; | ||||
|     attributes.reportType = reportType; | ||||
|     attributes.accounts = accountIds; | ||||
|  | ||||
|     $.getJSON('popup/report', {attributes: attributes}).done(respondInfoButton).fail(errorInfoButton); | ||||
|     $.getJSON('popup/general', {attributes: attributes}).done(respondInfoButton).fail(errorInfoButton); | ||||
| } | ||||
|  | ||||
| function errorInfoButton(data) { | ||||
|   | ||||
| @@ -1,19 +1,17 @@ | ||||
| /* globals budgetMultiUri, accountIds */ | ||||
|  | ||||
|  | ||||
| $(function () { | ||||
|     "use strict"; | ||||
|     drawChart(); | ||||
|  | ||||
|     loadAjaxPartial('budgetPeriodReport', budgetPeriodReportUri); | ||||
|     loadAjaxPartial('categoryPeriodReport', categoryPeriodReportUri); | ||||
|     loadAjaxPartial('categoryExpense', categoryExpenseUri); | ||||
|     loadAjaxPartial('categoryIncome', categoryIncomeUri); | ||||
| }); | ||||
|  | ||||
| function drawChart() { | ||||
|     "use strict"; | ||||
|  | ||||
|     // income and expense over multi year: | ||||
|     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'); | ||||
|     lineChart(netWorthUri, 'net-worth'); | ||||
|     columnChart(opChartUri, 'income-expenses-chart'); | ||||
|     columnChart(sumChartUri, 'income-expenses-sum-chart'); | ||||
| } | ||||
|   | ||||
		Reference in New Issue
	
	Block a user