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

Improve report boxes one by one #2428

Browse Source
This commit is contained in:
James Cole
2019-08-16 06:21:10 +02:00
parent 41c15b0cf8
commit d8eb59736e
18 changed files with 268 additions and 252 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
resources/views/v1/reports/budget/month.twig
View File

@@ -250,7 +250,7 @@
<td data-value="{{ row.amount}}" style="text-align: right;">
{{ formatAmountBySymbol(row.amount, row.currency_symbol, row.currency_symbol_decimal_places) }}
{{ formatAmountBySymbol(row.amount, row.currency_symbol, row.currency_decimal_places) }}
</td>
</tr>

4
resources/views/v1/reports/category/month.twig
View File

@@ -283,7 +283,7 @@
</a>
</td>
<td data-value="{{ row.amount }}" style="text-align: right;">
{{ formatAmountBySymbol(row.amount, row.currency_symbol, row.currency_symbol_decimal_places) }}
{{ formatAmountBySymbol(row.amount, row.currency_symbol, row.currency_decimal_places) }}
</td>
</tr>
{% endfor %}
@@ -404,7 +404,7 @@
</a>
</td>
<td data-value="{{ row.amount }}" style="text-align: right;">
{{ formatAmountBySymbol(row.amount*-1, row.currency_symbol, row.currency_symbol_decimal_places) }}
{{ formatAmountBySymbol(row.amount*-1, row.currency_symbol, row.currency_decimal_places) }}
</td>
</tr>
{% endfor %}

39
resources/views/v1/reports/partials/accounts.twig
View File

@@ -14,28 +14,35 @@
<a href="{{ route('accounts.show',account.id) }}" title="{{ account.name }}">{{ account.name }}</a>
</td>
<td class="hidden-xs" data-value="{{ account.start_balance }}" style="text-align: right;">
{{ formatAmountByCurrency(account.currency, account.start_balance) }}
{{ formatAmountBySymbol(account.start_balance, account.currency_symbol, account.currency_decimal_places) }}
</td>
<td class="hidden-xs" data-value="{{ account.end_balance }}" style="text-align: right;">
{{ formatAmountByCurrency(account.currency, account.end_balance) }}</td>
{{ formatAmountBySymbol(account.end_balance, account.currency_symbol, account.currency_decimal_places) }}
</td>
<td style="text-align: right;"
data-value="{{ (account.end_balance - account.start_balance) }}">
{{ formatAmountByCurrency(account.currency, (account.end_balance - account.start_balance)) }}
{{ formatAmountBySymbol(account.end_balance - account.start_balance, account.currency_symbol, account.currency_decimal_places) }}
</td>
</tr>
{% endfor %}
<tr>
<td colspan="4"><em>{{ 'sumOfSums'|_ }}</em></td>
</tr>
{% for sum in accountReport.sums %}
<tr>
<td>
&nbsp;
</td>
<td style="text-align: right;">
{{ formatAmountBySymbol(sum.start, sum.currency_symbol, sum.currency_decimal_places) }}
</td>
<td style="text-align: right;">
{{ formatAmountBySymbol(sum.end, sum.currency_symbol, sum.currency_decimal_places) }}
</td>
<td style="text-align: right;">
{{ formatAmountBySymbol(sum.difference, sum.currency_symbol, sum.currency_decimal_places) }}
</td>
</tr>
{% endfor %}
</tbody>
<tfoot>
<tr>
<td><em>{{ 'sumOfSums'|_ }}</em></td>
<td class="hidden-xs" style="text-align: right;">{{ accountReport.start|formatAmount }}</td>
<td class="hidden-xs" style="text-align: right;">{{ accountReport.end|formatAmount }}</td>
<td style="text-align: right;">{{ accountReport.difference|formatAmount }}</td>
</tr>
{% if accountReport.currencies > 1 %}
<tr>
<td colspan="4"><small class="text-warning">{{ 'multi_currency_report_sum'|_ }}</small></td>
</tr>
{% endif %}
</tfoot>
</table>

44
resources/views/v1/reports/partials/income-expenses.twig
View File

@@ -8,58 +8,54 @@
</tr>
</thead>
<tbody>
{% set sum = 0 %}
{% for entry in entries %}
{% set sum = sum + entry.sum %}
{% for account in report.accounts %}
{% if loop.index > listLength %}
<tr class="overListLength">
{% else %}
<tr>
{% endif %}
<td data-value="{{ entry.name }}">
<a href="{{ route('accounts.show',entry.id) }}">{{ entry.name }}</a>
{% if entry.count > 1 %}
<td data-value="{{ account.name }}">
<a href="{{ route('accounts.show',account.id) }}">{{ account.name }}</a>
{% if account.count > 1 %}
<br/>
<small>
{{ entry.count }} {{ 'transactions'|_|lower }}
{{ account.count }} {{ 'transactions'|_|lower }}
</small>
{% endif %}
</td>
<td data-value="{{ entry.sum }}" style="text-align: right;">
{% if entry.currencies == 1 %}
{{ formatAmountByCurrency(entry.single_currency, entry.sum) }}
{% else %}
{{ (entry.sum)|formatAmount }}
{% endif %}
<td data-value="{{ account.sum }}" style="text-align: right;">
{{ formatAmountBySymbol(account.sum, account.currency_symbol, account.currency_decimal_places) }}
</td>
<td class="hidden-xs" data-value="{{ entry.average }}" style="text-align: right;">
{% if entry.count > 1 %}
{{ entry.average|formatAmount }}
{{ formatAmountBySymbol(account.average, account.currency_symbol, account.currency_decimal_places) }}
{% else %}
&mdash;
{% endif %}
</td>
<td>
<i class="fa fa-fw text-muted fa-info-circle firefly-info-button" data-location="{{ type }}"
data-account-id="{{ entry.id }}"></i>
data-account-id="{{ account.id }}"></i>
</td>
</tr>
{% endfor %}
</tbody>
<tfoot>
{% if entries|length > listLength %}
{% if report.accounts|length > listLength %}
<tr>
<td colspan="4" class="active">
<a href="#" class="listLengthTrigger">{{ trans('firefly.show_full_list',{number:incomeTopLength}) }}</a>
</td>
</tr>
{% endif %}
<tr>
<td><em>{{ 'sum'|_ }}</em></td>
<td style="text-align: right;">{{ (sum)|formatAmount }}</td>
</tr>
<tr>
<td colspan="4"><small class="text-warning">{{ 'sum_in_default_currency'|_ }}</small></td>
</tr>
</tfoot>
{% for sum in report.sums %}
<tr>
<td><em>{{ 'sum'|_ }} ({{ sum.currency_name }})</em></td>
<td style="text-align: right;">
{{ formatAmountBySymbol(sum.sum, sum.currency_symbol, sum.currency_decimal_places) }}
</td>
<td>&nbsp;</td>
</tr>
{% endfor %}
</table>

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

@@ -77,14 +77,14 @@
</td>
<td class="hide-balance_before" style="text-align: right;">
{{ formatAmountBySymbol(journal.balance_before, journal.currency_symbol, journal.currency_symbol_decimal_places) }}
{{ formatAmountBySymbol(journal.balance_before, journal.currency_symbol, journal.currency_decimal_places) }}
</td>
<td class="hide-amount" style="text-align: right;">
{{ formatAmountBySymbol(journal.amount, journal.currency_symbol, journal.currency_symbol_decimal_places) }}
{{ formatAmountBySymbol(journal.amount, journal.currency_symbol, journal.currency_decimal_places) }}
</td>
<td class="hide-balance_after" style="text-align: right;">
{{ formatAmountBySymbol(journal.balance_after, journal.currency_symbol, journal.currency_symbol_decimal_places) }}
{{ formatAmountBySymbol(journal.balance_after, journal.currency_symbol, journal.currency_decimal_places) }}
</td>
<td class="hide-date">{{ journal.date.formatLocalized(monthAndDayFormat) }}</td>

27
resources/views/v1/reports/partials/operations.twig
View File

@@ -1,19 +1,22 @@
<table class="table table-hover">
<tr>
<td>{{ 'money_flowing_in'|_ }}</td>
<td style="text-align: right;">{{ incomeSum|formatAmount }}</td>
<th>{{'currency'|_}}</th>
<th>{{ 'money_flowing_in'|_ }}</th>
<th>{{ 'money_flowing_out'|_ }}</th>
<th>{{ 'difference'|_ }}</th>
</tr>
{% for sum in sums %}
<tr>
<td>{{ 'money_flowing_out'|_ }}</td>
<td style="text-align: right;">{{ expensesSum|formatAmount }}</td>
</tr>
<tr>
<td>{{ 'difference'|_ }}</td>
<td style="text-align: right;">{{ (incomeSum + expensesSum)|formatAmount }}</td>
</tr>
<tr>
<td colspan="2">
<small class="text-warning">{{ 'sum_in_default_currency'|_ }}</small>
<td>{{ sum.currency_name }} ({{ sum.currency_symbol }})</td>
<td>
{{ formatAmountBySymbol(sum.in, sum.currency_symbol, sum.currency_decimal_places) }}
</td>
<td>
{{ formatAmountBySymbol(sum.out, sum.currency_symbol, sum.currency_decimal_places) }}
</td>
<td>
{{ formatAmountBySymbol(sum.sum, sum.currency_symbol, sum.currency_decimal_places) }}
</td>
</tr>
{% endfor %}
</table>

4
resources/views/v1/reports/partials/top-transactions.twig
View File

@@ -20,9 +20,9 @@
<td style="text-align: right;" data-value="{{ transaction.amount}}"><span
style="margin-right:5px;">
{{ formatAmountBySymbol(transaction.amount, transaction.currency_symbol, transaction.currency_symbol_decimal_places) }}
{{ formatAmountBySymbol(transaction.amount, transaction.currency_symbol, transaction.currency_decimal_places) }}
{% if null != transaction.foreign_amount %}
({{ formatAmountBySymbol(transaction.foreign_amount, transaction.foreign_currency_symbol, transaction.foreign_currency_symbol_decimal_places) }})
({{ formatAmountBySymbol(transaction.foreign_amount, transaction.foreign_currency_symbol, transaction.foreign_currency_decimal_places) }})
{% endif %}
</span></td>
</tr>

2
resources/views/v1/reports/tag/month.twig
View File

@@ -300,7 +300,7 @@
</a>
</td>
<td data-value="{{ row.amount }}" style="text-align: right;">
{{ formatAmountBySymbol(row.amount, row.currency_symbol, row.currency_symbol_decimal_places) }}
{{ formatAmountBySymbol(row.amount, row.currency_symbol, row.currency_decimal_places) }}
</td>
</tr>
{% endfor %}