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

Expand view of report and make multi currency

Browse Source
This commit is contained in:
James Cole
2019-09-01 15:23:33 +02:00
parent 1e9f354a81
commit ce06fb73b1
13 changed files with 124 additions and 147 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
resources/views/v1/reports/partials/balance.twig
View File

@@ -4,7 +4,8 @@
<th>{{ 'budgets'|_ }}</th>
{% for account in report.accounts %}
{% if account.sum != 0 %}
<th class="hidden-xs" style="text-align: right;"><a href="{{ route('accounts.show',account.id) }}" title="{{ account.iban|default(account.name) }}">{{ account.name }}</a></th>
<th class="hidden-xs" style="text-align: right;"><a href="{{ route('accounts.show',account.id) }}"
title="{{ account.iban|default(account.name) }}">{{ account.name }}</a></th>
{% endif %}
{% endfor %}
<th style="text-align: right;">{{ 'sum'|_ }}</th>
@@ -14,31 +15,34 @@
{% for budget in report.budgets %}
{% if budget.spent|length > 0 %}
<tr>
<td>
<a href="{{ route('budgets.show', [budget.budget_id]) }}">{{ budget.budget_name }}</a>
</td>
{% for account in report.accounts %}
{% if budget.spent[account.id] %}
<td style="text-align: right;">
{{ formatAmountBySymbol(budget.spent[account.id].spent, budget.spent[account.id].currency_symbol, budget.spent[account.id].currency_decimal_places) }}
<i class="fa fa-fw fa-info-circle text-muted"></i>
{# TODO #}
{#data-location="category-entry" data-category-id="{{ category.id }}" data-currency-id="{{ category.currency_id }}"-->#}
<tr>
<td>
<a href="{{ route('budgets.show', [budget.budget_id]) }}">{{ budget.budget_name }}</a>
</td>
{% else %}
{% if report.accounts[account.id].sum != 0 %}
<td>&nbsp;</td>
{% endif %}
{% endif %}
{% for account in report.accounts %}
{% if budget.spent[account.id] %}
<td style="text-align: right;">
{{ formatAmountBySymbol(budget.spent[account.id].spent, budget.spent[account.id].currency_symbol, budget.spent[account.id].currency_decimal_places) }}
<i data-location="budget-entry"
data-budget-id="{{ budget.budget_id }}"
data-account-id="{{ account.id }}"
data-currency-id="{{ budget.spent[account.id].currency_id }}"
class="fa fa-fw fa-info-circle text-muted firefly-info-button"></i>
</td>
{% else %}
{% if report.accounts[account.id].sum != 0 %}
<td>&nbsp;</td>
{% endif %}
{% endif %}
{% endfor %}
<td style="text-align: right;">
{% for sum in report.sums[budget.budget_id] %}
{{ formatAmountBySymbol(sum.sum, sum.currency_symbol, sum.currency_decimal_places) }} <i class="fa fa-fw fa-info-circle text-muted"></i><br />
{% endfor %}
</td>
</tr>
{% endfor %}
<td style="text-align: right;">
{% for sum in report.sums[budget.budget_id] %}
{{ formatAmountBySymbol(sum.sum, sum.currency_symbol, sum.currency_decimal_places) }} <i class="fa fa-fw fa-info-circle text-muted"></i>
<br/>
{% endfor %}
</td>
</tr>
{% endif %}
{% endfor %}
</tbody>
@@ -47,9 +51,9 @@
<td><em>{{ 'sum'|_ }}</em></td>
{% for account in report.accounts %}
{% if account.sum != 0 %}
<td style="text-align: right;">
<td style="text-align: right;">
{{ formatAmountBySymbol(account.sum, account.currency_symbol, account.currency_decimal_places) }}
</td>
</td>
{% endif %}
{% endfor %}
</tr>

1
resources/views/v1/reports/partials/budget-period.twig
View File

@@ -29,7 +29,6 @@
{% else %}
<td data-value="0" style="text-align: right;">
{{ formatAmountBySymbol(0, info.currency_symbol, info.currency_decimal_places) }}
</td>
{% endif %}

3
resources/views/v1/reports/partials/categories.twig
View File

@@ -22,8 +22,7 @@
<td style="text-align: right;">{{ formatAmountBySymbol(category.earned, category.currency_symbol, category.currency_decimal_places, true) }}</td>
<td style="text-align: right;">{{ formatAmountBySymbol(category.sum, category.currency_symbol, category.currency_decimal_places, true) }}</td>
<td style="width:20px;">
<i class="fa fa-fw fa-info-circle text-muted firefly-info-button"
data-location="category-entry" data-category-id="{{ category.id }}" data-currency-id="{{ category.currency_id }}"
<i class="fa fa-fw fa-info-circle text-muted firefly-info-button" data-location="category-entry" data-category-id="{{ category.id }}" data-currency-id="{{ category.currency_id }}"
></i>
</td>
</tr>