Skip to content

[IMPAC-667] Update time management on cashflow widgets #408

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
cesar-tonnoir merged 2 commits into from
Sep 22, 2017
Merged

[IMPAC-667] Update time management on cashflow widgets #408

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1dee94e
remove dates picker from cashflow widgets
cesar-tonnoir Sep 19, 2017
3baa105
add dates zooming shortcut to line chart
cesar-tonnoir Sep 19, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 2 additions & 12 deletions src/components/widgets/accounts-cash-balance/accounts-cash-balance.directive.coffee
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
# --------------------------------------
Expand Down
2 changes: 0 additions & 2 deletions src/components/widgets/accounts-cash-balance/accounts-cash-balance.tmpl.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,6 @@ <h4 ng-bind="header | titleize"></h4>
</div>
</div>

<div setting-dates-picker class="dates-picker" parent-widget="widget" deferred="::datesPickerDeferred" from="fromDate" to="toDate" period="period" keep-today="keepToday" update-on-pick="true"/>

<div ng-show="widget.demoData" common-data-not-found />
</div>
</div>
8 changes: 0 additions & 8 deletions src/components/widgets/accounts-cash-projection/accounts-cash-projection.directive.coffee
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
]
Expand All @@ -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 }

Expand Down
1 change: 0 additions & 1 deletion src/components/widgets/accounts-cash-projection/accounts-cash-projection.tmpl.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,6 @@ <h4>For each interval in the future</h4>
<button class="btn btn-sm btn-warning" ng-if="simulationMode" ng-click="saveSimulation()" title="Apply simulation">
Save
</button>
<div setting-dates-picker class="dates-picker" parent-widget="widget" deferred="::datesPickerDeferred" from="fromDate" to="toDate" period="period" keep-today="keepToday" update-on-pick="true"/>
</div>

</div>
Expand Down
3 changes: 2 additions & 1 deletion src/services/highcharts-factory/highcharts-factory.svc.coffee
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 = {})->
Expand Down