Chart re-implemented and added coveralls and other instructions, which will probably not work at all.

2025-10-15 16:57:09 +00:00 · 2015-02-07 08:23:44 +01:00
parent 37e58ac13a
commit fb1c78c657
13 changed files with 371 additions and 25 deletions
--- a/app/Http/Controllers/GoogleChartController.php
+++ b/app/Http/Controllers/GoogleChartController.php
@@ -0,0 +1,135 @@
+<?php namespace FireflyIII\Http\Controllers;
+
+use Auth;
+use Carbon\Carbon;
+use FireflyIII\Http\Requests;
+use FireflyIII\Models\Account;
+use FireflyIII\Models\Budget;
+use FireflyIII\Models\LimitRepetition;
+use Grumpydictator\Gchart\GChart;
+use Illuminate\Database\Query\Builder as QueryBuilder;
+use Illuminate\Http\Request;
+use Preferences;
+use Response;
+use Session;
+use Steam;
+
+/**
+ * Class GoogleChartController
+ *
+ * @package FireflyIII\Http\Controllers
+ */
+class GoogleChartController extends Controller
+{
+    /**
+     * @param GChart $chart
+     *
+     * @return \Symfony\Component\HttpFoundation\Response
+     */
+    public function allAccountsBalanceChart(GChart $chart)
+    {
+        $chart->addColumn('Day of the month', 'date');
+
+        $frontPage = Preferences::get('frontPageAccounts', []);
+        $start     = Session::get('start', Carbon::now()->startOfMonth());
+        $end       = Session::get('end', Carbon::now()->endOfMonth());
+
+        if ($frontPage->data == []) {
+            $accounts = Auth::user()->accounts()->accountTypeIn(['Default account', 'Asset account'])->get(['accounts.*']);
+        } else {
+            $accounts = Auth::user()->accounts()->whereIn('id', $frontPage->data)->get(['accounts.*']);
+        }
+        $index = 1;
+        /** @var Account $account */
+        foreach ($accounts as $account) {
+            $chart->addColumn('Balance for ' . $account->name, 'number');
+            $chart->addCertainty($index);
+            $index++;
+        }
+        $current = clone $start;
+        $current->subDay();
+        $today = Carbon::now();
+        while ($end >= $current) {
+            $row     = [clone $current];
+            $certain = $current < $today;
+            foreach ($accounts as $account) {
+                $row[] = Steam::balance($account, $current);
+                $row[] = $certain;
+            }
+            $chart->addRowArray($row);
+            $current->addDay();
+        }
+        $chart->generate();
+
+        return Response::json($chart->getData());
+
+    }
+
+
+    /**
+     * @param GChart $chart
+     *
+     * @return \Symfony\Component\HttpFoundation\Response
+     */
+    public function allBudgetsHomeChart(GChart $chart)
+    {
+        $chart->addColumn('Budget', 'string');
+        $chart->addColumn('Budgeted', 'number');
+        $chart->addColumn('Spent', 'number');
+
+        $budgets = Auth::user()->budgets()->orderBy('name', 'DESC')->get();
+        $start   = Session::get('start', Carbon::now()->startOfMonth());
+        $end     = Session::get('end', Carbon::now()->endOfMonth());
+
+        /** @var Budget $budget */
+        foreach ($budgets as $budget) {
+
+            /** @var \LimitRepetition $repetition */
+            $repetition = LimitRepetition::
+            leftJoin('budget_limits', 'limit_repetitions.budget_limit_id', '=', 'budget_limits.id')
+                                         ->where('limit_repetitions.startdate', $start->format('Y-m-d 00:00:00'))
+                                         ->where('budget_limits.budget_id', $budget->id)
+                                         ->first(['limit_repetitions.*']);
+            if (is_null($repetition)) { // use the session start and end for our search query
+                $searchStart = $start;
+                $searchEnd   = $end;
+                $limit       = 0; // the limit is zero:
+            } else {
+                // use the limit's start and end for our search query
+                $searchStart = $repetition->startdate;
+                $searchEnd   = $repetition->enddate;
+                $limit       = floatval($repetition->amount); // the limit is the repetitions limit:
+            }
+
+            $expenses = floatval($budget->transactionjournals()->before($searchEnd)->after($searchStart)->lessThan(0)->sum('amount')) * -1;
+            if ($expenses > 0) {
+                $chart->addRow($budget->name, $limit, $expenses);
+            }
+        }
+
+        $noBudgetSet = Auth::user()
+                           ->transactionjournals()
+                           ->whereNotIn(
+                               'transaction_journals.id', function (QueryBuilder $query) use ($start, $end) {
+                               $query
+                                   ->select('transaction_journals.id')
+                                   ->from('transaction_journals')
+                                   ->leftJoin('budget_transaction_journal', 'budget_transaction_journal.transaction_journal_id', '=', 'transaction_journals.id')
+                                   ->where('transaction_journals.date', '>=', $start->format('Y-m-d 00:00:00'))
+                                   ->where('transaction_journals.date', '<=', $end->format('Y-m-d 00:00:00'));
+                           }
+                           )
+                           ->before($end)
+                           ->after($start)
+                           ->lessThan(0)
+                           ->transactionTypes(['Withdrawal'])
+                           ->get();
+        $sum         = $noBudgetSet->sum('amount') * -1;
+        $chart->addRow('No budget', 0, $sum);
+        $chart->generate();
+
+        return Response::json($chart->getData());
+    }
+
+
+}
--- a/app/Http/routes.php
+++ b/app/Http/routes.php
@@ -1,6 +1,6 @@
 <?php

-/*
+/**
 * Home Controller
 */
 Route::get('/', ['uses' => 'HomeController@index', 'as' => 'index']);
@@ -8,7 +8,7 @@ Route::get('/prev', ['uses' => 'HomeController@sessionPrev', 'as' => 'sessionPre
 Route::get('/next', ['uses' => 'HomeController@sessionNext', 'as' => 'sessionNext']);
 Route::get('/jump/{range}', ['uses' => 'HomeController@rangeJump', 'as' => 'rangeJump']);

-/*
+/**
 * Account Controller
 */
 Route::get('/accounts/{what}', ['uses' => 'AccountController@index', 'as' => 'accounts.index'])->where('what', 'revenue|asset|expense');
@@ -17,10 +17,9 @@ Route::get('/accounts/create/{what}', ['uses' => 'AccountController@create', 'as
 //Route::get('/accounts/delete/{account}', ['uses' => 'AccountController@delete', 'as' => 'accounts.delete']);
 Route::get('/accounts/show/{account}/{view?}', ['uses' => 'AccountController@show', 'as' => 'accounts.show']);

-/*
+/**
 * Bills Controller
 */
-// bills controller
 Route::get('/bills', ['uses' => 'BillController@index', 'as' => 'bills.index']);
 //Route::get('/bills/rescan/{bill}', ['uses' => 'BillController@rescan', 'as' => 'bills.rescan']); # rescan for matching.
 Route::get('/bills/create', ['uses' => 'BillController@create', 'as' => 'bills.create']);
@@ -28,7 +27,7 @@ Route::get('/bills/create', ['uses' => 'BillController@create', 'as' => 'bills.c
 //Route::get('/bills/delete/{bill}', ['uses' => 'BillController@delete', 'as' => 'bills.delete']);
 //Route::get('/bills/show/{bill}', ['uses' => 'BillController@show', 'as' => 'bills.show']);

-/*
+/**
 * Budget Controller
 */
 Route::get('/budgets', ['uses' => 'BudgetController@index', 'as' => 'budgets.index']);
@@ -39,7 +38,7 @@ Route::get('/budgets', ['uses' => 'BudgetController@index', 'as' => 'budgets.ind
 //Route::get('/budgets/show/{budget}/{limitrepetition?}', ['uses' => 'BudgetController@show', 'as' => 'budgets.show']);
 //Route::get('/budgets/list/noBudget', ['uses' => 'BudgetController@noBudget', 'as' => 'budgets.noBudget']);

-/*
+/**
 * Category Controller
 */
 Route::get('/categories', ['uses' => 'CategoryController@index', 'as' => 'categories.index']);
@@ -49,7 +48,7 @@ Route::get('/categories', ['uses' => 'CategoryController@index', 'as' => 'catego
 //Route::get('/categories/show/{category}', ['uses' => 'CategoryController@show', 'as' => 'categories.show']);
 //Route::get('/categories/list/noCategory', ['uses' => 'CategoryController@noCategory', 'as' => 'categories.noCategory']);

-/*
+/**
 * Currency Controller
 */
 Route::get('/currency', ['uses' => 'CurrencyController@index', 'as' => 'currency.index']);
@@ -58,7 +57,20 @@ Route::get('/currency', ['uses' => 'CurrencyController@index', 'as' => 'currency
 //Route::get('/currency/delete/{currency}', ['uses' => 'CurrencyController@delete', 'as' => 'currency.delete']);
 //Route::get('/currency/default/{currency}', ['uses' => 'CurrencyController@defaultCurrency', 'as' => 'currency.default']);

-/*
+/**
+ * Google Chart Controller
+ */
+Route::get('/chart/home/account', ['uses' => 'GoogleChartController@allAccountsBalanceChart']);
+Route::get('/chart/home/budgets', ['uses' => 'GoogleChartController@allBudgetsHomeChart']);
+//Route::get('/chart/home/categories', ['uses' => 'GoogleChartController@allCategoriesHomeChart']);
+//Route::get('/chart/home/bills', ['uses' => 'GoogleChartController@billsOverview']);
+//Route::get('/chart/account/{account}/{view?}', ['uses' => 'GoogleChartController@accountBalanceChart']);
+//Route::get('/chart/reports/income-expenses/{year}', ['uses' => 'GoogleChartController@yearInExp']);
+//Route::get('/chart/reports/income-expenses-sum/{year}', ['uses' => 'GoogleChartController@yearInExpSum']);
+//Route::get('/chart/bills/{bill}', ['uses' => 'GoogleChartController@billOverview']);
+
+
+/**
 * Piggy Bank Controller
 */
 // piggy bank controller
@@ -70,28 +82,27 @@ Route::get('/piggy_banks', ['uses' => 'PiggyBankController@index', 'as' => 'pigg
 //Route::get('/piggy_banks/delete/{piggyBank}', ['uses' => 'PiggyBankController@delete', 'as' => 'piggy_banks.delete']);
 //Route::get('/piggy_banks/show/{piggyBank}', ['uses' => 'PiggyBankController@show', 'as' => 'piggy_banks.show']);

-/*
+/**
 * Preferences Controller
 */
 Route::get('/preferences', ['uses' => 'PreferencesController@index', 'as' => 'preferences']);

-/*
+/**
 * Profile Controller
 */
 Route::get('/profile', ['uses' => 'ProfileController@index', 'as' => 'profile']);
 //Route::get('/profile/change-password', ['uses' => 'ProfileController@changePassword', 'as' => 'change-password']);

-/*
+/**
 * Repeated Expenses Controller
 */
-// repeated expenses controller:
 Route::get('/repeatedexpenses', ['uses' => 'RepeatedExpenseController@index', 'as' => 'repeated.index']);
 //Route::get('/repeatedexpenses/create', ['uses' => 'RepeatedExpenseController@create', 'as' => 'repeated.create']);
 //Route::get('/repeatedexpenses/edit/{repeatedExpense}', ['uses' => 'RepeatedExpenseController@edit', 'as' => 'repeated.edit']);
 //Route::get('/repeatedexpenses/delete/{repeatedExpense}', ['uses' => 'RepeatedExpenseController@delete', 'as' => 'repeated.delete']);
 //Route::get('/repeatedexpenses/show/{repeatedExpense}', ['uses' => 'RepeatedExpenseController@show', 'as' => 'repeated.show']);

-/*
+/**
 * Report Controller
 */
 Route::get('/reports', ['uses' => 'ReportController@index', 'as' => 'reports.index']);
@@ -99,15 +110,14 @@ Route::get('/reports', ['uses' => 'ReportController@index', 'as' => 'reports.ind
 //Route::get('/reports/{year}/{month}', ['uses' => 'ReportController@month', 'as' => 'reports.month']);
 //Route::get('/reports/budget/{year}/{month}', ['uses' => 'ReportController@budget', 'as' => 'reports.budget']);

-/*
+/**
 * Search Controller
 */
 Route::get('/search', ['uses' => 'SearchController@index', 'as' => 'search']);

-/*
+/**
 * Transaction Controller
 */
-// transaction controller:
 Route::get('/transactions/{what}', ['uses' => 'TransactionController@index', 'as' => 'transactions.index'])->where(
    ['what' => 'expenses|revenue|withdrawal|deposit|transfer|transfers']
 );
@@ -123,7 +133,7 @@ Route::get('/transaction/show/{tj}', ['uses' => 'TransactionController@show', 'a
 //Route::post('/transactions/doRelate', ['uses' => 'TransactionController@doRelate', 'as' => 'transactions.doRelate']);
 //Route::any('/transactions/unrelate/{tj}', ['uses' => 'TransactionController@unrelate', 'as' => 'transactions.unrelate']);

-/*
+/**
 * User Controller
 * TODO move to AuthController
 */