Skip to content

[IMPAC-649] Account comparison widget bugs #399

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 3 commits into from
Sep 11, 2017
Merged

[IMPAC-649] Account comparison widget bugs #399

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9a38647
Timeout change for async chart update
rheasunshine Sep 3, 2017
2cfa9e0
Fix accounts comparison legend overflow
rheasunshine Sep 5, 2017
f9901e2
Purple add account button fixed
rheasunshine Sep 5, 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
6 changes: 3 additions & 3 deletions src/components/widgets/accounts-comparison/accounts-comparison.directive.coffee
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ module.controller('WidgetAccountsComparisonCtrl', ($scope, $q, ChartFormatterSvc
# Widget specific methods
# --------------------------------------
w.initContext = ->
$scope.movedAccount = {}
$scope.movedAccount = []
# defines the available options for params-checkboxes.directive
$translate('impac.widget.account_comp.compare_mode_opt').then((label)->
$scope.comparisonModeOptions = [{
Expand Down Expand Up @@ -105,7 +105,7 @@ module.controller('WidgetAccountsComparisonCtrl', ($scope, $q, ChartFormatterSvc
inputData = {labels: [], values: []}
# Waiting for next digest cycle to ensure w.selectedAccounts have been pre-populated
# by any saved accounts.
$timeout () ->
$timeout ->
for account in w.selectedAccounts
if $scope.isComparisonMode()
for groupedAccount in account.accounts
Expand All @@ -128,7 +128,7 @@ module.controller('WidgetAccountsComparisonCtrl', ($scope, $q, ChartFormatterSvc

# calls chart.draw()
$scope.drawTrigger.notify(chartData)

, 500
# Widget is ready: can trigger the "wait for settigns to be ready"
# --------------------------------------
$scope.widgetDeferred.resolve(settingsPromises)
Expand Down
2 changes: 2 additions & 0 deletions src/components/widgets/accounts-comparison/accounts-comparison.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,8 @@
.widget-lines-container {
font-size: 11px;
max-height: @impac-widget-accounts-comparison-lines-container-max-height;
margin-bottom: 65px;
overflow: auto;
}

.settings.params-checkboxes {
Expand Down
4 changes: 2 additions & 2 deletions src/components/widgets/accounts-comparison/accounts-comparison.tmpl.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ <h5 translate>impac.widget.account_comp.account.select</h5>
</div>
<div class="col-md-6">
<div class="input-group">
<select ng-model="movedAccount" ng-options="account.name + ' (' + formatAmount(account) + ')' group by account.classification for account in widget.remainingAccounts" class="form-control" ng-show="widget.hasEditAbility" ng-change="addAccount(movedAccount)"></select>
<select ng-model="movedAccount[0]" ng-options="account.name + ' (' + formatAmount(account) + ')' group by account.classification for account in widget.remainingAccounts" class="form-control" ng-show="widget.hasEditAbility" ng-change="addAccount(movedAccount[0])"></select>
</div>
</div>
</div>
Expand Down Expand Up @@ -85,7 +85,7 @@ <h5 translate>impac.widget.account_comp.account.select</h5>

<div class="row" ng-show="hasAccountsSelected() && !pdfMode">
<div class="col-xs-12 input-group add-account">
<select ng-model="movedAccount" ng-options="account.name + ' (' + formatAmount(account) + ')' group by account.classification for account in widget.remainingAccounts track by account.uid" class="form-control" ng-show="widget.hasDeleteAbility" ng-change="addAccount(movedAccount)" ng-disabled="widget.selectedAccounts.length >= 15 || widget.remainingAccounts.length == 0 || isComparisonMode()">
<select ng-model="movedAccount[0]" ng-options="account.name + ' (' + formatAmount(account) + ')' group by account.classification for account in widget.remainingAccounts track by account.uid" class="form-control" ng-show="widget.hasDeleteAbility" ng-change="addAccount(movedAccount[0])" ng-disabled="widget.selectedAccounts.length >= 15 || widget.remainingAccounts.length == 0 || isComparisonMode()">
<option value="" disabled selected translate>impac.widget.account_comp.account.add</option>
</select>
</div>
Expand Down