kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-12 15:35:15 +00:00
Code Issues Projects Releases Wiki Activity

Optimized some code.

Browse Source
This commit is contained in:
James Cole
2015-07-06 22:12:35 +02:00
parent 516725456f
commit d67db74ca2
8 changed files with 375 additions and 366 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/Helpers/Report/ReportQuery.php
View File

@@ -227,11 +227,10 @@ class ReportQuery implements ReportQueryInterface
* @param Account $account
* @param Carbon $start
* @param Carbon $end
* @param bool $shared
*
* @return string
*/
public function spentNoBudget(Account $account, Carbon $start, Carbon $end, $shared = false)
public function spentNoBudget(Account $account, Carbon $start, Carbon $end)
{
return
Auth::user()->transactionjournals()

3
app/Helpers/Report/ReportQueryInterface.php
View File

@@ -71,11 +71,10 @@ interface ReportQueryInterface
* @param Account $account
* @param Carbon $start
* @param Carbon $end
* @param bool $shared
*
* @return string
*/
public function spentNoBudget(Account $account, Carbon $start, Carbon $end, $shared = false);
public function spentNoBudget(Account $account, Carbon $start, Carbon $end);
}

13
app/Http/Controllers/CsvController.php
View File

@@ -229,16 +229,13 @@ class CsvController extends Controller
public function map()
{
/*
* Make sure all fields we need are accounted for.
*/
// Make sure all fields we need are accounted for.
$fields = ['csv-file', 'csv-date-format', 'csv-has-headers', 'csv-map', 'csv-roles'];
if (!$this->wizard->sessionHasValues($fields)) {
Session::flash('warning', 'Could not recover upload.');
return redirect(route('csv.index'));
}
/*
* The "options" array contains all options the user has
* per column, where the key represents the column.
@@ -246,10 +243,8 @@ class CsvController extends Controller
* For each key there is an array which in turn represents
* all the options available: grouped by ID.
*
* Aka:
*
* options[column index] = [
* field id => field identifier.
* field id => field identifier.
* ]
*/
try {
@@ -258,9 +253,7 @@ class CsvController extends Controller
return view('error', ['message' => $e->getMessage()]);
}
/*
* After these values are prepped, read the actual CSV file
*/
// After these values are prepped, read the actual CSV file
$reader = $this->data->getReader();
$map = $this->data->getMap();
$hasHeaders = $this->data->getHasHeaders();

6
app/Http/Controllers/TagController.php
View File

@@ -220,9 +220,9 @@ class TagController extends Controller
public function store(TagFormRequest $request, TagRepositoryInterface $repository)
{
if (Input::get('setTag') == 'true') {
$latitude = strlen($request->get('latitude')) > 0 ? $request->get('latitude') : null;
$longitude = strlen($request->get('longitude')) > 0 ? $request->get('longitude') : null;
$zoomLevel = strlen($request->get('zoomLevel')) > 0 ? $request->get('zoomLevel') : null;
$latitude = $request->get('latitude');
$longitude = $request->get('longitude');
$zoomLevel = $request->get('zoomLevel');
} else {
$latitude = null;
$longitude = null;

32
app/Http/Controllers/TransactionController.php
View File

@@ -2,6 +2,7 @@
use Auth;
use Carbon\Carbon;
use Config;
use ExpandedForm;
use FireflyIII\Events\JournalCreated;
use FireflyIII\Events\JournalSaved;
@@ -189,31 +190,12 @@ class TransactionController extends Controller
*/
public function index(JournalRepositoryInterface $repository, $what)
{
$types = [];
switch ($what) {
case 'expenses':
case 'withdrawal':
$subTitleIcon = 'fa-long-arrow-left';
$subTitle = trans('firefly.expenses');
$types = ['Withdrawal'];
break;
case 'revenue':
case 'deposit':
$subTitleIcon = 'fa-long-arrow-right';
$subTitle = trans('firefly.income');
$types = ['Deposit'];
break;
case 'transfer':
case 'transfers':
$subTitleIcon = 'fa-exchange';
$subTitle = trans('firefly.transfers');
$types = ['Transfer'];
break;
}
$page = intval(Input::get('page'));
$offset = $page > 0 ? ($page - 1) * 50 : 0;
$journals = $repository->getJournalsOfTypes($types, $offset, $page);
$subTitleIcon = Config::get('firefly.transactionIconsByWhat.' . $what);
$types = Config::get('firefly.transactionTypesByWhat.' . $what);
$subTitle = trans('firefly.title_' . $what);
$page = intval(Input::get('page'));
$offset = $page > 0 ? ($page - 1) * 50 : 0;
$journals = $repository->getJournalsOfTypes($types, $offset, $page);
$journals->setPath('transactions/' . $what);