kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2026-01-09 23:41:10 +00:00
Code Issues Projects Releases Wiki Activity

Clean up code, fixes #392

Browse Source
This commit is contained in:
James Cole
2016-11-08 20:35:30 +01:00
parent 5b8583dd2b
commit 49cc8a97a3
9 changed files with 42 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
resources/views/reports/partials/accounts.twig
View File

@@ -2,8 +2,8 @@
<thead>
<tr>
<th>{{ 'name'|_ }}</th>
<th>{{ 'balanceStart'|_ }}</th>
<th>{{ 'balanceEnd'|_ }}</th>
<th class="hidden-xs">{{ 'balanceStart'|_ }}</th>
<th class="hidden-xs">{{ 'balanceEnd'|_ }}</th>
<th>{{ 'difference'|_ }}</th>
</tr>
</thead>
@@ -13,8 +13,8 @@
<td>
<a href="{{ route('accounts.show',account.id) }}" title="{{ account.name }}">{{ account.name }}</a>
</td>
<td data-value="{{ account.startBalance }}">{{ account.startBalance|formatAmount }}</td>
<td data-value="{{ account.endBalance }}">{{ account.endBalance|formatAmount }}</td>
<td class="hidden-xs" data-value="{{ account.startBalance }}">{{ account.startBalance|formatAmount }}</td>
<td class="hidden-xs" data-value="{{ account.endBalance }}">{{ account.endBalance|formatAmount }}</td>
<td data-value="{{ (account.endBalance - account.startBalance) }}">{{ (account.endBalance - account.startBalance)|formatAmount }}</td>
</tr>
{% endfor %}
@@ -22,8 +22,8 @@
<tfoot>
<tr>
<td><em>{{ 'sumOfSums'|_ }}</em></td>
<td>{{ accountReport.getStart|formatAmount }}</td>
<td>{{ accountReport.getEnd|formatAmount }}</td>
<td class="hidden-xs">{{ accountReport.getStart|formatAmount }}</td>
<td class="hidden-xs">{{ accountReport.getEnd|formatAmount }}</td>
<td>{{ accountReport.getDifference|formatAmount }}</td>
</tr>
</tfoot>

6
resources/views/reports/partials/balance.twig
View File

@@ -4,7 +4,7 @@
<tr>
<th colspan="2">{{ 'budgets'|_ }}</th>
{% for account in balance.getBalanceHeader.getAccounts %}
<th><a href="{{ route('accounts.show',account.id) }}">{{ account.name }}</a></th>
<th class="hidden-xs"><a href="{{ route('accounts.show',account.id) }}">{{ account.name }}</a></th>
{% endfor %}
<th>
{{ 'leftInBudget'|_ }}
@@ -21,7 +21,7 @@
<td>
<a href="{{ route('budgets.show',balanceLine.getBudget.id) }}">{{ balanceLine.getTitle }}</a>
{% if balanceLine.getStartdate and balanceLine.getEnddate %}
<span class="small"><br>
<span class="small" class="hidden-xs"><br>
{{ balanceLine.getStartdate.formatLocalized(monthAndDayFormat) }}
&mdash;
{{ balanceLine.getEnddate.formatLocalized(monthAndDayFormat) }}
@@ -40,7 +40,7 @@
{% endif %}
{% for balanceEntry in balanceLine.getBalanceEntries %}
<td>
<td class="hidden-xs">
{% if balanceEntry.getSpent != 0 %}
<span class="text-danger">{{ (balanceEntry.getSpent)|formatAmountPlain }}</span>
<i class="fa fa-fw text-muted fa-info-circle firefly-info-button" data-location="balance-amount"

8
resources/views/reports/partials/bills.twig
View File

@@ -7,8 +7,8 @@
<thead>
<tr>
<th>{{ trans('form.name') }}</th>
<th>{{ trans('form.amount_min') }}</th>
<th>{{ trans('form.amount_max') }}</th>
<th class="hidden-xs">{{ trans('form.amount_min') }}</th>
<th class="hidden-xs">{{ trans('form.amount_max') }}</th>
<th>{{ trans('form.amount') }}</th>
<th>{{ trans('form.under') }}</th>
</tr>
@@ -19,8 +19,8 @@
<td data-value="{{ line.getBill.name }}">
<a href="{{ route('bills.show',line.getBill.id) }}">{{ line.getBill.name }}</a>
</td>
<td data-value="{{ line.getMin }}">{{ line.getMin|formatAmount }}</td>
<td data-value="{{ line.getMax }}">{{ line.getMax|formatAmount }}</td>
<td class="hidden-xs" data-value="{{ line.getMin }}">{{ line.getMin|formatAmount }}</td>
<td class="hidden-xs" data-value="{{ line.getMax }}">{{ line.getMax|formatAmount }}</td>
{% if line.isHit %}
<td data-value="{{ line.getAmount }}">
<a href="{{ route('transactions.show', line.getTransactionJournalId) }}">

7
resources/views/reports/partials/budgets.twig
View File

@@ -2,7 +2,7 @@
<thead>
<tr>
<th>{{ 'budget'|_ }}</th>
<th>{{ 'date'|_ }}</th>
<th class="hidden-xs">{{ 'date'|_ }}</th>
<th>{{ 'budgeted'|_ }}</th>
<th>{{ 'spent'|_ }}</th>
<th>{{ 'left'|_ }}</th>
@@ -19,7 +19,7 @@
<em>{{ 'no_budget'|_ }}</em>
{% endif %}
</td>
<td>
<td class="hidden-xs">
{% if budgetLine.getRepetition.id %}
<a href="{{ route('budgets.showWithRepetition', [budgetLine.getBudget.id, budgetLine.getRepetition.id]) }}">
{{ budgetLine.getRepetition.startdate.formatLocalized(monthAndDayFormat) }}
@@ -62,7 +62,8 @@
</tbody>
<tfoot>
<tr>
<td colspan="2"><em>{{ 'sum'|_ }}</em></td>
<td><em>{{ 'sum'|_ }}</em></td>
<td class="hidden-xs">&nbsp;</td>
<td>{{ budgets.getBudgeted|formatAmount }}</td>
<td>
{% if budgets.getSpent != 0 %}