;
+ let debug: DebugElement;
+ let element: HTMLElement;
+
+ let totalCountPerc = {'sid-fake-id': 0, 'fake-start-event': 100};
+ let totalTimePerc = {'sid-fake-id': 10, 'fake-start-event': 30};
+ let avgTimePercentages = {'sid-fake-id': 5, 'fake-start-event': 50};
+
+ beforeEach(async(() => {
+ TestBed.configureTestingModule({
+ imports: [
+ CoreModule,
+ DiagramsModule
+ ],
+ declarations: [
+ AnalyticsReportHeatMapComponent,
+ ...WIDGET_DIRECTIVES
+ ],
+ providers: [
+ AnalyticsService
+ ]
+ }).compileComponents();
+ }));
+
+ beforeEach(() => {
+ fixture = TestBed.createComponent(AnalyticsReportHeatMapComponent);
+ component = fixture.componentInstance;
+ debug = fixture.debugElement;
+ element = fixture.nativeElement;
+ componentHandler = jasmine.createSpyObj('componentHandler', [
+ 'upgradeAllRegistered'
+ ]);
+ window['componentHandler'] = componentHandler;
+
+ component.report = {
+ totalCountsPercentages: totalCountPerc,
+ totalTimePercentages: totalTimePerc,
+ avgTimePercentages: avgTimePercentages
+ };
+ });
+
+ describe('Rendering tests: Heat Map', () => {
+
+ beforeEach(() => {
+ jasmine.Ajax.install();
+ });
+
+ afterEach(() => {
+ jasmine.Ajax.uninstall();
+ });
+
+ it('should render the dropdown with the metric options', async(() => {
+ component.report = {totalCountsPercentages: {'sid-fake-id': 10, 'fake-start-event': 30}};
+
+ component.onSuccess.subscribe(() => {
+ fixture.whenStable().then(() => {
+ let dropDown: any = element.querySelector('#select-metrics');
+ expect(dropDown).toBeDefined();
+ expect(dropDown.length).toEqual(3);
+ expect(dropDown[0].innerHTML).toEqual('Number of times a step is executed');
+ expect(dropDown[1].innerHTML).toEqual('Total time spent in a process step');
+ expect(dropDown[2].innerHTML).toEqual('Average time spent in a process step');
+ });
+ });
+ fixture.detectChanges();
+ }));
+
+ it('should return false when no metrics are defined in the report', async(() => {
+ component.report = {};
+ expect(component.hasMetric()).toBeFalsy();
+ }));
+
+ it('should return true when the metrics are defined in the report', async(() => {
+ expect(component.hasMetric()).toBeTruthy();
+ }));
+
+ it('should change the currentmetric width totalCount', async(() => {
+ let field = {value: 'totalCount'};
+ component.onMetricChanges(field);
+ expect(component.currentMetric).toEqual(totalCountPerc);
+ }));
+
+ it('should change the currentmetric width totalTime', async(() => {
+ let field = {value: 'totalTime'};
+ component.onMetricChanges(field);
+ expect(component.currentMetric).toEqual(totalTimePerc);
+ }));
+
+ it('should change the currentmetric width avgTime', async(() => {
+ let field = {value: 'avgTime'};
+ component.onMetricChanges(field);
+ expect(component.currentMetric).toEqual(avgTimePercentages);
+ }));
+
+ });
+
+});
diff --git a/ng2-components/ng2-activiti-analytics/src/components/analytics-report-heat-map.component.ts b/ng2-components/ng2-activiti-analytics/src/components/analytics-report-heat-map.component.ts
new file mode 100644
index 0000000000..1087157e24
--- /dev/null
+++ b/ng2-components/ng2-activiti-analytics/src/components/analytics-report-heat-map.component.ts
@@ -0,0 +1,89 @@
+/*!
+ * @license
+ * Copyright 2016 Alfresco Software, Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { Component, OnInit, Input, Output, EventEmitter } from '@angular/core';
+import { AlfrescoTranslationService } from 'ng2-alfresco-core';
+import { AnalyticsService } from '../services/analytics.service';
+import { FormGroup, FormBuilder, FormControl } from '@angular/forms';
+
+@Component({
+ moduleId: module.id,
+ selector: 'analytics-report-heat-map',
+ templateUrl: './analytics-report-heat-map.component.html'
+})
+export class AnalyticsReportHeatMapComponent implements OnInit {
+
+ @Input()
+ report: any;
+
+ @Output()
+ onSuccess = new EventEmitter();
+
+ @Output()
+ onError = new EventEmitter();
+
+ field: any = {};
+
+ metricForm: FormGroup;
+ currentMetric: string;
+
+ constructor(private translate: AlfrescoTranslationService,
+ private analyticsService: AnalyticsService,
+ private formBuilder: FormBuilder) {
+ if (translate) {
+ translate.addTranslationFolder('node_modules/ng2-activiti-analytics/src');
+ }
+ }
+
+ ngOnInit() {
+ this.initForm();
+ this.field.id = 'metrics';
+ this.field.value = 'totalCount';
+
+ this.analyticsService.getMetricValues().subscribe(
+ (opts: any[]) => {
+ this.field.options = opts;
+ this.onSuccess.emit(opts);
+ }
+ );
+ }
+
+ onMetricChanges(field: any) {
+ if (field.value === 'totalCount') {
+ this.currentMetric = this.report.totalCountsPercentages;
+ } else if (field.value === 'totalTime') {
+ this.currentMetric = this.report.totalTimePercentages;
+ } else if (field.value === 'avgTime') {
+ this.currentMetric = this.report.avgTimePercentages;
+ }
+ }
+
+ initForm() {
+ this.metricForm = this.formBuilder.group({
+ metricGroup: new FormGroup({
+ metric: new FormControl()
+ })
+ });
+ }
+
+ hasMetric() {
+ return (this.report.totalCountsPercentages ||
+ this.report.totalTimePercentages ||
+ this.report.avgTimePercentages) ? true : false;
+ }
+
+}
diff --git a/ng2-components/ng2-activiti-analytics/src/components/analytics-report-parameters.component.html b/ng2-components/ng2-activiti-analytics/src/components/analytics-report-parameters.component.html
index bc98145dee..3fe322d9f7 100644
--- a/ng2-components/ng2-activiti-analytics/src/components/analytics-report-parameters.component.html
+++ b/ng2-components/ng2-activiti-analytics/src/components/analytics-report-parameters.component.html
@@ -16,7 +16,8 @@
-
+
diff --git a/ng2-components/ng2-activiti-analytics/src/components/analytics-report-parameters.component.spec.ts b/ng2-components/ng2-activiti-analytics/src/components/analytics-report-parameters.component.spec.ts
index afd6c03fee..9302b32f01 100644
--- a/ng2-components/ng2-activiti-analytics/src/components/analytics-report-parameters.component.spec.ts
+++ b/ng2-components/ng2-activiti-analytics/src/components/analytics-report-parameters.component.spec.ts
@@ -20,11 +20,8 @@ import {
CoreModule
} from 'ng2-alfresco-core';
-import { AnalyticsReportListComponent } from '../components/analytics-report-list.component';
-import { AnalyticsComponent } from '../components/analytics.component';
import { AnalyticsReportParametersComponent } from '../components/analytics-report-parameters.component';
import { WIDGET_DIRECTIVES } from '../components/widgets/index';
-import { CHART_DIRECTIVES } from 'ng2-charts/ng2-charts';
import { AnalyticsService } from '../services/analytics.service';
import { ReportParametersModel } from '../models/report.model';
@@ -32,16 +29,6 @@ import * as moment from 'moment';
import { DebugElement, SimpleChange } from '@angular/core';
import * as analyticParamsMock from '../assets/analyticsParamsReportComponent.mock';
-export const ANALYTICS_DIRECTIVES: any[] = [
- AnalyticsComponent,
- AnalyticsReportParametersComponent,
- AnalyticsReportListComponent,
- WIDGET_DIRECTIVES
-];
-export const ANALYTICS_PROVIDERS: any[] = [
- AnalyticsService
-];
-
declare let jasmine: any;
declare let mdDateTimePicker: any;
@@ -60,11 +47,11 @@ describe('Test ng2-analytics-report-parameters Report Parameters ', () => {
CoreModule
],
declarations: [
- ...ANALYTICS_DIRECTIVES,
- ...CHART_DIRECTIVES
+ AnalyticsReportParametersComponent,
+ ...WIDGET_DIRECTIVES
],
providers: [
- ...ANALYTICS_PROVIDERS
+ AnalyticsService
]
}).compileComponents();
}));
@@ -178,6 +165,7 @@ describe('Test ng2-analytics-report-parameters Report Parameters ', () => {
expect(res.duration).toEqual(22);
expect(res.dateRangeInterval).toEqual(120);
expect(res.slowProcessInstanceInteger).toEqual(2);
+ expect(res.typeFiltering).toEqual(true);
});
let values: any = {
@@ -201,6 +189,9 @@ describe('Test ng2-analytics-report-parameters Report Parameters ', () => {
},
processInstanceGroup: {
slowProcessInstanceInteger: 2
+ },
+ typeFilteringGroup: {
+ typeFiltering: true
}
};
component.submit(values);
diff --git a/ng2-components/ng2-activiti-analytics/src/components/analytics-report-parameters.component.ts b/ng2-components/ng2-activiti-analytics/src/components/analytics-report-parameters.component.ts
index 993d2121cf..f31fcb0f18 100644
--- a/ng2-components/ng2-activiti-analytics/src/components/analytics-report-parameters.component.ts
+++ b/ng2-components/ng2-activiti-analytics/src/components/analytics-report-parameters.component.ts
@@ -115,6 +115,9 @@ export class AnalyticsReportParametersComponent implements OnInit, OnChanges {
taskGroup: new FormGroup({
taskName: new FormControl()
}),
+ typeFilteringGroup: new FormGroup({
+ typeFiltering: new FormControl()
+ }),
dateIntervalGroup: new FormGroup({
dateRangeInterval: new FormControl()
}),
@@ -192,6 +195,7 @@ export class AnalyticsReportParametersComponent implements OnInit, OnChanges {
reportParamQuery.duration = values.durationGroup.duration;
reportParamQuery.dateRangeInterval = values.dateIntervalGroup.dateRangeInterval;
reportParamQuery.slowProcessInstanceInteger = this.convertNumber(values.processInstanceGroup.slowProcessInstanceInteger);
+ reportParamQuery.typeFiltering = values.typeFilteringGroup.typeFiltering;
return reportParamQuery;
}
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 403632310c..e12995435e 100644
--- a/ng2-components/ng2-activiti-analytics/src/components/analytics.component.html
+++ b/ng2-components/ng2-activiti-analytics/src/components/analytics.component.html
@@ -51,6 +51,9 @@
[chartType]="report.type">
+
{{'ANALYTICS.MESSAGES.UNKNOWN-WIDGET-TYPE' | translate}}: {{report.type}}
diff --git a/ng2-components/ng2-activiti-analytics/src/components/analytics.component.spec.ts b/ng2-components/ng2-activiti-analytics/src/components/analytics.component.spec.ts
index 16d1fbd100..d5fb553eec 100644
--- a/ng2-components/ng2-activiti-analytics/src/components/analytics.component.spec.ts
+++ b/ng2-components/ng2-activiti-analytics/src/components/analytics.component.spec.ts
@@ -19,10 +19,12 @@ import { ComponentFixture, TestBed, async } from '@angular/core/testing';
import {
CoreModule
} from 'ng2-alfresco-core';
+import { DiagramsModule } from 'ng2-activiti-diagrams';
import { AnalyticsReportListComponent } from '../components/analytics-report-list.component';
import { AnalyticsComponent } from '../components/analytics.component';
import { AnalyticsReportParametersComponent } from '../components/analytics-report-parameters.component';
+import { AnalyticsReportHeatMapComponent } from '../components/analytics-report-heat-map.component';
import { WIDGET_DIRECTIVES } from '../components/widgets/index';
import { CHART_DIRECTIVES } from 'ng2-charts/ng2-charts';
import { Chart } from '../models/chart.model';
@@ -35,6 +37,7 @@ export const ANALYTICS_DIRECTIVES: any[] = [
AnalyticsComponent,
AnalyticsReportParametersComponent,
AnalyticsReportListComponent,
+ AnalyticsReportHeatMapComponent,
WIDGET_DIRECTIVES
];
export const ANALYTICS_PROVIDERS: any[] = [
@@ -56,7 +59,8 @@ describe('Test ng2-activiti-analytics Report ', () => {
beforeEach(async(() => {
TestBed.configureTestingModule({
imports: [
- CoreModule
+ CoreModule,
+ DiagramsModule
],
declarations: [
...ANALYTICS_DIRECTIVES,
diff --git a/ng2-components/ng2-activiti-analytics/src/components/widgets/checkbox/checkbox.widget.html b/ng2-components/ng2-activiti-analytics/src/components/widgets/checkbox/checkbox.widget.html
index b9841dae1b..4d02c9a7da 100644
--- a/ng2-components/ng2-activiti-analytics/src/components/widgets/checkbox/checkbox.widget.html
+++ b/ng2-components/ng2-activiti-analytics/src/components/widgets/checkbox/checkbox.widget.html
@@ -1,5 +1,5 @@
-