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

Small additions and bug fixes.

Browse Source 
Signed-off-by: James Cole <thegrumpydictator@gmail.com>
This commit is contained in:
James Cole 2016-11-02 20:52:40 +01:00
parent 5e480eca36
commit a7e0e3fc15
No known key found for this signature in database
GPG Key ID: C16961E655E74B5E
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
public/js/ff/reports/default/all.js
View File

@ -11,14 +11,13 @@ $(function () {
"use strict"; "use strict";
// load the account report, which this report shows: // load the account report, which this report shows:
loadAjaxPartial('accountReport', accountReportUri); loadAjaxPartial('accountReport', accountReportUri);
// load income and expense reports: // load income and expense reports:
loadAjaxPartial('incomeReport',incomeReportUri); loadAjaxPartial('incomeReport', incomeReportUri);
loadAjaxPartial('expenseReport',expenseReportUri); loadAjaxPartial('expenseReport', expenseReportUri);
loadAjaxPartial('incomeVsExpenseReport',incExpReportUri); loadAjaxPartial('incomeVsExpenseReport', incExpReportUri);
}); });
@ -106,13 +105,19 @@ function displayAjaxPartial(data, holder) {
// call some often needed recalculations and what-not: // call some often needed recalculations and what-not:
// find a sortable table and make it sortable: // find a sortable table and make it sortable:
$.bootstrapSortable(true); if (typeof $.bootstrapSortable === "function") {
$.bootstrapSortable(true);
}
// find the info click things and respond to them: // find the info click things and respond to them:
triggerInfoClick(); triggerInfoClick();
// trigger list thing // trigger list thing
listLengthInitial(); listLengthInitial();
// trigger thing for budgets:
$('.budget-chart-activate').unbind('click').on('click', clickBudgetChart);
} }
function failAjaxPartial(uri, holder) { function failAjaxPartial(uri, holder) {

2
routes/web.php
View File

@ -196,6 +196,7 @@ Route::group(
// budgets: // budgets:
Route::get('/chart/budget/frontpage', ['uses' => 'Chart\BudgetController@frontpage']); Route::get('/chart/budget/frontpage', ['uses' => 'Chart\BudgetController@frontpage']);
Route::get('/chart/budget/period/{budget}/default/{start_date}/{end_date}/{accountList}', ['uses' => 'Chart\BudgetController@period']);
// this chart is used in reports: // this chart is used in reports:
Route::get('/chart/budget/{budget}/{limitrepetition}', ['uses' => 'Chart\BudgetController@budgetLimit']); Route::get('/chart/budget/{budget}/{limitrepetition}', ['uses' => 'Chart\BudgetController@budgetLimit']);
@ -216,6 +217,7 @@ Route::group(
Route::get('/chart/report/in-out-sum/{reportType}/{start_date}/{end_date}/{accountList}', ['uses' => 'Chart\ReportController@yearInOutSummarized']); Route::get('/chart/report/in-out-sum/{reportType}/{start_date}/{end_date}/{accountList}', ['uses' => 'Chart\ReportController@yearInOutSummarized']);
Route::get('/chart/report/net-worth/{reportType}/{start_date}/{end_date}/{accountList}', ['uses' => 'Chart\ReportController@netWorth']); Route::get('/chart/report/net-worth/{reportType}/{start_date}/{end_date}/{accountList}', ['uses' => 'Chart\ReportController@netWorth']);
/** /**
* IMPORT CONTROLLER * IMPORT CONTROLLER
*/ */