kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-12-15 19:09:50 +00:00
Code Issues Projects Releases Wiki Activity

Building report from issue #386

Browse Source
This commit is contained in:
James Cole
2016-12-03 21:03:20 +01:00
parent 8377a2a0de
commit b032825342
8 changed files with 148 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
resources/views/reports/partials/category-period.twig
View File

@@ -18,7 +18,7 @@
</thead>
<tbody>
{% for category in categories %}
{% if income[category.id] %}
{% if report.income[category.id] or report.expense[category.id] %}
<tr>
<td data-value="{{ category.name }}">
<a title="{{ category.name }}" href="#" data-category="{{ category.id }}" class="category-chart-activate">{{ category.name }}</a>
@@ -26,26 +26,30 @@
{% for key, period in periods %}
{# income first #}
{% if(income[category.id].entries[key]) %}
<td data-value="{{ income[category.id].entries[key] }}">
{{ income[category.id].entries[key]|formatAmount }}
{% if(report.income[category.id].entries[key]) %}
<td data-value="{{ report.income[category.id].entries[key] }}">
{{ report.income[category.id].entries[key]|formatAmount }}
</td>
{% else %}
<td data-value="0">
{{ 0|formatAmount }}
</td>
{% endif %}
{# expenses #}
<td data-value="0">
<!-- expense -->
</td>
{% if(report.expense[category.id].entries[key]) %}
<td data-value="{{ report.expense[category.id].entries[key] }}">
{{ report.expense[category.id].entries[key]|formatAmount }}
</td>
{% else %}
<td data-value="0">
</td>
{% endif %}
{% endfor %}
<td data-value="{{ info.sum }}">
0
<td data-value="{{ report.income[category.id].sum }}">
{{ report.income[category.id].sum }}
</td>
<td data-value="{{ info.sum }}">
1
<td data-value="{{ report.expense[category.id].sum }}">
{{ report.expense[category.id].sum }}
</td>
</tr>
{% endif %}