More hip report stuff.

app/Helpers/Collection/Balance.php

@@ -49,5 +49,15 @@ class Balance
         $this->balanceHeader = $balanceHeader;
     }
 
+    /**
+     * @return \Illuminate\Support\Collection
+     */
+    public function getBalanceLines()
+    {
+        return $this->balanceLines;
+    }
+
+
+
 
 }

app/Helpers/Collection/BalanceLine.php

@@ -15,9 +15,13 @@ class BalanceLine
 
     /** @var  Collection */
     protected $balanceEntries;
+
     /** @var BudgetModel */
     protected $budget;
 
+    /** @var float  */
+    protected $budgetAmount = 0.0;
+
     /**
      *
      */
@@ -26,6 +30,9 @@ class BalanceLine
         $this->balanceEntries = new Collection;
     }
 
+    /**
+     * @param BalanceEntry $balanceEntry
+     */
     public function addBalanceEntry(BalanceEntry $balanceEntry)
     {
         $this->balanceEntries->push($balanceEntry);
@@ -63,5 +70,34 @@ class BalanceLine
         $this->budget = $budget;
     }
 
+    /**
+     * @return float
+     */
+    public function getBudgetAmount()
+    {
+        return $this->budgetAmount;
+    }
+
+    /**
+     * @param float $budgetAmount
+     */
+    public function setBudgetAmount($budgetAmount)
+    {
+        $this->budgetAmount = $budgetAmount;
+    }
+
+    /**
+     * @return float
+     */
+    public function left() {
+        $start = $this->getBudgetAmount();
+        /** @var BalanceEntry $balanceEntry */
+        foreach($this->getBalanceEntries() as $balanceEntry) {
+            $start += $balanceEntry->getSpent();
+        }
+        return $start;
+    }
+
+
 
 }

app/Helpers/Report/ReportHelper.php

@@ -109,21 +109,34 @@ class ReportHelper implements ReportHelperInterface
             $header->addAccount($account);
         }
 
+        /** @var BudgetModel $budget */
         foreach ($budgets as $budget) {
             $line = new BalanceLine;
             $line->setBudget($budget);
 
+            // get budget amount for current period:
+            $rep = $budget->limitrepetitions()->where('budget_limits.startdate',$start->format('Y-m-d 00:00:00'))->first();
+            if($rep) {
+                $line->setBudgetAmount($rep->amount);
+            }
+
             // loop accounts:
             foreach ($accounts as $account) {
                 $balanceEntry = new BalanceEntry;
                 $balanceEntry->setAccount($account);
-                $balanceEntry->setSpent(rand(1, 100));
+
+                // get spent:
+                $spent = $this->query->spentInBudget($account, $budget, $start, $end, $shared); // I think shared is irrelevant.
+
+                $balanceEntry->setSpent($spent);
                 $line->addBalanceEntry($balanceEntry);
             }
             // add line to balance:
             $balance->addBalanceLine($line);
         }
 
+        // then a new line for without budget.
+
         $balance->setBalanceHeader($header);
 
         return $balance;

app/Helpers/Report/ReportQuery.php

@@ -7,6 +7,7 @@ use Carbon\Carbon;
 use Crypt;
 use DB;
 use FireflyIII\Models\Account;
+use FireflyIII\Models\Budget;
 use FireflyIII\Models\TransactionJournal;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Model;
@@ -522,36 +523,28 @@ class ReportQuery implements ReportQueryInterface
     }
 
     /**
-     *
-     * This query will get all transaction journals and budget information for a specified account
-     * in a certain date range, where the transaction journal does not have a budget.
-     * There is no get() specified, this is up to the method itself.
-     *
      * @param Account $account
+     * @param Budget  $budget
      * @param Carbon  $start
      * @param Carbon  $end
+     * @param bool    $shared
      *
-     * @return Builder
+     * @return float
      */
-    protected function queryJournalsNoBudget(Account $account, Carbon $start, Carbon $end)
+    public function spentInBudget(Account $account, Budget $budget, Carbon $start, Carbon $end, $shared = false)
     {
-        return TransactionJournal::
-        leftJoin('budget_transaction_journal', 'budget_transaction_journal.transaction_journal_id', '=', 'transaction_journals.id')
-                                 ->leftJoin('budgets', 'budgets.id', '=', 'budget_transaction_journal.budget_id')
-                                 ->leftJoin('transaction_types', 'transaction_types.id', '=', 'transaction_journals.transaction_type_id')
-                                 ->leftJoin(
-                                     'transactions', function (JoinClause $join) {
-                                     $join->on('transactions.transaction_journal_id', '=', 'transaction_journals.id')->where('transactions.amount', '<', 0);
-                                 }
-                                 )
-                                 ->leftJoin('accounts', 'accounts.id', '=', 'transactions.account_id')
-                                 ->before($end)
-                                 ->after($start)
-                                 ->where('accounts.id', $account->id)
-                                 ->where('transaction_journals.user_id', Auth::user()->id)
-                                 ->where('transaction_types.type', 'Withdrawal')
-                                 ->groupBy('budgets.id')
-                                 ->orderBy('budgets.name', 'ASC');
+
+        return floatval(
+            Auth::user()->transactionjournals()
+                ->leftJoin('transactions' , 'transactions.transaction_journal_id', '=', 'transaction_journals.id')
+                ->leftJoin('budget_transaction_journal', 'budget_transaction_journal.transaction_journal_id', '=', 'transaction_journals.id')
+                ->where('transactions.amount', '<', 0)
+                ->where('transactions.account_id', $account->id)
+                ->before($end)
+                ->after($start)
+                ->where('budget_transaction_journal.budget_id', $budget->id)
+                ->sum('transactions.amount')
+        );
     }
 
     /**
@@ -591,4 +584,36 @@ class ReportQuery implements ReportQueryInterface
         return $query;
     }
 
+    /**
+     *
+     * This query will get all transaction journals and budget information for a specified account
+     * in a certain date range, where the transaction journal does not have a budget.
+     * There is no get() specified, this is up to the method itself.
+     *
+     * @param Account $account
+     * @param Carbon  $start
+     * @param Carbon  $end
+     *
+     * @return Builder
+     */
+    protected function queryJournalsNoBudget(Account $account, Carbon $start, Carbon $end)
+    {
+        return TransactionJournal::
+        leftJoin('budget_transaction_journal', 'budget_transaction_journal.transaction_journal_id', '=', 'transaction_journals.id')
+                                 ->leftJoin('budgets', 'budgets.id', '=', 'budget_transaction_journal.budget_id')
+                                 ->leftJoin('transaction_types', 'transaction_types.id', '=', 'transaction_journals.transaction_type_id')
+                                 ->leftJoin(
+                                     'transactions', function (JoinClause $join) {
+                                     $join->on('transactions.transaction_journal_id', '=', 'transaction_journals.id')->where('transactions.amount', '<', 0);
+                                 }
+                                 )
+                                 ->leftJoin('accounts', 'accounts.id', '=', 'transactions.account_id')
+                                 ->before($end)
+                                 ->after($start)
+                                 ->where('accounts.id', $account->id)
+                                 ->where('transaction_journals.user_id', Auth::user()->id)
+                                 ->where('transaction_types.type', 'Withdrawal')
+                                 ->groupBy('budgets.id')
+                                 ->orderBy('budgets.name', 'ASC');
+    }
 }

app/Helpers/Report/ReportQueryInterface.php

@@ -4,6 +4,7 @@ namespace FireflyIII\Helpers\Report;
 
 use Carbon\Carbon;
 use FireflyIII\Models\Account;
+use FireflyIII\Models\Budget;
 use Illuminate\Support\Collection;
 
 /**
@@ -123,6 +124,17 @@ interface ReportQueryInterface
      */
     public function journalsByCategory(Carbon $start, Carbon $end, $includeShared = false);
 
+    /**
+     * @param Account $account
+     * @param Budget  $budget
+     * @param Carbon  $start
+     * @param Carbon  $end
+     * @param bool    $shared
+     *
+     * @return float
+     */
+    public function spentInBudget(Account $account, Budget $budget, Carbon $start, Carbon $end, $shared = false); // I think shared is irrelevant.
+
 
     /**
      * Gets a list of expense accounts and the expenses therein, grouped by that expense account.