kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-09-23 14:26:58 +00:00
Code Issues Projects Releases Wiki Activity

Fix #3878

Browse Source
This commit is contained in:
James Cole
2020-10-01 07:07:18 +02:00
parent 8046d14d2d
commit c01345468d
3 changed files with 102 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
resources/views/v1/reports/partials/bills.twig
View File

@@ -1,4 +1,4 @@
<table class="table table-hover sortable"> <table class="table table-hover sortable">
<thead> <thead>
<tr> <tr>
<th data-defaultsign="az">{{ trans('form.name') }}</th> <th data-defaultsign="az">{{ trans('form.name') }}</th>
@@ -81,4 +81,4 @@
{% endfor %} {% endfor %}
</tbody> </tbody>
</table> </table>

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

@@ -1,11 +1,11 @@
<table class="table table-hover"> <table class="table table-hover sortable">
<thead> <thead>
<tr> <tr>
<th>{{ 'category'|_ }}</th> <th data-defaultsign="az">{{ 'category'|_ }}</th>
<th style="text-align: right;">{{ 'spent'|_ }}</th> <th data-defaultsign="_19" style="text-align: right;">{{ 'spent'|_ }}</th>
<th style="text-align: right;">{{ 'earned'|_ }}</th> <th data-defaultsign="_19" style="text-align: right;">{{ 'earned'|_ }}</th>
<th style="text-align: right;">{{ 'sum'|_ }}</th> <th data-defaultsign="_19" style="text-align: right;">{{ 'sum'|_ }}</th>
<th>&nbsp;</th> <th data-defaultsort="disabled">&nbsp;</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
@@ -15,12 +15,12 @@
{% else %} {% else %}
<tr> <tr>
{% endif %} {% endif %}
<td> <td data-value="{{ category.title }}">
<a href="{{ route('categories.show', category.id) }}">{{ category.title }}</a> <a href="{{ route('categories.show', category.id) }}">{{ category.title }}</a>
</td> </td>
<td style="text-align: right;">{{ formatAmountBySymbol(category.spent, category.currency_symbol, category.currency_decimal_places, true) }}</td> <td data-value="{{ category.spent }}" style="text-align: right;">{{ formatAmountBySymbol(category.spent, category.currency_symbol, category.currency_decimal_places, true) }}</td>
<td style="text-align: right;">{{ formatAmountBySymbol(category.earned, category.currency_symbol, category.currency_decimal_places, true) }}</td> <td data-value="{{ category.earned }}" 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 data-value="{{ category.sum }}" style="text-align: right;">{{ formatAmountBySymbol(category.sum, category.currency_symbol, category.currency_decimal_places, true) }}</td>
<td style="width:20px;"> <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> ></i>

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

@@ -1,22 +1,26 @@
<table class="table table-hover"> <table class="table table-hover sortable">
<thead>
<tr> <tr>
<th>{{'currency'|_}}</th> <th data-defaultsign="az">{{'currency'|_}}</th>
<th>{{ 'money_flowing_in'|_ }}</th> <th data-defaultsign="_19">{{ 'money_flowing_in'|_ }}</th>
<th>{{ 'money_flowing_out'|_ }}</th> <th data-defaultsign="_19">{{ 'money_flowing_out'|_ }}</th>
<th>{{ 'difference'|_ }}</th> <th data-defaultsign="_19">{{ 'difference'|_ }}</th>
</tr> </tr>
</thead>
<tbody>
{% for sum in sums %} {% for sum in sums %}
<tr> <tr>
<td>{{ sum.currency_name }} ({{ sum.currency_symbol }})</td> <td>{{ sum.currency_name }} ({{ sum.currency_symbol }})</td>
<td> <td data-value="{{ sum.in }}">
{{ formatAmountBySymbol(sum.in, sum.currency_symbol, sum.currency_decimal_places) }} {{ formatAmountBySymbol(sum.in, sum.currency_symbol, sum.currency_decimal_places) }}
</td> </td>
<td> <td data-value="{{ sum.out }}">
{{ formatAmountBySymbol(sum.out, sum.currency_symbol, sum.currency_decimal_places) }} {{ formatAmountBySymbol(sum.out, sum.currency_symbol, sum.currency_decimal_places) }}
</td> </td>
<td> <td data-value="{{ sum.sum }}">
{{ formatAmountBySymbol(sum.sum, sum.currency_symbol, sum.currency_decimal_places) }} {{ formatAmountBySymbol(sum.sum, sum.currency_symbol, sum.currency_decimal_places) }}
</td> </td>
</tr> </tr>
{% endfor %} {% endfor %}
</tbody>
</table> </table>