Merge branch 'feature/google-charts' into develop

Conflicts:
	app/views/accounts/show.blade.php

app/config/app.php

@@ -43,7 +43,7 @@ return [
         'Firefly\Helper\HelperServiceProvider',
         'Firefly\Validation\ValidationServiceProvider',
         'DaveJamesMiller\Breadcrumbs\ServiceProvider',
-        'TwigBridge\ServiceProvider'
+        'Grumpydictator\Gchart\GchartServiceProvider',
     ],
     'manifest'        => storage_path() . '/meta',
     'aliases'         => [

app/controllers/GoogleChartController.php

@@ -0,0 +1,421 @@
+<?php
+use Carbon\Carbon;
+
+/**
+ * Class GoogleChartController
+ */
+class GoogleChartController extends BaseController
+{
+
+    /**
+     * This method renders the b
+     */
+    public function allAccountsBalanceChart()
+    {
+        /** @var \Grumpydictator\Gchart\GChart $chart */
+        $chart = App::make('gchart');
+        $chart->addColumn('Day of the month', 'date');
+
+        /** @var \FireflyIII\Shared\Preferences\Preferences $preferences */
+        $preferences = App::make('FireflyIII\Shared\Preferences\Preferences');
+        $pref        = $preferences->get('frontpageAccounts');
+
+        /** @var \FireflyIII\Database\Account $acct */
+        $acct     = App::make('FireflyIII\Database\Account');
+        $accounts = $acct->getByIds($pref->data);
+
+
+        /*
+         * Add a column for each account.
+         */
+        /** @var Account $account */
+        foreach ($accounts as $account) {
+            $chart->addColumn('Balance for ' . $account->name, 'number');
+        }
+        /*
+         * Loop the date, then loop the accounts, then add balance.
+         */
+        $start   = Session::get('start');
+        $end     = Session::get('end');
+        $current = clone $start;
+
+        while ($end >= $current) {
+            $row = [clone $current];
+
+            foreach ($accounts as $account) {
+                if ($current > Carbon::now()) {
+                    $row[] = null;
+                } else {
+                    $row[] = $account->balance($current);
+                }
+
+            }
+
+            $chart->addRowArray($row);
+            $current->addDay();
+        }
+
+        $chart->generate();
+        return Response::json($chart->getData());
+
+    }
+
+    /**
+     * @return \Illuminate\Http\JsonResponse
+     */
+    public function allBudgetsHomeChart()
+    {
+        /** @var \Grumpydictator\Gchart\GChart $chart */
+        $chart = App::make('gchart');
+        $chart->addColumn('Budget', 'string');
+        $chart->addColumn('Budgeted', 'number');
+        $chart->addColumn('Spent', 'number');
+
+        /** @var \FireflyIII\Database\Budget $bdt */
+        $bdt     = App::make('FireflyIII\Database\Budget');
+        $budgets = $bdt->get();
+
+        /*
+         * Loop budgets:
+         */
+        /** @var Budget $budget */
+        foreach ($budgets as $budget) {
+
+            /*
+             * Is there a repetition starting on this particular date? We can use that.
+             */
+            /** @var \LimitRepetition $repetition */
+            $repetition = $bdt->repetitionOnStartingOnDate($budget, Session::get('start'));
+
+            /*
+             * If there is, use it. Otherwise, forget it.
+             */
+            if (is_null($repetition)) {
+                // use the session start and end for our search query
+                $searchStart = Session::get('start');
+                $searchEnd   = Session::get('end');
+                // the limit is zero:
+                $limit = 0;
+
+            } else {
+                // use the limit's start and end for our search query
+                $searchStart = $repetition->startdate;
+                $searchEnd   = $repetition->enddate;
+                // the limit is the repetitions limit:
+                $limit = floatval($repetition->amount);
+            }
+
+            /*
+             * No matter the result of the search for the repetition, get all the transactions associated
+             * with the budget, and sum up the expenses made.
+             */
+            $expenses = floatval($budget->transactionjournals()->before($searchEnd)->after($searchStart)->lessThan(0)->sum('amount')) * -1;
+            if ($expenses > 0) {
+                $chart->addRow($budget->name, $limit, $expenses);
+            }
+        }
+
+        /*
+         * Finally, get all transactions WITHOUT a budget and add those as well.
+         * (yes this method is oddly specific).
+         */
+        $noBudgetSet = $bdt->transactionsWithoutBudgetInDateRange(Session::get('start'), Session::get('end'));
+        $sum         = $noBudgetSet->sum('amount') * -1;
+        $chart->addRow('No budget', 0, $sum);
+
+
+        $chart->generate();
+        return Response::json($chart->getData());
+    }
+
+    /**
+     * @return \Illuminate\Http\JsonResponse
+     */
+    public function allCategoriesHomeChart()
+    {
+        $data = [];
+
+        /** @var \Grumpydictator\Gchart\GChart $chart */
+        $chart = App::make('gchart');
+        $chart->addColumn('Category', 'string');
+        $chart->addColumn('Spent', 'number');
+
+        /** @var \FireflyIII\Database\TransactionJournal $tj */
+        $tj = App::make('FireflyIII\Database\TransactionJournal');
+
+        /*
+         * Get the journals:
+         */
+        $journals = $tj->getInDateRange(Session::get('start'), Session::get('end'));
+
+        /** @var \TransactionJournal $journal */
+        foreach ($journals as $journal) {
+            if ($journal->transactionType->type == 'Withdrawal') {
+                $amount   = floatval($journal->transactions[1]->amount);
+                $amount   = $amount < 0 ? $amount * -1 : $amount;
+                $category = $journal->categories()->first();
+                if (!is_null($category)) {
+                    if (isset($data[$category->name])) {
+                        $data[$category->name] += $amount;
+                    } else {
+                        $data[$category->name] = $amount;
+                    }
+                }
+            }
+        }
+        arsort($data);
+        foreach ($data as $key => $entry) {
+            $chart->addRow($key, $entry);
+        }
+
+
+        $chart->generate();
+        return Response::json($chart->getData());
+
+    }
+
+    /**
+     * @return \Illuminate\Http\JsonResponse
+     * @throws \Firefly\Exception\FireflyException
+     */
+    public function recurringTransactionsOverview()
+    {
+
+        /*
+         * Set of paid transaction journals.
+         * Set of unpaid recurring transactions.
+         */
+        $paid   = [
+            'items'  => [],
+            'amount' => 0
+        ];
+        $unpaid = [
+            'items'  => [],
+            'amount' => 0
+        ];
+
+        /** @var \Grumpydictator\Gchart\GChart $chart */
+        $chart = App::make('gchart');
+        $chart->addColumn('Name', 'string');
+        $chart->addColumn('Amount', 'number');
+
+        /** @var \FireflyIII\Database\Recurring $rcr */
+        $rcr = App::make('FireflyIII\Database\Recurring');
+
+        /** @var \FireflyIII\Shared\Toolkit\Date $dateKit */
+        $dateKit = App::make('FireflyIII\Shared\Toolkit\Date');
+
+        $recurring = $rcr->get();
+
+        /** @var \RecurringTransaction $entry */
+        foreach ($recurring as $entry) {
+            /*
+             * Start another loop starting at the $date.
+             */
+            $start = clone $entry->date;
+            $end   = Carbon::now();
+
+            /*
+             * The jump we make depends on the $repeat_freq
+             */
+            $current = clone $start;
+
+            while ($current <= $end) {
+                /*
+                 * Get end of period for $current:
+                 */
+                $currentEnd = clone $current;
+                $dateKit->endOfPeriod($currentEnd, $entry->repeat_freq);
+
+                /*
+                 * In the current session range?
+                 */
+                if (\Session::get('end') >= $current and $currentEnd >= \Session::get('start')) {
+                    /*
+                     * Lets see if we've already spent money on this recurring transaction (it hath recurred).
+                     */
+                    /** @var TransactionJournal $set */
+                    $journal = $rcr->getJournalForRecurringInRange($entry, $current, $currentEnd);
+
+                    if (is_null($journal)) {
+                        $unpaid['items'][] = $entry->name;
+                        $unpaid['amount'] += (($entry->amount_max + $entry->amount_min) / 2);
+                    } else {
+                        $amount          = floatval($journal->transactions[0]->amount);
+                        $amount          = $amount < 0 ? $amount * -1 : $amount;
+                        $paid['items'][] = $journal->description;
+                        $paid['amount'] += $amount;
+                    }
+                }
+
+                /*
+                 * Add some time for the next loop!
+                 */
+                $dateKit->addPeriod($current, $entry->repeat_freq, intval($entry->skip));
+
+            }
+
+        }
+        /** @var \RecurringTransaction $entry */
+        $chart->addRow('Unpaid: ' . join(', ', $unpaid['items']), $unpaid['amount']);
+        $chart->addRow('Paid: ' . join(', ', $paid['items']), $paid['amount']);
+
+        $chart->generate();
+        return Response::json($chart->getData());
+
+    }
+
+    /**
+     * @param Account $account
+     */
+    public function accountBalanceChart(Account $account)
+    {
+        /** @var \Grumpydictator\Gchart\GChart $chart */
+        $chart = App::make('gchart');
+        $chart->addColumn('Day of month', 'date');
+        $chart->addColumn('Balance for ' . $account->name, 'number');
+
+        /*
+         * Loop the date, then loop the accounts, then add balance.
+         */
+        $start   = Session::get('start');
+        $end     = Session::get('end');
+        $current = clone $start;
+
+        while ($end >= $current) {
+            $row = [clone $current];
+            if ($current > Carbon::now()) {
+                $row[] = null;
+            } else {
+                $row[] = $account->balance($current);
+            }
+
+            $chart->addRowArray($row);
+            $current->addDay();
+        }
+
+
+        $chart->generate();
+        return Response::json($chart->getData());
+    }
+
+    /**
+     * @param Account $account
+     *
+     * @return \Illuminate\Http\JsonResponse
+     */
+    public function accountSankeyOutChart(Account $account)
+    {
+        // collect all relevant entries.
+        $set = [];
+
+        /** @var \Grumpydictator\Gchart\GChart $chart */
+        $chart = App::make('gchart');
+        $chart->addColumn('From', 'string');
+        $chart->addColumn('To', 'string', 'domain');
+        $chart->addColumn('Weight', 'number');
+
+        $transactions = $account->transactions()->with(
+            ['transactionjournal', 'transactionjournal.transactions', 'transactionjournal.budgets', 'transactionjournal.transactiontype',
+             'transactionjournal.categories']
+        )->before(Session::get('end'))->after(
+            Session::get('start')
+        )->get();
+
+        /** @var Transaction $transaction */
+        foreach ($transactions as $transaction) {
+            $amount = floatval($transaction->amount);
+            $type   = $transaction->transactionJournal->transactionType->type;
+
+            if ($amount < 0 && $type != 'Transfer') {
+
+                // from account to a budget (if present).
+                $budgetName = isset($transaction->transactionJournal->budgets[0]) ? $transaction->transactionJournal->budgets[0]->name : '(no budget)';
+                $set[]      = [$account->name, $budgetName, $amount * -1];
+
+                // from budget to category.
+                $categoryName = isset($transaction->transactionJournal->categories[0]) ? ' ' . $transaction->transactionJournal->categories[0]->name
+                    : '(no cat)';
+                $set[]        = [$budgetName, $categoryName, $amount * -1];
+            }
+        }
+        // loop the set, group everything together:
+        $grouped = [];
+        foreach ($set as $entry) {
+            $key = $entry[0] . $entry[1];
+            if (isset($grouped[$key])) {
+                $grouped[$key][2] += $entry[2];
+            } else {
+                $grouped[$key] = $entry;
+            }
+        }
+
+        // add rows to the chart:
+        foreach ($grouped as $entry) {
+            $chart->addRow($entry[0], $entry[1], $entry[2]);
+        }
+
+        $chart->generate();
+        return Response::json($chart->getData());
+
+    }
+
+    /**
+     * @param Account $account
+     *
+     * @return \Illuminate\Http\JsonResponse
+     */
+    public function accountSankeyInChart(Account $account)
+    {
+        // collect all relevant entries.
+        $set = [];
+
+        /** @var \Grumpydictator\Gchart\GChart $chart */
+        $chart = App::make('gchart');
+        $chart->addColumn('From', 'string');
+        $chart->addColumn('To', 'string', 'domain');
+        $chart->addColumn('Weight', 'number');
+
+        $transactions = $account->transactions()->with(
+            ['transactionjournal', 'transactionjournal.transactions' => function ($q) {
+                $q->where('amount', '<', 0);
+            }, 'transactionjournal.budgets', 'transactionjournal.transactiontype', 'transactionjournal.categories']
+        )->before(Session::get('end'))->after(
+            Session::get('start')
+        )->get();
+
+        /** @var Transaction $transaction */
+        foreach ($transactions as $transaction) {
+            $amount = floatval($transaction->amount);
+            $type   = $transaction->transactionJournal->transactionType->type;
+
+            if ($amount > 0 && $type != 'Transfer') {
+
+                $otherAccount = $transaction->transactionJournal->transactions[0]->account->name;
+                $categoryName = isset($transaction->transactionJournal->categories[0]) ? $transaction->transactionJournal->categories[0]->name
+                    : '(no cat)';
+                $set[]        = [$otherAccount, $categoryName, $amount];
+                $set[]        = [$categoryName, $account->name, $amount];
+            }
+        }
+        // loop the set, group everything together:
+        $grouped = [];
+        foreach ($set as $entry) {
+            $key = $entry[0] . $entry[1];
+            if (isset($grouped[$key])) {
+                $grouped[$key][2] += $entry[2];
+            } else {
+                $grouped[$key] = $entry;
+            }
+        }
+
+        // add rows to the chart:
+        foreach ($grouped as $entry) {
+            $chart->addRow($entry[0], $entry[1], $entry[2]);
+        }
+
+        $chart->generate();
+        return Response::json($chart->getData());
+
+    }
+} 

app/controllers/GoogleTableController.php

@@ -0,0 +1,110 @@
+<?php
+use Carbon\Carbon;
+
+/**
+ * Class GoogleTableController
+ */
+class GoogleTableController extends BaseController
+{
+    /**
+     * @param Account $account
+     */
+    public function transactionsByAccount(Account $account)
+    {
+        $chart = App::make('gchart');
+        $chart->addColumn('ID', 'number');
+        $chart->addColumn('ID_Edit', 'string');
+        $chart->addColumn('ID_Delete', 'string');
+        $chart->addColumn('Date', 'date');
+        $chart->addColumn('Description_URL', 'string');
+        $chart->addColumn('Description', 'string');
+        $chart->addColumn('Amount', 'number');
+        $chart->addColumn('From_URL', 'string');
+        $chart->addColumn('From', 'string');
+        $chart->addColumn('To_URL', 'string');
+        $chart->addColumn('To', 'string');
+        $chart->addColumn('Budget_URL', 'string');
+        $chart->addColumn('Budget', 'string');
+        $chart->addColumn('Category_URL', 'string');
+        $chart->addColumn('Category', 'string');
+
+        /*
+         * Find transactions:
+         */
+        $accountID    = $account->id;
+        $transactions = $account->transactions()->with(
+            ['transactionjournal', 'transactionjournal.transactions' => function ($q) use ($accountID) {
+                $q->where('account_id', '!=', $accountID);
+            }, 'transactionjournal.budgets', 'transactionjournal.transactiontype',
+             'transactionjournal.categories']
+        )->before(Session::get('end'))->after(
+            Session::get('start')
+        )->orderBy('date', 'DESC')->get();
+
+        /** @var Transaction $transaction */
+        foreach ($transactions as $transaction) {
+            $date           = $transaction->transactionJournal->date;
+            $descriptionURL = route('transactions.show', $transaction->transaction_journal_id);
+            $description    = $transaction->transactionJournal->description;
+            $amount         = floatval($transaction->amount);
+
+            if ($transaction->transactionJournal->transactions[0]->account->id == $account->id) {
+                $opposingAccountURI  = route('accounts.show', $transaction->transactionJournal->transactions[1]->account->id);
+                $opposingAccountName = $transaction->transactionJournal->transactions[1]->account->name;
+            } else {
+                $opposingAccountURI  = route('accounts.show', $transaction->transactionJournal->transactions[0]->account->id);
+                $opposingAccountName = $transaction->transactionJournal->transactions[0]->account->name;
+            }
+            if (isset($transaction->transactionJournal->budgets[0])) {
+                $budgetURL = route('budgets.show', $transaction->transactionJournal->budgets[0]->id);
+                $budget    = $transaction->transactionJournal->budgets[0]->name;
+            } else {
+                $budgetURL = '';
+                $budget    = '';
+            }
+
+            if (isset($transaction->transactionJournal->categories[0])) {
+                $categoryURL = route('categories.show', $transaction->transactionJournal->categories[0]->id);
+                $category    = $transaction->transactionJournal->categories[0]->name;
+            } else {
+                $budgetURL = '';
+                $budget    = '';
+            }
+
+
+            if ($amount < 0) {
+                $from    = $account->name;
+                $fromURL = route('accounts.show', $account->id);
+
+                $to    = $opposingAccountName;
+                $toURL = $opposingAccountURI;
+            } else {
+                $to    = $account->name;
+                $toURL = route('accounts.show', $account->id);
+
+                $from    = $opposingAccountName;
+                $fromURL = $opposingAccountURI;
+            }
+
+            $budcat = 'Budcat';
+            $id     = $transaction->transactionJournal->id;
+            $edit   = route('transactions.edit', $transaction->transactionJournal->id);
+            $delete = route('transactions.delete', $transaction->transactionJournal->id);
+            $chart->addRow(
+                $id, $edit, $delete, $date, $descriptionURL, $description, $amount, $fromURL, $from, $toURL, $to, $budgetURL, $budget, $categoryURL, $category
+            );
+        }
+
+//        <th>Date</th>
+//        <th>Description</th>
+//        <th>Amount (&euro;)</th>
+//        <th>From</th>
+//        <th>To</th>
+//        <th>Budget / category</th>
+//        <th>ID</th>
+
+
+        $chart->generate();
+        return Response::json($chart->getData());
+    }
+} 

app/lib/FireflyIII/Database/Account.php

@@ -16,6 +16,9 @@ class Account implements CUD, CommonDatabaseCalls, AccountInterface
 {
     use SwitchUser;
 
+    /**
+     *
+     */
     public function __construct()
     {
         $this->setUser(\Auth::user());
@@ -423,4 +426,14 @@ class Account implements CUD, CommonDatabaseCalls, AccountInterface
     {
         // TODO: Implement findByWhat() method.
     }
+
+    /**
+     * @param array $ids
+     *
+     * @return Collection
+     */
+    public function getByIds(array $ids)
+    {
+        return $this->getUser()->accounts()->whereIn('id', $ids)->get();
+    }
 }

app/lib/FireflyIII/Database/Budget.php

@@ -0,0 +1,155 @@
+<?php
+namespace FireflyIII\Database;
+
+use Carbon\Carbon;
+use Illuminate\Support\MessageBag;
+use LaravelBook\Ardent\Ardent;
+use Illuminate\Support\Collection;
+
+/**
+ * Class Budget
+ *
+ * @package FireflyIII\Database
+ */
+class Budget implements CUD, CommonDatabaseCalls, BudgetInterface
+{
+    use SwitchUser;
+
+    /**
+     *
+     */
+    public function __construct()
+    {
+        $this->setUser(\Auth::user());
+    }
+
+    /**
+     * @param \Budget $budget
+     * @param Carbon  $date
+     *
+     * @return \LimitRepetition|null
+     */
+    public function repetitionOnStartingOnDate(\Budget $budget, Carbon $date)
+    {
+        return \LimitRepetition::
+        leftJoin('limits', 'limit_repetitions.limit_id', '=', 'limits.id')->leftJoin(
+            'components', 'limits.component_id', '=', 'components.id'
+        )->where('limit_repetitions.startdate', $date->format('Y-m-d'))->where(
+            'components.id', $budget->id
+        )->first(['limit_repetitions.*']);
+    }
+
+    /**
+     * @param Ardent $model
+     *
+     * @return bool
+     */
+    public function destroy(Ardent $model)
+    {
+        // TODO: Implement destroy() method.
+    }
+
+    /**
+     * Validates a model. Returns an array containing MessageBags
+     * errors/warnings/successes.
+     *
+     * @param Ardent $model
+     *
+     * @return array
+     */
+    public function validateObject(Ardent $model)
+    {
+        // TODO: Implement validateObject() method.
+    }
+
+    /**
+     * Validates an array. Returns an array containing MessageBags
+     * errors/warnings/successes.
+     *
+     * @param array $model
+     *
+     * @return array
+     */
+    public function validate(array $model)
+    {
+        // TODO: Implement validate() method.
+    }
+
+    /**
+     * @param array $data
+     *
+     * @return Ardent
+     */
+    public function store(array $data)
+    {
+        // TODO: Implement store() method.
+    }
+
+    /**
+     * Returns an object with id $id.
+     *
+     * @param int $id
+     *
+     * @return Ardent
+     */
+    public function find($id)
+    {
+        // TODO: Implement find() method.
+    }
+
+    /**
+     * Returns all objects.
+     *
+     * @return Collection
+     */
+    public function get()
+    {
+        return $this->getUser()->budgets()->get();
+    }
+
+    /**
+     * @param array $ids
+     *
+     * @return Collection
+     */
+    public function getByIds(array $ids)
+    {
+        // TODO: Implement getByIds() method.
+    }
+
+    /**
+     * Finds an account type using one of the "$what"'s: expense, asset, revenue, opening, etc.
+     *
+     * @param $what
+     *
+     * @return \AccountType|null
+     */
+    public function findByWhat($what)
+    {
+        // TODO: Implement findByWhat() method.
+    }
+
+    /**
+     * @param Carbon $start
+     * @param Carbon $end
+     *
+     * @return Collection
+     */
+    public function transactionsWithoutBudgetInDateRange(Carbon $start, Carbon $end)
+    {
+        // Add expenses that have no budget:
+        return \Auth::user()->transactionjournals()->whereNotIn(
+            'transaction_journals.id', function ($query) use ($start, $end) {
+                $query->select('transaction_journals.id')->from('transaction_journals')
+                      ->leftJoin(
+                          'component_transaction_journal', 'component_transaction_journal.transaction_journal_id', '=',
+                          'transaction_journals.id'
+                      )
+                      ->leftJoin('components', 'components.id', '=', 'component_transaction_journal.component_id')
+                      ->where('transaction_journals.date', '>=', $start->format('Y-m-d'))
+                      ->where('transaction_journals.date', '<=', $end->format('Y-m-d'))
+                      ->where('components.class', 'Budget');
+            }
+        )->before($end)->after($start)->lessThan(0)->transactionTypes(['Withdrawal'])->get();
+    }
+}

app/lib/FireflyIII/Database/BudgetInterface.php

@@ -0,0 +1,31 @@
+<?php
+
+namespace FireflyIII\Database;
+
+use Carbon\Carbon;
+use Illuminate\Support\Collection;
+
+/**
+ * Interface BudgetInterface
+ *
+ * @package FireflyIII\Database
+ */
+interface BudgetInterface
+{
+    /**
+     * @param \Budget $budget
+     * @param Carbon $date
+     *
+     * @return \LimitRepetition|null
+     */
+    public function repetitionOnStartingOnDate(\Budget $budget, Carbon $date);
+
+    /**
+     * @param Carbon $start
+     * @param Carbon $end
+     *
+     * @return Collection
+     */
+    public function transactionsWithoutBudgetInDateRange(Carbon $start, Carbon $end);
+
+} 

app/lib/FireflyIII/Database/Category.php

@@ -0,0 +1,115 @@
+<?php
+namespace FireflyIII\Database;
+
+use Carbon\Carbon;
+use Illuminate\Support\MessageBag;
+use LaravelBook\Ardent\Ardent;
+use Illuminate\Support\Collection;
+
+/**
+ * Class Category
+ *
+ * @package FireflyIII\Database
+ */
+class Category implements CUD, CommonDatabaseCalls, CategoryInterface
+{
+    use SwitchUser;
+
+    /**
+     *
+     */
+    public function __construct()
+    {
+        $this->setUser(\Auth::user());
+    }
+
+    /**
+     * @param Ardent $model
+     *
+     * @return bool
+     */
+    public function destroy(Ardent $model)
+    {
+        // TODO: Implement destroy() method.
+    }
+
+    /**
+     * Validates a model. Returns an array containing MessageBags
+     * errors/warnings/successes.
+     *
+     * @param Ardent $model
+     *
+     * @return array
+     */
+    public function validateObject(Ardent $model)
+    {
+        // TODO: Implement validateObject() method.
+    }
+
+    /**
+     * Validates an array. Returns an array containing MessageBags
+     * errors/warnings/successes.
+     *
+     * @param array $model
+     *
+     * @return array
+     */
+    public function validate(array $model)
+    {
+        // TODO: Implement validate() method.
+    }
+
+    /**
+     * @param array $data
+     *
+     * @return Ardent
+     */
+    public function store(array $data)
+    {
+        // TODO: Implement store() method.
+    }
+
+    /**
+     * Returns an object with id $id.
+     *
+     * @param int $id
+     *
+     * @return Ardent
+     */
+    public function find($id)
+    {
+        // TODO: Implement find() method.
+    }
+
+    /**
+     * Returns all objects.
+     *
+     * @return Collection
+     */
+    public function get()
+    {
+        // TODO: Implement get() method.
+    }
+
+    /**
+     * @param array $ids
+     *
+     * @return Collection
+     */
+    public function getByIds(array $ids)
+    {
+        // TODO: Implement getByIds() method.
+    }
+
+    /**
+     * Finds an account type using one of the "$what"'s: expense, asset, revenue, opening, etc.
+     *
+     * @param $what
+     *
+     * @return \AccountType|null
+     */
+    public function findByWhat($what)
+    {
+        // TODO: Implement findByWhat() method.
+    }
+}

app/lib/FireflyIII/Database/CategoryInterface.php

@@ -0,0 +1,16 @@
+<?php
+
+namespace FireflyIII\Database;
+
+use Carbon\Carbon;
+use Illuminate\Support\Collection;
+
+/**
+ * Interface CategoryInterface
+ *
+ * @package FireflyIII\Database
+ */
+interface CategoryInterface
+{
+
+} 

app/lib/FireflyIII/Database/CommonDatabaseCalls.php

@@ -35,6 +35,14 @@ interface CommonDatabaseCalls
      */
     public function get();
 
+
+    /**
+     * @param array $ids
+     *
+     * @return Collection
+     */
+    public function getByIds(array $ids);
+
     /**
      * Finds an account type using one of the "$what"'s: expense, asset, revenue, opening, etc.
      *

app/lib/FireflyIII/Database/Recurring.php

@@ -0,0 +1,129 @@
+<?php
+
+namespace FireflyIII\Database;
+
+
+use Carbon\Carbon;
+use Illuminate\Support\Collection;
+use LaravelBook\Ardent\Ardent;
+
+/**
+ * Class Recurring
+ *
+ * @package FireflyIII\Database
+ */
+class Recurring implements CUD, CommonDatabaseCalls, RecurringInterface
+{
+    use SwitchUser;
+
+    /**
+     *
+     */
+    public function __construct()
+    {
+        $this->setUser(\Auth::user());
+    }
+
+    /**
+     * @param \RecurringTransaction $recurring
+     * @param Carbon                $current
+     * @param Carbon                $currentEnd
+     *
+     * @return \TransactionJournal|null
+     */
+    public function getJournalForRecurringInRange(\RecurringTransaction $recurring, Carbon $start, Carbon $end)
+    {
+        return $this->getUser()->transactionjournals()->where('recurring_transaction_id', $recurring->id)->after($start)->before($end)->first();
+
+    }
+
+    /**
+     * @param Ardent $model
+     *
+     * @return bool
+     */
+    public function destroy(Ardent $model)
+    {
+        // TODO: Implement destroy() method.
+    }
+
+    /**
+     * Validates a model. Returns an array containing MessageBags
+     * errors/warnings/successes.
+     *
+     * @param Ardent $model
+     *
+     * @return array
+     */
+    public function validateObject(Ardent $model)
+    {
+        // TODO: Implement validateObject() method.
+    }
+
+    /**
+     * Validates an array. Returns an array containing MessageBags
+     * errors/warnings/successes.
+     *
+     * @param array $model
+     *
+     * @return array
+     */
+    public function validate(array $model)
+    {
+        // TODO: Implement validate() method.
+    }
+
+    /**
+     * @param array $data
+     *
+     * @return Ardent
+     */
+    public function store(array $data)
+    {
+        // TODO: Implement store() method.
+    }
+
+    /**
+     * Returns an object with id $id.
+     *
+     * @param int $id
+     *
+     * @return Ardent
+     */
+    public function find($id)
+    {
+        // TODO: Implement find() method.
+    }
+
+    /**
+     * Returns all objects.
+     *
+     * @return Collection
+     */
+    public function get()
+    {
+        return $this->getUser()->recurringtransactions()->get();
+    }
+
+    /**
+     * @param array $ids
+     *
+     * @return Collection
+     */
+    public function getByIds(array $ids)
+    {
+        // TODO: Implement getByIds() method.
+    }
+
+    /**
+     * Finds an account type using one of the "$what"'s: expense, asset, revenue, opening, etc.
+     *
+     * @param $what
+     *
+     * @return \AccountType|null
+     */
+    public function findByWhat($what)
+    {
+        // TODO: Implement findByWhat() method.
+    }
+}

app/lib/FireflyIII/Database/RecurringInterface.php

@@ -0,0 +1,22 @@
+<?php
+
+namespace FireflyIII\Database;
+use Carbon\Carbon;
+
+/**
+ * Interface RecurringInterface
+ *
+ * @package FireflyIII\Database
+ */
+interface RecurringInterface
+{
+    /**
+     * @param \RecurringTransaction $recurring
+     * @param Carbon                $current
+     * @param Carbon                $currentEnd
+     *
+     * @return \TransactionJournal|null
+     */
+    public function getJournalForRecurringInRange(\RecurringTransaction $recurring, Carbon $start, Carbon $end);
+
+} 

app/lib/FireflyIII/Database/TransactionJournal.php

@@ -33,6 +33,17 @@ class TransactionJournal implements TransactionJournalInterface, CUD, CommonData
         $this->setUser(\Auth::user());
     }
 
+    /**
+     * @param Carbon $start
+     * @param Carbon $end
+     *
+     * @return Collection
+     */
+    public function getInDateRange(Carbon $start, Carbon $end)
+    {
+        return $this->getuser()->transactionjournals()->withRelevantData()->before($end)->after($start)->get();
+    }
+
 
     /**
      * @param Ardent $model
@@ -250,4 +261,14 @@ class TransactionJournal implements TransactionJournalInterface, CUD, CommonData
     {
         // TODO: Implement findByWhat() method.
     }
+
+    /**
+     * @param array $ids
+     *
+     * @return Collection
+     */
+    public function getByIds(array $ids)
+    {
+        // TODO: Implement getByIds() method.
+    }
 }

app/lib/FireflyIII/Database/TransactionJournalInterface.php

@@ -7,6 +7,8 @@
  */
 
 namespace FireflyIII\Database;
+use Carbon\Carbon;
+use Illuminate\Support\Collection;
 
 /**
  * Interface TransactionJournalInterface
@@ -15,5 +17,12 @@ namespace FireflyIII\Database;
  */
 interface TransactionJournalInterface
 {
+    /**
+     * @param Carbon $start
+     * @param Carbon $end
+     *
+     * @return Collection
+     */
+    public function getInDateRange(Carbon $start, Carbon $end);
 
 } 

app/lib/FireflyIII/Shared/Preferences/Preferences.php

@@ -0,0 +1,58 @@
+<?php
+namespace FireflyIII\Shared\Preferences;
+/**
+ * Class PreferencesHelper
+ *
+ * @package Firefly\Helper\Preferences
+ */
+class Preferences implements PreferencesInterface
+{
+
+    /**
+     * @param      $name
+     * @param null $default
+     *
+     * @return null|\Preference
+     */
+    public function get($name, $default = null)
+    {
+        $pref = \Preference::where('user_id', \Auth::user()->id)->where('name', $name)->first();
+        if (is_null($default) && is_null($pref)) {
+            // return NULL
+            return null;
+        }
+        if (!is_null($pref)) {
+            return $pref;
+        }
+        if (!is_null($default) && is_null($pref)) {
+            // create preference, return that:
+            return $this->set($name, $default);
+        }
+
+        return null;
+
+    }
+
+    /**
+     * @param $name
+     * @param $value
+     *
+     * @return \Preference
+     */
+    public function set($name, $value)
+    {
+        $pref = \Preference::where('user_id', \Auth::user()->id)->where('name', $name)->first();
+        if (is_null($pref)) {
+            $pref       = new \Preference;
+            $pref->name = $name;
+            $pref->user()->associate(\Auth::user());
+
+        }
+        $pref->data = $value;
+        $pref->save();
+
+
+        return $pref;
+
+    }
+}

app/lib/FireflyIII/Shared/Preferences/PreferencesInterface.php

@@ -0,0 +1,29 @@
+<?php
+namespace FireflyIII\Shared\Preferences;
+
+/**
+ * Interface PreferencesHelperInterface
+ *
+ * @package Firefly\Helper\Preferences
+ */
+interface PreferencesInterface
+{
+
+
+    /**
+     * @param $name
+     * @param $value
+     *
+     * @return null|\Preference
+     */
+    public function set($name, $value);
+
+    /**
+     * @param      $name
+     * @param null $default
+     *
+     * @return \Preference
+     */
+    public function get($name, $default = null);
+
+}

app/lib/FireflyIII/Shared/Toolkit/Date.php

@@ -0,0 +1,86 @@
+<?php
+
+namespace FireflyIII\Shared\Toolkit;
+
+use Carbon\Carbon;
+use Firefly\Exception\FireflyException;
+
+/**
+ * Class Date
+ *
+ * @package FireflyIII\Shared\Toolkit
+ */
+class Date
+{
+    /**
+     * @param Carbon $currentEnd
+     * @param        $repeatFreq
+     *
+     * @throws FireflyException
+     */
+    public function endOfPeriod(Carbon $currentEnd, $repeatFreq)
+    {
+        switch ($repeatFreq) {
+            default:
+                throw new FireflyException('Cannot do endOfPeriod for $repeat_freq ' . $repeatFreq);
+                break;
+            case 'daily':
+                $currentEnd->addDay();
+                break;
+            case 'weekly':
+                $currentEnd->addWeek()->subDay();
+                break;
+            case 'monthly':
+                $currentEnd->addMonth()->subDay();
+                break;
+            case 'quarterly':
+                $currentEnd->addMonths(3)->subDay();
+                break;
+            case 'half-year':
+                $currentEnd->addMonths(6)->subDay();
+                break;
+            case 'yearly':
+                $currentEnd->addYear()->subDay();
+                break;
+        }
+    }
+
+    /**
+     * @param Carbon $date
+     * @param        $repeatFreq
+     * @param        $skip
+     *
+     * @return Carbon
+     * @throws FireflyException
+     */
+    public function addPeriod(Carbon $date, $repeatFreq, $skip)
+    {
+        $add = ($skip + 1);
+        switch ($repeatFreq) {
+            default:
+                throw new FireflyException('Cannot do addPeriod for $repeat_freq ' . $repeatFreq);
+                break;
+            case 'daily':
+                $date->addDays($add);
+                break;
+            case 'weekly':
+                $date->addWeeks($add);
+                break;
+            case 'monthly':
+                $date->addMonths($add);
+                break;
+            case 'quarterly':
+                $months = $add * 3;
+                $date->addMonths($months);
+                break;
+            case 'half-year':
+                $months = $add * 6;
+                $date->addMonths($months);
+                break;
+            case 'yearly':
+                $date->addYears($add);
+                break;
+        }
+        return $date;
+    }
+} 

app/routes.php

@@ -161,13 +161,24 @@ Route::group(['before' => 'auth'], function () {
         Route::get('/categories/edit/{category}',['uses' => 'CategoryController@edit','as' => 'categories.edit']);
         Route::get('/categories/delete/{category}',['uses' => 'CategoryController@delete','as' => 'categories.delete']);
 
-        // chart controller
-        Route::get('/chart/home/account/{account?}', ['uses' => 'ChartController@homeAccount', 'as' => 'chart.home']);
-        Route::get('/chart/home/categories', ['uses' => 'ChartController@homeCategories', 'as' => 'chart.categories']);
-        Route::get('/chart/home/budgets', ['uses' => 'ChartController@homeBudgets', 'as' => 'chart.budgets']);
+        // 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/recurring', ['uses' => 'GoogleChartController@recurringTransactionsOverview']);
+        Route::get('/chart/account/{account}', ['uses' => 'GoogleChartController@accountBalanceChart']);
+        Route::get('/chart/sankey/{account}/out', ['uses' => 'GoogleChartController@accountSankeyOutChart']);
+        Route::get('/chart/sankey/{account}/in', ['uses' => 'GoogleChartController@accountSankeyInChart']);
+
+        // google table controller
+        Route::get('/table/account/{account}/transactions', ['uses' => 'GoogleTableController@transactionsByAccount']);
+
+
+
+
         Route::get('/chart/home/info/{accountnameA}/{day}/{month}/{year}', ['uses' => 'ChartController@homeAccountInfo', 'as' => 'chart.info']);
         Route::get('/chart/categories/show/{category}', ['uses' => 'ChartController@categoryShowChart','as' => 'chart.showcategory']);
-        Route::get('/chart/home/recurring', ['uses' => 'ChartController@homeRecurring', 'as' => 'chart.recurring']);
+
         // (new charts for budgets)
         Route::get('/chart/budget/{budget}/default', ['uses' => 'ChartController@budgetDefault', 'as' => 'chart.budget.default']);
         Route::get('chart/budget/{budget}/no_envelope', ['uses' => 'ChartController@budgetNoLimits', 'as' => 'chart.budget.nolimit']);

app/views/budgets/show.blade.php

@@ -40,7 +40,7 @@
 
 <div class="row">
     <div class="col-lg-12 col-md-12 col-sm-12">
-        <div id="chart"></div>
+        <div id="chart"><img src="http://placehold.it/650x300" title="Placeholder" alt="" /></div>
         @if($view == 1)
         <div id="instr" data-type="envelope" data-envelope="{{$repetitions[0]['limitrepetition']->id}}"></div>
         @endif
@@ -101,7 +101,6 @@
 
 @stop
 @section('scripts')
-{{HTML::script('assets/javascript/highcharts/highcharts.js')}}
 @if($view == 1)
 {{HTML::script('assets/javascript/firefly/budgets/limit.js')}}
 @endif

app/views/categories/show.blade.php

@@ -21,7 +21,7 @@
 @include('partials.date_nav')
 <div class="row">
     <div class="col-lg-12 col-md-12 col-sm-12">
-        <div id="chart"><p class="small text-center">(Some chart here)</p></div>
+        <div id="chart"><img src="http://placehold.it/650x300" title="Placeholder" alt="" /></div>
         </div>
     </div>
 
@@ -40,6 +40,5 @@
 <script type="text/javascript">
     var categoryID = {{$category->id}};
 </script>
-{{HTML::script('assets/javascript/highcharts/highcharts.js')}}
 {{HTML::script('assets/javascript/firefly/categories.js')}}
 @stop

app/views/index.blade.php

@@ -30,102 +30,107 @@
 
 
 
-    <div class="row">
-        <div class="col-lg-8 col-md-12 col-sm-12">
-            <!-- ACCOUNTS -->
-            <div class="panel panel-default">
-                <div class="panel-heading">
-                    <i class="fa fa-credit-card fa-fw"></i> <a href="#">Your accounts</a>
-                </div>
-                <div class="panel-body">
-                    <div id="accounts-chart" style="height:300px;"></div>
-                </div>
+<div class="row">
+    <div class="col-lg-8 col-md-12 col-sm-12">
+        <!-- ACCOUNTS -->
+        <div class="panel panel-default">
+            <div class="panel-heading">
+                <i class="fa fa-credit-card fa-fw"></i> <a href="#">Your accounts</a>
             </div>
-            <!-- BUDGETS -->
-            <div class="panel panel-default">
-                <div class="panel-heading">
-                    <i class="fa fa-tasks fa-fw"></i> <a href="{{route('budgets.index.date')}}">Budgets and spending</a>
-                </div>
-                <div class="panel-body">
-                    <div id="budgets"></div>
-                </div>
+            <div class="panel-body">
+                <div id="accounts-chart"></div>
             </div>
-            <!-- CATEGORIES -->
-            <div class="panel panel-default">
-                <div class="panel-heading">
-                    <i class="fa fa-bar-chart fa-fw"></i> <a href="{{route('categories.index')}}">Categories</a>
-                </div>
-                <div class="panel-body">
-                    <div id="categories"></div>
-                </div>
-            </div>
-                    <div class="panel panel-default">
-                        <div class="panel-heading">
-                            <i class="fa fa-line-chart"></i> Savings
-                        </div>
-                        <div class="panel-body">
-                            Bla bla
-                        </div>
-                    </div>
-
-
-
         </div>
-        <div class="col-lg-4 col-md-6 col-sm-12">
-            <!-- time based navigation -->
-            @include('partials.date_nav')
-
-            <!-- REMINDERS -->
-            <div class="panel panel-default">
-                <div class="panel-heading">
-                    <i class="fa fa-line-chart"></i> Recurring transactions
-                </div>
-                <div class="panel-body">
-                    <div id="recurring"></div>
-                </div>
+        <!-- BUDGETS -->
+        <div class="panel panel-default">
+            <div class="panel-heading">
+                <i class="fa fa-tasks fa-fw"></i> <a href="{{route('budgets.index.date')}}">Budgets and spending</a>
             </div>
-
-            <!-- TRANSACTIONS -->
-            @foreach($transactions as $data)
-            <div class="panel panel-default">
-                <div class="panel-heading">
-                    <i class="fa fa-money fa-fw"></i>
-                    <a href="{{route('accounts.show',$data[1]->id)}}">{{{$data[1]->name}}}</a>
-
-
-                    <!-- ACTIONS MENU -->
-                    <div class="pull-right">
-                        <div class="btn-group">
-                            <button type="button" class="btn btn-default btn-xs dropdown-toggle" data-toggle="dropdown">
-                                Actions
-                                <span class="caret"></span>
-                            </button>
-                            <ul class="dropdown-menu pull-right" role="menu">
-                                <li><a href="{{route('transactions.create','withdrawal')}}?account_id={{{$data[1]->id}}}"><i class="fa fa-long-arrow-left fa-fw"></i> New withdrawal</a></li>
-                                <li><a href="{{route('transactions.create','deposit')}}?account_id={{{$data[1]->id}}}"><i class="fa fa-long-arrow-right fa-fw"></i> New deposit</a></li>
-                                <li><a href="{{route('transactions.create','transfer')}}?account_from_id={{{$data[1]->id}}}"><i class="fa fa-arrows-h fa-fw"></i> New transfer</a></li>
-                            </ul>
-                        </div>
-                    </div>
-
-
-
-                </div>
-                <div class="panel-body">
-                    @include('transactions.journals-small-index',['transactions' => $data[0],'account' => $data[1]])
-                </div>
+            <div class="panel-body">
+                <div id="budgets-chart"></div>
             </div>
-            @endforeach
         </div>
+        <!-- CATEGORIES -->
+        <div class="panel panel-default">
+            <div class="panel-heading">
+                <i class="fa fa-bar-chart fa-fw"></i> <a href="{{route('categories.index')}}">Categories</a>
+            </div>
+            <div class="panel-body">
+                <div id="categories-chart"></div>
+            </div>
+        </div>
+                <div class="panel panel-default">
+                    <div class="panel-heading">
+                        <i class="fa fa-line-chart"></i> Savings
+                    </div>
+                    <div class="panel-body">
+                        (todo)
+                    </div>
+                </div>
+
+
+
     </div>
+    <div class="col-lg-4 col-md-6 col-sm-12">
+        <!-- time based navigation -->
+        @include('partials.date_nav')
 
-    @endif
+        <!-- REMINDERS -->
+        <div class="panel panel-default">
+            <div class="panel-heading">
+                <i class="fa fa-line-chart"></i> Recurring transactions
+            </div>
+            <div class="panel-body">
+                <div id="recurring-chart"></div>
+            </div>
+        </div>
 
-    @stop
-    @section('scripts')
-    {{HTML::script('assets/javascript/highcharts/highcharts.js')}}
-    {{HTML::script('assets/javascript/firefly/index.js')}}
-    @stop
-    @section('styles')
-    {{HTML::style('assets/stylesheets/highslide/highslide.css')}}
-    @stop
+        <!-- TRANSACTIONS -->
+        @foreach($transactions as $data)
+        <div class="panel panel-default">
+            <div class="panel-heading">
+                <i class="fa fa-money fa-fw"></i>
+                <a href="{{route('accounts.show',$data[1]->id)}}">{{{$data[1]->name}}}</a>
+
+
+                <!-- ACTIONS MENU -->
+                <div class="pull-right">
+                    <div class="btn-group">
+                        <button type="button" class="btn btn-default btn-xs dropdown-toggle" data-toggle="dropdown">
+                            Actions
+                            <span class="caret"></span>
+                        </button>
+                        <ul class="dropdown-menu pull-right" role="menu">
+                            <li><a href="{{route('transactions.create','withdrawal')}}?account_id={{{$data[1]->id}}}"><i class="fa fa-long-arrow-left fa-fw"></i> New withdrawal</a></li>
+                            <li><a href="{{route('transactions.create','deposit')}}?account_id={{{$data[1]->id}}}"><i class="fa fa-long-arrow-right fa-fw"></i> New deposit</a></li>
+                            <li><a href="{{route('transactions.create','transfer')}}?account_from_id={{{$data[1]->id}}}"><i class="fa fa-arrows-h fa-fw"></i> New transfer</a></li>
+                        </ul>
+                    </div>
+                </div>
+
+
+
+            </div>
+            <div class="panel-body">
+                @include('transactions.journals-small-index',['transactions' => $data[0],'account' => $data[1]])
+            </div>
+        </div>
+        @endforeach
+    </div>
+</div>
+
+@endif
+
+@stop
+@section('scripts')
+<!-- load the libraries and scripts necessary for Google Charts: -->
+<script type="text/javascript" src="https://www.google.com/jsapi"></script>
+{{HTML::script('assets/javascript/firefly/gcharts.options.js')}}
+{{HTML::script('assets/javascript/firefly/gcharts.js')}}
+
+
+
+{{HTML::script('assets/javascript/firefly/index.js')}}
+@stop
+@section('styles')
+@stop