TSK-1190 Restructuring the monitor component

web/src/app/monitor/classification-tasks/classification-tasks.component.spec.ts

@@ -1,25 +0,0 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { ClassificationTasksComponent } from './classification-tasks.component';
-
-describe('ClassificationTasksComponent', () => {
-  let component: ClassificationTasksComponent;
-  let fixture: ComponentFixture<ClassificationTasksComponent>;
-
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      declarations: [ClassificationTasksComponent]
-    })
-      .compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(ClassificationTasksComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});

web/src/app/monitor/components/classification-report/classification-report.component.spec.ts

@@ -0,0 +1,25 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { ClassificationReportComponent } from './classification-report.component';
+
+describe('ClassificationReportComponent', () => {
+  let component: ClassificationReportComponent;
+  let fixture: ComponentFixture<ClassificationReportComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [ClassificationReportComponent]
+    })
+      .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(ClassificationReportComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});

web/src/app/monitor/components/classification-report/classification-report.component.ts

@@ -1,16 +1,16 @@
 import { Component, OnInit } from '@angular/core';
-import { RestConnectorService } from 'app/monitor/services/restConnector/rest-connector.service';
+import { RestConnectorService } from 'app/monitor/services/rest-connector.service';
 import { ChartData } from 'app/monitor/models/chart-data';
-import { ReportData } from '../models/report-data';
-import { ChartColorsDefinition } from '../models/chart-colors';
-import { RequestInProgressService } from '../../services/requestInProgress/request-in-progress.service';
+import { ReportData } from '../../models/report-data';
+import { ChartColorsDefinition } from '../../models/chart-colors';
+import { RequestInProgressService } from '../../../services/requestInProgress/request-in-progress.service';
 
 @Component({
   selector: 'taskana-monitor-classification-tasks',
-  templateUrl: './classification-tasks.component.html',
-  styleUrls: ['./classification-tasks.component.scss']
+  templateUrl: './classification-report.component.html',
+  styleUrls: ['./classification-report.component.scss']
 })
-export class ClassificationTasksComponent implements OnInit {
+export class ClassificationReportComponent implements OnInit {
   reportData: ReportData;
 
 

web/src/app/monitor/components/report-table/report-table.component.ts

@@ -3,10 +3,10 @@ import { ReportData } from 'app/monitor/models/report-data';
 
 @Component({
   selector: 'taskana-report',
-  templateUrl: './report.component.html',
-  styleUrls: ['./report.component.scss']
+  templateUrl: './report-table.component.html',
+  styleUrls: ['./report-table.component.scss']
 })
-export class ReportComponent implements OnInit {
+export class ReportTableComponent implements OnInit {
   currentExpHeaders = 0;
 
   @Input()

web/src/app/monitor/components/task-report/task-report.component.spec.ts

@@ -1,20 +1,20 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 
-import { TasksComponent } from './tasks.component';
+import { TaskReportComponent } from './task-report.component';
 
-describe('TasksComponent', () => {
-  let component: TasksComponent;
-  let fixture: ComponentFixture<TasksComponent>;
+describe('TaskReportComponent', () => {
+  let component: TaskReportComponent;
+  let fixture: ComponentFixture<TaskReportComponent>;
 
   beforeEach(async(() => {
     TestBed.configureTestingModule({
-      declarations: [TasksComponent]
+      declarations: [TaskReportComponent]
     })
       .compileComponents();
   }));
 
   beforeEach(() => {
-    fixture = TestBed.createComponent(TasksComponent);
+    fixture = TestBed.createComponent(TaskReportComponent);
     component = fixture.componentInstance;
     fixture.detectChanges();
   });

web/src/app/monitor/components/task-report/task-report.component.ts

@@ -1,14 +1,14 @@
 import { Component, OnInit } from '@angular/core';
 import { ReportData } from 'app/monitor/models/report-data';
-import { RestConnectorService } from '../services/restConnector/rest-connector.service';
-import { RequestInProgressService } from '../../services/requestInProgress/request-in-progress.service';
+import { RestConnectorService } from '../../services/rest-connector.service';
+import { RequestInProgressService } from '../../../services/requestInProgress/request-in-progress.service';
 
 @Component({
   selector: 'taskana-monitor-tasks',
-  templateUrl: './tasks.component.html',
-  styleUrls: ['./tasks.component.scss'],
+  templateUrl: './task-report.component.html',
+  styleUrls: ['./task-report.component.scss'],
 })
-export class TasksComponent implements OnInit {
+export class TaskReportComponent implements OnInit {
   pieChartLabels: string[];
   pieChartData: number[] = [];
   pieChartType = 'pie';

web/src/app/monitor/components/timestamp-report/timestamp-report.component.ts

@@ -1,13 +1,13 @@
 import { Component, OnInit } from '@angular/core';
-import { ReportData } from '../models/report-data';
-import { RestConnectorService } from '../services/restConnector/rest-connector.service';
+import { ReportData } from '../../models/report-data';
+import { RestConnectorService } from '../../services/rest-connector.service';
 
 @Component({
   selector: 'taskana-monitor-timestamp',
-  templateUrl: './timestamp.component.html',
-  styleUrls: ['./timestamp.component.scss']
+  templateUrl: './timestamp-report.component.html',
+  styleUrls: ['./timestamp-report.component.scss']
 })
-export class TimestampComponent implements OnInit {
+export class TimestampReportComponent implements OnInit {
   reportData: ReportData;
 
   constructor(private restConnectorService: RestConnectorService) {

web/src/app/monitor/components/workbasket-report-due-date/workbasket-report-due-date.component.spec.ts

@@ -0,0 +1,25 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { WorkbasketReportDueDateComponent } from './workbasket-report-due-date.component';
+
+describe('WorkbasketReportDueDateComponent', () => {
+  let component: WorkbasketReportDueDateComponent;
+  let fixture: ComponentFixture<WorkbasketReportDueDateComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [WorkbasketReportDueDateComponent]
+    })
+      .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(WorkbasketReportDueDateComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should be created', () => {
+    expect(component).toBeTruthy();
+  });
+});

web/src/app/monitor/components/workbasket-report-due-date/workbasket-report-due-date.component.ts

@@ -2,16 +2,16 @@ import { Component, EventEmitter, OnInit, Output } from '@angular/core';
 import { ReportData } from '../../models/report-data';
 import { ChartData } from '../../models/chart-data';
 import { ChartColorsDefinition } from '../../models/chart-colors';
-import { RestConnectorService } from '../../services/restConnector/rest-connector.service';
+import { RestConnectorService } from '../../services/rest-connector.service';
 import { MetaInfoData } from '../../models/meta-info-data';
 import { RequestInProgressService } from '../../../services/requestInProgress/request-in-progress.service';
 
 @Component({
   selector: 'taskana-monitor-workbasket-due-date',
-  templateUrl: './monitor-workbasket-due-date.component.html',
-  styleUrls: ['./monitor-workbasket-due-date.component.scss']
+  templateUrl: './workbasket-report-due-date.component.html',
+  styleUrls: ['./workbasket-report-due-date.component.scss']
 })
-export class MonitorWorkbasketDueDateComponent implements OnInit {
+export class WorkbasketReportDueDateComponent implements OnInit {
   @Output()
   metaInformation = new EventEmitter<MetaInfoData>();
 

web/src/app/monitor/components/workbasket-report-planned-date/workbasket-report-planned-date.component.spec.ts

@@ -0,0 +1,25 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { WorkbasketReportPlannedDateComponent } from './workbasket-report-planned-date.component';
+
+describe('WorkbasketReportPlannedDateComponent', () => {
+  let component: WorkbasketReportPlannedDateComponent;
+  let fixture: ComponentFixture<WorkbasketReportPlannedDateComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [WorkbasketReportPlannedDateComponent]
+    })
+      .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(WorkbasketReportPlannedDateComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});

web/src/app/monitor/components/workbasket-report-planned-date/workbasket-report-planned-date.component.ts

@@ -2,16 +2,16 @@ import { Component, EventEmitter, OnInit, Output } from '@angular/core';
 import { ReportData } from '../../models/report-data';
 import { ChartData } from '../../models/chart-data';
 import { ChartColorsDefinition } from '../../models/chart-colors';
-import { RestConnectorService } from '../../services/restConnector/rest-connector.service';
+import { RestConnectorService } from '../../services/rest-connector.service';
 import { MetaInfoData } from '../../models/meta-info-data';
 import { RequestInProgressService } from '../../../services/requestInProgress/request-in-progress.service';
 
 @Component({
   selector: 'taskana-monitor-workbasket-planned-date',
-  templateUrl: './monitor-workbasket-planned-date.component.html',
-  styleUrls: ['./monitor-workbasket-planned-date.component.scss']
+  templateUrl: './workbasket-report-planned-date.component.html',
+  styleUrls: ['./workbasket-report-planned-date.component.scss']
 })
-export class MonitorWorkbasketPlannedDateComponent implements OnInit {
+export class WorkbasketReportPlannedDateComponent implements OnInit {
   @Output()
   metaInformation = new EventEmitter<MetaInfoData>();
 

web/src/app/monitor/components/workbasket-report-query-switcher/workbasket-report-query-switcher.component.spec.ts

@@ -0,0 +1,25 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { WorkbasketReportQuerySwitcherComponent } from './workbasket-report-query-switcher.component';
+
+describe('WorkbasketReportQuerySwitcherComponent', () => {
+  let component: WorkbasketReportQuerySwitcherComponent;
+  let fixture: ComponentFixture<WorkbasketReportQuerySwitcherComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [WorkbasketReportQuerySwitcherComponent]
+    })
+      .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(WorkbasketReportQuerySwitcherComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});

web/src/app/monitor/components/workbasket-report-query-switcher/workbasket-report-query-switcher.component.ts

@@ -0,0 +1,26 @@
+import { Component, EventEmitter, OnInit, Output } from '@angular/core';
+import { QueryType } from '../../models/query-type';
+
+@Component({
+  selector: 'taskana-monitor-workbasket-query-switcher',
+  templateUrl: './workbasket-report-query-switcher.component.html',
+  styleUrls: ['./workbasket-report-query-switcher.component.scss']
+})
+export class WorkbasketReportQuerySwitcherComponent implements OnInit {
+  @Output()
+  queryChanged = new EventEmitter<QueryType>();
+
+  selectedChartType: QueryType;
+  monitorQueryPlannedDateType = QueryType.PlannedDate;
+  monitorQueryDueDateType = QueryType.DueDate;
+
+  ngOnInit() {
+    this.selectedChartType = QueryType.DueDate;
+    this.queryChanged.emit(QueryType.DueDate);
+  }
+
+  switch(queryType: QueryType) {
+    this.selectedChartType = queryType;
+    this.queryChanged.emit(queryType);
+  }
+}

web/src/app/monitor/components/workbasket-report/workbasket-report.component.spec.ts

@@ -1,20 +1,20 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 
-import { MonitorWorkbasketsComponent } from './monitor-workbaskets.component';
+import { WorkbasketReportComponent } from './workbasket-report.component';
 
-describe('MonitorWorkbasketsComponent', () => {
-  let component: MonitorWorkbasketsComponent;
-  let fixture: ComponentFixture<MonitorWorkbasketsComponent>;
+describe('WorkbasketReportComponent', () => {
+  let component: WorkbasketReportComponent;
+  let fixture: ComponentFixture<WorkbasketReportComponent>;
 
   beforeEach(async(() => {
     TestBed.configureTestingModule({
-      declarations: [MonitorWorkbasketsComponent]
+      declarations: [WorkbasketReportComponent]
     })
       .compileComponents();
   }));
 
   beforeEach(() => {
-    fixture = TestBed.createComponent(MonitorWorkbasketsComponent);
+    fixture = TestBed.createComponent(WorkbasketReportComponent);
     component = fixture.componentInstance;
     fixture.detectChanges();
   });

web/src/app/monitor/components/workbasket-report/workbasket-report.component.ts

@@ -1,13 +1,13 @@
 import { Component, OnInit } from '@angular/core';
-import { MetaInfoData } from '../models/meta-info-data';
-import { MonitorQueryType } from '../models/monitor-query-type';
+import { MetaInfoData } from '../../models/meta-info-data';
+import { QueryType } from '../../models/query-type';
 
 @Component({
   selector: 'taskana-monitor-workbaskets',
-  templateUrl: './monitor-workbaskets.component.html',
-  styleUrls: ['./monitor-workbaskets.component.scss']
+  templateUrl: './workbasket-report.component.html',
+  styleUrls: ['./workbasket-report.component.scss']
 })
-export class MonitorWorkbasketsComponent implements OnInit {
+export class WorkbasketReportComponent implements OnInit {
   metaInformation: MetaInfoData;
   showMonitorQueryPlannedDate: Boolean;
   showMonitorQueryDueDate: Boolean;
@@ -19,7 +19,7 @@ export class MonitorWorkbasketsComponent implements OnInit {
     this.metaInformation = metaInformation;
   }
 
-  queryChanged(monitorQueryType: MonitorQueryType) {
+  queryChanged(monitorQueryType: QueryType) {
     this.switchGraphicShowed(monitorQueryType);
   }
 
@@ -29,11 +29,11 @@ export class MonitorWorkbasketsComponent implements OnInit {
       : 'Tasks grouped by workbasket, querying by due date';
   }
 
-  private switchGraphicShowed(monitorQueryType: MonitorQueryType) {
-    if (monitorQueryType === MonitorQueryType.PlannedDate) {
+  private switchGraphicShowed(monitorQueryType: QueryType) {
+    if (monitorQueryType === QueryType.PlannedDate) {
       this.showMonitorQueryPlannedDate = true;
       this.showMonitorQueryDueDate = false;
-    } else if (monitorQueryType === MonitorQueryType.DueDate) {
+    } else if (monitorQueryType === QueryType.DueDate) {
       this.showMonitorQueryPlannedDate = false;
       this.showMonitorQueryDueDate = true;
     }

web/src/app/monitor/models/monitor-query-type.ts

@@ -1,4 +0,0 @@
-export enum MonitorQueryType {
-  DueDate,
-  PlannedDate
-}

web/src/app/monitor/models/query-type.ts

@@ -0,0 +1,4 @@
+export enum QueryType {
+  DueDate,
+  PlannedDate
+}

web/src/app/monitor/monitor-routing.module.ts

@@ -1,6 +1,6 @@
 import { NgModule } from '@angular/core';
 import { Routes, RouterModule } from '@angular/router';
-import { MonitorComponent } from './monitor.component';
+import { MonitorComponent } from './components/monitor/monitor.component';
 
 const routes: Routes = [
   {

web/src/app/monitor/monitor.module.ts

@@ -9,19 +9,19 @@ import { AngularSvgIconModule } from 'angular-svg-icon';
 import { MonitorRoutingModule } from './monitor-routing.module';
 import { SharedModule } from '../shared/shared.module';
 
-import { ReportComponent } from './report/report.component';
-import { MonitorComponent } from './monitor.component';
-import { TasksComponent } from './tasks/tasks.component';
-import { ClassificationTasksComponent } from './classification-tasks/classification-tasks.component';
-import { TimestampComponent } from './timestamp/timestamp.component';
+import { ReportTableComponent } from './components/report-table/report-table.component';
+import { MonitorComponent } from './components/monitor/monitor.component';
+import { TaskReportComponent } from './components/task-report/task-report.component';
+import { ClassificationReportComponent } from './components/classification-report/classification-report.component';
+import { TimestampReportComponent } from './components/timestamp-report/timestamp-report.component';
 
-import { RestConnectorService } from './services/restConnector/rest-connector.service';
+import { RestConnectorService } from './services/rest-connector.service';
 
 import { MapToIterable } from '../shared/pipes/mapToIterable/mapToIterable';
-import { MonitorWorkbasketsComponent } from './workbasket/monitor-workbaskets.component';
-import { MonitorWorkbasketPlannedDateComponent } from './workbasket/workbasket-planned-date/monitor-workbasket-planned-date.component';
-import { MonitorWorkbasketDueDateComponent } from './workbasket/monitor-workbasket-due-date/monitor-workbasket-due-date.component';
-import { MonitorWorkbasketQuerySwitcherComponent } from './workbasket/monitor-workbasket-query-switcher/monitor-workbasket-query-switcher.component';
+import { WorkbasketReportComponent } from './components/workbasket-report/workbasket-report.component';
+import { WorkbasketReportPlannedDateComponent } from './components/workbasket-report-planned-date/workbasket-report-planned-date.component';
+import { WorkbasketReportDueDateComponent } from './components/workbasket-report-due-date/workbasket-report-due-date.component';
+import { WorkbasketReportQuerySwitcherComponent } from './components/workbasket-report-query-switcher/workbasket-report-query-switcher.component';
 
 
 const MODULES = [
@@ -36,15 +36,15 @@ const MODULES = [
   SharedModule
 ];
 const DECLARATIONS = [
-  ReportComponent,
+  ReportTableComponent,
   MonitorComponent,
-  TimestampComponent,
-  MonitorWorkbasketsComponent,
-  MonitorWorkbasketPlannedDateComponent,
-  MonitorWorkbasketDueDateComponent,
-  MonitorWorkbasketQuerySwitcherComponent,
-  TasksComponent,
-  ClassificationTasksComponent,
+  TimestampReportComponent,
+  WorkbasketReportComponent,
+  WorkbasketReportPlannedDateComponent,
+  WorkbasketReportDueDateComponent,
+  WorkbasketReportQuerySwitcherComponent,
+  TaskReportComponent,
+  ClassificationReportComponent,
 ];
 
 @NgModule({

web/src/app/monitor/services/rest-connector.service.ts

@@ -3,7 +3,7 @@ import { HttpClient } from '@angular/common/http';
 import { environment } from 'environments/environment';
 import { Observable } from 'rxjs';
 import { ChartData } from 'app/monitor/models/chart-data';
-import { ReportData } from '../../models/report-data';
+import { ReportData } from '../models/report-data';
 
 const monitorUrl = '/v1/monitor/';
 

web/src/app/monitor/workbasket/monitor-workbasket-due-date/monitor-workbasket-due-date.component.spec.ts

@@ -1,25 +0,0 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { MonitorWorkbasketDueDateComponent } from './monitor-workbasket-due-date.component';
-
-describe('MonitorWorkbasketDueDateComponent', () => {
-  let component: MonitorWorkbasketDueDateComponent;
-  let fixture: ComponentFixture<MonitorWorkbasketDueDateComponent>;
-
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      declarations: [MonitorWorkbasketDueDateComponent]
-    })
-      .compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(MonitorWorkbasketDueDateComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should be created', () => {
-    expect(component).toBeTruthy();
-  });
-});

web/src/app/monitor/workbasket/monitor-workbasket-query-switcher/monitor-workbasket-query-switcher.component.spec.ts

@@ -1,25 +0,0 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { MonitorWorkbasketQuerySwitcherComponent } from './monitor-workbasket-query-switcher.component';
-
-describe('MonitorWorkbasketQuerySwitcherComponent', () => {
-  let component: MonitorWorkbasketQuerySwitcherComponent;
-  let fixture: ComponentFixture<MonitorWorkbasketQuerySwitcherComponent>;
-
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      declarations: [MonitorWorkbasketQuerySwitcherComponent]
-    })
-      .compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(MonitorWorkbasketQuerySwitcherComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});

web/src/app/monitor/workbasket/monitor-workbasket-query-switcher/monitor-workbasket-query-switcher.component.ts

@@ -1,26 +0,0 @@
-import { Component, EventEmitter, OnInit, Output } from '@angular/core';
-import { MonitorQueryType } from '../../models/monitor-query-type';
-
-@Component({
-  selector: 'taskana-monitor-workbasket-query-switcher',
-  templateUrl: './monitor-workbasket-query-switcher.component.html',
-  styleUrls: ['./monitor-workbasket-query-switcher.component.scss']
-})
-export class MonitorWorkbasketQuerySwitcherComponent implements OnInit {
-  @Output()
-  queryChanged = new EventEmitter<MonitorQueryType>();
-
-  selectedChartType: MonitorQueryType;
-  monitorQueryPlannedDateType = MonitorQueryType.PlannedDate;
-  monitorQueryDueDateType = MonitorQueryType.DueDate;
-
-  ngOnInit() {
-    this.selectedChartType = MonitorQueryType.DueDate;
-    this.queryChanged.emit(MonitorQueryType.DueDate);
-  }
-
-  switch(queryType: MonitorQueryType) {
-    this.selectedChartType = queryType;
-    this.queryChanged.emit(queryType);
-  }
-}

web/src/app/monitor/workbasket/workbasket-planned-date/monitor-workbasket-planned-date.component.spec.ts

@@ -1,25 +0,0 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { MonitorWorkbasketPlannedDateComponent } from './monitor-workbasket-planned-date.component';
-
-describe('MonitorWorkbasketPlannedDateComponent', () => {
-  let component: MonitorWorkbasketPlannedDateComponent;
-  let fixture: ComponentFixture<MonitorWorkbasketPlannedDateComponent>;
-
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      declarations: [MonitorWorkbasketPlannedDateComponent]
-    })
-      .compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(MonitorWorkbasketPlannedDateComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});