kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-09-25 14:58:40 +00:00
Code Issues Projects Releases Wiki Activity

Fix #1247

Browse Source
This commit is contained in:
James Cole
2018-03-25 10:17:07 +02:00
parent 6660306ac4
commit 41e468b507
3 changed files with 21 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
app/Http/Controllers/Json/BoxController.php
View File

@@ -66,21 +66,25 @@ class BoxController extends Controller
// get spent amount: // get spent amount:
$budgets = $repository->getActiveBudgets(); $budgets = $repository->getActiveBudgets();
$budgetInformation = $repository->collectBudgetInformation($budgets, $start, $end); $budgetInformation = $repository->collectBudgetInformation($budgets, $start, $end);
$spent = strval(array_sum(array_column($budgetInformation, 'spent'))); $spent = (string)array_sum(array_column($budgetInformation, 'spent'));
$left = bcadd($available, $spent); $left = bcadd($available, $spent);
// left less than zero? then it's zero:
if (bccomp($left, '0') === -1) {
$left = '0';
}
$days = $today->diffInDays($end) + 1; $days = $today->diffInDays($end) + 1;
$perDay = '0'; $perDay = '0';
if (0 !== $days) { $text = (string)trans('firefly.left_to_spend');
$perDay = bcdiv($left, strval($days)); $overspent = false;
if (bccomp($left, '0') === -1) {
$text = (string)trans('firefly.overspent');
$overspent = true;
}
if (0 !== $days && bccomp($left, '0') > -1) {
$perDay = bcdiv($left, (string)$days);
} }
$return = [ $return = [
'perDay' => app('amount')->formatAnything($currency, $perDay, false), 'perDay' => app('amount')->formatAnything($currency, $perDay, false),
'left' => app('amount')->formatAnything($currency, $left, false), 'left' => app('amount')->formatAnything($currency, $left, false),
'text' => $text,
'overspent' => $overspent,
]; ];
$cache->store($return); $cache->store($return);
@@ -135,7 +139,7 @@ class BoxController extends Controller
$set = $collector->getJournals(); $set = $collector->getJournals();
/** @var Transaction $transaction */ /** @var Transaction $transaction */
foreach ($set as $transaction) { foreach ($set as $transaction) {
$currencyId = intval($transaction->transaction_currency_id); $currencyId = (int)$transaction->transaction_currency_id;
$expenses[$currencyId] = $expenses[$currencyId] ?? '0'; $expenses[$currencyId] = $expenses[$currencyId] ?? '0';
$expenses[$currencyId] = bcadd($expenses[$currencyId], $transaction->transaction_amount); $expenses[$currencyId] = bcadd($expenses[$currencyId], $transaction->transaction_amount);
$sums[$currencyId] = $sums[$currencyId] ?? '0'; $sums[$currencyId] = $sums[$currencyId] ?? '0';
@@ -236,7 +240,7 @@ class BoxController extends Controller
foreach ($accounts as $account) { foreach ($accounts as $account) {
$accountCurrency = $currency; $accountCurrency = $currency;
$balance = $balances[$account->id] ?? '0'; $balance = $balances[$account->id] ?? '0';
$currencyId = intval($repository->getMetaValue($account, 'currency_id')); $currencyId = (int)$repository->getMetaValue($account, 'currency_id');
if ($currencyId !== 0) { if ($currencyId !== 0) {
$accountCurrency = $currencyRepos->findNull($currencyId); $accountCurrency = $currencyRepos->findNull($currencyId);
} }

4
public/js/ff/index.js vendored
View File

@@ -76,6 +76,10 @@ function getAvailableBox() {
$.getJSON('json/box/available').done(function (data) { $.getJSON('json/box/available').done(function (data) {
$('#box-left-to-spend').html(data.left); $('#box-left-to-spend').html(data.left);
$('#box-left-per-day').html(data.perDay); $('#box-left-per-day').html(data.perDay);
$('#box-left-to-spend-text').text(data.text);
if(data.overspent === true) {
$('#box-left-to-spend-box').removeClass('bg-green-gradient').addClass('bg-red-gradient');
}
}); });
} }

4
resources/views/partials/boxes.twig
View File

@@ -42,10 +42,10 @@
{# available to spend total / per day #} {# available to spend total / per day #}
<div class="col-lg-3 col-md-3 col-sm-6 col-xs-12"> <div class="col-lg-3 col-md-3 col-sm-6 col-xs-12">
<div class="info-box bg-green-gradient"> <div class="info-box bg-green-gradient" id="box-left-to-spend-box">
<span class="info-box-icon"><i class="fa fa-money"></i></span> <span class="info-box-icon"><i class="fa fa-money"></i></span>
<div class="info-box-content"> <div class="info-box-content">
<span class="info-box-text">{{ 'left_to_spend'|_ }}</span> <span class="info-box-text" id="box-left-to-spend-text">{{ 'left_to_spend'|_ }}</span>
<span class="info-box-number" id="box-left-to-spend"></span> <span class="info-box-number" id="box-left-to-spend"></span>
<div class="progress"> <div class="progress">