gh-mirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-12-22 19:21:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed budget charts.

Browse Source
This commit is contained in:
James Cole
2015-01-24 07:46:57 +01:00
parent b766d93d9a
commit 4ad67a87f1
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/views/budgets/show.blade.php
View File

@@ -8,7 +8,7 @@
Overview Overview
</div> </div>
<div class="panel-body"> <div class="panel-body">
<div id="componentOverview"></div> <div id="budgetOverview"></div>
</div> </div>
</div> </div>
@@ -71,7 +71,8 @@
@stop @stop
@section('scripts') @section('scripts')
<script type="text/javascript"> <script type="text/javascript">
var componentID = {{$budget->id}}; var budgetID = {{$budget->id}};
var currencyCode = '{{Amount::getCurrencyCode()}}';
@if(!is_null($repetition)) @if(!is_null($repetition))
var repetitionID = {{$repetition->id}}; var repetitionID = {{$repetition->id}};
var year = {{$repetition->startdate->format('Y')}}; var year = {{$repetition->startdate->format('Y')}};

8
public/assets/javascript/firefly/budgets.js
View File

@@ -7,11 +7,11 @@ $(function () {
$('.updateIncome').on('click', updateIncome); $('.updateIncome').on('click', updateIncome);
if (typeof componentID != 'undefined' && typeof repetitionID == 'undefined') { if (typeof budgetID != 'undefined' && typeof repetitionID == 'undefined') {
googleColumnChart('chart/budget/' + componentID + '/spending/' + year, 'componentOverview'); googleColumnChart('chart/budget/' + budgetID + '/spending/' + year, 'budgetOverview');
} }
if (typeof componentID != 'undefined' && typeof repetitionID != 'undefined') { if (typeof budgetID != 'undefined' && typeof repetitionID != 'undefined') {
googleLineChart('chart/budget/' + componentID + '/' + repetitionID, 'componentOverview'); googleLineChart('chart/budget/' + budgetID + '/' + repetitionID, 'budgetOverview');
} }
}); });