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

Added sum for the current period, see issue #99

Browse Source
This commit is contained in:
James Cole 2015-08-09 17:01:12 +02:00
parent 51e30aed66
commit deefef83bd
5 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/Http/Controllers/CategoryController.php
View File

@ -152,10 +152,11 @@ class CategoryController extends Controller
$set = $repository->getJournals($category, $page);
$count = $repository->countJournals($category);
$totalSum = $repository->journalsSum($category);
$periodSum = $repository->journalsSum($category, Session::get('start'), Session::get('end'));
$journals = new LengthAwarePaginator($set, $count, 50, $page);
$journals->setPath('categories/show/' . $category->id);
return view('categories.show', compact('category', 'journals', 'hideCategory', 'totalSum'));
return view('categories.show', compact('category', 'journals', 'hideCategory', 'totalSum', 'periodSum'));
}
/**

1
resources/lang/en/firefly.php
View File

@ -16,6 +16,7 @@ return [
'from' => 'From',
'to' => 'To',
'total_sum' => 'Total sum',
'period_sum' => 'Sum for period',
'showEverything' => 'Show everything',
'never' => 'Never',
'search_results_for' => 'Search results for ":query"',

1
resources/lang/nl/firefly.php
View File

@ -16,6 +16,7 @@ return [
'from' => 'Van',
'to' => 'Tot',
'total_sum' => 'Totale som',
'period_sum' => 'Som van periode',
'showEverything' => 'Laat alles zien',
'never' => 'Nooit',
'search_results_for' => 'Zoekresultaten voor ":query"',

2
resources/twig/categories/show.twig
View File

@ -45,7 +45,7 @@
<h3 class="box-title">{{ 'transactions'|_ }}</h3>
</div>
<div class="box-body no-padding">
{% include 'list/journals' with {showPageSum: true,showTotalSum: true} %}
{% include 'list/journals' with {showPageSum: true, showTotalSum: true, showPeriodSum: true} %}
</div>
</div>
</div>

7
resources/twig/list/journals.twig
View File

@ -125,13 +125,18 @@
<td colspan="2">{{ _sum|formatAmount }}</td>
</tr>
{% endif %}
{% if showPeriodSum %}
<tr>
<td colspan="3" style="text-align: right;"><em>{{ 'period_sum'|_ }}</em></td>
<td colspan="2">{{ periodSum|formatAmount }}</td>
</tr>
{% endif %}
{% if showTotalSum %}
<tr>
<td colspan="3" style="text-align: right;"><em>{{ 'total_sum'|_ }}</em></td>
<td colspan="2">{{ totalSum|formatAmount }}</td>
</tr>
{% endif %}
</tfoot>
</table>