Some cleanup.

This commit is contained in:
James Cole
2014-08-10 15:01:46 +02:00
parent fbd056104a
commit d0a30f71cd
35 changed files with 752 additions and 407 deletions

View File

@@ -34,11 +34,21 @@ class BudgetController extends BaseController
return View::make('budgets.create')->with('periods', $periods);
}
/**
* @param Budget $budget
*
* @return $this
*/
public function delete(Budget $budget)
{
return View::make('budgets.delete')->with('budget', $budget);
}
/**
* @param Budget $budget
*
* @return \Illuminate\Http\RedirectResponse
*/
public function destroy(Budget $budget)
{
$result = $this->_repository->destroy($budget);
@@ -58,6 +68,11 @@ class BudgetController extends BaseController
}
/**
* @param Budget $budget
*
* @return $this
*/
public function edit(Budget $budget)
{
return View::make('budgets.edit')->with('budget', $budget);
@@ -102,7 +117,7 @@ class BudgetController extends BaseController
if (!is_null(Input::get('rep'))) {
$repetitionId = intval(Input::get('rep'));
$repetitions = $this->_budgets->organizeRepetition($budget, $repetitionId);
$repetitions = $this->_budgets->organizeRepetition($repetitionId);
$filters[] = $repetitions[0]['limit'];
$filters[] = $repetitions[0]['limitrepetition'];
} else {
@@ -148,6 +163,11 @@ class BudgetController extends BaseController
}
/**
* @param Budget $budget
*
* @return $this|\Illuminate\Http\RedirectResponse
*/
public function update(Budget $budget)
{
$budget = $this->_repository->update($budget, Input::all());

View File

@@ -11,6 +11,10 @@ class CategoryController extends BaseController
protected $_repository;
protected $_category;
/**
* @param CRI $repository
* @param CI $category
*/
public function __construct(CRI $repository, CI $category)
{
$this->_repository = $repository;
@@ -18,16 +22,29 @@ class CategoryController extends BaseController
View::share('menu', 'categories');
}
/**
* @return \Illuminate\View\View
*/
public function create()
{
return View::make('categories.create');
}
/**
* @param Category $category
*
* @return $this
*/
public function delete(Category $category)
{
return View::make('categories.delete')->with('category', $category);
}
/**
* @param Category $category
*
* @return \Illuminate\Http\RedirectResponse
*/
public function destroy(Category $category)
{
$result = $this->_repository->destroy($category);
@@ -40,11 +57,19 @@ class CategoryController extends BaseController
return Redirect::route('categories.index');
}
/**
* @param Category $category
*
* @return $this
*/
public function edit(Category $category)
{
return View::make('categories.edit')->with('category', $category);
}
/**
* @return $this
*/
public function index()
{
$categories = $this->_repository->get();
@@ -52,6 +77,11 @@ class CategoryController extends BaseController
return View::make('categories.index')->with('categories', $categories);
}
/**
* @param Category $category
*
* @return $this
*/
public function show(Category $category)
{
$start = \Session::get('start');
@@ -65,6 +95,9 @@ class CategoryController extends BaseController
);
}
/**
* @return $this|\Illuminate\Http\RedirectResponse
*/
public function store()
{
$category = $this->_repository->store(Input::all());
@@ -83,6 +116,11 @@ class CategoryController extends BaseController
}
}
/**
* @param Category $category
*
* @return $this|\Illuminate\Http\RedirectResponse
*/
public function update(Category $category)
{
$category = $this->_repository->update($category, Input::all());

View File

@@ -15,7 +15,8 @@ class ChartController extends BaseController
/**
* @param ChartInterface $chart
* @param ChartInterface $chart
* @param AccountRepositoryInterface $accounts
*/
public function __construct(ChartInterface $chart, AccountRepositoryInterface $accounts)
{
@@ -23,6 +24,11 @@ class ChartController extends BaseController
$this->_accounts = $accounts;
}
/**
* @param Category $category
*
* @return \Illuminate\Http\JsonResponse
*/
public function categoryShowChart(Category $category)
{
$start = Session::get('start');
@@ -49,7 +55,6 @@ class ChartController extends BaseController
public function homeAccount(Account $account = null)
{
// get preferences and accounts (if necessary):
$data = [];
$start = Session::get('start');
$end = Session::get('end');
@@ -85,6 +90,14 @@ class ChartController extends BaseController
return Response::json($data);
}
/**
* @param $name
* @param $day
* @param $month
* @param $year
*
* @return $this
*/
public function homeAccountInfo($name, $day, $month, $year)
{
$account = $this->_accounts->findByName($name);

View File

@@ -25,9 +25,9 @@ class LimitController extends BaseController
}
/**
* @param null $budgetId
* @param Budget $budget
*
* @return $this|\Illuminate\View\View
* @return $this
*/
public function create(\Budget $budget = null)
{
@@ -45,11 +45,21 @@ class LimitController extends BaseController
)->with('prefilled', $prefilled);
}
/**
* @param Limit $limit
*
* @return $this
*/
public function delete(\Limit $limit)
{
return View::make('limits.delete')->with('limit', $limit);
}
/**
* @param Limit $limit
*
* @return \Illuminate\Http\RedirectResponse
*/
public function destroy(\Limit $limit)
{
$success = $this->_limits->destroy($limit);
@@ -67,9 +77,9 @@ class LimitController extends BaseController
}
/**
* @param null $limitId
* @param Limit $limit
*
* @return $this|\Illuminate\View\View
* @return $this
*/
public function edit(Limit $limit)
{
@@ -81,6 +91,11 @@ class LimitController extends BaseController
);
}
/**
* @param Budget $budget
*
* @return $this|\Illuminate\Http\RedirectResponse
*/
public function store(Budget $budget = null)
{
@@ -103,9 +118,9 @@ class LimitController extends BaseController
}
/**
* @param null $limitId
* @param Limit $limit
*
* @return $this|\Illuminate\Http\RedirectResponse|\Illuminate\View\View
* @return $this|\Illuminate\Http\RedirectResponse
*/
public function update(\Limit $limit)
{

View File

@@ -12,6 +12,10 @@ class PiggybankController extends BaseController
protected $_repository;
protected $_accounts;
/**
* @param PRI $repository
* @param ARI $accounts
*/
public function __construct(PRI $repository, ARI $accounts)
{
$this->_repository = $repository;
@@ -20,6 +24,9 @@ class PiggybankController extends BaseController
}
/**
* @return $this
*/
public function create()
{
$accounts = $this->_accounts->getActiveDefaultAsSelectList();
@@ -27,11 +34,21 @@ class PiggybankController extends BaseController
return View::make('piggybanks.create')->with('accounts', $accounts);
}
/**
* @param Piggybank $piggyBank
*
* @return $this
*/
public function delete(Piggybank $piggyBank)
{
return View::make('piggybanks.delete')->with('piggybank', $piggyBank);
}
/**
* @param Piggybank $piggyBank
*
* @return \Illuminate\Http\RedirectResponse
*/
public function destroy(Piggybank $piggyBank)
{
$piggyBank->delete();
@@ -40,6 +57,11 @@ class PiggybankController extends BaseController
return Redirect::route('piggybanks.index');
}
/**
* @param Piggybank $piggyBank
*
* @return $this
*/
public function edit(Piggybank $piggyBank)
{
$accounts = $this->_accounts->getActiveDefaultAsSelectList();
@@ -47,6 +69,9 @@ class PiggybankController extends BaseController
return View::make('piggybanks.edit')->with('piggybank', $piggyBank)->with('accounts', $accounts);
}
/**
* @return $this
*/
public function index()
{
$count = $this->_repository->count();
@@ -75,10 +100,16 @@ class PiggybankController extends BaseController
);
}
/**
*
*/
public function show()
{
}
/**
* @return $this|\Illuminate\Http\RedirectResponse
*/
public function store()
{
$piggyBank = $this->_repository->store(Input::all());
@@ -100,6 +131,9 @@ class PiggybankController extends BaseController
}
/**
* @return $this|\Illuminate\Http\RedirectResponse
*/
public function update()
{
@@ -117,6 +151,9 @@ class PiggybankController extends BaseController
}
/**
* @param Piggybank $piggybank
*/
public function updateAmount(Piggybank $piggybank)
{
$this->_repository->updateAmount($piggybank, Input::get('amount'));

View File

@@ -2,16 +2,25 @@
use Firefly\Storage\RecurringTransaction\RecurringTransactionRepositoryInterface as RTR;
/**
* Class RecurringController
*/
class RecurringController extends BaseController
{
protected $_repository;
/**
* @param RTR $repository
*/
public function __construct(RTR $repository)
{
$this->_repository = $repository;
View::share('menu', 'home');
}
/**
* @return $this
*/
public function create()
{
$periods = \Config::get('firefly.periods_to_text');
@@ -19,11 +28,21 @@ class RecurringController extends BaseController
return View::make('recurring.create')->with('periods', $periods);
}
/**
* @param RecurringTransaction $recurringTransaction
*
* @return $this
*/
public function delete(RecurringTransaction $recurringTransaction)
{
return View::make('recurring.delete')->with('recurringTransaction', $recurringTransaction);
}
/**
* @param RecurringTransaction $recurringTransaction
*
* @return \Illuminate\Http\RedirectResponse
*/
public function destroy(RecurringTransaction $recurringTransaction)
{
$result = $this->_repository->destroy($recurringTransaction);
@@ -37,6 +56,11 @@ class RecurringController extends BaseController
}
/**
* @param RecurringTransaction $recurringTransaction
*
* @return $this
*/
public function edit(RecurringTransaction $recurringTransaction)
{
$periods = \Config::get('firefly.periods_to_text');
@@ -46,6 +70,9 @@ class RecurringController extends BaseController
);
}
/**
* @return $this
*/
public function index()
{
$list = $this->_repository->get();
@@ -53,10 +80,16 @@ class RecurringController extends BaseController
return View::make('recurring.index')->with('list', $list);
}
/**
*
*/
public function show()
{
}
/**
* @return $this|\Illuminate\Http\RedirectResponse
*/
public function store()
{
$recurringTransaction = $this->_repository->store(Input::all());
@@ -76,6 +109,9 @@ class RecurringController extends BaseController
}
}
/**
* @param RecurringTransaction $recurringTransaction
*/
public function update(RecurringTransaction $recurringTransaction)
{
}

View File

@@ -1,9 +1,15 @@
<?php
/**
* Class ReportController
*/
class ReportController extends BaseController
{
/**
*
*/
public function index()
{

View File

@@ -1,9 +1,15 @@
<?php
/**
* Class SearchController
*/
class SearchController extends BaseController
{
/**
*
*/
public function index()
{
}

View File

@@ -44,6 +44,11 @@ class TransactionController extends BaseController
);
}
/**
* @param TransactionJournal $transactionJournal
*
* @return $this
*/
public function delete(TransactionJournal $transactionJournal)
{
return View::make('transactions.delete')->with('journal', $transactionJournal);
@@ -51,6 +56,12 @@ class TransactionController extends BaseController
}
/**
* @param TransactionJournal $transactionJournal
*
* @return \Illuminate\Http\RedirectResponse
*/
public function destroy(TransactionJournal $transactionJournal)
{
$transactionJournal->delete();
@@ -60,9 +71,9 @@ class TransactionController extends BaseController
}
/**
* @param $journalId
* @param TransactionJournal $journal
*
* @return $this|\Illuminate\View\View
* @return $this
*/
public function edit(TransactionJournal $journal)
{
@@ -129,9 +140,9 @@ class TransactionController extends BaseController
}
/**
* @param $journalId
* @param TransactionJournal $journal
*
* @return $this|\Illuminate\View\View
* @return $this
*/
public function show(TransactionJournal $journal)
{
@@ -164,6 +175,11 @@ class TransactionController extends BaseController
}
/**
* @param TransactionJournal $journal
*
* @return $this|\Illuminate\Http\RedirectResponse
*/
public function update(TransactionJournal $journal)
{
$journal = $this->_repository->update($journal, Input::all());