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

Add notes to audit report.

Browse Source
This commit is contained in:
James Cole
2024-12-23 08:35:33 +01:00
parent ae09200f42
commit e1785898ba
3 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/Generator/Report/Audit/MonthReportGenerator.php
View File

@@ -83,6 +83,9 @@ class MonthReportGenerator implements ReportGeneratorInterface
'create_date', 'create_date',
'update_date', 'update_date',
// more
'notes',
// date fields. // date fields.
'interest_date', 'interest_date',
'book_date', 'book_date',
@@ -126,7 +129,7 @@ class MonthReportGenerator implements ReportGeneratorInterface
/** @var GroupCollectorInterface $collector */ /** @var GroupCollectorInterface $collector */
$collector = app(GroupCollectorInterface::class); $collector = app(GroupCollectorInterface::class);
$collector->setAccounts(new Collection([$account]))->setRange($this->start, $this->end)->withAccountInformation() $collector->setAccounts(new Collection([$account]))->setRange($this->start, $this->end)->withAccountInformation()
->withBudgetInformation()->withCategoryInformation()->withBillInformation() ->withBudgetInformation()->withCategoryInformation()->withBillInformation()->withNotes()
; ;
$journals = $collector->getExtractedJournals(); $journals = $collector->getExtractedJournals();
$journals = array_reverse($journals, true); $journals = array_reverse($journals, true);

2
resources/views/reports/audit/report.twig
View File

@@ -58,7 +58,7 @@
account_name: account.name|escape, account_name: account.name|escape,
url: url, url: url,
end: auditData[account.id].dayBefore, end: auditData[account.id].dayBefore,
balance: formatAmountByAccount(account, auditData[account.id].dayBeforeBalance) balance: formatAmountByAccount(account, auditData[account.id].dayBeforeBalance.balance)
})|raw }} })|raw }}
</p> </p>
{% include 'reports.partials.journals-audit' with {'journals': auditData[account.id].journals,'account':account} %} {% include 'reports.partials.journals-audit' with {'journals': auditData[account.id].journals,'account':account} %}

5
resources/views/reports/partials/journals-audit.twig
View File

@@ -22,6 +22,8 @@
<th class="hide-create_date">{{ trans('list.create_date') }}</th> <th class="hide-create_date">{{ trans('list.create_date') }}</th>
<th class="hide-update_date">{{ trans('list.update_date') }}</th> <th class="hide-update_date">{{ trans('list.update_date') }}</th>
<th class="hide-notes">{{ trans('list.notes') }}</th>
{# even more optional fields #} {# even more optional fields #}
<th class="hide-interest_date">{{ trans('list.interest_date') }}</th> <th class="hide-interest_date">{{ trans('list.interest_date') }}</th>
<th class="hide-book_date">{{ trans('list.book_date') }}</th> <th class="hide-book_date">{{ trans('list.book_date') }}</th>
@@ -144,6 +146,9 @@
<td class="hide-update_date"> <td class="hide-update_date">
{{ journal.updated_at.isoFormat(dateTimeFormat) }} {{ journal.updated_at.isoFormat(dateTimeFormat) }}
</td> </td>
<td class="hide-notes">
{{ journal.notes|default('')|markdown }}
</td>
<!-- more new dates --> <!-- more new dates -->
<td class="hide-interest_date"> <td class="hide-interest_date">