kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-09-29 02:57:45 +00:00
Code Issues Projects Releases Wiki Activity

Built the 'show'-view for budgets.

Browse Source
This commit is contained in:
Sander Dorigo
2014-11-08 19:11:51 +01:00
parent ac299e7279
commit 873384a34b
8 changed files with 231 additions and 449 deletions
Download Patch File Download Diff File Expand all files Collapse all files

276
app/controllers/PiggybankController.php
View File

@@ -39,28 +39,6 @@ class PiggybankController extends BaseController
->with('subTitle', 'Create new piggy bank')->with('subTitleIcon', 'fa-plus');
}
// /**
// * @return $this
// */
// public function createRepeated()
// {
// throw new NotImplementedException;
// /** @var \Firefly\Helper\Toolkit\Toolkit $toolkit */
// $toolkit = App::make('Firefly\Helper\Toolkit\Toolkit');
//
// $periods = Config::get('firefly.piggybank_periods');
// $list = $this->_accounts->getActiveDefault();
// $accounts = $toolkit->makeSelectList($list);
//
// View::share('title', 'Repeated expenses');
// View::share('subTitle', 'Create new');
// View::share('mainTitleIcon', 'fa-rotate-right');
//
// return View::make('piggybanks.create-repeated')->with('accounts', $accounts)->with('periods', $periods);
// }
/**
* @param Piggybank $piggyBank
*
@@ -126,82 +104,8 @@ class PiggybankController extends BaseController
'mainTitleIcon', 'fa-sort-amount-asc'
)
->with('subTitle', 'Edit piggy bank "' . e($piggybank->name) . '"')->with('subTitleIcon', 'fa-pencil');
//throw new NotImplementedException;
// /** @var \Firefly\Helper\Toolkit\Toolkit $toolkit */
// $toolkit = App::make('Firefly\Helper\Toolkit\Toolkit');
//
// $list = $this->_accounts->getActiveDefault();
// $accounts = $toolkit->makeSelectList($list);
// $periods = Config::get('firefly.piggybank_periods');
//
//
// View::share('subTitle', 'Edit "' . $piggyBank->name . '"');
//
//
// if ($piggyBank->repeats == 1) {
// View::share('title', 'Repeated expenses');
// View::share('mainTitleIcon', 'fa-rotate-left');
//
// return View::make('piggybanks.edit-repeated')->with('piggybank', $piggyBank)->with('accounts', $accounts)
// ->with('periods', $periods);
// } else {
// // piggy bank.
// View::share('title', 'Piggy banks');
// View::share('mainTitleIcon', 'fa-sort-amount-asc');
//
// return View::make('piggybanks.edit-piggybank')->with('piggybank', $piggyBank)->with('accounts', $accounts)
// ->with('periods', $periods);
// }
}
// /**
// * @param Piggybank $piggyBank
// *
// * @return \Illuminate\Http\RedirectResponse
// * @throws Firefly\Exception\FireflyException
// */
// public function modMoney(Piggybank $piggyBank)
// {
// throw new NotImplementedException;
// $amount = floatval(Input::get('amount'));
// switch (Input::get('what')) {
// default:
// throw new FireflyException('No such action');
// break;
// case 'add':
// $maxAdd = $this->_repository->leftOnAccount($piggyBank->account);
// if (round($amount, 2) <= round(min($maxAdd, $piggyBank->targetamount), 2)) {
// Session::flash('success', 'Amount updated!');
// $this->_repository->modifyAmount($piggyBank, $amount);
// Event::fire('piggybanks.modifyAmountAdd', [$piggyBank, $amount]);
// } else {
// Session::flash('warning', 'Could not!');
// }
// break;
// case 'remove':
// $rep = $piggyBank->currentRelevantRep();
// $maxRemove = $rep->currentamount;
// if (round($amount, 2) <= round($maxRemove, 2)) {
// Session::flash('success', 'Amount updated!');
// $this->_repository->modifyAmount($piggyBank, ($amount * -1));
// Event::fire('piggybanks.modifyAmountRemove', [$piggyBank, ($amount * -1)]);
// } else {
// Session::flash('warning', 'Could not!');
// }
// break;
// }
// if ($piggyBank->repeats == 1) {
// $route = 'piggybanks.index.repeated';
//
// } else {
// $route = 'piggybanks.index.piggybanks';
// }
// return Redirect::route($route);
// }
/**
* @param Piggybank $piggybank
*
@@ -316,122 +220,13 @@ class PiggybankController extends BaseController
}
}
return View::make('piggybanks.index', compact('piggybanks', 'accounts'))->with('title', 'Piggy banks')->with('mainTitleIcon', 'fa-sort-amount-asc');
//throw new NotImplementedException;
// $countRepeating = $this->_repository->countRepeating();
// $countNonRepeating = $this->_repository->countNonrepeating();
//
// $piggybanks = $this->_repository->get();
//
// // get the accounts with each piggy bank and check their balance; Fireflyy might needs to
// // show the user a correction.
//
// $accounts = [];
// /** @var \Piggybank $piggybank */
// foreach ($piggybanks as $piggybank) {
// $account = $piggybank->account;
// $id = $account->id;
// if (!isset($accounts[$id])) {
// $account->leftOnAccount = $this->_repository->leftOnAccount($account);
// $accounts[$id] = [
// 'account' => $account,
// 'left' => $this->_repository->leftOnAccount($account),
// 'tosave' => $piggybank->targetamount,
// 'saved' => $piggybank->currentRelevantRep()->currentamount
// ];
// } else {
// $accounts[$id]['tosave'] += $piggybank->targetamount;
// $accounts[$id]['saved'] += $piggybank->currentRelevantRep()->currentamount;
// }
// }
//
// View::share('title', 'Piggy banks');
// View::share('subTitle', 'Save for big expenses');
// View::share('mainTitleIcon', 'fa-sort-amount-asc');
//
// return View::make('piggybanks.index')->with('piggybanks', $piggybanks)
// ->with('countRepeating', $countRepeating)
// ->with('countNonRepeating', $countNonRepeating)
// ->with('accounts', $accounts);
}
// /**
// * @param Piggybank $piggyBank
// *
// * @return $this
// */
// public function removeMoney(Piggybank $piggyBank)
// {
// $what = 'remove';
// $maxAdd = $this->_repository->leftOnAccount($piggyBank->account);
// $maxRemove = $piggyBank->currentRelevantRep()->currentamount;
//
// return View::make('piggybanks.modifyAmount')->with('what', $what)->with('maxAdd', $maxAdd)->with(
// 'maxRemove', $maxRemove
// )->with('piggybank', $piggyBank);
// }
// /**
// * @return $this
// */
// public function repeated()
// {
// $countRepeating = $this->_repository->countRepeating();
// $countNonRepeating = $this->_repository->countNonrepeating();
//
// $piggybanks = $this->_repository->get();
//
// // get the accounts with each piggy bank and check their balance; Fireflyy might needs to
// // show the user a correction.
//
// $accounts = [];
// /** @var \Piggybank $piggybank */
// foreach ($piggybanks as $piggybank) {
// $account = $piggybank->account;
// $id = $account->id;
// if (!isset($accounts[$id])) {
// $account->leftOnAccount = $this->_repository->leftOnAccount($account);
// $accounts[$id] = ['account' => $account, 'left' => $this->_repository->leftOnAccount($account)];
// }
// }
//
// View::share('title', 'Repeated expenses');
// View::share('subTitle', 'Save for returning bills');
// View::share('mainTitleIcon', 'fa-rotate-left');
//
//
// return View::make('piggybanks.index')->with('piggybanks', $piggybanks)
// ->with('countRepeating', $countRepeating)
// ->with('countNonRepeating', $countNonRepeating)
// ->with('accounts', $accounts);
// }
// /**
// * @param Piggybank $piggyBank
// *
// * @return $this
// * @throws NotImplementedException
// */
public function show(Piggybank $piggyBank)
{
throw new NotImplementedException;
// $leftOnAccount = $this->_repository->leftOnAccount($piggyBank->account);
// $balance = $piggyBank->account->balance();
//
// View::share('subTitle', $piggyBank->name);
//
// if ($piggyBank->repeats == 1) {
// // repeated expense.
// View::share('title', 'Repeated expenses');
// View::share('mainTitleIcon', 'fa-rotate-left');
// } else {
// // piggy bank.
// View::share('title', 'Piggy banks');
// View::share('mainTitleIcon', 'fa-sort-amount-asc');
// }
//
// return View::make('piggybanks.show')->with('piggyBank', $piggyBank)->with('leftOnAccount', $leftOnAccount)
// ->with('balance', $balance);
}
/**
@@ -477,58 +272,8 @@ class PiggybankController extends BaseController
return Redirect::route('piggybanks.create')->withInput();
break;
}
// $data = Input::all();
// unset($data['_token']);
//
// // extend the data array with the settings needed to create a piggy bank:
// $data['repeats'] = 0;
// $data['rep_times'] = 1;
// $data['rep_every'] = 1;
// $data['order'] = 0;
//
// $piggyBank = $this->_repository->store($data);
// if (!is_null($piggyBank->id)) {
// Session::flash('success', 'New piggy bank "' . $piggyBank->name . '" created!');
// Event::fire('piggybanks.store', [$piggyBank]);
//
// return Redirect::route('piggybanks.index.piggybanks');
//
//
// } else {
// Session::flash('error', 'Could not save piggy bank: ' . $piggyBank->errors()->first());
//
// return Redirect::route('piggybanks.create.piggybank')->withInput()->withErrors($piggyBank->errors());
// }
}
// /**
// * @return $this|\Illuminate\Http\RedirectResponse
// */
// public function storeRepeated()
// {
//
// $data = Input::all();
// unset($data['_token']);
//
// // extend the data array with the settings needed to create a repeated:
// $data['repeats'] = 1;
// $data['order'] = 0;
//
// $piggyBank = $this->_repository->store($data);
// if ($piggyBank->id) {
// Session::flash('success', 'New piggy bank "' . $piggyBank->name . '" created!');
// Event::fire('piggybanks.store', [$piggyBank]);
// return Redirect::route('piggybanks.index.repeated');
//
// } else {
// Session::flash('error', 'Could not save piggy bank: ' . $piggyBank->errors()->first());
//
// return Redirect::route('piggybanks.create.repeated')->withInput()->withErrors($piggyBank->errors());
// }
//
// }
/**
* @param Piggybank $piggyBank
*
@@ -575,21 +320,4 @@ class PiggybankController extends BaseController
}
}
// /**
// * @param Piggybank $piggyBank
// *
// * @return $this
// */
// public function addMoney(Piggybank $piggyBank)
// {
// throw new NotImplementedException;
// $what = 'add';
// $maxAdd = $this->_repository->leftOnAccount($piggyBank->account);
// $maxRemove = null;
//
// return View::make('piggybanks.modifyAmount')->with('what', $what)->with('maxAdd', $maxAdd)->with(
// 'maxRemove', $maxRemove
// )->with('piggybank', $piggyBank);
// }
}