| Eigenschaft |
diff --git a/src/main/angular/src/app/pages/bulk/bulk/bulk.component.ts b/src/main/angular/src/app/pages/bulk/bulk/bulk.component.ts
index 07d18bd..87089ff 100644
--- a/src/main/angular/src/app/pages/bulk/bulk/bulk.component.ts
+++ b/src/main/angular/src/app/pages/bulk/bulk/bulk.component.ts
@@ -34,6 +34,10 @@ export class BulkComponent implements OnInit {
});
}
+ set(bulk: Bulk, property: string, value: any): void {
+ this.bulkService.set(bulk, property, value, result => this.bulk = result);
+ }
+
setEntry(entry: BulkEntry, property: string, value: any): void {
this.bulkService.setEntry(entry, property, value, result => this.update(result));
}
diff --git a/src/main/angular/src/app/pages/device-all-list/device-all-list.component.ts b/src/main/angular/src/app/pages/device-all-list/device-all-list.component.ts
index 17e74e0..2a9d10b 100644
--- a/src/main/angular/src/app/pages/device-all-list/device-all-list.component.ts
+++ b/src/main/angular/src/app/pages/device-all-list/device-all-list.component.ts
@@ -60,7 +60,6 @@ export class DeviceAllListComponent implements OnInit {
}
}
-
private updateScene(scene: Scene, existing: boolean): void {
const index: number = this.scenes.findIndex(p => p.id === scene.id);
if (index >= 0) {
diff --git a/src/main/angular/src/app/pages/device/device.component.ts b/src/main/angular/src/app/pages/device/device.component.ts
index 5ecb645..1e03618 100644
--- a/src/main/angular/src/app/pages/device/device.component.ts
+++ b/src/main/angular/src/app/pages/device/device.component.ts
@@ -32,7 +32,7 @@ export class DeviceComponent implements OnInit {
ngOnInit(): void {
this.dataService.device = undefined;
- this.activatedRoute.params.subscribe(params => this.deviceService.getById(params.id, device => this.setDevice(device)));
+ this.activatedRoute.params.subscribe(params => this.deviceService.getById(params['id'], device => this.setDevice(device)));
}
private setDevice(device: Device): void {
diff --git a/src/main/angular/src/app/pages/mobile/device-tree/area-list/area-list.component.ts b/src/main/angular/src/app/pages/mobile/device-tree/area-list/area-list.component.ts
index 12d489f..fddb999 100644
--- a/src/main/angular/src/app/pages/mobile/device-tree/area-list/area-list.component.ts
+++ b/src/main/angular/src/app/pages/mobile/device-tree/area-list/area-list.component.ts
@@ -12,6 +12,7 @@ import {STUB_AREAS, STUB_DEVICES} from "../../../../api/STUB";
export class AreaListComponent implements OnInit {
readonly faArrowAltCircleRight = faArrowAltCircleRight;
+
readonly faPlayCircle = faPlayCircle;
areas: Area[] = STUB_AREAS.sort(Area.comparePosition);
diff --git a/src/main/angular/src/app/pages/mobile/device-tree/device-list/device-list.component.ts b/src/main/angular/src/app/pages/mobile/device-tree/device-list/device-list.component.ts
index f6eab13..d803366 100644
--- a/src/main/angular/src/app/pages/mobile/device-tree/device-list/device-list.component.ts
+++ b/src/main/angular/src/app/pages/mobile/device-tree/device-list/device-list.component.ts
@@ -13,9 +13,13 @@ import {Room} from "../../../../api/room/Room";
export class DeviceListComponent implements OnInit {
readonly faArrowAltCircleLeft = faArrowAltCircleLeft;
+
readonly faArrowAltCircleRight = faArrowAltCircleRight;
+
readonly faPlayCircle = faPlayCircle;
+
readonly faCheckCircle = faCheckCircle;
+
readonly faTimesCircle = faTimesCircle;
room?: Room;
diff --git a/src/main/angular/src/app/pages/mobile/device-tree/room-list/room-list.component.ts b/src/main/angular/src/app/pages/mobile/device-tree/room-list/room-list.component.ts
index ea0b302..51bcdbb 100644
--- a/src/main/angular/src/app/pages/mobile/device-tree/room-list/room-list.component.ts
+++ b/src/main/angular/src/app/pages/mobile/device-tree/room-list/room-list.component.ts
@@ -14,7 +14,9 @@ import {Area} from "../../../../api/area/Area";
export class RoomListComponent implements OnInit {
readonly faArrowAltCircleLeft = faArrowAltCircleLeft;
+
readonly faArrowAltCircleRight = faArrowAltCircleRight;
+
readonly faPlayCircle = faPlayCircle;
area?: Area;
diff --git a/src/main/angular/src/app/pages/schedule-list/schedule-list.component.ts b/src/main/angular/src/app/pages/schedule-list/schedule-list.component.ts
index bf8a34f..8510f09 100644
--- a/src/main/angular/src/app/pages/schedule-list/schedule-list.component.ts
+++ b/src/main/angular/src/app/pages/schedule-list/schedule-list.component.ts
@@ -11,7 +11,9 @@ import {faCheckCircle, faCircle, faTimesCircle} from '@fortawesome/free-regular-
export class ScheduleListComponent implements OnInit {
readonly faCheckCircle = faCheckCircle;
+
readonly faCircle = faCircle;
+
readonly faTimes = faTimesCircle;
readonly Schedule = Schedule;
diff --git a/src/main/angular/src/app/pages/schedule/schedule.component.ts b/src/main/angular/src/app/pages/schedule/schedule.component.ts
index 25a21da..806cb16 100644
--- a/src/main/angular/src/app/pages/schedule/schedule.component.ts
+++ b/src/main/angular/src/app/pages/schedule/schedule.component.ts
@@ -45,7 +45,7 @@ export class ScheduleComponent implements OnInit {
ngOnInit(): void {
this.dataService.schedule = undefined;
this.sceneService.findAll(scenes => this.scenes = scenes);
- this.activatedRoute.params.subscribe(params => this.scheduleService.getById(params.id, schedule => this.setSchedule(schedule)));
+ this.activatedRoute.params.subscribe(params => this.scheduleService.getById(params['id'], schedule => this.setSchedule(schedule)));
}
private setSchedule(schedule: Schedule): void {
diff --git a/src/main/angular/src/app/shared/edit-field/edit-field.component.html b/src/main/angular/src/app/shared/edit-field/edit-field.component.html
index 38b4686..3a07dd0 100644
--- a/src/main/angular/src/app/shared/edit-field/edit-field.component.html
+++ b/src/main/angular/src/app/shared/edit-field/edit-field.component.html
@@ -1,4 +1,4 @@
-
+
{{initial}}
-
diff --git a/src/main/angular/src/app/shared/edit-field/edit-field.component.spec.ts b/src/main/angular/src/app/shared/edit-field/edit-field.component.spec.ts
deleted file mode 100644
index 56fe30b..0000000
--- a/src/main/angular/src/app/shared/edit-field/edit-field.component.spec.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-import {ComponentFixture, TestBed} from '@angular/core/testing';
-
-import {EditFieldComponent} from './edit-field.component';
-
-describe('EditFieldComponent', () => {
- let component: EditFieldComponent;
- let fixture: ComponentFixture;
-
- beforeEach(async () => {
- await TestBed.configureTestingModule({
- declarations: [EditFieldComponent]
- })
- .compileComponents();
- });
-
- beforeEach(() => {
- fixture = TestBed.createComponent(EditFieldComponent);
- component = fixture.componentInstance;
- fixture.detectChanges();
- });
-
- it('should create', () => {
- expect(component).toBeTruthy();
- });
-});
diff --git a/src/main/angular/src/app/shared/edit-field/edit-field.component.ts b/src/main/angular/src/app/shared/edit-field/edit-field.component.ts
index a1ae3bb..2e08ba2 100644
--- a/src/main/angular/src/app/shared/edit-field/edit-field.component.ts
+++ b/src/main/angular/src/app/shared/edit-field/edit-field.component.ts
@@ -36,12 +36,6 @@ export class EditFieldComponent implements OnInit {
}
}
- keypress($event: KeyboardEvent): void {
- if ($event.key == "Enter") {
- this.finish();
- }
- }
-
start(): void {
this.editing = true;
setTimeout(() => this.input?.nativeElement.focus(), 0);
diff --git a/src/main/angular/src/app/shared/number/number.component.html b/src/main/angular/src/app/shared/number/number.component.html
index 0012beb..d3a0295 100644
--- a/src/main/angular/src/app/shared/number/number.component.html
+++ b/src/main/angular/src/app/shared/number/number.component.html
@@ -1 +1 @@
-
+
diff --git a/src/main/angular/src/app/shared/number/number.component.spec.ts b/src/main/angular/src/app/shared/number/number.component.spec.ts
deleted file mode 100644
index a6c4bb0..0000000
--- a/src/main/angular/src/app/shared/number/number.component.spec.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-import {ComponentFixture, TestBed} from '@angular/core/testing';
-
-import {NumberComponent} from './number.component';
-
-describe('NumberComponent', () => {
- let component: NumberComponent;
- let fixture: ComponentFixture;
-
- beforeEach(async () => {
- await TestBed.configureTestingModule({
- declarations: [NumberComponent]
- })
- .compileComponents();
- });
-
- beforeEach(() => {
- fixture = TestBed.createComponent(NumberComponent);
- component = fixture.componentInstance;
- fixture.detectChanges();
- });
-
- it('should create', () => {
- expect(component).toBeTruthy();
- });
-});
diff --git a/src/main/angular/src/app/shared/search/search.component.html b/src/main/angular/src/app/shared/search/search.component.html
index 42c82c7..9f346fe 100644
--- a/src/main/angular/src/app/shared/search/search.component.html
+++ b/src/main/angular/src/app/shared/search/search.component.html
@@ -7,7 +7,7 @@
-
-
+
diff --git a/src/main/angular/src/app/shared/search/search.component.spec.ts b/src/main/angular/src/app/shared/search/search.component.spec.ts
deleted file mode 100644
index 3fe0a21..0000000
--- a/src/main/angular/src/app/shared/search/search.component.spec.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-import {ComponentFixture, TestBed} from '@angular/core/testing';
-
-import {SearchComponent} from './search.component';
-
-describe('SearchComponent', () => {
- let component: SearchComponent
;
- let fixture: ComponentFixture>;
-
- beforeEach(async () => {
- await TestBed.configureTestingModule({
- declarations: [SearchComponent]
- })
- .compileComponents();
- });
-
- beforeEach(() => {
- fixture = TestBed.createComponent(SearchComponent);
- component = fixture.componentInstance;
- fixture.detectChanges();
- });
-
- it('should create', () => {
- expect(component).toBeTruthy();
- });
-});
diff --git a/src/main/angular/src/app/shared/search/search.component.ts b/src/main/angular/src/app/shared/search/search.component.ts
index 020c8d8..390a4a2 100644
--- a/src/main/angular/src/app/shared/search/search.component.ts
+++ b/src/main/angular/src/app/shared/search/search.component.ts
@@ -53,7 +53,7 @@ export class SearchComponent implements OnInit {
changed(): void {
this.clearChangedTimeout();
- this.changedTimeout = setTimeout(() => this.doSearch(), 400);
+ this.changedTimeout = window.setTimeout(() => this.doSearch(), 400);
}
private clearChangedTimeout(): void {
@@ -73,17 +73,6 @@ export class SearchComponent implements OnInit {
this.doSearch();
}
- inputKeyPress($event: KeyboardEvent): void {
- switch ($event.key) {
- case 'Enter':
- this.doSearch();
- break;
- case 'Escape':
- this.cancelSearch();
- break;
- }
- }
-
doSearch(): void {
this.clearChangedTimeout();
if (!this.term) {
diff --git a/src/main/angular/src/index.html b/src/main/angular/src/index.html
index aa06306..d3d0ec5 100644
--- a/src/main/angular/src/index.html
+++ b/src/main/angular/src/index.html
@@ -8,6 +8,6 @@
-
+