diff --git a/src/components/widgets/accounts-cash-balance/accounts-cash-balance.directive.coffee b/src/components/widgets/accounts-cash-balance/accounts-cash-balance.directive.coffee index b060a88a..1d118aa4 100644 --- a/src/components/widgets/accounts-cash-balance/accounts-cash-balance.directive.coffee +++ b/src/components/widgets/accounts-cash-balance/accounts-cash-balance.directive.coffee @@ -6,18 +6,8 @@ module.controller('WidgetAccountsCashBalanceCtrl', ($scope, $q, $timeout, $filte # Define settings # -------------------------------------- $scope.orgDeferred = $q.defer() - $scope.datesPickerDeferred = $q.defer() - - settingsPromises = [ - $scope.orgDeferred.promise, - $scope.datesPickerDeferred.promise - ] - - # Dates picker defaults - $scope.fromDate = moment().subtract(3, 'months').format('YYYY-MM-DD') - $scope.toDate = moment().add(1, 'month').format('YYYY-MM-DD') - $scope.period = 'DAILY' - $scope.keepToday = false + + settingsPromises = [$scope.orgDeferred.promise] # Widget specific methods # -------------------------------------- diff --git a/src/components/widgets/accounts-cash-balance/accounts-cash-balance.tmpl.html b/src/components/widgets/accounts-cash-balance/accounts-cash-balance.tmpl.html index 47a0ea65..241d16cc 100644 --- a/src/components/widgets/accounts-cash-balance/accounts-cash-balance.tmpl.html +++ b/src/components/widgets/accounts-cash-balance/accounts-cash-balance.tmpl.html @@ -38,8 +38,6 @@

-
-
diff --git a/src/components/widgets/accounts-cash-projection/accounts-cash-projection.directive.coffee b/src/components/widgets/accounts-cash-projection/accounts-cash-projection.directive.coffee index 5fd000a9..eb9578da 100644 --- a/src/components/widgets/accounts-cash-projection/accounts-cash-projection.directive.coffee +++ b/src/components/widgets/accounts-cash-projection/accounts-cash-projection.directive.coffee @@ -6,13 +6,11 @@ module.controller('WidgetAccountsCashProjectionCtrl', ($scope, $q, $filter, Impa # Define settings # -------------------------------------- $scope.orgDeferred = $q.defer() - $scope.datesPickerDeferred = $q.defer() $scope.intervalsOffsetsDeferred = $q.defer() $scope.currentOffsetsDeferred = $q.defer() settingsPromises = [ $scope.orgDeferred.promise, - $scope.datesPickerDeferred.promise, $scope.intervalsOffsetsDeferred.promise, $scope.currentOffsetsDeferred.promise ] @@ -28,12 +26,6 @@ module.controller('WidgetAccountsCashProjectionCtrl', ($scope, $q, $filter, Impa label: 'Get alerted when the cash projection goes below' } - # Dates picker defaults - $scope.fromDate = moment().subtract(3, 'months').format('YYYY-MM-DD') - $scope.toDate = moment().add(1, 'month').format('YYYY-MM-DD') - $scope.period = 'DAILY' - $scope.keepToday = false - # Transactions List component $scope.trxList = { display: false } diff --git a/src/components/widgets/accounts-cash-projection/accounts-cash-projection.tmpl.html b/src/components/widgets/accounts-cash-projection/accounts-cash-projection.tmpl.html index 6325c443..16a5bb6a 100644 --- a/src/components/widgets/accounts-cash-projection/accounts-cash-projection.tmpl.html +++ b/src/components/widgets/accounts-cash-projection/accounts-cash-projection.tmpl.html @@ -51,7 +51,6 @@

For each interval in the future

-
diff --git a/src/services/highcharts-factory/highcharts-factory.svc.coffee b/src/services/highcharts-factory/highcharts-factory.svc.coffee index 49a1516b..2a69ddcc 100644 --- a/src/services/highcharts-factory/highcharts-factory.svc.coffee +++ b/src/services/highcharts-factory/highcharts-factory.svc.coffee @@ -24,13 +24,14 @@ angular series: series rangeSelector: buttons: [ + { type: 'month', count: 4, text: 'def.' }, { type: 'month', count: 1, text: '1m' }, { type: 'month', count: 3, text: '3m' }, { type: 'month', count: 6, text: '6m' }, { type: 'year', count: 1, text: '1y' }, { type: 'all', text: 'All' } ] - inputEnabled: false + selected: 0 class Chart constructor: (@id, @data = {}, @options = {})->