mirror of
https://github.com/firefly-iii/firefly-iii.git
synced 2025-02-25 18:45:27 -06:00
More alignment for #511
This commit is contained in:
James Cole
parent
ad116d1959
commit
b91f6c7ce6
@ -107,14 +107,14 @@
|
||||
<table class="table table-hover">
|
||||
{% if entry[2] != 0 %}
|
||||
<tr>
|
||||
<td colspan="33%">{{ 'spent'|_ }}</td>
|
||||
<td colspan="67%">{{ entry[2]|formatAmount }}</td>
|
||||
<td style="width:33%;">{{ 'spent'|_ }}</td>
|
||||
<td style="text-align: right;">{{ entry[2]|formatAmount }}</td>
|
||||
</tr>
|
||||
{% endif %}
|
||||
{% if entry[3] != 0 %}
|
||||
<tr>
|
||||
<td colspan="33%">{{ 'earned'|_ }}</td>
|
||||
<td colspan="67%">{{ entry[3]|formatAmount }}</td>
|
||||
<td style="width: 33%;">{{ 'earned'|_ }}</td>
|
||||
<td style="text-align: right;">{{ entry[3]|formatAmount }}</td>
|
||||
</tr>
|
||||
{% endif %}
|
||||
</table>
|
||||
|
||||
@ -96,14 +96,14 @@
|
||||
<table class="table table-hover">
|
||||
{% if entry[2] != 0 %}
|
||||
<tr>
|
||||
<td colspan="33%">{{ 'spent'|_ }}</td>
|
||||
<td colspan="67%">{{ entry[2]|formatAmount }}</td>
|
||||
<td style="width:33%;">{{ 'spent'|_ }}</td>
|
||||
<td style="text-align: right;">{{ entry[2]|formatAmount }}</td>
|
||||
</tr>
|
||||
{% endif %}
|
||||
{% if entry[3] != 0 %}
|
||||
<tr>
|
||||
<td colspan="33%">{{ 'earned'|_ }}</td>
|
||||
<td colspan="67%">{{ entry[3]|formatAmount }}</td>
|
||||
<td style="width:33%;">{{ 'earned'|_ }}</td>
|
||||
<td style="text-align: right;">{{ entry[3]|formatAmount }}</td>
|
||||
</tr>
|
||||
{% endif %}
|
||||
</table>
|
||||
|
||||
@ -17,7 +17,7 @@
|
||||
<thead>
|
||||
<tr>
|
||||
<th data-defaultsign="az">{{ 'name'|_ }}</th>
|
||||
<th data-defaultsign="_19">{{ 'spent'|_ }}</th>
|
||||
<th data-defaultsign="_19" style="text-align: right;">{{ 'spent'|_ }}</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
@ -27,9 +27,9 @@
|
||||
<a href="{{ route('accounts.show', account.id) }}" title="{{ account.name }}">{{ account.name }}</a>
|
||||
</td>
|
||||
{% if accountSummary[account.id] %}
|
||||
<td data-value="{{ accountSummary[account.id] }}">{{ accountSummary[account.id]|formatAmount }}</td>
|
||||
<td data-value="{{ accountSummary[account.id] }}" style="text-align: right;">{{ accountSummary[account.id]|formatAmount }}</td>
|
||||
{% else %}
|
||||
<td data-value="0">{{ 0|formatAmount }}</td>
|
||||
<td data-value="0" style="text-align: right;">{{ 0|formatAmount }}</td>
|
||||
{% endif %}
|
||||
</tr>
|
||||
{% endfor %}
|
||||
@ -47,7 +47,7 @@
|
||||
<thead>
|
||||
<tr>
|
||||
<th data-defaultsign="az">{{ 'name'|_ }}</th>
|
||||
<th data-defaultsign="_19">{{ 'spent'|_ }}</th>
|
||||
<th data-defaultsign="_19" style="text-align: right;">{{ 'spent'|_ }}</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
@ -57,9 +57,9 @@
|
||||
<a href="{{ route('budgets.show', budget.id) }}" title="{{ budget.name }}">{{ budget.name }}</a>
|
||||
</td>
|
||||
{% if budgetSummary[budget.id] %}
|
||||
<td data-value="{{ budgetSummary[budget.id] }}">{{ budgetSummary[budget.id]|formatAmount }}</td>
|
||||
<td data-value="{{ budgetSummary[budget.id] }}" style="text-align: right;">{{ budgetSummary[budget.id]|formatAmount }}</td>
|
||||
{% else %}
|
||||
<td data-value="0">{{ 0|formatAmount }}</td>
|
||||
<td data-value="0" style="text-align: right;">{{ 0|formatAmount }}</td>
|
||||
{% endif %}
|
||||
</tr>
|
||||
{% endfor %}
|
||||
@ -133,8 +133,8 @@
|
||||
<thead>
|
||||
<tr>
|
||||
<th data-defaultsign="az">{{ 'account'|_ }}</th>
|
||||
<th data-defaultsign="_19">{{ 'spent_average'|_ }}</th>
|
||||
<th data-defaultsign="_19">{{ 'total'|_ }}</th>
|
||||
<th data-defaultsign="_19" style="text-align: right;">{{ 'spent_average'|_ }}</th>
|
||||
<th data-defaultsign="_19" style="text-align: right;">{{ 'total'|_ }}</th>
|
||||
<th data-defaultsign="_19">{{ 'transaction_count'|_ }}</th>
|
||||
</tr>
|
||||
</thead>
|
||||
@ -148,10 +148,10 @@
|
||||
<td data-value="{{ row.name }}">
|
||||
<a href="{{ route('accounts.show', row.id) }}">{{ row.name }}</a>
|
||||
</td>
|
||||
<td data-value="{{ row.average }}">
|
||||
<td data-value="{{ row.average }}" style="text-align: right;">
|
||||
{{ row.average|formatAmount }}
|
||||
</td>
|
||||
<td data-value="{{ row.sum }}">
|
||||
<td data-value="{{ row.sum }}" style="text-align: right;">
|
||||
{{ row.sum|formatAmount }}
|
||||
</td>
|
||||
<td data-value="{{ row.count }}">
|
||||
@ -188,7 +188,7 @@
|
||||
<th data-defaultsort="disabled">{{ 'description'|_ }}</th>
|
||||
<th data-defaultsign="month">{{ 'date'|_ }}</th>
|
||||
<th data-defaultsign="az">{{ 'account'|_ }}</th>
|
||||
<th data-defaultsign="_19">{{ 'amount'|_ }}</th>
|
||||
<th data-defaultsign="_19" style="text-align: right;">{{ 'amount'|_ }}</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
@ -215,7 +215,7 @@
|
||||
{{ row.opposing_account_name }}
|
||||
</a>
|
||||
</td>
|
||||
<td data-value="{{ row.transaction_amount }}">
|
||||
<td data-value="{{ row.transaction_amount }}" style="text-align: right;">
|
||||
{{ row.transaction_amount|formatAmount }}
|
||||
</td>
|
||||
</tr>
|
||||
|
||||
@ -17,8 +17,8 @@
|
||||
<thead>
|
||||
<tr>
|
||||
<th data-defaultsign="az">{{ 'name'|_ }}</th>
|
||||
<th data-defaultsign="_19">{{ 'earned'|_ }}</th>
|
||||
<th data-defaultsign="_19">{{ 'spent'|_ }}</th>
|
||||
<th data-defaultsign="_19" style="text-align: right;">{{ 'earned'|_ }}</th>
|
||||
<th data-defaultsign="_19" style="text-align: right;">{{ 'spent'|_ }}</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
@ -28,14 +28,14 @@
|
||||
<a href="{{ route('accounts.show', account.id) }}" title="{{ account.name }}">{{ account.name }}</a>
|
||||
</td>
|
||||
{% if accountSummary[account.id] %}
|
||||
<td data-value="{{ accountSummary[account.id].earned }}">{{ accountSummary[account.id].earned|formatAmount }}</td>
|
||||
<td data-value="{{ accountSummary[account.id].earned }}" style="text-align: right;">{{ accountSummary[account.id].earned|formatAmount }}</td>
|
||||
{% else %}
|
||||
<td data-value="0">{{ 0|formatAmount }}</td>
|
||||
<td data-value="0" style="text-align: right;">{{ 0|formatAmount }}</td>
|
||||
{% endif %}
|
||||
{% if accountSummary[account.id] %}
|
||||
<td data-value="{{ accountSummary[account.id].spent }}">{{ accountSummary[account.id].spent|formatAmount }}</td>
|
||||
<td data-value="{{ accountSummary[account.id].spent }}" style="text-align: right;">{{ accountSummary[account.id].spent|formatAmount }}</td>
|
||||
{% else %}
|
||||
<td data-value="0">{{ 0|formatAmount }}</td>
|
||||
<td data-value="0" style="text-align: right;">{{ 0|formatAmount }}</td>
|
||||
{% endif %}
|
||||
</tr>
|
||||
{% endfor %}
|
||||
@ -53,8 +53,8 @@
|
||||
<thead>
|
||||
<tr>
|
||||
<th data-defaultsign="az">{{ 'name'|_ }}</th>
|
||||
<th data-defaultsign="_19">{{ 'earned'|_ }}</th>
|
||||
<th data-defaultsign="_19">{{ 'spent'|_ }}</th>
|
||||
<th data-defaultsign="_19" style="text-align: right;">{{ 'earned'|_ }}</th>
|
||||
<th data-defaultsign="_19" style="text-align: right;">{{ 'spent'|_ }}</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
@ -64,14 +64,14 @@
|
||||
<a href="{{ route('categories.show', category.id) }}" title="{{ category.name }}">{{ category.name }}</a>
|
||||
</td>
|
||||
{% if categorySummary[category.id] %}
|
||||
<td data-value="{{ categorySummary[category.id].earned }}">{{ categorySummary[category.id].earned|formatAmount }}</td>
|
||||
<td data-value="{{ categorySummary[category.id].earned }}" style="text-align: right;">{{ categorySummary[category.id].earned|formatAmount }}</td>
|
||||
{% else %}
|
||||
<td data-value="0">{{ 0|formatAmount }}</td>
|
||||
<td data-value="0" style="text-align: right;">{{ 0|formatAmount }}</td>
|
||||
{% endif %}
|
||||
{% if categorySummary[category.id] %}
|
||||
<td data-value="{{ categorySummary[category.id].spent }}">{{ categorySummary[category.id].spent|formatAmount }}</td>
|
||||
<td data-value="{{ categorySummary[category.id].spent }}" style="text-align: right;">{{ categorySummary[category.id].spent|formatAmount }}</td>
|
||||
{% else %}
|
||||
<td data-value="0">{{ 0|formatAmount }}</td>
|
||||
<td data-value="0" style="text-align: right;">{{ 0|formatAmount }}</td>
|
||||
{% endif %}
|
||||
</tr>
|
||||
{% endfor %}
|
||||
@ -164,8 +164,8 @@
|
||||
<thead>
|
||||
<tr>
|
||||
<th data-defaultsign="az">{{ 'account'|_ }}</th>
|
||||
<th data-defaultsign="_19">{{ 'spent_average'|_ }}</th>
|
||||
<th data-defaultsign="_19">{{ 'total'|_ }}</th>
|
||||
<th data-defaultsign="_19" style="text-align: right;">{{ 'spent_average'|_ }}</th>
|
||||
<th data-defaultsign="_19" style="text-align: right;">{{ 'total'|_ }}</th>
|
||||
<th data-defaultsign="_19">{{ 'transaction_count'|_ }}</th>
|
||||
</tr>
|
||||
</thead>
|
||||
@ -179,10 +179,10 @@
|
||||
<td data-value="{{ row.name }}">
|
||||
<a href="{{ route('accounts.show', row.id) }}">{{ row.name }}</a>
|
||||
</td>
|
||||
<td data-value="{{ row.average }}">
|
||||
<td data-value="{{ row.average }}" style="text-align: right;">
|
||||
{{ row.average|formatAmount }}
|
||||
</td>
|
||||
<td data-value="{{ row.sum }}">
|
||||
<td data-value="{{ row.sum }}" style="text-align: right;">
|
||||
{{ row.sum|formatAmount }}
|
||||
</td>
|
||||
<td data-value="{{ row.count }}">
|
||||
@ -219,7 +219,7 @@
|
||||
<th data-defaultsort="disabled">{{ 'description'|_ }}</th>
|
||||
<th data-defaultsign="month">{{ 'date'|_ }}</th>
|
||||
<th data-defaultsign="az">{{ 'account'|_ }}</th>
|
||||
<th data-defaultsign="_19">{{ 'amount'|_ }}</th>
|
||||
<th data-defaultsign="_19" style="text-align: right;">{{ 'amount'|_ }}</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
@ -246,7 +246,7 @@
|
||||
{{ row.opposing_account_name }}
|
||||
</a>
|
||||
</td>
|
||||
<td data-value="{{ row.transaction_amount }}">
|
||||
<td data-value="{{ row.transaction_amount }}" style="text-align: right;">
|
||||
{{ row.transaction_amount|formatAmount }}
|
||||
</td>
|
||||
</tr>
|
||||
|
||||
@ -2,9 +2,9 @@
|
||||
<thead>
|
||||
<tr>
|
||||
<th data-defaultsign="az">{{ 'name'|_ }}</th>
|
||||
<th data-defaultsign="_19" class="hidden-xs">{{ 'balanceStart'|_ }}</th>
|
||||
<th data-defaultsign="_19" class="hidden-xs">{{ 'balanceEnd'|_ }}</th>
|
||||
<th data-defaultsign="_19">{{ 'difference'|_ }}</th>
|
||||
<th data-defaultsign="_19" class="hidden-xs" style="text-align: right;">{{ 'balanceStart'|_ }}</th>
|
||||
<th data-defaultsign="_19" class="hidden-xs" style="text-align: right;">{{ 'balanceEnd'|_ }}</th>
|
||||
<th data-defaultsign="_19" style="text-align: right;">{{ 'difference'|_ }}</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
@ -13,18 +13,18 @@
|
||||
<td data-value="{{ account.name }}">
|
||||
<a href="{{ route('accounts.show',account.id) }}" title="{{ account.name }}">{{ account.name }}</a>
|
||||
</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>
|
||||
<td class="hidden-xs" data-value="{{ account.startBalance }}" style="text-align: right;">{{ account.startBalance|formatAmount }}</td>
|
||||
<td class="hidden-xs" data-value="{{ account.endBalance }}" style="text-align: right;">{{ account.endBalance|formatAmount }}</td>
|
||||
<td style="text-align: right;" data-value="{{ (account.endBalance - account.startBalance) }}">{{ (account.endBalance - account.startBalance)|formatAmount }}</td>
|
||||
</tr>
|
||||
{% endfor %}
|
||||
</tbody>
|
||||
<tfoot>
|
||||
<tr>
|
||||
<td><em>{{ 'sumOfSums'|_ }}</em></td>
|
||||
<td class="hidden-xs">{{ accountReport.getStart|formatAmount }}</td>
|
||||
<td class="hidden-xs">{{ accountReport.getEnd|formatAmount }}</td>
|
||||
<td>{{ accountReport.getDifference|formatAmount }}</td>
|
||||
<td class="hidden-xs" style="text-align: right;">{{ accountReport.getStart|formatAmount }}</td>
|
||||
<td class="hidden-xs" style="text-align: right;">{{ accountReport.getEnd|formatAmount }}</td>
|
||||
<td style="text-align: right;">{{ accountReport.getDifference|formatAmount }}</td>
|
||||
</tr>
|
||||
</tfoot>
|
||||
</table>
|
||||
|
||||
@ -4,9 +4,9 @@
|
||||
<tr>
|
||||
<th colspan="2">{{ 'budgets'|_ }}</th>
|
||||
{% for account in balance.getBalanceHeader.getAccounts %}
|
||||
<th class="hidden-xs"><a href="{{ route('accounts.show',account.id) }}">{{ account.name }}</a></th>
|
||||
<th class="hidden-xs" style="text-align: right;"><a href="{{ route('accounts.show',account.id) }}">{{ account.name }}</a></th>
|
||||
{% endfor %}
|
||||
<th>
|
||||
<th style="text-align: right;">
|
||||
{{ 'leftInBudget'|_ }}
|
||||
</th>
|
||||
</tr>
|
||||
@ -28,7 +28,7 @@
|
||||
</span>
|
||||
{% endif %}
|
||||
</td>
|
||||
<td>
|
||||
<td style="text-align: right;">
|
||||
{% if(balanceLine.getBudget.amount) %}
|
||||
{{ balanceLine.getBudget.amount|formatAmount }}
|
||||
{% else %}
|
||||
@ -40,7 +40,7 @@
|
||||
{% endif %}
|
||||
|
||||
{% for balanceEntry in balanceLine.getBalanceEntries %}
|
||||
<td class="hidden-xs">
|
||||
<td class="hidden-xs" style="text-align: right;">
|
||||
{% 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"
|
||||
@ -49,11 +49,11 @@
|
||||
|
||||
{% endif %}
|
||||
{% if balanceEntry.getLeft != 0 %}
|
||||
<span class="text-success">{{ (balanceEntry.getLeft)|formatAmountPlain }}</span>
|
||||
<span class="text-success" style="text-align: right;">{{ (balanceEntry.getLeft)|formatAmountPlain }}</span>
|
||||
{% endif %}
|
||||
</td>
|
||||
{% endfor %}
|
||||
<td>
|
||||
<td style="text-align: right;">
|
||||
{{ balanceLine.leftOfRepetition|formatAmount }}
|
||||
</td>
|
||||
</tr>
|
||||
|
||||
@ -7,10 +7,10 @@
|
||||
<thead>
|
||||
<tr>
|
||||
<th data-defaultsign="az">{{ trans('form.name') }}</th>
|
||||
<th data-defaultsign="_19" class="hidden-xs">{{ trans('form.amount_min') }}</th>
|
||||
<th data-defaultsign="_19" class="hidden-xs">{{ trans('form.amount_max') }}</th>
|
||||
<th data-defaultsign="_19">{{ trans('form.amount') }}</th>
|
||||
<th data-defaultsign="_19">{{ trans('form.under') }}</th>
|
||||
<th data-defaultsign="_19" class="hidden-xs" style="text-align: right;">{{ trans('form.amount_min') }}</th>
|
||||
<th data-defaultsign="_19" class="hidden-xs" style="text-align: right;">{{ trans('form.amount_max') }}</th>
|
||||
<th data-defaultsign="_19" style="text-align: right;">{{ trans('form.amount') }}</th>
|
||||
<th data-defaultsign="_19" style="text-align: right;">{{ trans('form.under') }}</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
@ -19,10 +19,10 @@
|
||||
<td data-value="{{ line.getBill.name }}">
|
||||
<a href="{{ route('bills.show',line.getBill.id) }}">{{ line.getBill.name }}</a>
|
||||
</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>
|
||||
<td class="hidden-xs" data-value="{{ line.getMin }}" style="text-align: right;">{{ line.getMin|formatAmount }}</td>
|
||||
<td class="hidden-xs" data-value="{{ line.getMax }}" style="text-align: right;">{{ line.getMax|formatAmount }}</td>
|
||||
{% if line.isHit %}
|
||||
<td data-value="{{ line.getAmount }}">
|
||||
<td data-value="{{ line.getAmount }}" style="text-align: right;">
|
||||
<a href="{{ route('transactions.show', line.getTransactionJournalId) }}">
|
||||
{{ line.getAmount|formatAmount }}
|
||||
</a>
|
||||
@ -34,7 +34,7 @@
|
||||
{% if not line.isActive %}
|
||||
<td data-value="-1"> </td>
|
||||
{% endif %}
|
||||
<td data-value="{{ (line.getMax - line.getAmount) }}">
|
||||
<td data-value="{{ (line.getMax - line.getAmount) }}" style="text-align: right;">
|
||||
{% if line.isActive %}
|
||||
{{ (line.getMax + line.getAmount)|formatAmount }}
|
||||
{% endif %}
|
||||
|
||||
@ -3,9 +3,9 @@
|
||||
<tr>
|
||||
<th data-defaultsign="az" colspan="2">{{ 'budget'|_ }}</th>
|
||||
{% for period in periods %}
|
||||
<th data-defaultsign="_19">{{ period }}</th>
|
||||
<th data-defaultsign="_19" style="text-align: right;">{{ period }}</th>
|
||||
{% endfor %}
|
||||
<th data-defaultsign="_19">{{ 'sum'|_ }}</th>
|
||||
<th data-defaultsign="_19" style="text-align: right;">{{ 'sum'|_ }}</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
@ -19,17 +19,17 @@
|
||||
</td>
|
||||
{% for key, period in periods %}
|
||||
{% if(info.entries[key]) %}
|
||||
<td data-value="{{ info.entries[key] }}">
|
||||
<td data-value="{{ info.entries[key] }}" style="text-align: right;">
|
||||
{{ info.entries[key]|formatAmount }}
|
||||
</td>
|
||||
{% else %}
|
||||
<td data-value="0">
|
||||
<td data-value="0" style="text-align: right;">
|
||||
{{ 0|formatAmount }}
|
||||
</td>
|
||||
{% endif %}
|
||||
|
||||
{% endfor %}
|
||||
<td data-value="{{ info.sum }}">
|
||||
<td data-value="{{ info.sum }}" style="text-align: right;">
|
||||
{{ info.sum|formatAmount }}
|
||||
</td>
|
||||
</tr>
|
||||
|
||||
@ -3,10 +3,11 @@
|
||||
<tr>
|
||||
<th data-defaultsign="az">{{ 'budget'|_ }}</th>
|
||||
<th data-defaultsign="month" class="hidden-xs">{{ 'date'|_ }}</th>
|
||||
<th data-defaultsign="_19">{{ 'budgeted'|_ }}</th>
|
||||
<th data-defaultsign="_19">{{ 'spent'|_ }}</th>
|
||||
<th data-defaultsign="_19">{{ 'left'|_ }}</th>
|
||||
<th data-defaultsign="_19">{{ 'overspent'|_ }}</th>
|
||||
<th data-defaultsign="_19" style="text-align: right;">{{ 'budgeted'|_ }}</th>
|
||||
<th data-defaultsign="_19" style="text-align: right;">{{ 'spent'|_ }}</th>
|
||||
<th data-defaultsort="disabled"> </th>
|
||||
<th data-defaultsign="_19" style="text-align: right;">{{ 'left'|_ }}</th>
|
||||
<th data-defaultsign="_19" style="text-align: right;">{{ 'overspent'|_ }}</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
@ -40,33 +41,41 @@
|
||||
|
||||
|
||||
{% if budgetLine.getBudgetLimit.id %}
|
||||
<td data-value="{{ budgetLine.getBudgetLimit.amount }}">
|
||||
<td data-value="{{ budgetLine.getBudgetLimit.amount }}" style="text-align: right;">
|
||||
{{ budgetLine.getBudgetLimit.amount|formatAmount }}
|
||||
</td>
|
||||
{% else %}
|
||||
<td data-value="0">
|
||||
<td data-value="0" style="text-align: right;">
|
||||
{{ 0|formatAmount }}
|
||||
</td>
|
||||
{% endif %}
|
||||
|
||||
<td data-value="{{ budgetLine.getSpent }}">
|
||||
<td data-value="{{ budgetLine.getSpent }}" style="text-align: right;">
|
||||
{% if budgetLine.getSpent != 0 %}
|
||||
{{ budgetLine.getSpent|formatAmount }}
|
||||
<i class="fa fa-fw text-muted fa-info-circle firefly-info-button"
|
||||
<!-- <i class="fa fa-fw text-muted fa-info-circle firefly-info-button"
|
||||
data-location="budget-spent-amount" data-budget-id="{{ budgetLine.getBudget.id }}"></i>
|
||||
-->
|
||||
{% endif %}
|
||||
|
||||
{% if budgetLine.getSpent == 0 %}
|
||||
{{ budgetLine.getSpent|formatAmount }}
|
||||
{% endif %}
|
||||
|
||||
</td>
|
||||
<td data-value="{{ budgetLine.getLeft }}">
|
||||
<td>
|
||||
{% if budgetLine.getSpent != 0 %}
|
||||
<i class="fa fa-fw text-muted fa-info-circle firefly-info-button"
|
||||
data-location="budget-spent-amount" data-budget-id="{{ budgetLine.getBudget.id }}"></i>
|
||||
|
||||
{% endif %}
|
||||
</td>
|
||||
|
||||
<td data-value="{{ budgetLine.getLeft }}" style="text-align: right;">
|
||||
{% if(budgetLine.getOverspent == 0) %}
|
||||
{{ budgetLine.getLeft|formatAmount }}
|
||||
{% endif %}
|
||||
</td>
|
||||
<td data-value="{{ budgetLine.getOverspent }}">
|
||||
<td data-value="{{ budgetLine.getOverspent }}" style="text-align: right;">
|
||||
{% if budgetLine.getOverspent != 0 %}
|
||||
{{ budgetLine.getOverspent|formatAmount }}
|
||||
{% endif %}
|
||||
@ -78,8 +87,8 @@
|
||||
<tr>
|
||||
<td><em>{{ 'sum'|_ }}</em></td>
|
||||
<td class="hidden-xs"> </td>
|
||||
<td>{{ budgets.getBudgeted|formatAmount }}</td>
|
||||
<td>
|
||||
<td style="text-align: right;">{{ budgets.getBudgeted|formatAmount }}</td>
|
||||
<td style="text-align: right;">
|
||||
{% if budgets.getSpent != 0 %}
|
||||
<span class="text-danger">{{ budgets.getSpent|formatAmountPlain }}</span>
|
||||
{% endif %}
|
||||
@ -87,8 +96,9 @@
|
||||
{{ budgets.getSpent|formatAmount }}
|
||||
{% endif %}
|
||||
</td>
|
||||
<td>{{ budgets.getLeft|formatAmount }}</td>
|
||||
<td><span class="text-danger">{{ budgets.getOverspent|formatAmountPlain }}</span></td>
|
||||
<td> </td>
|
||||
<td style="text-align: right;">{{ budgets.getLeft|formatAmount }}</td>
|
||||
<td style="text-align: right;"><span class="text-danger">{{ budgets.getOverspent|formatAmountPlain }}</span></td>
|
||||
</tr>
|
||||
</tfoot>
|
||||
</table>
|
||||
|
||||
@ -2,7 +2,8 @@
|
||||
<thead>
|
||||
<tr>
|
||||
<th>{{ 'category'|_ }}</th>
|
||||
<th colspan="2">{{ 'spent'|_ }}</th>
|
||||
<th style="text-align: right;">{{ 'spent'|_ }}</th>
|
||||
<th> </th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
@ -17,7 +18,7 @@
|
||||
<td>
|
||||
<a href="{{ route('categories.show',id) }}">{{ category.name }}</a>
|
||||
</td>
|
||||
<td>{{ category.spent|formatAmount }}</td>
|
||||
<td style="text-align: right;">{{ category.spent|formatAmount }}</td>
|
||||
<td style="width:20px;">
|
||||
<i class="fa fa-fw fa-info-circle text-muted firefly-info-button"
|
||||
data-location="category-entry" data-category-id="{{ id }}"
|
||||
@ -37,7 +38,8 @@
|
||||
|
||||
<tr>
|
||||
<td><em>{{ 'sum'|_ }}</em></td>
|
||||
<td>{{ sum|formatAmount }}</td>
|
||||
<td style="text-align: right;">{{ sum|formatAmount }}</td>
|
||||
<td> </td>
|
||||
</tr>
|
||||
</tfoot>
|
||||
</table>
|
||||
|
||||
@ -3,9 +3,9 @@
|
||||
<tr>
|
||||
<th data-defaultsign="az" colspan="2">{{ 'category'|_ }}</th>
|
||||
{% for period in periods %}
|
||||
<th data-defaultsign="_19">{{ period }}</th>
|
||||
<th data-defaultsign="_19" style="text-align: right;">{{ period }}</th>
|
||||
{% endfor %}
|
||||
<th data-defaultsign="_19">{{ 'sum'|_ }}</th>
|
||||
<th data-defaultsign="_19" style="text-align: right;">{{ 'sum'|_ }}</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
@ -20,11 +20,11 @@
|
||||
{% for key, period in periods %}
|
||||
{# income first #}
|
||||
{% if(info.entries[key]) %}
|
||||
<td data-value="{{ info.entries[key] }}">
|
||||
<td data-value="{{ info.entries[key] }}" style="text-align: right;">
|
||||
{{ info.entries[key]|formatAmount }}
|
||||
</td>
|
||||
{% else %}
|
||||
<td data-value="0">
|
||||
<td data-value="0" style="text-align: right;">
|
||||
{{ 0|formatAmount }}
|
||||
</td>
|
||||
{% endif %}
|
||||
@ -32,11 +32,11 @@
|
||||
|
||||
{# if sum of income, display: #}
|
||||
{% if info.sum %}
|
||||
<td data-value="{{ info.sum }}">
|
||||
<td data-value="{{ info.sum }}" style="text-align: right;">
|
||||
{{ info.sum|formatAmount }}
|
||||
</td>
|
||||
{% else %}
|
||||
<td data-value="0">
|
||||
<td data-value="0" style="text-align: right;">
|
||||
{{ 0|formatAmount }}
|
||||
</td>
|
||||
{% endif %}
|
||||
|
||||
@ -2,8 +2,8 @@
|
||||
<thead>
|
||||
<tr>
|
||||
<th data-defaultsign="az">{{ 'name'|_ }}</th>
|
||||
<th data-defaultsign="_19">{{ 'total'|_ }}</th>
|
||||
<th data-defaultsign="_19" class="hidden-xs">{{ 'average'|_ }}</th>
|
||||
<th data-defaultsign="_19" style="text-align: right;">{{ 'total'|_ }}</th>
|
||||
<th data-defaultsign="_19" class="hidden-xs" style="text-align: right;">{{ 'average'|_ }}</th>
|
||||
<th data-defaultsort="disabled"></th>
|
||||
</tr>
|
||||
</thead>
|
||||
@ -25,10 +25,10 @@
|
||||
</small>
|
||||
{% endif %}
|
||||
</td>
|
||||
<td data-value="{{ entry.sum }}">
|
||||
<td data-value="{{ entry.sum }}" style="text-align: right;">
|
||||
{{ (entry.sum)|formatAmount }}
|
||||
</td>
|
||||
<td class="hidden-xs" data-value="{{ entry.average }}">
|
||||
<td class="hidden-xs" data-value="{{ entry.average }}" style="text-align: right;">
|
||||
{% if entry.count > 1 %}
|
||||
{{ entry.average|formatAmount }}
|
||||
{% else %}
|
||||
@ -52,7 +52,7 @@
|
||||
{% endif %}
|
||||
<tr>
|
||||
<td><em>{{ 'sum'|_ }}</em></td>
|
||||
<td>{{ (sum)|formatAmount }}</td>
|
||||
<td style="text-align: right;">{{ (sum)|formatAmount }}</td>
|
||||
</tr>
|
||||
</tfoot>
|
||||
</table>
|
||||
|
||||
@ -7,9 +7,9 @@
|
||||
<th class="hide-icon"> </th>
|
||||
|
||||
<th class="hide-description">{{ trans('list.description') }}</th>
|
||||
<th class="hide-balance_before">{{ trans('list.balance_before') }}</th>
|
||||
<th class="hide-amount">{{ trans('list.amount') }}</th>
|
||||
<th class="hide-balance_after">{{ trans('list.balance_after') }}</th>
|
||||
<th class="hide-balance_before" style="text-align: right;">{{ trans('list.balance_before') }}</th>
|
||||
<th class="hide-amount" style="text-align: right;">{{ trans('list.amount') }}</th>
|
||||
<th class="hide-balance_after" style="text-align: right;">{{ trans('list.balance_after') }}</th>
|
||||
|
||||
<th class="hide-date">{{ trans('list.date') }}</th>
|
||||
<th class="hide-book_date">{{ trans('list.book_date') }}</th>
|
||||
@ -57,14 +57,14 @@
|
||||
{% endif %}
|
||||
</a>
|
||||
</td>
|
||||
<td class="hide-balance_before">{{ transaction.before|formatAmount }}</td>
|
||||
<td class="hide-amount">
|
||||
<td class="hide-balance_before" style="text-align: right;">{{ transaction.before|formatAmount }}</td>
|
||||
<td class="hide-amount" style="text-align: right;">
|
||||
<!-- format amount of transaction -->
|
||||
{{ formatByCode(transaction.transaction_currency_code, transaction.transaction_amount) }}
|
||||
<!-- and then amount of journal itself. -->
|
||||
{{ optionalJournalAmount(transaction.journal_id, transaction.transaction_amount, transaction.transaction_currency_code, transaction.transaction_type_type) }}
|
||||
</td>
|
||||
<td class="hide-balance_after">{{ transaction.after|formatAmount }}</td>
|
||||
<td class="hide-balance_after" style="text-align: right;">{{ transaction.after|formatAmount }}</td>
|
||||
|
||||
<td class="hide-date">{{ transaction.date.formatLocalized(monthAndDayFormat) }}</td>
|
||||
<td class="hide-book_date">
|
||||
|
||||
@ -1,14 +1,14 @@
|
||||
<table class="table table-hover">
|
||||
<tr>
|
||||
<td>{{ 'in'|_ }}</td>
|
||||
<td>{{ incomeSum|formatAmount }}</td>
|
||||
<td style="text-align: right;">{{ incomeSum|formatAmount }}</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>{{ 'out'|_ }}</td>
|
||||
<td>{{ expensesSum|formatAmount }}</td>
|
||||
<td style="text-align: right;">{{ expensesSum|formatAmount }}</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>{{ 'difference'|_ }}</td>
|
||||
<td>{{ (incomeSum + expensesSum)|formatAmount }}</td>
|
||||
<td style="text-align: right;">{{ (incomeSum + expensesSum)|formatAmount }}</td>
|
||||
</tr>
|
||||
</table>
|
||||
|
||||
Loading…
Reference in New Issue
Block a user