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

Live update budget amounts.

Browse Source
This commit is contained in:
James Cole 2017-06-07 11:58:04 +02:00
parent 8bbd3063ec
commit 935fb015d3
No known key found for this signature in database
GPG Key ID: C16961E655E74B5E
4 changed files with 22 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -241,7 +241,8 @@ class BudgetController extends Controller
return view(
'budgets.index',
compact(
'available', 'currentMonth', 'next', 'nextText', 'prev', 'prevText', 'periodStart', 'periodEnd', 'budgetInformation', 'inactive', 'budgets',
'available', 'currentMonth', 'next', 'nextText', 'prev', 'prevText',
'periodStart', 'periodEnd', 'budgetInformation', 'inactive', 'budgets',
'spent', 'budgeted', 'previousLoop', 'nextLoop', 'start'
)
);

2
app/Support/Amount.php
View File

@ -204,7 +204,7 @@ class Amount
}
/**
* @return TransactionCurrency
* @return \FireflyIII\Models\TransactionCurrency
* @throws FireflyException
*/
public function getDefaultCurrency(): TransactionCurrency

17
public/js/ff/budgets/index.js
View File

@ -59,9 +59,26 @@ function updateBudgetedAmounts(e) {
"use strict";
var target = $(e.target);
var id = target.data('id');
var value = target.val();
var original = target.data('original');
var difference = value - original;
var spentCell = $('td[class="spent"][data-id="' + id + '"]');
var leftCell = $('td[class="left"][data-id="' + id + '"]');
var spentAmount = parseFloat(spentCell.data('spent'));
var newAmountLeft = spentAmount + parseFloat(value);
var amountLeftString = accounting.formatMoney(newAmountLeft);
if(newAmountLeft < 0) {
leftCell.html('<span class="text-danger">' + amountLeftString + '</span>');
}
if(newAmountLeft > 0) {
leftCell.html('<span class="text-success">' + amountLeftString + '</span>');
}
if(newAmountLeft === 0.0) {
leftCell.html('<span style="color:#999">' + amountLeftString + '</span>');
}
if (difference !== 0) {
// add difference to 'budgeted' var
budgeted = budgeted + difference;

53
resources/views/budgets/index.twig
View File

@ -176,61 +176,12 @@
step="1" min="0" name="amount" type="number">
</div>
</td>
<td>
<td class="spent" data-id="{{ budget.id }}" data-spent="{{ budgetInformation[budget.id]['spent'] }}">
{{ budgetInformation[budget.id]['spent']|formatAmount }}
</td>
<td>
<td class="left" data-id="{{ budget.id }}">
{{ (repAmount + budgetInformation[budget.id]['spent'])|formatAmount }}
</td>
{#
<div class="box-body">
<table class="table">
<tr>
<td style="width:40%;">
</td>
<td>
<div class="form-group" style="margin-bottom:0;">
</div>
</td>
</tr>
<tr>
<td style="width:40%;">
{{ 'spent'|_ }}
<span class="small"><br/>
{{ session('start').formatLocalized(monthAndDayFormat) }} -
{{ session('end').formatLocalized(monthAndDayFormat) }}
</span>
</td>
<td>
</td>
</tr>
{% if budgetInformation[budget.id]['otherLimits'].count > 0 %}
<tr>
<td colspan="2">
<ul class="list-unstyled">
{% for other in budgetInformation[budget.id]['otherLimits'] %}
<li>
<!-- translate -->
Budgeted
<a href="{{ route('budgets.show.limit', [budget.id, other.id]) }}">{{ other.amount|formatAmountPlain }}</a>
between
{{ other.start_date.formatLocalized(monthAndDayFormat) }}
and {{ other.end_date.formatLocalized(monthAndDayFormat) }}.
</li>
{% endfor %}
</ul>
</td>
</tr>
{% endif %}
</table>
</div>
</div>
</div>
#}
</tr>
{% endfor %}
</tbody>