kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-16 09:22:33 +00:00
Code Issues Projects Releases Wiki Activity

Simplify frontpage.

Browse Source
This commit is contained in:
James Cole
2020-08-05 18:51:17 +02:00
parent dfa60ec703
commit 8df6356abf
4 changed files with 103 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
app/Http/Controllers/HomeController.php
View File

@@ -63,8 +63,8 @@ class HomeController extends Controller
*
* @param Request $request
*
* @throws Exception
* @return JsonResponse
* @throws Exception
*/
public function dateRange(Request $request): JsonResponse
{
@@ -105,8 +105,8 @@ class HomeController extends Controller
*
* @param AccountRepositoryInterface $repository
*
* @throws Exception
* @return Factory|RedirectResponse|Redirector|View
* @throws Exception
*/
public function index(AccountRepositoryInterface $repository)
{
@@ -119,10 +119,7 @@ class HomeController extends Controller
}
$subTitle = (string) trans('firefly.welcome_back');
$transactions = [];
$frontPage = app('preferences')->get(
'frontPageAccounts',
$repository->getAccountsByType([AccountType::DEFAULT, AccountType::ASSET])->pluck('id')->toArray()
);
$frontPage = app('preferences')->get('frontPageAccounts', $repository->getAccountsByType([AccountType::ASSET])->pluck('id')->toArray());
/** @var Carbon $start */
$start = session('start', Carbon::now()->startOfMonth());
/** @var Carbon $end */
@@ -134,14 +131,15 @@ class HomeController extends Controller
/** @var BillRepositoryInterface $billRepository */
$billRepository = app(BillRepositoryInterface::class);
$billCount = $billRepository->getBills()->count();
// collect groups for each transaction.
foreach ($accounts as $account) {
/** @var GroupCollectorInterface $collector */
$collector = app(GroupCollectorInterface::class);
$collector->setAccounts(new Collection([$account]))
->withAccountInformation()
->setRange($start, $end)->setLimit(10)->setPage(1);
$set = $collector->getGroups();
$transactions[] = [$set, $account];
$collector->setAccounts(new Collection([$account]))->withAccountInformation()->setRange($start, $end)->setLimit(10)->setPage(1);
$set = $collector->getExtractedJournals();
$transactions[] = ['transactions' => $set, 'account' => $account];
}
/** @var User $user */