Merge branch 'development' into dev-eromano-bundle

This commit is contained in:
Mario Romano
2016-12-15 10:40:01 +00:00
committed by GitHub
17 changed files with 174 additions and 34 deletions

View File

@@ -41,12 +41,15 @@ export class AnalyticsComponent implements OnChanges {
@Output()
onSuccess = new EventEmitter();
@Output()
editReport = new EventEmitter();
@Output()
onError = new EventEmitter();
reportParamQuery = new ReportQuery();
reports: any[];
reports: Chart[];
public barChartOptions: any = {
responsive: true,
@@ -107,4 +110,8 @@ export class AnalyticsComponent implements OnChanges {
let clone = JSON.parse(JSON.stringify(report));
report.datasets = clone.datasets;
}
public onEditReport(name: string) {
this.editReport.emit(name);
}
}