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

Updated code for #384

Browse Source
This commit is contained in:
James Cole
2017-12-10 20:03:10 +01:00
parent b1b6fe553a
commit 0c529cb7e7
6 changed files with 177 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
resources/lang/en_US/firefly.php
View File

@@ -20,6 +20,7 @@
*/
declare(strict_types=1);
return [
// general stuff:
'close' => 'Close',
@@ -716,6 +717,7 @@ return [
'mass_edit_journals' => 'Edit a number of transactions',
'cannot_edit_other_fields' => 'You cannot mass-edit other fields than the ones here, because there is no room to show them. Please follow the link and edit them by one-by-one, if you need to edit these fields.',
'no_budget' => 'none',
'no_budget_squared' => '(no budget)',
'perm-delete-many' => 'Deleting many items in one go can be very disruptive. Please be cautious.',
'mass_deleted_transactions_success' => 'Deleted :amount transaction(s).',
'mass_edited_transactions_success' => 'Updated :amount transaction(s)',

31
resources/views/reports/partials/exp-budgets.twig Normal file
View File

@@ -0,0 +1,31 @@
<table class="table table-hover sortable">
<thead>
<tr>
<th style="width:50%;" data-defaultsign="az">{{ 'budget'|_ }}</th>
<th style="width:50%;text-align: right;" data-defaultsort="disabled">{{ 'spent'|_ }}</th>
</tr>
</thead>
<tbody>
{% for budgetId, entry in together %}
<tr>
<td style="width:50%;" data-value="{% if entry.budget.name|length ==0 %}{{ 'no_budget_squared'|_ }}{% else %}{{ entry.budget.name }}{% endif %}">
{% if entry.budget.name|length ==0 %}
<a href="{{ route('budgets.no-budget') }}">{{ 'no_budget_squared'|_ }}</a>
{% else %}
<a href="{{ route('budgets.show', budgetId) }}">{{ entry.budget.name }}</a>
{% endif %}
</td>
<td style="text-align: right;">
{% if entry.spent|length ==0 %}
{{ '0'|formatAmount }}
{% else %}
{% for expense in entry.spent %}
{{ formatAmountBySymbol(expense.sum, expense.currency.symbol, expense.currency.dp) }}<br />
{% endfor %}
{% endif %}
</td>
</tr>
{% endfor %}
</tbody>
</table>

14
resources/views/reports/partials/exp-categories.twig
View File

@@ -1,16 +1,20 @@
<table class="table table-hover sortable">
<thead>
<tr>
<th data-defaultsign="az">{{ 'category'|_ }}</th>
<th style="text-align: right;">{{ 'spent'|_ }}</th>
<th style="text-align: right;">{{ 'earned'|_ }}</th>
<th style="width:50%;" data-defaultsign="az">{{ 'category'|_ }}</th>
<th style="width:25%;text-align: right;" data-defaultsort="disabled">{{ 'spent'|_ }}</th>
<th style="width:25%;text-align: right;" data-defaultsort="disabled">{{ 'earned'|_ }}</th>
</tr>
</thead>
<tbody>
{% for categoryId, entry in together %}
<tr>
<td data-value="{% if entry.category.name|length ==0 %}{{ 'noCategory'|_ }}{% else %}{{ entry.category.name }}{% endif %}">
<a href="{{ route('categories.show', categoryId) }}">{% if entry.category.name|length ==0 %}{{ 'noCategory'|_ }}{% else %}{{ entry.category.name }}{% endif %}</a>
<td style="width:50%;" data-value="{% if entry.category.name|length ==0 %}{{ 'noCategory'|_ }}{% else %}{{ entry.category.name }}{% endif %}">
{% if entry.category.name|length ==0 %}
<a href="{{ route('categories.no-category') }}">{{ 'noCategory'|_ }}</a>
{% else %}
<a href="{{ route('categories.show', categoryId) }}">{{ entry.category.name }}</a>
{% endif %}
</td>
<td style="text-align: right;">
{% if entry.spent|length ==0 %}

8
resources/views/reports/partials/exp-grouped.twig
View File

@@ -1,10 +1,10 @@
<table class="table table-hover sortable">
<thead>
<tr>
<th data-defaultsign="az">{{ 'name'|_ }}</th>
<th data-defaultsign="az">{{ 'period'|_ }}</th>
<th class="hidden-xs" style="text-align: right;" data-defaultsort="disabled">{{ 'spent'|_ }}</th>
<th class="hidden-xs" style="text-align: right;" data-defaultsort="disabled">{{ 'earned'|_ }}</th>
<th style="width:40%;" data-defaultsign="az">{{ 'name'|_ }}</th>
<th style="width:20%;" data-defaultsign="az">{{ 'period'|_ }}</th>
<th class="hidden-xs" style="width:20%;text-align: right;" data-defaultsort="disabled">{{ 'spent'|_ }}</th>
<th class="hidden-xs" style="width:20%;text-align: right;" data-defaultsort="disabled">{{ 'earned'|_ }}</th>
</tr>
</thead>
<tbody>

6
resources/views/reports/partials/exp-not-grouped.twig
View File

@@ -1,9 +1,9 @@
<table class="table table-hover sortable">
<thead>
<tr>
<th data-defaultsign="az">{{ 'name'|_ }}</th>
<th class="hidden-xs" style="text-align: right;" data-defaultsort="disabled">{{ 'spent'|_ }}</th>
<th class="hidden-xs" style="text-align: right;" data-defaultsort="disabled">{{ 'earned'|_ }}</th>
<th style="width:50%;" data-defaultsign="az">{{ 'name'|_ }}</th>
<th style="width:25%;text-align:right;" class="hidden-xs" style="text-align: right;" data-defaultsort="disabled">{{ 'spent'|_ }}</th>
<th style="width:25%;text-align:right;" class="hidden-xs" style="text-align: right;" data-defaultsort="disabled">{{ 'earned'|_ }}</th>
</tr>
</thead>
<tbody>