mirror of
				https://github.com/firefly-iii/firefly-iii.git
				synced 2025-11-03 20:55:05 +00:00 
			
		
		
		
	Small additions and bug fixes.
Signed-off-by: James Cole <thegrumpydictator@gmail.com>
This commit is contained in:
		@@ -11,14 +11,13 @@ $(function () {
 | 
			
		||||
    "use strict";
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
    // load the account report, which this report shows:
 | 
			
		||||
    loadAjaxPartial('accountReport', accountReportUri);
 | 
			
		||||
 | 
			
		||||
    // load income and expense reports:
 | 
			
		||||
    loadAjaxPartial('incomeReport',incomeReportUri);
 | 
			
		||||
    loadAjaxPartial('expenseReport',expenseReportUri);
 | 
			
		||||
    loadAjaxPartial('incomeVsExpenseReport',incExpReportUri);
 | 
			
		||||
    loadAjaxPartial('incomeReport', incomeReportUri);
 | 
			
		||||
    loadAjaxPartial('expenseReport', expenseReportUri);
 | 
			
		||||
    loadAjaxPartial('incomeVsExpenseReport', incExpReportUri);
 | 
			
		||||
 | 
			
		||||
});
 | 
			
		||||
 | 
			
		||||
@@ -106,13 +105,19 @@ function displayAjaxPartial(data, holder) {
 | 
			
		||||
    // call some often needed recalculations and what-not:
 | 
			
		||||
 | 
			
		||||
    // 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:
 | 
			
		||||
    triggerInfoClick();
 | 
			
		||||
 | 
			
		||||
    // trigger list thing
 | 
			
		||||
    listLengthInitial();
 | 
			
		||||
 | 
			
		||||
    // trigger thing for budgets:
 | 
			
		||||
    $('.budget-chart-activate').unbind('click').on('click', clickBudgetChart);
 | 
			
		||||
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
function failAjaxPartial(uri, holder) {
 | 
			
		||||
 
 | 
			
		||||
@@ -196,6 +196,7 @@ Route::group(
 | 
			
		||||
 | 
			
		||||
    // budgets:
 | 
			
		||||
    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:
 | 
			
		||||
    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/net-worth/{reportType}/{start_date}/{end_date}/{accountList}', ['uses' => 'Chart\ReportController@netWorth']);
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
    /**
 | 
			
		||||
     * IMPORT CONTROLLER
 | 
			
		||||
     */
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user