gwh/ledgerrb
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

major overhaul in presentation

Browse source
This commit is contained in:
Gwenhael Le Moine 2015-05-15 10:45:03 +02:00
parent 6e30dc6d83
commit b8b2d37940
2 changed files with 150 additions and 183 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
public/app/js/controllers/DashboardCtrl.js
View file

@ -23,9 +23,9 @@ app.controller( 'DashboardCtrl',
// compute an account's score: from 1 (good) to 10 (bad), 0 is neutral/undecided
var score_account = function ( account ) {
if ( account.match( /^Income:(salaire|Sécu|Mutuelle)$/ ) ) {
return 1;
return 11;
} else if ( account.match( /^Income:(Gift|Remboursement)$/ ) ) {
return 6;
return 12;
} else if ( account.match( /^Expenses:(courses|Hang)$/ ) ) {
return 1;
} else if ( account.match( /^Expenses:Home/ ) ) {
@ -40,14 +40,34 @@ app.controller( 'DashboardCtrl',
return 9;
} else if ( account.match( /^Expenses:Gadgets/ ) ) {
return 10;
} else if ( account.match( /^Liabilities/ ) ) {
return 1000;
} else if ( account.match( /^Assets/ ) ) {
return 100;
} else {
return 0;
}
};
$scope.coloring_score = function ( score ) {
var adjusted_score = score;
var color_scale = [ '#99f', '#0f0', '#3f0', '#6f0', '#9f0', '#cf0', '#fc0', '#f90', '#f60', '#f30', '#f00' ];
return color_scale[ score ];
if ( score >= 1000 ) {
// Liabilities
adjusted_score = score - 1000;
color_scale = [ '#0ff' ];
} else if ( score >= 100 ) {
// Assets
adjusted_score = score - 100;
color_scale = [ '#f0f' ];
} else if ( score >= 11 ) {
// Income
adjusted_score = score - 11;
color_scale = [ '#ff0', '#ff9' ];
}
return color_scale[ adjusted_score ];
};
$scope.color = function () {
@ -96,8 +116,7 @@ app.controller( 'DashboardCtrl',
};
$scope.balance = {
buckets: [ new Bucket( 'Expenses' ),
new Bucket( 'Income' ) ],
buckets: [ new Bucket( 'Expenses Assets Liabilities Income' ) ],
details: {}
};
@ -134,12 +153,6 @@ app.controller( 'DashboardCtrl',
$scope.total_unbudgeted = _($scope.budget).findWhere( { percentage: -1 } ).amount;
} );
API.register( { period: period,
categories: '' } )
.then( function( response ) {
$scope.balance.details = _($scope.balance.details).extend( _(response.data.values).groupBy( 'account' ) );
} );
_($scope.balance.buckets).each( function( bucket ) {
API.balance( { period: period,
categories: bucket.categories } )
@ -153,7 +166,11 @@ app.controller( 'DashboardCtrl',
.sortBy( function ( account ) {
return 1 / account.amount;
} )
.value();
.sortBy( function ( account ) {
return account.account.split(":")[0];
} )
.value()
.reverse();
bucket.raw_total = _( response.data ).reduce( function ( memo, account ) {
return memo + account.amount;
}, 0 );

60
public/app/js/templates/dashboard.html
View file

@ -61,59 +61,6 @@
</tbody>
</table>
</md-card>
<md-card flex="48" layout="column">
<table class="table">
<thead>
<tr>
<th style="width: 11%">Account</th>
<th style="width: 3%">Left</th>
<th style="width: 3%">Total</th>
<th style="width: 3%">Percentage</th>
<th>Progress</th>
</tr>
</thead>
<tbody>
<tr class="odd">
<td>
Balance
</td>
<td style="text-align: right;">
{{balance.buckets[1].raw_total - balance.buckets[0].raw_total | number:2}}{{budget[0].currency}}
</td>
<td style="text-align: right;">
{{balance.buckets[1].raw_total | number:2}}{{budget[0].currency}}
</td>
<td style="text-align: right;">
{{( ( balance.buckets[1].raw_total - balance.buckets[0].raw_total ) / balance.buckets[1].raw_total ) * 100 | number:2}}%
</td>
<td>
<md-progress-linear md-theme="green" mode="determinate"
value="{{( ( balance.buckets[1].raw_total - balance.buckets[0].raw_total ) / balance.buckets[1].raw_total ) * 100}}"></md-progress-linear>
</td>
</tr>
<tr class="even">
<td>
Potential savings
</td>
<td style="text-align: right;">
{{balance.buckets[1].raw_total - total_budget - total_unbudgeted | number:2}}{{budget[0].currency}}
</td>
<td style="text-align: right;">
{{balance.buckets[1].raw_total - total_budget | number:2}}{{budget[0].currency}}
</td>
<td style="text-align: right;">
{{( ( balance.buckets[1].raw_total - total_budget - total_unbudgeted ) / ( balance.buckets[1].raw_total - total_budget ) ) * 100 | number:2}}%
</td>
<td>
<md-progress-linear md-theme="green" mode="determinate"
value="{{( ( balance.buckets[1].raw_total - total_budget - total_unbudgeted ) / balance.buckets[1].raw_total ) * 100}}"></md-progress-linear>
</td>
</tr>
</tbody>
</table>
</md-card>
</md-content>
<md-content flex="100" layout="column" layout-gt-md="row">
<md-card flex="48" layout="column"
data-ng-repeat="bucket in balance.buckets">
<md-toolbar>
@ -133,7 +80,8 @@
</md-toolbar>
<md-content>
<md-card>
<nvd3-pie-chart data="bucket.data"
<nvd3-pie-chart
data="bucket.data"
x="xFunction()"
y="yFunction()"
height="300"
@ -142,7 +90,9 @@
tooltips="true"
tooltipcontent="toolTipContentFunction()"
showLabels="true"
labelType="value">
labelType="value"
donut="true"
donutRatio="0.25">
<svg></svg>
</nvd3-pie-chart>
</md-card>