{{'ANALYTICS.MESSAGES.UNKNOWN-WIDGET-TYPE' | translate}}: {{field.type}}
diff --git a/lib/insights/src/lib/analytics-process/components/analytics-report-parameters.component.ts b/lib/insights/src/lib/analytics-process/components/analytics-report-parameters.component.ts
index 4ec5356731..d6b093f1c2 100644
--- a/lib/insights/src/lib/analytics-process/components/analytics-report-parameters.component.ts
+++ b/lib/insights/src/lib/analytics-process/components/analytics-report-parameters.component.ts
@@ -402,4 +402,36 @@ export class AnalyticsReportParametersComponent implements OnInit, OnChanges, On
isFormValid() {
return this.reportForm && this.reportForm.dirty && this.reportForm.valid;
}
+
+ get taskGroup(): FormGroup {
+ return this.reportForm.controls.taskGroup as FormGroup;
+ }
+
+ get processDefGroup(): FormGroup {
+ return this.reportForm.controls.processDefGroup as FormGroup;
+ }
+
+ get dateIntervalGroup(): FormGroup {
+ return this.reportForm.controls.dateIntervalGroup as FormGroup;
+ }
+
+ get dateRange(): FormGroup {
+ return this.reportForm.controls.dateRange as FormGroup;
+ }
+
+ get statusGroup(): FormGroup {
+ return this.reportForm.controls.statusGroup as FormGroup;
+ }
+
+ get typeFilteringGroup(): FormGroup {
+ return this.reportForm.controls.typeFilteringGroup as FormGroup;
+ }
+
+ get durationGroup(): FormGroup {
+ return this.reportForm.controls.durationGroup as FormGroup;
+ }
+
+ get processInstanceGroup(): FormGroup {
+ return this.reportForm.controls.processInstanceGroup as FormGroup;
+ }
}
diff --git a/lib/insights/src/lib/analytics-process/components/analytics.component.html b/lib/insights/src/lib/analytics-process/components/analytics.component.html
index 4ca8b7a9b9..9e3c4c5056 100644
--- a/lib/insights/src/lib/analytics-process/components/analytics.component.html
+++ b/lib/insights/src/lib/analytics-process/components/analytics.component.html
@@ -1,15 +1,18 @@
diff --git a/lib/insights/src/lib/analytics-process/components/analytics.component.ts b/lib/insights/src/lib/analytics-process/components/analytics.component.ts
index ed2ecdadb0..03e02e888c 100644
--- a/lib/insights/src/lib/analytics-process/components/analytics.component.ts
+++ b/lib/insights/src/lib/analytics-process/components/analytics.component.ts
@@ -33,7 +33,7 @@ export class AnalyticsComponent implements OnChanges {
/** reportId. */
@Input()
- reportId: number;
+ reportId: string;
/** hideParameters. */
@Input()
diff --git a/lib/insights/src/lib/analytics-process/services/analytics.service.ts b/lib/insights/src/lib/analytics-process/services/analytics.service.ts
index 10d5ac44fe..3a7571a2d8 100644
--- a/lib/insights/src/lib/analytics-process/services/analytics.service.ts
+++ b/lib/insights/src/lib/analytics-process/services/analytics.service.ts
@@ -181,7 +181,7 @@ export class AnalyticsService {
);
}
- getReportsByParams(reportId: string, paramsQuery: any): Observable
{
+ getReportsByParams(reportId: string, paramsQuery: any): Observable {
return from(this.apiService.getInstance().activiti.reportApi.getReportsByParams(reportId, paramsQuery))
.pipe(
map((res: any) => {
diff --git a/lib/insights/src/lib/diagram/models/chart/bar-chart.model.ts b/lib/insights/src/lib/diagram/models/chart/bar-chart.model.ts
index dfd753f341..76fbe1f855 100644
--- a/lib/insights/src/lib/diagram/models/chart/bar-chart.model.ts
+++ b/lib/insights/src/lib/diagram/models/chart/bar-chart.model.ts
@@ -19,11 +19,6 @@ import moment from 'moment-es6';
import { Chart } from './chart.model';
export class BarChart extends Chart {
- title: string;
- titleKey: string;
- labels: any = [];
- datasets: any[] = [];
- data: any[] = [];
xAxisType: string;
yAxisType: string;
options: any = {
@@ -45,8 +40,6 @@ export class BarChart extends Chart {
constructor(obj?: any) {
super(obj);
- this.title = obj && obj.title || null;
- this.titleKey = obj && obj.titleKey || null;
this.xAxisType = obj && obj.xAxisType || null;
this.yAxisType = obj && obj.yAxisType || null;
this.options.scales.xAxes[0].ticks.callback = this.xAxisTickFormatFunction(this.xAxisType);
@@ -100,8 +93,4 @@ export class BarChart extends Chart {
return value;
};
};
-
- hasDatasets(): boolean {
- return this.datasets && this.datasets.length > 0;
- }
}
diff --git a/lib/insights/src/lib/diagram/models/chart/chart.model.ts b/lib/insights/src/lib/diagram/models/chart/chart.model.ts
index 03970f6058..5d3c86145a 100644
--- a/lib/insights/src/lib/diagram/models/chart/chart.model.ts
+++ b/lib/insights/src/lib/diagram/models/chart/chart.model.ts
@@ -19,9 +19,26 @@ export class Chart {
id: string;
type: string;
icon: string;
+ title?: string;
+ titleKey?: string;
+ labels?: string[] = [];
+ data?: any[] = [];
+ datasets?: any[] = [];
+ detailsTable?: any;
+ showDetails = false;
+ options?: any;
constructor(obj?: any) {
this.id = obj && obj.id || null;
+ this.title = obj.title;
+ this.titleKey = obj.titleKey;
+ this.labels = obj.labels || [];
+ this.data = obj.data || [];
+ this.datasets = obj.datasets || [];
+ this.detailsTable = obj.detailsTable;
+ this.showDetails = !!obj.showDetails;
+ this.options = obj.options;
+
if (obj && obj.type) {
this.type = this.convertType(obj.type);
this.icon = this.getIconType(this.type);
@@ -89,4 +106,32 @@ export class Chart {
}
return typeIcon;
}
+
+ hasData(): boolean {
+ return this.data && this.data.length > 0;
+ }
+
+ hasDatasets(): boolean {
+ return this.datasets && this.datasets.length > 0;
+ }
+
+ hasDetailsTable(): boolean {
+ return !!this.detailsTable;
+ }
+
+ hasZeroValues(): boolean {
+ let isZeroValues = false;
+
+ if (this.hasData()) {
+ isZeroValues = true;
+
+ this.data.forEach((value) => {
+ if (value.toString() !== '0') {
+ isZeroValues = false;
+ }
+ });
+ }
+
+ return isZeroValues;
+ }
}
diff --git a/lib/insights/src/lib/diagram/models/chart/details-table-chart.model.ts b/lib/insights/src/lib/diagram/models/chart/details-table-chart.model.ts
index d88f2f2686..2d5758ce71 100644
--- a/lib/insights/src/lib/diagram/models/chart/details-table-chart.model.ts
+++ b/lib/insights/src/lib/diagram/models/chart/details-table-chart.model.ts
@@ -18,17 +18,11 @@
import { TableChart } from './table-chart.model';
export class DetailsTableChart extends TableChart {
- detailsTable: any;
- showDetails: boolean = false;
-
constructor(obj?: any) {
super(obj);
+
if (obj.detailTables) {
this.detailsTable = new TableChart(obj.detailTables[0]);
}
}
-
- hasDetailsTable(): boolean {
- return !!this.detailsTable;
- }
}
diff --git a/lib/insights/src/lib/diagram/models/chart/heat-map-chart.model.ts b/lib/insights/src/lib/diagram/models/chart/heat-map-chart.model.ts
index 6d6eaedaea..9c7601febd 100644
--- a/lib/insights/src/lib/diagram/models/chart/heat-map-chart.model.ts
+++ b/lib/insights/src/lib/diagram/models/chart/heat-map-chart.model.ts
@@ -21,7 +21,6 @@ export class HeatMapChart extends Chart {
avgTimePercentages: string;
avgTimeValues: string;
processDefinitionId: string;
- titleKey: string;
totalCountValues: string;
totalCountsPercentages: string;
totalTimePercentages: string;
@@ -33,7 +32,6 @@ export class HeatMapChart extends Chart {
this.avgTimeValues = obj && obj.avgTimeValues || null;
this.processDefinitionId = obj && obj.processDefinitionId || null;
this.totalCountValues = obj && obj.totalCountValues || null;
- this.titleKey = obj && obj.titleKey || null;
this.totalCountsPercentages = obj && obj.totalCountsPercentages || null;
this.totalTimePercentages = obj && obj.totalTimePercentages || null;
this.totalTimeValues = obj && obj.totalTimeValues || null;
diff --git a/lib/insights/src/lib/diagram/models/chart/line-chart.model.ts b/lib/insights/src/lib/diagram/models/chart/line-chart.model.ts
index 5da6cdb233..39bf734dc2 100644
--- a/lib/insights/src/lib/diagram/models/chart/line-chart.model.ts
+++ b/lib/insights/src/lib/diagram/models/chart/line-chart.model.ts
@@ -18,15 +18,10 @@
import { Chart } from './chart.model';
export class LineChart extends Chart {
- title: string;
- titleKey: string;
- labels: string[] = [];
datasets: any[] = [];
constructor(obj?: any) {
super(obj);
- this.title = obj && obj.title || null;
- this.titleKey = obj && obj.titleKey || null;
this.labels = obj && obj.columnNames.slice(1, obj.columnNames.length);
obj.rows.forEach((value: any) => {
diff --git a/lib/insights/src/lib/diagram/models/chart/pie-chart.model.ts b/lib/insights/src/lib/diagram/models/chart/pie-chart.model.ts
index 2de9448d56..0e1b32077c 100644
--- a/lib/insights/src/lib/diagram/models/chart/pie-chart.model.ts
+++ b/lib/insights/src/lib/diagram/models/chart/pie-chart.model.ts
@@ -18,15 +18,9 @@
import { Chart } from './chart.model';
export class PieChart extends Chart {
- title: string;
- titleKey: string;
- labels: string[] = [];
- data: string[] = [];
-
constructor(obj?: any) {
super(obj);
- this.title = obj && obj.title || null;
- this.titleKey = obj && obj.titleKey || null;
+
if (obj.values) {
obj.values.forEach((value: any) => {
this.add(value.key, value.y);
@@ -38,21 +32,4 @@ export class PieChart extends Chart {
this.labels.push(label);
this.data.push(data);
}
-
- hasData(): boolean {
- return this.data && this.data.length > 0 ? true : false;
- }
-
- hasZeroValues(): boolean {
- let isZeroValues: boolean = false;
- if (this.hasData()) {
- isZeroValues = true;
- this.data.forEach((value) => {
- if (value.toString() !== '0') {
- isZeroValues = false;
- }
- });
- }
- return isZeroValues;
- }
}
diff --git a/lib/insights/src/lib/diagram/models/chart/table-chart.model.ts b/lib/insights/src/lib/diagram/models/chart/table-chart.model.ts
index f6952e53f7..6d560284d9 100644
--- a/lib/insights/src/lib/diagram/models/chart/table-chart.model.ts
+++ b/lib/insights/src/lib/diagram/models/chart/table-chart.model.ts
@@ -18,22 +18,13 @@
import { Chart } from './chart.model';
export class TableChart extends Chart {
- title: string;
- titleKey: string;
- labels: string[] = [];
- datasets: any[] = [];
-
constructor(obj?: any) {
super(obj);
- this.title = obj && obj.title || null;
- this.titleKey = obj && obj.titleKey || null;
+
this.labels = obj && obj.columnNames;
+
if (obj.rows) {
this.datasets = obj && obj.rows;
}
}
-
- hasDatasets() {
- return this.datasets && this.datasets.length > 0 ? true : false;
- }
}
diff --git a/lib/insights/src/lib/diagram/models/report/report-parameters.model.ts b/lib/insights/src/lib/diagram/models/report/report-parameters.model.ts
index 859f39f479..2ff04cc9eb 100644
--- a/lib/insights/src/lib/diagram/models/report/report-parameters.model.ts
+++ b/lib/insights/src/lib/diagram/models/report/report-parameters.model.ts
@@ -22,10 +22,13 @@ export class ReportParametersModel {
name: string;
definition: ReportDefinitionModel;
created: string;
+ description?: string;
constructor(obj?: any) {
this.id = obj && obj.id;
this.name = obj && obj.name || null;
+ this.description = obj.description;
+
if (obj && obj.definition) {
this.definition = new ReportDefinitionModel(JSON.parse(obj.definition));
}
diff --git a/lib/insights/tsconfig.lib.json b/lib/insights/tsconfig.lib.json
index d757bae9e5..2cb1ce71f8 100644
--- a/lib/insights/tsconfig.lib.json
+++ b/lib/insights/tsconfig.lib.json
@@ -13,6 +13,7 @@
"angularCompilerOptions": {
"skipTemplateCodegen": true,
"strictMetadataEmit": true,
- "enableResourceInlining": true
+ "enableResourceInlining": true,
+ "strictTemplates": true
}
}
diff --git a/lib/process-services-cloud/src/lib/form/components/widgets/attach-file/attach-file-cloud-widget.component.html b/lib/process-services-cloud/src/lib/form/components/widgets/attach-file/attach-file-cloud-widget.component.html
index 11f410e7fd..221c659182 100644
--- a/lib/process-services-cloud/src/lib/form/components/widgets/attach-file/attach-file-cloud-widget.component.html
+++ b/lib/process-services-cloud/src/lib/form/components/widgets/attach-file/attach-file-cloud-widget.component.html
@@ -23,7 +23,7 @@
check_circle
{{file.name}}