Code cleanup.

This commit is contained in:
James Cole
2015-05-20 19:55:53 +02:00
parent 7645005d5a
commit b1d3158db1
19 changed files with 65 additions and 65 deletions

View File

@@ -1,6 +1,7 @@
<?php <?php
namespace FireflyIII\Helpers\Collection; namespace FireflyIII\Helpers\Collection;
use Illuminate\Support\Collection; use Illuminate\Support\Collection;
/** /**
@@ -60,6 +61,4 @@ class Balance
} }
} }

View File

@@ -17,13 +17,10 @@ class BalanceEntry
/** @var AccountModel */ /** @var AccountModel */
protected $account; protected $account;
/** @var float */
protected $spent = 0.0;
/** @var float */ /** @var float */
protected $left = 0.0; protected $left = 0.0;
/** @var float */
protected $spent = 0.0;
/** /**
* @return AccountModel * @return AccountModel
@@ -41,22 +38,6 @@ class BalanceEntry
$this->account = $account; $this->account = $account;
} }
/**
* @return float
*/
public function getSpent()
{
return $this->spent;
}
/**
* @param float $spent
*/
public function setSpent($spent)
{
$this->spent = $spent;
}
/** /**
* @return float * @return float
*/ */
@@ -73,7 +54,21 @@ class BalanceEntry
$this->left = $left; $this->left = $left;
} }
/**
* @return float
*/
public function getSpent()
{
return $this->spent;
}
/**
* @param float $spent
*/
public function setSpent($spent)
{
$this->spent = $spent;
}
} }

View File

@@ -43,5 +43,4 @@ class BalanceHeader
} }
} }

View File

@@ -44,7 +44,8 @@ class Bill
function (BillLine $bill) { function (BillLine $bill) {
$active = intval($bill->getBill()->active) == 0 ? 1 : 0; $active = intval($bill->getBill()->active) == 0 ? 1 : 0;
$name = $bill->getBill()->name; $name = $bill->getBill()->name;
return $active.$name;
return $active . $name;
} }
); );

View File

@@ -1,6 +1,7 @@
<?php <?php
namespace FireflyIII\Helpers\Collection; namespace FireflyIII\Helpers\Collection;
use Illuminate\Support\Collection; use Illuminate\Support\Collection;
/** /**
@@ -71,6 +72,14 @@ class Budget
$this->spent += floatval($add); $this->spent += floatval($add);
} }
/**
* @return \Illuminate\Support\Collection
*/
public function getBudgetLines()
{
return $this->budgetLines;
}
/** /**
* @return float * @return float
*/ */
@@ -135,15 +144,5 @@ class Budget
$this->spent = $spent; $this->spent = $spent;
} }
/**
* @return \Illuminate\Support\Collection
*/
public function getBudgetLines()
{
return $this->budgetLines;
}
} }

View File

@@ -127,8 +127,4 @@ class BudgetLine
} }
} }

View File

@@ -113,7 +113,9 @@ class ReportQuery implements ReportQueryInterface
$query->orderBy('transaction_journals.date'); $query->orderBy('transaction_journals.date');
// get everything // get everything
$data = $query->get(['transaction_journals.*', 'transaction_types.type', 'ac_to.name as name','ac_to.id as account_id', 'ac_to.encrypted as account_encrypted']); $data = $query->get(
['transaction_journals.*', 'transaction_types.type', 'ac_to.name as name', 'ac_to.id as account_id', 'ac_to.encrypted as account_encrypted']
);
$data->each( $data->each(
function (TransactionJournal $journal) { function (TransactionJournal $journal) {
@@ -285,7 +287,9 @@ class ReportQuery implements ReportQueryInterface
$query->orderBy('transaction_journals.date'); $query->orderBy('transaction_journals.date');
// get everything // get everything
$data = $query->get(['transaction_journals.*', 'transaction_types.type', 'ac_from.name as name','ac_from.id as account_id', 'ac_from.encrypted as account_encrypted']); $data = $query->get(
['transaction_journals.*', 'transaction_types.type', 'ac_from.name as name', 'ac_from.id as account_id', 'ac_from.encrypted as account_encrypted']
);
$data->each( $data->each(
function (TransactionJournal $journal) { function (TransactionJournal $journal) {

View File

@@ -7,7 +7,6 @@ use FireflyIII\Models\Account;
use FireflyIII\Models\Bill; use FireflyIII\Models\Bill;
use FireflyIII\Models\Transaction; use FireflyIII\Models\Transaction;
use FireflyIII\Models\TransactionJournal; use FireflyIII\Models\TransactionJournal;
use FireflyIII\Repositories\Account\AccountRepositoryInterface;
use FireflyIII\Repositories\Bill\BillRepositoryInterface; use FireflyIII\Repositories\Bill\BillRepositoryInterface;
use Input; use Input;
use Redirect; use Redirect;

View File

@@ -28,7 +28,7 @@ class BudgetController extends Controller
*/ */
public function budget(GChart $chart, BudgetRepositoryInterface $repository, Budget $budget) public function budget(GChart $chart, BudgetRepositoryInterface $repository, Budget $budget)
{ {
$chart->addColumn(trans('firefly.period'),'date'); $chart->addColumn(trans('firefly.period'), 'date');
$chart->addColumn(trans('firefly.spent'), 'number'); $chart->addColumn(trans('firefly.spent'), 'number');
@@ -50,6 +50,7 @@ class BudgetController extends Controller
} }
$chart->generate(); $chart->generate();
return Response::json($chart->getData()); return Response::json($chart->getData());
} }

View File

@@ -4,7 +4,6 @@ namespace FireflyIII\Http\Controllers\Chart;
use Carbon\Carbon; use Carbon\Carbon;
use Crypt;
use FireflyIII\Http\Controllers\Controller; use FireflyIII\Http\Controllers\Controller;
use FireflyIII\Models\Category; use FireflyIII\Models\Category;
use FireflyIII\Models\LimitRepetition; use FireflyIII\Models\LimitRepetition;
@@ -82,7 +81,7 @@ class CategoryController extends Controller
foreach ($set as $entry) { foreach ($set as $entry) {
$sum = floatval($entry['sum']); $sum = floatval($entry['sum']);
if($sum != 0) { if ($sum != 0) {
$chart->addRow($entry['name'], $sum); $chart->addRow($entry['name'], $sum);
} }
} }

View File

@@ -276,7 +276,9 @@ Route::group(
*/ */
// accounts: // accounts:
Route::get('/chart/account/frontpage', ['uses' => 'Chart\AccountController@frontpage']); Route::get('/chart/account/frontpage', ['uses' => 'Chart\AccountController@frontpage']);
Route::get('/chart/account/month/{year}/{month}/{shared?}', ['uses' => 'Chart\AccountController@all'])->where(['year' => '[0-9]{4}', 'month' => '[0-9]{1,2}', 'shared' => 'shared']); Route::get('/chart/account/month/{year}/{month}/{shared?}', ['uses' => 'Chart\AccountController@all'])->where(
['year' => '[0-9]{4}', 'month' => '[0-9]{1,2}', 'shared' => 'shared']
);
Route::get('/chart/account/{account}', ['uses' => 'Chart\AccountController@single']); Route::get('/chart/account/{account}', ['uses' => 'Chart\AccountController@single']);

View File

@@ -417,6 +417,7 @@ class BudgetRepository implements BudgetRepositoryInterface
public function expensesOnDayCorrected(Budget $budget, Carbon $date) public function expensesOnDayCorrected(Budget $budget, Carbon $date)
{ {
$sum = floatval($budget->transactionjournals()->transactionTypes(['Withdrawal'])->onDate($date)->get(['transaction_journals.*'])->sum('amount')); $sum = floatval($budget->transactionjournals()->transactionTypes(['Withdrawal'])->onDate($date)->get(['transaction_journals.*'])->sum('amount'));
return $sum * -1; return $sum * -1;
} }
} }

View File

@@ -115,6 +115,7 @@ interface CategoryRepositoryInterface
/** /**
* *
* Corrected for tags. * Corrected for tags.
*
* @param Category $category * @param Category $category
* @param Carbon $date * @param Carbon $date
* *

View File

@@ -9,7 +9,6 @@ use FireflyIII\Models\PiggyBank;
use FireflyIII\Models\PiggyBankEvent; use FireflyIII\Models\PiggyBankEvent;
use FireflyIII\Models\PiggyBankRepetition; use FireflyIII\Models\PiggyBankRepetition;
use Illuminate\Support\Collection; use Illuminate\Support\Collection;
use Navigation;
/** /**
* Class PiggyBankRepository * Class PiggyBankRepository

View File

@@ -51,7 +51,8 @@ class ExpandedForm
if (isset($options['label'])) { if (isset($options['label'])) {
return $options['label']; return $options['label'];
} }
return trans('form.'.$name);
return trans('form.' . $name);
} }

View File

@@ -41,8 +41,8 @@ class Budget extends Twig_Extension
$functions[] = new Twig_SimpleFunction( $functions[] = new Twig_SimpleFunction(
'spentInRepetitionCorrected', function (LimitRepetition $repetition) { 'spentInRepetitionCorrected', function (LimitRepetition $repetition) {
$sum = $sum
Auth::user()->transactionjournals() = Auth::user()->transactionjournals()
->leftJoin('budget_transaction_journal', 'budget_transaction_journal.transaction_journal_id', '=', 'transaction_journals.id') ->leftJoin('budget_transaction_journal', 'budget_transaction_journal.transaction_journal_id', '=', 'transaction_journals.id')
->leftJoin('budget_limits', 'budget_limits.budget_id', '=', 'budget_transaction_journal.budget_id') ->leftJoin('budget_limits', 'budget_limits.budget_id', '=', 'budget_transaction_journal.budget_id')
->leftJoin('limit_repetitions', 'limit_repetitions.budget_limit_id', '=', 'budget_limits.id') ->leftJoin('limit_repetitions', 'limit_repetitions.budget_limit_id', '=', 'budget_limits.id')
@@ -50,6 +50,7 @@ class Budget extends Twig_Extension
->after($repetition->startdate) ->after($repetition->startdate)
->where('limit_repetitions.id', '=', $repetition->id) ->where('limit_repetitions.id', '=', $repetition->id)
->get(['transaction_journals.*'])->sum('amount'); ->get(['transaction_journals.*'])->sum('amount');
return floatval($sum); return floatval($sum);
} }
); );

View File

@@ -85,6 +85,7 @@ class Journal extends Twig_Extension
// return tag formatted for a "balancing act", even if other // return tag formatted for a "balancing act", even if other
// tags are present. // tags are present.
$amount = App::make('amount')->formatJournal($journal, false); $amount = App::make('amount')->formatJournal($journal, false);
return '<a href="' . route('tags.show', $tag->id) . '" class="label label-success" title="' . $amount return '<a href="' . route('tags.show', $tag->id) . '" class="label label-success" title="' . $amount
. '"><i class="fa fa-fw fa-refresh"></i> ' . $tag->tag . '</a>'; . '"><i class="fa fa-fw fa-refresh"></i> ' . $tag->tag . '</a>';
} }
@@ -94,6 +95,7 @@ class Journal extends Twig_Extension
*/ */
if ($tag->tagMode == 'advancePayment' && $journal->transactionType->type == 'Deposit') { if ($tag->tagMode == 'advancePayment' && $journal->transactionType->type == 'Deposit') {
$amount = App::make('amount')->formatJournal($journal, false); $amount = App::make('amount')->formatJournal($journal, false);
return '<a href="' . route('tags.show', $tag->id) . '" class="label label-success" title="' . $amount return '<a href="' . route('tags.show', $tag->id) . '" class="label label-success" title="' . $amount
. '"><i class="fa fa-fw fa-sort-numeric-desc"></i> ' . $tag->tag . '</a>'; . '"><i class="fa fa-fw fa-sort-numeric-desc"></i> ' . $tag->tag . '</a>';
} }
@@ -103,6 +105,7 @@ class Journal extends Twig_Extension
*/ */
if ($tag->tagMode == 'advancePayment' && $journal->transactionType->type == 'Withdrawal') { if ($tag->tagMode == 'advancePayment' && $journal->transactionType->type == 'Withdrawal') {
$amount = App::make('amount')->formatJournal($journal); $amount = App::make('amount')->formatJournal($journal);
return '<a href="' . route('tags.show', $tag->id) . '">' . $amount . '</a>'; return '<a href="' . route('tags.show', $tag->id) . '">' . $amount . '</a>';
} }