mirror of
https://github.com/firefly-iii/firefly-iii.git
synced 2025-10-26 13:36:15 +00:00
Expand view of report and make multi currency
This commit is contained in:
James Cole
@@ -1,31 +0,0 @@
|
||||
<div class="modal-dialog">
|
||||
<div class="modal-content">
|
||||
<div class="modal-header">
|
||||
<button type="button" class="close" data-dismiss="modal"><span>×</span><span class="sr-only">{{ 'close'|_ }}</span>
|
||||
</button>
|
||||
<h4 class="modal-title">
|
||||
{{ trans('firefly.update_budget_amount_range',
|
||||
{start: start.formatLocalized(monthAndDayFormat), end: end.formatLocalized(monthAndDayFormat)}) }}
|
||||
</h4>
|
||||
</div>
|
||||
|
||||
<form style="display: inline;" id="income" action="{{ route('budgets.income.post') }}" method="POST">
|
||||
<div class="modal-body">
|
||||
<input type="hidden" name="_token" value="{{ csrf_token() }}"/>
|
||||
<input type="hidden" name="start" value="{{ start.format('Y-m-d') }}"/>
|
||||
<input type="hidden" name="end" value="{{ end.format('Y-m-d') }}"/>
|
||||
<input type="hidden" name="page" value="{{ page }}" />
|
||||
|
||||
<div class="input-group">
|
||||
<div class="input-group-addon">{{ defaultCurrency.symbol|raw }}</div>
|
||||
<input step="any" class="form-control" id="amount" value="{{ available }}" autocomplete="off" name="amount" type="number"/>
|
||||
</div>
|
||||
</div>
|
||||
<div class="modal-footer">
|
||||
<button type="button" class="btn btn-default" data-dismiss="modal">{{ 'close'|_ }}</button>
|
||||
<button type="submit" class="btn btn-primary">{{ 'update_amount'|_ }}</button>
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -1,53 +0,0 @@
|
||||
<div class="modal-dialog">
|
||||
<div class="modal-content">
|
||||
<div class="modal-header">
|
||||
<button type="button" class="close" data-dismiss="modal"><span>×</span><span class="sr-only">{{ 'close'|_ }}</span>
|
||||
</button>
|
||||
<h4 class="modal-title">
|
||||
{{ trans('firefly.info_on_available_amount') }}
|
||||
</h4>
|
||||
</div>
|
||||
|
||||
<div class="modal-body">
|
||||
<p>
|
||||
{{ 'available_amount_indication'|_ }}
|
||||
</p>
|
||||
<table class="table table-bordered table-striped">
|
||||
<tr>
|
||||
<td>
|
||||
{{ 'budgeted'|_ }}
|
||||
<small><br/>
|
||||
{{ trans('firefly.average_between', {start:searchBegin.formatLocalized(monthAndDayFormat), end:searchEnd.formatLocalized(monthAndDayFormat)}) }}
|
||||
</td>
|
||||
<td>
|
||||
<span class="pull-right">{{ result.available|formatAmount }}</span>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>{{ 'earned'|_ }}
|
||||
<small><br/>
|
||||
{{ trans('firefly.average_between', {start:searchBegin.formatLocalized(monthAndDayFormat), end:searchEnd.formatLocalized(monthAndDayFormat)}) }}
|
||||
</small>
|
||||
</td>
|
||||
<td><span class="pull-right">{{ result.earned|formatAmount }}</span></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>{{ 'spent'|_ }}
|
||||
<small><br/>
|
||||
{{ trans('firefly.average_between', {start:searchBegin.formatLocalized(monthAndDayFormat), end:searchEnd.formatLocalized(monthAndDayFormat)}) }}
|
||||
</small>
|
||||
</td>
|
||||
<td><span class="pull-right">{{ result.spent|formatAmount }}</span></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td><strong>{{ 'suggested'|_ }}</strong></td>
|
||||
<td><span class="pull-right">{{ result.suggested|formatAmount }}</span></td>
|
||||
</tr>
|
||||
</table>
|
||||
</div>
|
||||
<div class="modal-footer">
|
||||
<button type="button" class="btn btn-default" data-dismiss="modal">{{ 'close'|_ }}</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -16,8 +16,6 @@
|
||||
{{ trans('firefly.chart_all_journals_for_budget', {name:budget.name}) }}
|
||||
{% endif %}
|
||||
</h3>
|
||||
|
||||
|
||||
<div class="box-tools pull-right">
|
||||
<div class="btn-group">
|
||||
<button class="btn btn-box-tool dropdown-toggle" data-toggle="dropdown"><i class="fa fa-ellipsis-v"></i></button>
|
||||
|
||||
@@ -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> </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> </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>
|
||||
|
||||
@@ -29,7 +29,6 @@
|
||||
{% else %}
|
||||
<td data-value="0" style="text-align: right;">
|
||||
{{ formatAmountBySymbol(0, info.currency_symbol, info.currency_decimal_places) }}
|
||||
|
||||
</td>
|
||||
{% endif %}
|
||||
|
||||
|
||||
@@ -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>
|
||||
|
||||
Reference in New Issue
Block a user