From a8896a11ef1a87bfebfbc4680975b5bea0511f5c Mon Sep 17 00:00:00 2001 From: mauriziovitale84 Date: Fri, 14 Oct 2016 12:43:09 +0100 Subject: [PATCH] Add No data found message --- .../activiti/activiti-demo.component.html | 2 +- ...analytics-report-parameters.component.html | 12 ++--- ...lytics-report-parameters.component.spec.ts | 11 +++-- .../analytics-report-parameters.component.ts | 44 ++++++++++------- .../src/components/analytics.component.html | 47 +++++++++++-------- .../widgets/date-range/date-range.widget.html | 2 +- .../src/models/chart.model.ts | 29 ++++++++++-- 7 files changed, 93 insertions(+), 54 deletions(-) diff --git a/demo-shell-ng2/app/components/activiti/activiti-demo.component.html b/demo-shell-ng2/app/components/activiti/activiti-demo.component.html index eb25883a76..92170512ed 100644 --- a/demo-shell-ng2/app/components/activiti/activiti-demo.component.html +++ b/demo-shell-ng2/app/components/activiti/activiti-demo.component.html @@ -5,7 +5,7 @@ APPS TASK LIST PROCESS LIST - REPORT + ANALYTICS
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 d6aaf29e1b..2322623fad 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 @@ -6,7 +6,7 @@

-
@@ -30,7 +30,7 @@

-
@@ -39,7 +39,7 @@

-
@@ -47,14 +47,10 @@
-

-

ReportForm valid : {{ reportForm.valid }}

ReportForm status : {{ reportForm.errors | json }}

-

ReportForm FormGroup valid : {{reportForm.controls.dateRange.valid | json }}

+

ReportForm FormGroup valid : {{reportForm && reportForm.controls.dateRange.valid | json }}

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 5dfbcadd24..afd6c03fee 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 @@ -191,16 +191,16 @@ describe('Test ng2-analytics-report-parameters Report Parameters ', () => { processDefinitionId: 'FakeProcess:1:22' }, taskGroup: { - task: 'FakeTaskName' + taskName: 'FakeTaskName' }, durationGroup: { duration: 22 }, dateIntervalGroup: { - dateInterval: 120 + dateRangeInterval: 120 }, processInstanceGroup: { - processInstance: 2 + slowProcessInstanceInteger: 2 } }; component.submit(values); @@ -398,4 +398,9 @@ describe('Test ng2-analytics-report-parameters Report Parameters ', () => { }); }); }); + + it('Should convert a string in number', () => { + let numberConvert = component.convertNumber('2'); + expect(numberConvert).toEqual(2); + }); }); 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 633cbbf25c..22de0b3f9c 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 @@ -55,8 +55,6 @@ export class AnalyticsReportParametersComponent implements OnInit, OnChanges { reportParameters: ReportParametersModel; - reportParamQuery = new ReportQuery(); - reportForm: FormGroup; debug: boolean = false; @@ -93,7 +91,6 @@ export class AnalyticsReportParametersComponent implements OnInit, OnChanges { } ngOnChanges(changes: SimpleChanges) { - this.initForm(); let reportId = changes['reportId']; if (reportId && reportId.currentValue) { this.getReportParams(reportId.currentValue); @@ -112,13 +109,13 @@ export class AnalyticsReportParametersComponent implements OnInit, OnChanges { status: new FormControl() }), processInstanceGroup: new FormGroup({ - processInstance: new FormControl() + slowProcessInstanceInteger: new FormControl() }), taskGroup: new FormGroup({ - task: new FormControl() + taskName: new FormControl() }), dateIntervalGroup: new FormGroup({ - dateInterval: new FormControl() + dateRangeInterval: new FormControl() }), durationGroup: new FormGroup({ duration: new FormControl() @@ -164,19 +161,15 @@ export class AnalyticsReportParametersComponent implements OnInit, OnChanges { } public submit(values: any) { - this.reportParamQuery.dateRange.startDate = this.convertMomentDate(values.dateRange.startDate); - this.reportParamQuery.dateRange.endDate = this.convertMomentDate(values.dateRange.endDate); - this.reportParamQuery.status = values.statusGroup.status; - this.reportParamQuery.processDefinitionId = values.processDefGroup.processDefinitionId; - this.reportParamQuery.taskName = values.taskGroup.task; - this.reportParamQuery.duration = values.durationGroup.duration; - this.reportParamQuery.dateRangeInterval = values.dateIntervalGroup.dateInterval; - this.reportParamQuery.slowProcessInstanceInteger = values.processInstanceGroup.processInstance; - this.onSuccess.emit(this.reportParamQuery); + let reportParamQuery = this.convertFormValuesToReportParamQuery(values); + this.onSuccess.emit(reportParamQuery); } - onValueChanged(data: any) { - this.onFormValueChanged.emit(data); + onValueChanged(values: any) { + this.onFormValueChanged.emit(values); + if (this.reportForm && this.reportForm.valid) { + this.submit(values); + } } public convertMomentDate(date: string) { @@ -184,6 +177,23 @@ export class AnalyticsReportParametersComponent implements OnInit, OnChanges { .format(AnalyticsReportParametersComponent.FORMAT_DATE_ACTIVITI) + 'T00:00:00.000Z'; } + public convertNumber(value: string): number { + return parseInt(value, 10); + } + + convertFormValuesToReportParamQuery(values: any): ReportQuery { + let reportParamQuery: ReportQuery = new ReportQuery(); + reportParamQuery.dateRange.startDate = this.convertMomentDate(values.dateRange.startDate); + reportParamQuery.dateRange.endDate = this.convertMomentDate(values.dateRange.endDate); + reportParamQuery.status = values.statusGroup.status; + reportParamQuery.processDefinitionId = values.processDefGroup.processDefinitionId; + reportParamQuery.taskName = values.taskGroup.taskName; + reportParamQuery.duration = values.durationGroup.duration; + reportParamQuery.dateRangeInterval = values.dateIntervalGroup.dateRangeInterval; + reportParamQuery.slowProcessInstanceInteger = this.convertNumber(values.processInstanceGroup.slowProcessInstanceInteger); + return reportParamQuery; + } + ngOnDestroy() { this.dropDownSub.unsubscribe(); this.paramOpts.unsubscribe(); 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 74697003b5..492fa7f0c0 100644 --- a/ng2-components/ng2-activiti-analytics/src/components/analytics.component.html +++ b/ng2-components/ng2-activiti-analytics/src/components/analytics.component.html @@ -8,38 +8,43 @@
- No data found
+
-
- - - - - - - -
{{label | translate}}
{{row | translate }}
+
No data found
+
+ + + + + + + +
{{label | translate}}
{{row | translate }}
- - - - - - - -
{{label | translate}}
{{row | translate }}
+
No data found
+
+ + + + + + + +
{{label | translate}}
{{row | translate }}
+
- No data found
+
+


+
Fill in the parameters to generate your report
\ No newline at end of file diff --git a/ng2-components/ng2-activiti-analytics/src/components/widgets/date-range/date-range.widget.html b/ng2-components/ng2-activiti-analytics/src/components/widgets/date-range/date-range.widget.html index ded990cf99..e6b3c60e37 100644 --- a/ng2-components/ng2-activiti-analytics/src/components/widgets/date-range/date-range.widget.html +++ b/ng2-components/ng2-activiti-analytics/src/components/widgets/date-range/date-range.widget.html @@ -43,6 +43,6 @@

FormGroup : {{dateRange && dateRange.value | json }}

FormGroup valid : {{dateRange && dateRange.valid }}

FormGroup status : {{dateRange && dateRange.errors | json }}

-

FormGroup start status : {{dateRange && dateRange.controls.startDate.errors | json }}

+

FormGroup start status : {{dateRange && dateRange.controls.startDate && dateRange.controls.startDate.errors | json }}

FormGroup end status: {{dateRange && dateRange.controls.endDate.errors | json }}

\ No newline at end of file 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 00599d3221..3f61139a4f 100644 --- a/ng2-components/ng2-activiti-analytics/src/models/chart.model.ts +++ b/ng2-components/ng2-activiti-analytics/src/models/chart.model.ts @@ -99,10 +99,15 @@ export class BarChart extends Chart { } }); }); - this.datasets.push({data: dataValue, label: params.key}); - + if (dataValue && dataValue.length > 0) { + this.datasets.push({data: dataValue, label: params.key}); + } }); } + + hasDatasets() { + return this.datasets && this.datasets.length > 0 ? true : false; + } } export class TableChart extends Chart { @@ -116,7 +121,13 @@ export class TableChart extends Chart { this.title = obj && obj.title || null; this.titleKey = obj && obj.titleKey || null; this.labels = obj && obj.columnNames; - this.datasets = obj && obj.rows; + if (obj.rows) { + this.datasets = obj && obj.rows; + } + } + + hasDatasets() { + return this.datasets && this.datasets.length > 0 ? true : false; } } @@ -131,7 +142,13 @@ export class HeatMapChart extends Chart { this.title = obj && obj.title || null; this.titleKey = obj && obj.titleKey || null; this.labels = obj && obj.columnNames; - this.datasets = obj && obj.rows; + if (obj.rows) { + this.datasets = obj && obj.rows; + } + } + + hasDatasets() { + return this.datasets && this.datasets.length > 0 ? true : false; } } @@ -156,4 +173,8 @@ export class PieChart extends Chart { this.labels.push(label); this.data.push(data); } + + hasData() { + return this.data && this.data.length > 0 ? true : false; + } }