Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 2 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,5 @@ before_script:
script:
- node_modules/.bin/gulp build:dist
- node_modules/.bin/gulp test
addons:
chrome: stable
12 changes: 8 additions & 4 deletions dist/impac-angular.css

Large diffs are not rendered by default.

114 changes: 85 additions & 29 deletions dist/impac-angular.js

Large diffs are not rendered by default.

19 changes: 12 additions & 7 deletions dist/impac-angular.less
Original file line number Diff line number Diff line change
Expand Up @@ -986,7 +986,6 @@ body {
}

.widget-item .content, kpis-bar .kpi {

::-webkit-scrollbar {
width: 6px;
background-color: transparent;
Expand Down Expand Up @@ -2438,6 +2437,13 @@ dashboard-templates-selector {
min-height: 250px !important;
max-height: auto !important;
}

// Avoid content to leak out of widget's box
.content-template-wrapper {
height: 100%;
overflow: auto;
overflow-x: hidden;
}
}

&.pdf-mode .content {
Expand Down Expand Up @@ -2555,9 +2561,6 @@ dashboard-templates-selector {
}
}

.analytics .dashboard-settings.pdf-mode {
}

.analytics .dashboard-settings.currency {
text-align: right;
select {
Expand Down Expand Up @@ -2671,6 +2674,9 @@ dashboard-templates-selector {
.fa.success { color: @flurogreen; }
}

.analytics .dashboard-settings.pdf-mode {
}

chart-threshold {

.attach-panel {
Expand Down Expand Up @@ -3154,6 +3160,8 @@ chart-threshold {
.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 Expand Up @@ -3227,9 +3235,6 @@ chart-threshold {
text-align: center;
}
}
.chart-container {
max-height: 125px;
}
}

.analytics .widget-item .content.accounts-expenses-revenue {
Expand Down
2 changes: 1 addition & 1 deletion dist/impac-angular.min.css

Large diffs are not rendered by default.

20 changes: 10 additions & 10 deletions dist/impac-angular.min.js

Large diffs are not rendered by default.

5 changes: 3 additions & 2 deletions karma-min.conf.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ module.exports = function(config) {
// 'karma-mocha',
// 'karma-chai',
// 'karma-sinon-chai',
'karma-firefox-launcher',
'karma-chrome-launcher',
'karma-mocha-reporter',
'karma-jasmine'
],
Expand All @@ -33,6 +33,7 @@ module.exports = function(config) {
'bower_components/angular-xeditable/dist/js/xeditable.js',
'bower_components/angular-toastr/dist/angular-toastr.tpls.js',
'bower_components/bootstrap/dist/js/bootstrap.js',
'bower_components/ng-tags-input/ng-tags-input.js',
'bower_components/Chart.js/dist/Chart.js',
'bower_components/lodash/lodash.js',
'bower_components/angular-poller/angular-poller.min.js',
Expand Down Expand Up @@ -96,7 +97,7 @@ module.exports = function(config) {

// start these browsers
// available browser launchers: https://npmjs.org/browse/keyword/karma-launcher
browsers: ['Firefox'],
browsers: ['Chrome'],


// Continuous Integration mode
Expand Down
5 changes: 3 additions & 2 deletions karma.conf.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ module.exports = function(config) {
// 'karma-mocha',
// 'karma-chai',
// 'karma-sinon-chai',
'karma-firefox-launcher',
'karma-chrome-launcher',
'karma-mocha-reporter',
'karma-jasmine'
],
Expand All @@ -33,6 +33,7 @@ module.exports = function(config) {
'bower_components/angular-xeditable/dist/js/xeditable.js',
'bower_components/angular-toastr/dist/angular-toastr.tpls.js',
'bower_components/bootstrap/dist/js/bootstrap.js',
'bower_components/ng-tags-input/ng-tags-input.js',
'bower_components/Chart.js/dist/Chart.js',
'bower_components/lodash/lodash.js',
'bower_components/angular-poller/angular-poller.min.js',
Expand Down Expand Up @@ -96,7 +97,7 @@ module.exports = function(config) {

// start these browsers
// available browser launchers: https://npmjs.org/browse/keyword/karma-launcher
browsers: ['Firefox'],
browsers: ['Chrome'],


// Continuous Integration mode
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,9 @@
"http-proxy-middleware": "^0.17.2",
"jasmine-core": "^2.4.1",
"karma": "~0.12.22",
"karma-chrome-launcher": "^2.2.0",
"karma-jasmine": "^0.3.6",
"karma-mocha-reporter": "^0.3.1",
"karma-firefox-launcher": "^1.0.0",
"lazypipe": "^1.0.1",
"less-plugin-glob": "^1.1.0",
"run-sequence": "^1.1.5",
Expand Down
7 changes: 7 additions & 0 deletions src/components/widget/widget.less
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,13 @@
min-height: 250px !important;
max-height: auto !important;
}

// Avoid content to leak out of widget's box
.content-template-wrapper {
height: 100%;
overflow: auto;
overflow-x: hidden;
}
}

&.pdf-mode .content {
Expand Down
2 changes: 1 addition & 1 deletion src/components/widget/widget.tmpl.html
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ <h6 translate>impac.widget.include_pdf</h6>
</a>
</div>

<div ng-hide="widget.isLoading" ng-include="::templatePath" />
<div ng-hide="widget.isLoading" class="content-template-wrapper" ng-include="::templatePath" />
</div>

<div common-info-panel parent-widget="widget" on-close="toggleInfoPanel()" ng-show="isInfoPanelDisplayed()" />
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
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
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
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,4 @@
text-align: center;
}
}
.chart-container {
max-height: 125px;
}
}
1 change: 0 additions & 1 deletion src/stylesheets/globals.less
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,6 @@ body {
}

.widget-item .content, kpis-bar .kpi {

::-webkit-scrollbar {
width: 6px;
background-color: transparent;
Expand Down