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

Fix order, fix bar.

Browse Source
This commit is contained in:
James Cole
2020-06-09 10:33:55 +02:00
parent 3eccc56c7a
commit 18172b7fdb
2 changed files with 80 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Controllers/PiggyBank/IndexController.php
View File

@@ -117,6 +117,8 @@ class IndexController extends Controller
$piggyBanks[$groupOrder]['piggy_banks'][] = $array; $piggyBanks[$groupOrder]['piggy_banks'][] = $array;
} }
ksort($piggyBanks);
return view('piggy-banks.index', compact('piggyBanks', 'accounts')); return view('piggy-banks.index', compact('piggyBanks', 'accounts'));
} }

154
resources/views/v1/list/piggy-banks.twig
View File

@@ -12,89 +12,91 @@
</thead> </thead>
{% for objectGroupOrder, objectGroup in piggyBanks %} {% for objectGroupOrder, objectGroup in piggyBanks %}
<tbody> {% if objectGroup.piggy_banks|length > 0 %}
<tr> <tbody>
<td colspan="5"><small>{{ objectGroup.object_group_title }}</small></td> <tr>
</tr> <td colspan="8"><small>{{ objectGroup.object_group_title }}</small></td>
{% for piggy in objectGroup.piggy_banks %} </tr>
<tr class="sortable" data-id="{{ piggy.id }}" data-name="{{ piggy.name }}" data-order="{{ piggy.order }}" data-position="{{ loop.index0 }}"> {% for piggy in objectGroup.piggy_banks %}
<td class="visible-xs visible-sm hidden-md hidden-lg"> <tr class="sortable" data-id="{{ piggy.id }}" data-name="{{ piggy.name }}" data-order="{{ piggy.order }}" data-position="{{ loop.index0 }}">
&nbsp; <td class="visible-xs visible-sm hidden-md hidden-lg">
</td> &nbsp;
<td class="visible-xs visible-sm hidden-md hidden-lg"> </td>
<div class="btn-group btn-group-xs"> <td class="visible-xs visible-sm hidden-md hidden-lg">
<a href="{{ route('piggy-banks.remove-money-mobile', piggy.id) }}" class="btn btn-default btn-xs"><i class="fa fa-minus"></i></a> <div class="btn-group btn-group-xs">
<a href="{{ route('piggy-banks.add-money-mobile', piggy.id) }}" class="btn btn-default btn-xs"><i class="fa fa-plus"></i></a> <a href="{{ route('piggy-banks.remove-money-mobile', piggy.id) }}" class="btn btn-default btn-xs"><i class="fa fa-minus"></i></a>
</div> <a href="{{ route('piggy-banks.add-money-mobile', piggy.id) }}" class="btn btn-default btn-xs"><i class="fa fa-plus"></i></a>
</td> </div>
<td style="width:60px;" class="hidden-sm hidden-xs"> </td>
<i class="fa fa-fw fa-bars handle"></i> <td style="width:60px;" class="hidden-sm hidden-xs">
<i class="loadSpin"></i> <i class="fa fa-fw fa-bars handle"></i>
</td> <i class="loadSpin"></i>
<td style="width:100px;" class="hidden-sm hidden-xs"> </td>
<div class="btn-group btn-group-xs"> <td style="width:100px;" class="hidden-sm hidden-xs">
<a href="{{ route('piggy-banks.edit', piggy.id) }}" class="btn btn-default btn-xs"><i class="fa fa-pencil fa-fw"></i></a> <div class="btn-group btn-group-xs">
<a href="{{ route('piggy-banks.delete', piggy.id) }}" class="btn btn-danger btn-xs"><i class="fa fa-trash fa-fw"></i></a> <a href="{{ route('piggy-banks.edit', piggy.id) }}" class="btn btn-default btn-xs"><i class="fa fa-pencil fa-fw"></i></a>
</div> <a href="{{ route('piggy-banks.delete', piggy.id) }}" class="btn btn-danger btn-xs"><i class="fa fa-trash fa-fw"></i></a>
</td> </div>
<td> </td>
<a href="{{ route('piggy-banks.show', piggy.id) }}" title="{{ piggy.account_name }}">{{ piggy.name }}</a> <td>
{% if piggy.attachments.count > 0 %} <a href="{{ route('piggy-banks.show', piggy.id) }}" title="{{ piggy.account_name }}">{{ piggy.name }}</a>
<i class="fa fa-fw fa-paperclip"></i> {% if piggy.attachments.count > 0 %}
{% endif %} <i class="fa fa-fw fa-paperclip"></i>
{% endif %}
</td> </td>
<td style="text-align: right;" class="piggySaved"> <td style="text-align: right;" class="piggySaved">
<span title="Saved so far" <span title="Saved so far"
style="text-align:right;">{{ formatAmountBySymbol(piggy.current_amount,piggy.currency_symbol,piggy.currency_decimal_places) }}</span> style="text-align:right;">{{ formatAmountBySymbol(piggy.current_amount,piggy.currency_symbol,piggy.currency_decimal_places) }}</span>
</td> </td>
<td class="hidden-sm hidden-xs" style="text-align:right;width:40px;"> <td class="hidden-sm hidden-xs" style="text-align:right;width:40px;">
{% if piggy.current_amount > 0 %} {% if piggy.current_amount > 0 %}
<a href="{{ route('piggy-banks.remove-money', piggy.id) }}" class="btn btn-default btn-xs removeMoney" data-id="{{ piggy.id }}"> <a href="{{ route('piggy-banks.remove-money', piggy.id) }}" class="btn btn-default btn-xs removeMoney" data-id="{{ piggy.id }}">
<i data-id="{{ piggy.id }}" class="fa fa-minus"></i></a> <i data-id="{{ piggy.id }}" class="fa fa-minus"></i></a>
{% endif %} {% endif %}
</td> </td>
<td class="hidden-sm hidden-xs piggyBar"> <td class="hidden-sm hidden-xs piggyBar">
<div class="progress progress" style="margin-bottom:0;"> <div class="progress progress" style="margin-bottom:0;">
<div <div
{% if piggy.percentage == 100 %} {% if piggy.percentage == 100 %}
class="progress-bar progress-bar-success" class="progress-bar progress-bar-success"
{% elseif piggy.percentage == 0 %} {% elseif piggy.percentage == 0 %}
class="progress-bar progress-bar-warning" class="progress-bar progress-bar-warning"
{% else %} {% else %}
class="progress-bar progress-bar-info" class="progress-bar progress-bar-info"
{% endif %} {% endif %}
role="progressbar" aria-valuenow="{{ piggy.percentage }}" aria-valuemin="0" aria-valuemax="100" role="progressbar" aria-valuenow="{{ piggy.percentage }}" aria-valuemin="0" aria-valuemax="100"
style="min-width: 30px;width: {{ piggy.percentage }}%;"> style="min-width: 30px;width: {{ piggy.percentage }}%;">
{{ piggy.percentage }}% {{ piggy.percentage }}%
</div>
</div> </div>
</div> </td>
</td>
<td class="hidden-sm hidden-xs" style="width:40px;"> <td class="hidden-sm hidden-xs" style="width:40px;">
{% if piggy.left_to_save > 0 %} {% if piggy.left_to_save > 0 %}
<a href="{{ route('piggy-banks.add-money', piggy.id) }}" class="btn btn-default btn-xs addMoney" data-id="{{ piggy.id }}"> <a href="{{ route('piggy-banks.add-money', piggy.id) }}" class="btn btn-default btn-xs addMoney" data-id="{{ piggy.id }}">
<i data-id="{{ piggy.id }}" class="fa fa-plus"></i></a> <i data-id="{{ piggy.id }}" class="fa fa-plus"></i></a>
{% endif %} {% endif %}
</td> </td>
<td class="hidden-sm hidden-xs" style="text-align:right;"> <td class="hidden-sm hidden-xs" style="text-align:right;">
<span title="{{ 'target_amount'|_ }}">{{ formatAmountBySymbol(piggy.target_amount,piggy.currency_symbol,piggy.currency_decimal_places) }}</span> <span title="{{ 'target_amount'|_ }}">{{ formatAmountBySymbol(piggy.target_amount,piggy.currency_symbol,piggy.currency_decimal_places) }}</span>
</td> </td>
<td class="hidden-sm hidden-xs" style="text-align:right;"> <td class="hidden-sm hidden-xs" style="text-align:right;">
{% if piggy.left_to_save > 0 %} {% if piggy.left_to_save > 0 %}
<span title="{{ 'left_to_save'|_ }}">{{ formatAmountBySymbol(piggy.left_to_save,piggy.currency_symbol,piggy.currency_decimal_places) }}</span> <span title="{{ 'left_to_save'|_ }}">{{ formatAmountBySymbol(piggy.left_to_save,piggy.currency_symbol,piggy.currency_decimal_places) }}</span>
{% endif %} {% endif %}
</td> </td>
<td class="hidden-sm hidden-xs" style="text-align:right;"> <td class="hidden-sm hidden-xs" style="text-align:right;">
{% if piggy.target_date %} {% if piggy.target_date %}
{{ formatAmountBySymbol(piggy.save_per_month, piggy.currency_symbol, piggy.currency_decimal_places) }} {{ formatAmountBySymbol(piggy.save_per_month, piggy.currency_symbol, piggy.currency_decimal_places) }}
{% endif %} {% endif %}
</td> </td>
</tr> </tr>
{% endfor %} {% endfor %}
</tbody> </tbody>
{% endif %}
{% endfor %} {% endfor %}