From 762a25e1102c87af9abbfc1cca0875173aa47661 Mon Sep 17 00:00:00 2001
From: mauriziovitale84 <maurizio.vitale@alfresco.com>
Date: Fri, 4 Nov 2016 16:46:39 +0000
Subject: [PATCH] Fix multibar xAxes label

---
 .../src/components/analytics.component.html   | 26 ++++++++++---------
 .../src/models/chart.model.ts                 | 15 -----------
 2 files changed, 14 insertions(+), 27 deletions(-)

diff --git a/ng2-components/ng2-activiti-analytics/src/components/analytics.component.html b/ng2-components/ng2-activiti-analytics/src/components/analytics.component.html
index 1d93ec9754..3f0e5c2e8c 100644
--- a/ng2-components/ng2-activiti-analytics/src/components/analytics.component.html
+++ b/ng2-components/ng2-activiti-analytics/src/components/analytics.component.html
@@ -54,18 +54,20 @@
                 <div *ngSwitchCase="'multiBar'">
                     <div class="col-md-6">
                         <div *ngIf="!report.hasDatasets()">{{'ANALYTICS.MESSAGES.NO-DATA-FOUND' | translate}}</div>
-                        <label class="mdl-checkbox mdl-js-checkbox mdl-js-ripple-effect" [attr.for]="'stacked-id'">
-                            <input type="checkbox" [attr.id]="'stacked-id'" class="mdl-checkbox__input"
-                                   [checked]="report.options.scales.xAxes[0].stacked"
-                                   [(ngModel)]="report.options.scales.xAxes[0].stacked"
-                                   (change)="refresh(report)">
-                            <span class="mdl-checkbox__label">Stacked</span>
-                        </label>
-                        <base-chart *ngIf="report.hasDatasets()" class="chart"
-                                    [datasets]="report.datasets"
-                                    [labels]="report.labels"
-                                    [options]="report.options"
-                                    [chartType]="'bar'"></base-chart>
+                        <div *ngIf="report.hasDatasets()">
+                            <label class="mdl-checkbox mdl-js-checkbox mdl-js-ripple-effect" [attr.for]="'stacked-id'">
+                                <input type="checkbox" [attr.id]="'stacked-id'" class="mdl-checkbox__input"
+                                       [checked]="report.options.scales.xAxes[0].stacked"
+                                       [(ngModel)]="report.options.scales.xAxes[0].stacked"
+                                       (change)="refresh(report)">
+                                <span class="mdl-checkbox__label">Stacked</span>
+                            </label>
+                            <base-chart class="chart"
+                                        [datasets]="report.datasets"
+                                        [labels]="report.labels"
+                                        [options]="report.options"
+                                        [chartType]="'bar'"></base-chart>
+                        </div>
                     </div>
                 </div>
                 <div *ngSwitchCase="'HeatMap'">
diff --git a/ng2-components/ng2-activiti-analytics/src/models/chart.model.ts b/ng2-components/ng2-activiti-analytics/src/models/chart.model.ts
index c876532010..15ab95b87a 100644
--- a/ng2-components/ng2-activiti-analytics/src/models/chart.model.ts
+++ b/ng2-components/ng2-activiti-analytics/src/models/chart.model.ts
@@ -160,21 +160,6 @@ export class BarChart extends Chart {
 }
 
 export class MultiBarChart extends BarChart {
-    options: any = {
-        scales: {
-            yAxes: [{
-                ticks: {
-                    beginAtZero: true,
-                    stepSize: 1
-                }
-            }],
-            xAxes: [{
-                ticks: {
-                },
-                stacked: false
-            }]
-        }
-    };
 
     constructor(obj?: any) {
         super(obj);