Extended reports

app/controllers/GoogleChartController.php

@@ -124,15 +124,19 @@ class GoogleChartController extends BaseController
         $end->endOfYear();
         $income  = 0;
         $expense = 0;
+        $count   = 0;
         while ($start < $end) {
 
             // total income:
             $income += $tj->getSumOfIncomesByMonth($start);
             $expense += $tj->getSumOfExpensesByMonth($start);
+            $count++;
 
             $start->addMonth();
         }
         $chart->addRow('Sum', $income, $expense);
+        $count = $count > 0 ? $count : 1;
+        $chart->addRow('Average', ($income / $count), ($expense / $count));
 
 
         $chart->generate();
@@ -140,6 +144,53 @@ class GoogleChartController extends BaseController
 
     }
 
+
+    /**
+     * @return \Illuminate\Http\JsonResponse
+     */
+    public function budgetsReportChart($year)
+    {
+
+        try {
+            $start = new Carbon('01-01-' . $year);
+        } catch (Exception $e) {
+            App::abort(500);
+        }
+
+        /** @var \Grumpydictator\Gchart\GChart $chart */
+        $chart = App::make('gchart');
+
+        /** @var \FireflyIII\Database\Budget $bdt */
+        $bdt     = App::make('FireflyIII\Database\Budget');
+        $budgets = $bdt->get();
+
+        $chart->addColumn('Month', 'date');
+        /** @var \Budget $budget */
+        foreach ($budgets as $budget) {
+            $chart->addColumn($budget->name, 'number');
+        }
+
+        /*
+         * Loop budgets this year.
+         */
+        $end = clone $start;
+        $end->endOfYear();
+        while ($start <= $end) {
+            $row = [clone $start];
+
+            foreach($budgets as $budget) {
+                $row[] = $bdt->spentInMonth($budget, $start);
+            }
+
+            $chart->addRowArray($row);
+            $start->addMonth();
+        }
+
+
+        $chart->generate();
+        return Response::json($chart->getData());
+    }
+
     /**
      * @return \Illuminate\Http\JsonResponse
      */

app/routes.php

@@ -168,6 +168,7 @@ Route::group(
         Route::get('/chart/sankey/{account}/in', ['uses' => 'GoogleChartController@accountSankeyInChart']);
         Route::get('/chart/reports/income-expenses/{year}', ['uses' => 'GoogleChartController@yearInExp']);
         Route::get('/chart/reports/income-expenses-sum/{year}', ['uses' => 'GoogleChartController@yearInExpSum']);
+        Route::get('/chart/reports/budgets/{year}', ['uses' => 'GoogleChartController@budgetsReportChart']);
 
         // google table controller
         Route::get('/table/account/{account}/transactions', ['uses' => 'GoogleTableController@transactionsByAccount']);

app/views/reports/year.blade.php

@@ -25,7 +25,7 @@
 
 <div class="row">
     <div class="col-lg-12 col-md-12 col-sm-12">
-    <div class="panel panel-default">
+        <div class="panel panel-default">
             <div class="panel-heading">
                 Summary
             </div>
@@ -33,8 +33,8 @@
                 <table class="table table-striped">
                     <tr>
                         <td></td>
-                        @foreach($summary as $entry)
-                            <th>{{$entry['month']}}</th>
+                            @foreach($summary as $entry)
+                                <th>{{$entry['month']}}</th>
                         @endforeach
                         <th>Sum</th>
                     </tr>
@@ -67,6 +67,19 @@
     </div>
 </div>
 
+<div class="row">
+    <div class="col-lg-12 col-md-12 col-sm-12">
+        <div class="panel panel-default">
+            <div class="panel-heading">
+                Budgets
+            </div>
+            <div class="panel-body">
+                <div id="budgets"></div>
+            </div>
+        </div>
+    </div>
+</div>
+
 @stop
 @section('scripts')
 <!-- load the libraries and scripts necessary for Google Charts: -->