Miroirs/ledgerrb
1
0
Fork 0
mirror of https://github.com/gwenhael-le-moine/ledgerrb.git synced 2025-01-27 07:58:31 +01:00
Code Issues Projects Releases Packages Wiki Activity

add 'future' period

Browse source
This commit is contained in:
Gwenhael Le Moine 2014-10-05 09:49:42 +02:00
parent 890974cb38
commit 7f8f165279
2 changed files with 17 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
public/app/js/controllers/BalanceCtrl.js
View file

@ -68,14 +68,24 @@ app.controller( 'BalanceCtrl',
} ); } );
var retrieve_data = function () { var retrieve_data = function () {
$scope.from_date = new Date( $scope.dates_salaries[ $scope.period_offset ] ); var from, to, period;
$scope.to_date = ( $scope.period_offset < $scope.dates_salaries.length - 1 ) ? new Date( $scope.dates_salaries[ $scope.period_offset + 1 ] ) : moment( $scope.from_date ).add( 1, 'month' ).toDate();
var from = moment( $scope.from_date ); if ( $scope.period_offset === $scope.dates_salaries.length ) {
var to = moment( $scope.to_date ); $scope.from_date = moment( _($scope.dates_salaries).last() ).add( 1, 'month' ).toDate();
var period = 'from ' + from.year() + '-' + ( from.month() + 1 ) + '-' + from.date(); from = moment( $scope.from_date );
period += ' to ' + to.year() + '-' + ( to.month() + 1 ) + '-' + to.date();
period = 'from ' + from.year() + '-' + ( from.month() + 1 ) + '-' + from.date();
} else {
$scope.from_date = new Date( $scope.dates_salaries[ $scope.period_offset ] );
$scope.to_date = ( $scope.period_offset < $scope.dates_salaries.length - 1 ) ? new Date( $scope.dates_salaries[ $scope.period_offset + 1 ] ) : moment( $scope.from_date ).add( 1, 'month' ).toDate();
from = moment( $scope.from_date );
to = moment( $scope.to_date );
period = 'from ' + from.year() + '-' + ( from.month() + 1 ) + '-' + from.date();
period += ' to ' + to.year() + '-' + ( to.month() + 1 ) + '-' + to.date();
}
$scope.balance = { $scope.balance = {
buckets: [ { buckets: [ {

2
public/app/js/templates/balance.tpl.html
View file

@ -15,7 +15,7 @@
data-ng-class="{'disabled': period_offset == dates_salaries.length - 1}">Now</material-button> data-ng-class="{'disabled': period_offset == dates_salaries.length - 1}">Now</material-button>
<material-button class="material-theme-green" <material-button class="material-theme-green"
data-ng-click="after()" data-ng-click="after()"
data-ng-class="{'disabled': period_offset == dates_salaries.length - 1}">next</material-button> data-ng-class="{'disabled': period_offset == dates_salaries.length}">next</material-button>
</div> </div>
<material-toolbar> <material-toolbar>
<h2 class="balance" data-ng-class="{'negative': balance.buckets[1].total - balance.buckets[0].total < 0, 'positive': balance.buckets[1].total - balance.buckets[0].total > 0}"> <h2 class="balance" data-ng-class="{'negative': balance.buckets[1].total - balance.buckets[0].total < 0, 'positive': balance.buckets[1].total - balance.buckets[0].total > 0}">