IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-02-25 18:45:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into 5.8-dev

Browse Source
This commit is contained in:
James Cole 2022-10-24 19:48:13 +02:00
commit e3bdc62ac4
No known key found for this signature in database
GPG Key ID: B49A324B7EAD6D80
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -56,7 +56,7 @@
title="{{ group.title }}">{{ group.title }}</a> title="{{ group.title }}">{{ group.title }}</a>
</strong></small> </strong></small>
</td> </td>
<td colspan="2" style="border-top:1px #aaa solid;"> <td colspan="1" style="text-align:right;border-top:1px #aaa solid;">
{% for sum in group.sums %} {% for sum in group.sums %}
{% if group.transaction_type == 'Deposit' %} {% if group.transaction_type == 'Deposit' %}
{{ formatAmountBySymbol(sum.amount*-1, sum.currency_symbol, sum.currency_decimal_places) }}{% if loop.index != group.sums|length %},{% endif %} {{ formatAmountBySymbol(sum.amount*-1, sum.currency_symbol, sum.currency_decimal_places) }}{% if loop.index != group.sums|length %},{% endif %}
@ -75,7 +75,7 @@
{% else %} {% else %}
<td style="border-top:1px #aaa solid;" colspan="2">&nbsp;</td> <td style="border-top:1px #aaa solid;" colspan="2">&nbsp;</td>
{% endif %} {% endif %}
<td style="border-top:1px #aaa solid;" class="hidden-xs"> <td style="border-top:1px #aaa solid;" colspan="2" class="hidden-xs">
<div class="btn-group btn-group-xs pull-right"> <div class="btn-group btn-group-xs pull-right">
<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown" <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown"
aria-haspopup="true" aria-expanded="false"> aria-haspopup="true" aria-expanded="false">
@ -94,9 +94,9 @@
</tr> </tr>
{% endif %} {% endif %}
{% for index, transaction in group.transactions %} {% for index, transaction in group.transactions %}
{% set style="" %} {% set style="text-align:right;" %}
{% if group.transactions|length == loop.index and group.count > 1 %} {% if group.transactions|length == loop.index and group.count > 1 %}
{% set style="border-bottom:1px #aaa solid;" %} {% set style="text-align:right;border-bottom:1px #aaa solid;" %}
{% endif %} {% endif %}
<tr data-date="{{ transaction.date.format('Y-m-d') }}" data-count="{{ group.count }}" data-id="{{ group.id }}"> <tr data-date="{{ transaction.date.format('Y-m-d') }}" data-count="{{ group.count }}" data-id="{{ group.id }}">
<td style=" {{ style|raw }}" class="hidden-xs"> <td style=" {{ style|raw }}" class="hidden-xs">