mirror of
https://github.com/firefly-iii/firefly-iii.git
synced 2025-01-07 06:33:57 -06:00
Merge branch 'hotfix/chart-fix'
This commit is contained in:
commit
cc82505b66
@ -46,8 +46,9 @@ class GoogleChartController extends Controller
|
|||||||
*/
|
*/
|
||||||
public function accountBalanceChart(Account $account, GChart $chart)
|
public function accountBalanceChart(Account $account, GChart $chart)
|
||||||
{
|
{
|
||||||
|
$accountName = iconv('UTF-8', 'ASCII//TRANSLIT', $account->name);
|
||||||
$chart->addColumn('Day of month', 'date');
|
$chart->addColumn('Day of month', 'date');
|
||||||
$chart->addColumn('Balance for ' . $account->name, 'number');
|
$chart->addColumn('Balance for ' . $accountName, 'number');
|
||||||
$chart->addCertainty(1);
|
$chart->addCertainty(1);
|
||||||
|
|
||||||
$start = Session::get('start', Carbon::now()->startOfMonth());
|
$start = Session::get('start', Carbon::now()->startOfMonth());
|
||||||
@ -88,7 +89,8 @@ class GoogleChartController extends Controller
|
|||||||
$index = 1;
|
$index = 1;
|
||||||
/** @var Account $account */
|
/** @var Account $account */
|
||||||
foreach ($accounts as $account) {
|
foreach ($accounts as $account) {
|
||||||
$chart->addColumn('Balance for ' . $account->name, 'number');
|
$accountName = iconv('UTF-8', 'ASCII//TRANSLIT', $account->name);
|
||||||
|
$chart->addColumn('Balance for ' . $accountName, 'number');
|
||||||
$chart->addCertainty($index);
|
$chart->addCertainty($index);
|
||||||
$index++;
|
$index++;
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user