kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-21 03:42:54 +00:00
Code Issues Projects Releases Wiki Activity

This should fix most amounts for #511

Browse Source
This commit is contained in:
James Cole
2017-01-02 19:27:27 +01:00
parent 8aa2e3d2f5
commit e323f5a2d5
4 changed files with 21 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
resources/views/list/accounts.twig
View File

@@ -10,7 +10,8 @@
<th data-defaultsign="_19">{{ trans('list.currentBalance') }}</th> <th data-defaultsign="_19">{{ trans('list.currentBalance') }}</th>
<th class="hidden-sm hidden-xs">{{ trans('list.active') }}</th> <th class="hidden-sm hidden-xs">{{ trans('list.active') }}</th>
<th data-defaultsign="month" class="hidden-sm hidden-xs">{{ trans('list.lastActivity') }}</th> <th data-defaultsign="month" class="hidden-sm hidden-xs">{{ trans('list.lastActivity') }}</th>
<th data-defaultsign="_19" class="hidden-sm hidden-xs">{{ trans('list.balanceDiff', {'start' : Session.get('start').formatLocalized(monthAndDayFormat),'end' : Session.get('end').formatLocalized(monthAndDayFormat)}) }}</th> <th data-defaultsign="_19"
class="hidden-sm hidden-xs">{{ trans('list.balanceDiff', {'start' : Session.get('start').formatLocalized(monthAndDayFormat),'end' : Session.get('end').formatLocalized(monthAndDayFormat)}) }}</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
@@ -33,7 +34,11 @@
</td> </td>
{% endif %} {% endif %}
<td class="hidden-sm hidden-xs">{{ account.iban }}</td> <td class="hidden-sm hidden-xs">{{ account.iban }}</td>
<td data-value="{{ account.endBalance }}">{{ account.endBalance|formatAmount }}</td> <td data-value="{{ account.endBalance }}" style="text-align: right;">
<span style="margin-right:5px;">
{{ account.endBalance|formatAmount }}
</span>
</td>
<td class="hidden-sm hidden-xs" data-value="{{ account.active }}"> <td class="hidden-sm hidden-xs" data-value="{{ account.active }}">
{% if account.active %} {% if account.active %}
<i class="fa fa-fw fa-check"></i> <i class="fa fa-fw fa-check"></i>
@@ -50,8 +55,10 @@
<em>{{ 'never'|_ }}</em> <em>{{ 'never'|_ }}</em>
</td> </td>
{% endif %} {% endif %}
<td class="hidden-sm hidden-xs" data-value="{{ account.difference }}"> <td class="hidden-sm hidden-xs" data-value="{{ account.difference }}" style="text-align: right;">
<span style="margin-right:5px;">
{{ (account.difference)|formatAmount }} {{ (account.difference)|formatAmount }}
</span>
</td> </td>
</tr> </tr>

8
resources/views/list/bills.twig
View File

@@ -29,11 +29,15 @@
<span class="label label-info">{{ match }}</span> <span class="label label-info">{{ match }}</span>
{% endfor %} {% endfor %}
</td> </td>
<td data-value="{{ entry.amount_min }}"> <td data-value="{{ entry.amount_min }}" style="text-align: right;">
<span style="margin-right:5px;">
{{ entry.amount_min|formatAmount }} {{ entry.amount_min|formatAmount }}
</span>
</td> </td>
<td data-value="{{ entry.amount_max }}"> <td data-value="{{ entry.amount_max }}" style="text-align: right;">
<span style="margin-right:5px;">
{{ entry.amount_max|formatAmount }} {{ entry.amount_max|formatAmount }}
</span>
</td> </td>
{% if entry.paidDates.count() == 0 and entry.payDates.count() == 0 and entry.active %} {% if entry.paidDates.count() == 0 and entry.payDates.count() == 0 and entry.active %}

7
resources/views/list/journals-tasker.twig
View File

@@ -1,6 +1,6 @@
{{ journals.render|raw }} {{ journals.render|raw }}
<table class="table table-hover table-compressed {% if sorting %}sortable-table{% endif %}"> <table class="table table-hover table-condensed {% if sorting %}sortable-table{% endif %}">
<thead> <thead>
<tr class="ignore"> <tr class="ignore">
<th class="hidden-xs no_select_boxes" colspan="2">&nbsp;</th> <th class="hidden-xs no_select_boxes" colspan="2">&nbsp;</th>
@@ -62,12 +62,13 @@
{% endif %} {% endif %}
</td> </td>
<td> <td style="text-align: right;">
<span style="margin-right:5px;">
<!-- format amount of transaction --> <!-- format amount of transaction -->
{{ formatByCode(transaction.transaction_currency_code, transaction.transaction_amount) }} {{ formatByCode(transaction.transaction_currency_code, transaction.transaction_amount) }}
<!-- and then amount of journal itself. --> <!-- and then amount of journal itself. -->
{{ optionalJournalAmount(transaction.journal_id, transaction.transaction_amount, transaction.transaction_currency_code, transaction.transaction_type_type) }} {{ optionalJournalAmount(transaction.journal_id, transaction.transaction_amount, transaction.transaction_currency_code, transaction.transaction_type_type) }}
</span>
</td> </td>
<td class="hidden-sm hidden-xs"> <td class="hidden-sm hidden-xs">

2
resources/views/list/piggy-bank-events.twig
View File

@@ -22,7 +22,7 @@
{% endif %} {% endif %}
</td> </td>
<td> <td style="text-align: right;">
{% if event.amount < 0 %} {% if event.amount < 0 %}
<span class="text-danger">{{ trans('firefly.removed_amount', {amount: (event.amount)|formatAmountPlain})|raw }}</span> <span class="text-danger">{{ trans('firefly.removed_amount', {amount: (event.amount)|formatAmountPlain})|raw }}</span>
{% else %} {% else %}