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

Code to catch empty lists and nudge user in the right direction.

Browse Source
This commit is contained in:
James Cole
2017-02-23 07:24:05 +01:00
parent b3df1f3d26
commit 563c668e3f
11 changed files with 309 additions and 228 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -183,20 +183,23 @@ class TagController extends Controller
}
/**
* @param TagRepositoryInterface $repository
*
* @return View
*/
public function index()
public function index(TagRepositoryInterface $repository)
{
$title = 'Tags';
$mainTitleIcon = 'fa-tags';
$types = ['nothing', 'balancingAct', 'advancePayment'];
$count = $repository->count();
// loop each types and get the tags, group them by year.
$collection = [];
foreach ($types as $type) {
/** @var Collection $tags */
$tags = auth()->user()->tags()->where('tagMode', $type)->orderBy('date', 'ASC')->get();
$tags = $repository->getByType($type);
$tags = $tags->sortBy(
function (Tag $tag) {
$date = !is_null($tag->date) ? $tag->date->format('Ymd') : '000000';
@@ -216,7 +219,7 @@ class TagController extends Controller
}
}
return view('tags.index', compact('title', 'mainTitleIcon', 'types', 'collection'));
return view('tags.index', compact('title', 'mainTitleIcon', 'types', 'collection','count'));
}
/**
@@ -266,8 +269,8 @@ class TagController extends Controller
$page = intval($request->get('page')) === 0 ? 1 : intval($request->get('page'));
$pageSize = intval(Preferences::get('transactionPageSize', 50)->data);
$collector->setAllAssetAccounts()->setLimit($pageSize)->setPage($page)->setTag($tag)
->withOpposingAccount()->disableInternalFilter()
->withBudgetInformation()->withCategoryInformation();
->withOpposingAccount()->disableInternalFilter()
->withBudgetInformation()->withCategoryInformation();
$journals = $collector->getPaginatedJournals();
$journals->setPath('tags/show/' . $tag->id . '/all');