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

Code for #1324

Browse Source
This commit is contained in:
James Cole
2018-04-08 17:36:37 +02:00
parent 8f0e36a8e4
commit 3fbd2f93c8
6 changed files with 66 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -21,8 +21,8 @@
{% for entry in bills %}
{% if entry.active %}
{% set count = count + 1 %}
{% set sum_min = sum_min + entry.amount_min %}
{% set sum_max = sum_min + entry.amount_max %}
{% set sum_min = sum_min + entry.amount_min %}
{% set sum_max = sum_min + entry.amount_max %}
{% set expected_total = expected_total + ((entry.amount_min + entry.amount_max) / 2) %}
{% endif %}
<tr>
@@ -43,7 +43,13 @@
</td>
<td class="hidden-sm hidden-md hidden-xs">
(rules)
{% if entry.rules|length > 0 %}
<ul class="list-unstyled">
{% for rule in entry.rules %}
<li><a href="{{ route('rules.edit', [rule.id]) }}">{{ rule.title }}</a></li>
{% endfor %}
</ul>
{% endif %}
</td>
<td data-value="{{ entry.amount_min }}" style="text-align: right;">
<span style="margin-right:5px;" title="{{ entry.amount_min|formatAmountPlain }} - {{ entry.amount_max|formatAmountPlain }}">
@@ -127,7 +133,7 @@
<td colspan="5">&nbsp;</td>
</tr>
{# calculate total#}
{# calculate total#}
{% if count > 0 %}
{% set avg_min = (sum_min / count) %}
{% set avg_max = (sum_max / count) %}