Should simplify reports.

app/Helpers/Report/ReportHelper.php

@@ -5,12 +5,17 @@ namespace FireflyIII\Helpers\Report;
 use App;
 use Carbon\Carbon;
 use FireflyIII\Helpers\Collection\Account as AccountCollection;
+use FireflyIII\Helpers\Collection\Balance;
+use FireflyIII\Helpers\Collection\BalanceEntry;
+use FireflyIII\Helpers\Collection\BalanceHeader;
+use FireflyIII\Helpers\Collection\BalanceLine;
 use FireflyIII\Helpers\Collection\Budget as BudgetCollection;
 use FireflyIII\Helpers\Collection\BudgetLine;
 use FireflyIII\Helpers\Collection\Category as CategoryCollection;
 use FireflyIII\Helpers\Collection\Expense;
 use FireflyIII\Helpers\Collection\Income;
 use FireflyIII\Models\Account;
+use FireflyIII\Models\Budget as BudgetModel;
 use FireflyIII\Models\LimitRepetition;
 
 /**
@@ -69,6 +74,61 @@ class ReportHelper implements ReportHelperInterface
         return $object;
     }
 
+    /**
+     *
+     * The balance report contains a Balance object which in turn contains:
+     *
+     * A BalanceHeader object which contains all relevant user asset accounts for the report.
+     *
+     * A number of BalanceLine objects, which hold:
+     * - A budget
+     * - A number of BalanceEntry objects.
+     *
+     * The BalanceEntry object holds:
+     *   - The same budget (again)
+     *   - A user asset account as mentioned in the BalanceHeader
+     *   - The amount of money spent on the budget by the user asset account
+     *
+     * @param Carbon  $start
+     * @param Carbon  $end
+     * @param boolean $shared
+     *
+     * @return Balance
+     */
+    public function getBalanceReport(Carbon $start, Carbon $end, $shared)
+    {
+        $repository = App::make('FireflyIII\Repositories\Budget\BudgetRepositoryInterface');
+        $balance    = new Balance;
+
+        // build a balance header:
+        $header = new BalanceHeader;
+
+        $accounts = $this->query->getAllAccounts($start, $end, $shared);
+        $budgets  = $repository->getBudgets();
+        foreach ($accounts as $account) {
+            $header->addAccount($account);
+        }
+
+        foreach ($budgets as $budget) {
+            $line = new BalanceLine;
+            $line->setBudget($budget);
+
+            // loop accounts:
+            foreach ($accounts as $account) {
+                $balanceEntry = new BalanceEntry;
+                $balanceEntry->setAccount($account);
+                $balanceEntry->setSpent(rand(1, 100));
+                $line->addBalanceEntry($balanceEntry);
+            }
+            // add line to balance:
+            $balance->addBalanceLine($line);
+        }
+
+        $balance->setBalanceHeader($header);
+
+        return $balance;
+    }
+
     /**
      * @param Carbon  $start
      * @param Carbon  $end
@@ -143,7 +203,23 @@ class ReportHelper implements ReportHelperInterface
      */
     public function getCategoryReport(Carbon $start, Carbon $end, $shared)
     {
-        return null;
+        $object = new CategoryCollection;
+
+
+        /**
+         * GET CATEGORIES:
+         */
+        /** @var \FireflyIII\Repositories\Category\CategoryRepositoryInterface $repository */
+        $repository = App::make('FireflyIII\Repositories\Category\CategoryRepositoryInterface');
+        $set        = $repository->getCategories();
+        foreach ($set as $category) {
+            $spent           = $repository->spentInPeriod($category, $start, $end, $shared);
+            $category->spent = $spent;
+            $object->addCategory($category);
+            $object->addTotal($spent);
+        }
+
+        return $object;
     }
 
     /**

app/Helpers/Report/ReportHelperInterface.php

@@ -4,10 +4,11 @@ namespace FireflyIII\Helpers\Report;
 
 use Carbon\Carbon;
 use FireflyIII\Helpers\Collection\Account;
-use FireflyIII\Helpers\Collection\Expense;
-use FireflyIII\Helpers\Collection\Income;
+use FireflyIII\Helpers\Collection\Balance;
 use FireflyIII\Helpers\Collection\Budget as BudgetCollection;
 use FireflyIII\Helpers\Collection\Category as CategoryCollection;
+use FireflyIII\Helpers\Collection\Expense;
+use FireflyIII\Helpers\Collection\Income;
 
 /**
  * Interface ReportHelperInterface
@@ -29,6 +30,15 @@ interface ReportHelperInterface
      */
     public function getAccountReport(Carbon $date, Carbon $end, $shared);
 
+    /**
+     * @param Carbon  $start
+     * @param Carbon  $end
+     * @param boolean $shared
+     *
+     * @return Balance
+     */
+    public function getBalanceReport(Carbon $start, Carbon $end, $shared);
+
     /**
      * @param Carbon  $start
      * @param Carbon  $end

app/Helpers/Report/ReportQuery.php

@@ -86,6 +86,70 @@ class ReportQuery implements ReportQueryInterface
         return floatval($this->balancedTransactionsList($account, $start, $end)->sum('queryAmount'));
     }
 
+    /**
+     * This method returns all "expense" journals in a certain period, which are both transfers to a shared account
+     * and "ordinary" withdrawals. The query used is almost equal to ReportQueryInterface::journalsByRevenueAccount but it does
+     * not group and returns different fields.
+     *
+     * @param Carbon $start
+     * @param Carbon $end
+     * @param bool   $includeShared
+     *
+     * @return Collection
+     *
+     */
+    public function expenseInPeriod(Carbon $start, Carbon $end, $includeShared = false)
+    {
+        $query = $this->queryJournalsWithTransactions($start, $end);
+        if ($includeShared === false) {
+            // only get withdrawals not from a shared account
+            // and transfers from a shared account.
+            $query->where(
+                function (Builder $query) {
+                    $query->where(
+                        function (Builder $q) {
+                            $q->where('transaction_types.type', 'Withdrawal');
+                            $q->where('acm_from.data', '!=', '"sharedAsset"');
+                        }
+                    );
+                    $query->orWhere(
+                        function (Builder $q) {
+                            $q->where('transaction_types.type', 'Transfer');
+                            $q->where('acm_to.data', '=', '"sharedAsset"');
+                        }
+                    );
+                }
+            );
+        } else {
+            // any withdrawal is fine.
+            $query->where('transaction_types.type', 'Withdrawal');
+        }
+        $query->groupBy('transaction_journals.id')->orderBy('transaction_journals.date');
+
+        // get everything, decrypt and return
+        $data = $query->get(
+            ['transaction_journals.id',
+             'transaction_journals.description',
+             'transaction_journals.encrypted',
+             'transaction_types.type',
+             DB::Raw('SUM(`t_from`.`amount`) as `queryAmount`'),
+             'transaction_journals.date',
+             't_to.account_id as account_id',
+             'ac_to.name as name',
+             'ac_to.encrypted as account_encrypted'
+            ]
+        );
+
+        $data->each(
+            function (Model $object) {
+                $object->name = intval($object->account_encrypted) == 1 ? Crypt::decrypt($object->name) : $object->name;
+            }
+        );
+        $data->sortByDesc('queryAmount');
+
+        return $data;
+    }
+
     /**
      * Get a users accounts combined with various meta-data related to the start and end date.
      *
@@ -232,69 +296,6 @@ class ReportQuery implements ReportQueryInterface
         return $data;
     }
 
-    /**
-     * This method returns all "expense" journals in a certain period, which are both transfers to a shared account
-     * and "ordinary" withdrawals. The query used is almost equal to ReportQueryInterface::journalsByRevenueAccount but it does
-     * not group and returns different fields.
-     *
-     * @param Carbon $start
-     * @param Carbon $end
-     * @param bool   $includeShared
-     *
-     * @return Collection
-     *
-     */
-    public function expenseInPeriod(Carbon $start, Carbon $end, $includeShared = false) {
-        $query = $this->queryJournalsWithTransactions($start, $end);
-        if ($includeShared === false) {
-            // only get withdrawals not from a shared account
-            // and transfers from a shared account.
-            $query->where(
-                function (Builder $query) {
-                    $query->where(
-                        function (Builder $q) {
-                            $q->where('transaction_types.type', 'Withdrawal');
-                            $q->where('acm_from.data', '!=', '"sharedAsset"');
-                        }
-                    );
-                    $query->orWhere(
-                        function (Builder $q) {
-                            $q->where('transaction_types.type', 'Transfer');
-                            $q->where('acm_to.data', '=', '"sharedAsset"');
-                        }
-                    );
-                }
-            );
-        } else {
-            // any withdrawal is fine.
-            $query->where('transaction_types.type', 'Withdrawal');
-        }
-        $query->groupBy('transaction_journals.id')->orderBy('transaction_journals.date');
-
-        // get everything, decrypt and return
-        $data = $query->get(
-            ['transaction_journals.id',
-             'transaction_journals.description',
-             'transaction_journals.encrypted',
-             'transaction_types.type',
-             DB::Raw('SUM(`t_from`.`amount`) as `queryAmount`'),
-             'transaction_journals.date',
-             't_to.account_id as account_id',
-             'ac_to.name as name',
-             'ac_to.encrypted as account_encrypted'
-            ]
-        );
-
-        $data->each(
-            function (Model $object) {
-                $object->name = intval($object->account_encrypted) == 1 ? Crypt::decrypt($object->name) : $object->name;
-            }
-        );
-        $data->sortByDesc('queryAmount');
-
-        return $data;
-    }
-
     /**
      * Gets a list of expenses grouped by the budget they were filed under.
      *

app/Helpers/Report/ReportQueryInterface.php

@@ -123,6 +123,7 @@ interface ReportQueryInterface
      */
     public function journalsByCategory(Carbon $start, Carbon $end, $includeShared = false);
 
+
     /**
      * Gets a list of expense accounts and the expenses therein, grouped by that expense account.
      * This result excludes transfers to shared accounts which are expenses, technically.