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

Small display bug related to #648

Browse Source
This commit is contained in:
James Cole
2017-07-01 10:29:07 +02:00
parent f1e0ad0df0
commit 1eed142423
5 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Controllers/AccountController.php
View File

@@ -308,7 +308,7 @@ class AccountController extends Controller
$journals = $collector->getPaginatedJournals(); $journals = $collector->getPaginatedJournals();
$journals->setPath('accounts/show/' . $account->id . '/' . $moment); $journals->setPath('accounts/show/' . $account->id . '/' . $moment);
$count = $journals->getCollection()->count(); $count = $journals->getCollection()->count();
if ($count === 0) { if ($count === 0 && $loop < 3) {
$start->subDay(); $start->subDay();
$start = Navigation::startOfPeriod($start, $range); $start = Navigation::startOfPeriod($start, $range);
$end = Navigation::endOfPeriod($start, $range); $end = Navigation::endOfPeriod($start, $range);

4
app/Http/Controllers/BudgetController.php
View File

@@ -302,7 +302,7 @@ class BudgetController extends Controller
Log::info('Now at no-budget loop start.'); Log::info('Now at no-budget loop start.');
while ($count === 0 && $loop < 3) { while ($count === 0 && $loop < 3) {
$loop++; $loop++;
Log::info('Count is zero, search for journals.'); Log::info(sprintf('Count is zero, search for journals between %s and %s.', $start->format('Y-m-d'), $end->format('Y-m-d')));
/** @var JournalCollectorInterface $collector */ /** @var JournalCollectorInterface $collector */
$collector = app(JournalCollectorInterface::class); $collector = app(JournalCollectorInterface::class);
$collector->setAllAssetAccounts()->setRange($start, $end)->setTypes([TransactionType::WITHDRAWAL])->setLimit($pageSize)->setPage($page) $collector->setAllAssetAccounts()->setRange($start, $end)->setTypes([TransactionType::WITHDRAWAL])->setLimit($pageSize)->setPage($page)
@@ -310,7 +310,7 @@ class BudgetController extends Controller
$journals = $collector->getPaginatedJournals(); $journals = $collector->getPaginatedJournals();
$journals->setPath('/budgets/list/no-budget'); $journals->setPath('/budgets/list/no-budget');
$count = $journals->getCollection()->count(); $count = $journals->getCollection()->count();
if ($count === 0) { if ($count === 0 && $loop < 3) {
$start->subDay(); $start->subDay();
$start = Navigation::startOfPeriod($start, $range); $start = Navigation::startOfPeriod($start, $range);
$end = Navigation::endOfPeriod($start, $range); $end = Navigation::endOfPeriod($start, $range);

4
app/Http/Controllers/CategoryController.php
View File

@@ -216,7 +216,7 @@ class CategoryController extends Controller
$journals = $collector->getPaginatedJournals(); $journals = $collector->getPaginatedJournals();
$journals->setPath('/categories/list/no-category'); $journals->setPath('/categories/list/no-category');
$count = $journals->getCollection()->count(); $count = $journals->getCollection()->count();
if ($count === 0) { if ($count === 0 && $loop < 3) {
$start->subDay(); $start->subDay();
$start = Navigation::startOfPeriod($start, $range); $start = Navigation::startOfPeriod($start, $range);
$end = Navigation::endOfPeriod($start, $range); $end = Navigation::endOfPeriod($start, $range);
@@ -300,7 +300,7 @@ class CategoryController extends Controller
$journals = $collector->getPaginatedJournals(); $journals = $collector->getPaginatedJournals();
$journals->setPath('categories/show/' . $category->id); $journals->setPath('categories/show/' . $category->id);
$count = $journals->getCollection()->count(); $count = $journals->getCollection()->count();
if ($count === 0) { if ($count === 0 && $loop < 3) {
$start->subDay(); $start->subDay();
$start = Navigation::startOfPeriod($start, $range); $start = Navigation::startOfPeriod($start, $range);
$end = Navigation::endOfPeriod($start, $range); $end = Navigation::endOfPeriod($start, $range);

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

@@ -293,7 +293,7 @@ class TagController extends Controller
$journals = $collector->getPaginatedJournals(); $journals = $collector->getPaginatedJournals();
$journals->setPath($path); $journals->setPath($path);
$count = $journals->getCollection()->count(); $count = $journals->getCollection()->count();
if ($count === 0) { if ($count === 0 && $loop < 3) {
$start->subDay(); $start->subDay();
$start = Navigation::startOfPeriod($start, $range); $start = Navigation::startOfPeriod($start, $range);
$end = Navigation::endOfPeriod($start, $range); $end = Navigation::endOfPeriod($start, $range);

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

@@ -122,7 +122,7 @@ class TransactionController extends Controller
$journals = $collector->getPaginatedJournals(); $journals = $collector->getPaginatedJournals();
$journals->setPath($path); $journals->setPath($path);
$count = $journals->getCollection()->count(); $count = $journals->getCollection()->count();
if ($count === 0) { if ($count === 0 && $loop < 3) {
$start->subDay(); $start->subDay();
$start = Navigation::startOfPeriod($start, $range); $start = Navigation::startOfPeriod($start, $range);
$end = Navigation::endOfPeriod($start, $range); $end = Navigation::endOfPeriod($start, $range);