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

small changes and refactoring

Browse source
This commit is contained in:
Gwenhael Le Moine 2015-10-02 15:02:02 +02:00
parent dd3adadaee
commit c0a109d56a
1 changed files with 10 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -22,10 +22,8 @@ app.controller( 'DashboardCtrl',
// compute an account's score: from 1 (good) to 10 (bad), 0 is neutral/undecided // compute an account's score: from 1 (good) to 10 (bad), 0 is neutral/undecided
var score_account = function ( account ) { var score_account = function ( account ) {
if ( account.match( /^Income:(salaire|Sécu|Mutuelle)$/ ) ) { if ( account.match( /^Income/ ) ) {
return 11; return -10;
} else if ( account.match( /^Income:(Gift|Remboursement)$/ ) ) {
return 12;
} else if ( account.match( /^Expenses:(courses|Hang)$/ ) ) { } else if ( account.match( /^Expenses:(courses|Hang)$/ ) ) {
return 1; return 1;
} else if ( account.match( /^Expenses:Home/ ) ) { } else if ( account.match( /^Expenses:Home/ ) ) {
@ -41,9 +39,9 @@ app.controller( 'DashboardCtrl',
} else if ( account.match( /^Expenses:Gadgets/ ) ) { } else if ( account.match( /^Expenses:Gadgets/ ) ) {
return 10; return 10;
} else if ( account.match( /^Liabilities/ ) ) { } else if ( account.match( /^Liabilities/ ) ) {
return 1000; return 0;
} else if ( account.match( /^Assets/ ) ) { } else if ( account.match( /^Assets/ ) ) {
return 100; return -100;
} else { } else {
return 0; return 0;
} }
@ -53,18 +51,14 @@ app.controller( 'DashboardCtrl',
var adjusted_score = score; var adjusted_score = score;
var color_scale = [ '#99f', '#0f0', '#3f0', '#6f0', '#9f0', '#cf0', '#fc0', '#f90', '#f60', '#f30', '#f00' ]; var color_scale = [ '#99f', '#0f0', '#3f0', '#6f0', '#9f0', '#cf0', '#fc0', '#f90', '#f60', '#f30', '#f00' ];
if ( score >= 1000 ) { if ( score <= -100 ) {
// Liabilities
adjusted_score = score - 1000;
color_scale = [ '#0ff' ];
} else if ( score >= 100 ) {
// Assets // Assets
adjusted_score = score - 100; adjusted_score = ( score * -1 ) - 100;
color_scale = [ '#f0f' ]; color_scale = [ '#f0f' ];
} else if ( score >= 11 ) { } else if ( score <= -10 ) {
// Income // Income
adjusted_score = score - 11; adjusted_score = ( score * -1 ) - 10;
color_scale = [ '#360', '#369' ]; color_scale = [ '#360' ];
} }
return color_scale[ adjusted_score ]; return color_scale[ adjusted_score ];
@ -97,7 +91,7 @@ app.controller( 'DashboardCtrl',
return memo + account.amount; return memo + account.amount;
}, 0 ); }, 0 );
} ) } )
.value(); .value();
bucket.total_detailed = _.chain(bucket.total_detailed) bucket.total_detailed = _.chain(bucket.total_detailed)
.keys() .keys()
.map( function( key ) { .map( function( key ) {
@ -109,12 +103,6 @@ app.controller( 'DashboardCtrl',
} ); } );
}; };
$scope.select = { score_higher_than: function( bucket, score ) {
bucket.accounts_selected = _(bucket.raw_data).filter( function( account ) {
return account.score >= score;
} );
}};
var Bucket = function( categories, period ) { var Bucket = function( categories, period ) {
var _this = this; var _this = this;
this.categories = categories; this.categories = categories;
@ -164,29 +152,11 @@ app.controller( 'DashboardCtrl',
}, 0 ); }, 0 );
bucket.accounts_selected = bucket.raw_data; bucket.accounts_selected = bucket.raw_data;
$scope.select.score_higher_than( bucket, bucket.score_threshold );
$scope.filter_data(); $scope.filter_data();
} ); } );
} ); } );
}; };
// $scope.dates_salaries = [];
// var retrieve_dates_salaries = function() {
// API.dates_salaries()
// .then( function ( response ) {
// $scope.dates_salaries = response.data;
// $scope.periods= [];
// for ( var i = 0 ; i < ( $scope.dates_salaries.length - 1 ) ; i++ ) {
// $scope.periods.push( 'from ' + $scope.dates_salaries[i] + ' to ' + $scope.dates_salaries[i+1] );
// }
// $scope.periods.push( 'from ' + _($scope.dates_salaries).last() );
// $scope.periods = _($scope.periods).reverse();
// $scope.period = _($scope.periods).first();
// } );
// };
//retrieve_dates_salaries();
var retrieve_accounts = function() { var retrieve_accounts = function() {
API.accounts() API.accounts()
.then( function ( response ) { .then( function ( response ) {