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

Remove various sort routines.

Browse Source
This commit is contained in:
James Cole
2019-05-04 20:58:43 +02:00
parent d5c5fa4fad
commit 8676764513
19 changed files with 261 additions and 151 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
app/Repositories/Budget/BudgetRepository.php
View File

@@ -312,16 +312,10 @@ class BudgetRepository implements BudgetRepositoryInterface
{
/** @var Collection $set */
$set = $this->user->budgets()->where('active', 1)
->orderBy('order','DESC')
->orderBy('name', 'ASC')
->get();
$set = $set->sortBy(
function (Budget $budget) {
$str = str_pad((string)$budget->order, 4, '0', STR_PAD_LEFT) . strtolower($budget->name);
return $str;
}
);
return $set;
}
@@ -596,15 +590,8 @@ class BudgetRepository implements BudgetRepositoryInterface
public function getBudgets(): Collection
{
/** @var Collection $set */
$set = $this->user->budgets()->get();
$set = $set->sortBy(
function (Budget $budget) {
$str = str_pad((string)$budget->order, 4, '0', STR_PAD_LEFT) . strtolower($budget->name);
return $str;
}
);
$set = $this->user->budgets()->orderBy('order','DESC')
->orderBy('name', 'ASC')->get();
return $set;
}
@@ -629,15 +616,8 @@ class BudgetRepository implements BudgetRepositoryInterface
public function getInactiveBudgets(): Collection
{
/** @var Collection $set */
$set = $this->user->budgets()->where('active', 0)->get();
$set = $set->sortBy(
function (Budget $budget) {
$str = str_pad((string)$budget->order, 4, '0', STR_PAD_LEFT) . strtolower($budget->name);
return $str;
}
);
$set = $this->user->budgets()->orderBy('order','DESC')
->orderBy('name', 'ASC')->where('active', 0)->get();
return $set;
}