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

Cleanup and prep-work for new charts (will be a new feature).

Browse Source
This commit is contained in:
Sander Dorigo
2014-10-28 09:25:29 +01:00
parent 4533b46436
commit a0afa25145
5 changed files with 46 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/views/accounts/sankey.blade.php
View File

@@ -29,12 +29,10 @@ google.setOnLoadCallback(drawChart);
// Set chart options
var options = {
width: 600,
sankey: {
link: { color: { fill: '#9fa8da', fillOpacity: 0.8 } },
node: { color: { fill: '#a61d4c' },
label: { color: '#871b47' } }
node: { color: { fill: '#000' },
label: { color: '#000' } }
}
};

43
app/views/accounts/show.blade.php
View File

@@ -7,7 +7,7 @@
<i class="fa fa-fw {{$subTitleIcon}} fa-fw"></i> {{{$account->name}}}
</div>
<div class="panel-body">
<div id="accountTransactionsTable"></div>
<div id="overviewChart"></div>
</div>
</div>
</div>
@@ -61,11 +61,36 @@
</div>
</div>
</div>
<div class="row">
<div class="col-lg-6 col-md-12 col-sm-12">
<div class="panel panel-default">
<div class="panel-heading">
Out
</div>
<div class="panel-body">
<div id="accountOutSankey"></div>
</div>
</div>
</div>
<div class="col-lg-6 col-md-12 col-sm-12">
<div class="panel panel-default">
<div class="panel-heading">
In
</div>
<div class="panel-body">
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-lg-12 col-md-12 col-sm-12">
<div class="panel panel-default">
<div class="panel-heading">
<i class="fa fa-repeat fa-fw"></i> Transaction
<i class="fa fa-repeat fa-fw"></i> Transactions
</div>
<div class="panel-body">
@@ -122,18 +147,7 @@
</div>
</div>
<div class="row">
<div class="col-lg-12 col-md-12 col-sm-12">
<div class="panel panel-default">
<div class="panel-heading">
<i class="fa fa-repeat fa-fw"></i> Transaction
</div>
<div class="panel-body">
</div>
</div>
</div>
</div>
{{--
<div class="row">
@@ -153,12 +167,9 @@
@section('scripts')
<script type="text/javascript">
var accountID = {{{$account->id}}};
var URL = 'bla bla bla';
var container = 'transactionByAccountTable';
</script>
{{HTML::script('assets/javascript/datatables/jquery.dataTables.min.js')}}
{{HTML::script('assets/javascript/datatables/dataTables.bootstrap.js')}}
{{HTML::script('assets/javascript/datatables/transactions.js')}}
{{HTML::script('assets/javascript/highcharts/highcharts.js')}}
{{HTML::script('assets/javascript/firefly/accounts.js')}}
@stop