IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2026-08-26 21:27:44 -05:00
Code Issues Packages Projects Releases Wiki Activity

New view

Browse Source
This commit is contained in:
James Cole
2026-06-27 16:47:20 +02:00
parent c276268a93
commit 5bc1f9b1a6
71 changed files with 741 additions and 735 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/Report/AccountController.php
+1 -1
View File
@@ -63,7 +63,7 @@ final class AccountController extends Controller
} catch (Throwable $e) {
Log::error(sprintf('Could not render reports.partials.accounts: %s', $e->getMessage()));
Log::error($e->getTraceAsString());
$result = 'Could not render view.';
$result = sprintf('Could not render view: %s', $e->getMessage());
throw new FireflyException($result, 0, $e);
}
app/Http/Controllers/Report/BillController.php
+1 -1
View File
@@ -63,7 +63,7 @@ final class BillController extends Controller
} catch (Throwable $e) {
Log::error(sprintf('Could not render reports.partials.budgets: %s', $e->getMessage()));
Log::error($e->getTraceAsString());
$result = 'Could not render view.';
$result = sprintf('Could not render view: %s', $e->getMessage());
throw new FireflyException($result, 0, $e);
}
app/Http/Controllers/Report/CategoryController.php
+3 -1
View File
@@ -641,9 +641,11 @@ final class CategoryController extends Controller
public function topExpenses(Collection $accounts, Collection $categories, Carbon $start, Carbon $end)
{
$spent = $this->opsRepository->listExpenses($start, $end, $accounts, $categories);
$incomeTopLength = 0;
$result = [];
foreach ($spent as $currency) {
foreach ($currency['categories'] as $category) {
$incomeTopLength++;
foreach ($category['transaction_journals'] as $journal) {
$result[] = [
'description' => $journal['description'],
@@ -670,7 +672,7 @@ final class CategoryController extends Controller
array_multisort($amounts, SORT_ASC, $result);
try {
$result = view('reports.category.partials.top-expenses', ['result' => $result])->render();
$result = view('reports.category.partials.top-expenses', ['result' => $result, 'incomeTopLength' => $incomeTopLength])->render();
} catch (Throwable $e) {
Log::debug(sprintf('Could not render reports.partials.budget-period: %s', $e->getMessage()));
$result = sprintf('Could not render view: %s', $e->getMessage());
app/Http/Controllers/Report/OperationsController.php
+5 -4
View File
@@ -75,13 +75,14 @@ final class OperationsController extends Controller
}
$report = $this->tasker->getExpenseReport($start, $end, $accounts);
$type = 'expense-entry';
$incomeTopLength= count($report['accounts']);
try {
$result = view('reports.partials.income-expenses', ['report' => $report, 'type' => $type])->render();
$result = view('reports.partials.income-expenses', ['report' => $report, 'type' => $type, 'incomeTopLength' => $incomeTopLength])->render();
} catch (Throwable $e) {
Log::error(sprintf('Could not render reports.partials.income-expense: %s', $e->getMessage()));
Log::error($e->getTraceAsString());
$result = 'Could not render view.';
$result = sprintf('Could not render view: %s', $e->getMessage());
throw new FireflyException($result, 0, $e);
}
@@ -115,7 +116,7 @@ final class OperationsController extends Controller
} catch (Throwable $e) {
Log::error(sprintf('Could not render reports.partials.income-expenses: %s', $e->getMessage()));
Log::error($e->getTraceAsString());
$result = 'Could not render view.';
$result = sprintf('Could not render view: %s', $e->getMessage());
throw new FireflyException($result, 0, $e);
}
@@ -170,7 +171,7 @@ final class OperationsController extends Controller
} catch (Throwable $e) {
Log::error(sprintf('Could not render reports.partials.operations: %s', $e->getMessage()));
Log::error($e->getTraceAsString());
$result = 'Could not render view.';
$result = sprintf('Could not render view: %s', $e->getMessage());
throw new FireflyException($result, 0, $e);
}