From 4baa0139b15bd026edbde12cc2f918ffd4dc6813 Mon Sep 17 00:00:00 2001 From: feilner Date: Thu, 5 Nov 2020 11:14:24 +0100 Subject: [PATCH 1/4] Add door and window --- .../core/accessories/accessories.module.ts | 212 +++++++++--------- .../types/door/door.component.html | 23 ++ .../types/door/door.component.scss | 6 + .../accessories/types/door/door.component.ts | 36 +++ .../types/door/door.manage.component.html | 35 +++ .../types/door/door.manage.component.ts | 59 +++++ .../types/window/window.component.html | 23 ++ .../types/window/window.component.scss | 6 + .../types/window/window.component.ts | 36 +++ .../types/window/window.manage.component.html | 35 +++ .../types/window/window.manage.component.ts | 59 +++++ .../accessories/accessories.component.html | 4 + .../accessories-widget.component.html | 4 + ui/src/assets/hap-icons/door-closed.svg | 3 + ui/src/assets/hap-icons/door-open.svg | 3 + ui/src/assets/hap-icons/window-closed.svg | 3 + ui/src/assets/hap-icons/window-open.svg | 3 + 17 files changed, 446 insertions(+), 104 deletions(-) create mode 100644 ui/src/app/core/accessories/types/door/door.component.html create mode 100644 ui/src/app/core/accessories/types/door/door.component.scss create mode 100644 ui/src/app/core/accessories/types/door/door.component.ts create mode 100644 ui/src/app/core/accessories/types/door/door.manage.component.html create mode 100644 ui/src/app/core/accessories/types/door/door.manage.component.ts create mode 100644 ui/src/app/core/accessories/types/window/window.component.html create mode 100644 ui/src/app/core/accessories/types/window/window.component.scss create mode 100644 ui/src/app/core/accessories/types/window/window.component.ts create mode 100644 ui/src/app/core/accessories/types/window/window.manage.component.html create mode 100644 ui/src/app/core/accessories/types/window/window.manage.component.ts create mode 100644 ui/src/assets/hap-icons/door-closed.svg create mode 100644 ui/src/assets/hap-icons/door-open.svg create mode 100644 ui/src/assets/hap-icons/window-closed.svg create mode 100644 ui/src/assets/hap-icons/window-open.svg diff --git a/ui/src/app/core/accessories/accessories.module.ts b/ui/src/app/core/accessories/accessories.module.ts index c6f564879..537f621dc 100644 --- a/ui/src/app/core/accessories/accessories.module.ts +++ b/ui/src/app/core/accessories/accessories.module.ts @@ -31,6 +31,10 @@ import { HumiditysensorComponent } from './types/humiditysensor/humiditysensor.c import { AirqualitysensorComponent } from './types/airqualitysensor/airqualitysensor.component'; import { WindowcoveringComponent } from './types/windowcovering/windowcovering.component'; import { WindowcoveringManageComponent } from './types/windowcovering/windowcovering.manage.component'; +import { WindowComponent } from './types/window/window.component'; +import { WindowManageComponent } from './types/window/window.manage.component'; +import { DoorComponent } from './types/door/door.component'; +import { DoorManageComponent } from './types/door/door.manage.component'; import { TelevisionComponent } from './types/television/television.component'; import { ContactsensorComponent } from './types/contactsensor/contactsensor.component'; import { BatteryserviceComponent } from './types/batteryservice/batteryservice.component'; @@ -50,109 +54,109 @@ import { HeaterCoolerManageComponent } from './types/heatercooler/heatercooler.m import { InfoModalComponent } from './info-modal/info-modal.component'; @NgModule({ - entryComponents: [ - InfoModalComponent, - ThermostatManageComponent, - LightbulbManageComponent, - FanManageComponent, - Fanv2ManageComponent, - WindowcoveringManageComponent, - SpeakerManageComponent, - SecuritysystemManageComponent, - ValveManageComponent, - AirpurifierManageComponent, - HeaterCoolerManageComponent, - ], - declarations: [ - InfoModalComponent, - SwitchComponent, - ThermostatComponent, - ThermostatManageComponent, - OutletComponent, - FanComponent, - FanManageComponent, - Fanv2Component, - Fanv2ManageComponent, - UnknownComponent, - LightbulbComponent, - LightbulbManageComponent, - LightsensorComponent, - LockmechanismComponent, - TemperaturesensorComponent, - GaragedooropenerComponent, - MotionsensorComponent, - OccupancysensorComponent, - HumiditysensorComponent, - AirqualitysensorComponent, - WindowcoveringComponent, - WindowcoveringManageComponent, - TelevisionComponent, - ContactsensorComponent, - BatteryserviceComponent, - SpeakerComponent, - SpeakerManageComponent, - SecuritysystemComponent, - SecuritysystemManageComponent, - LeaksensorComponent, - ValveComponent, - ValveManageComponent, - IrrigationSystemComponent, - AirpurifierComponent, - AirpurifierManageComponent, - HeaterCoolerComponent, - HeaterCoolerManageComponent, - ], - imports: [ - CommonModule, - FormsModule, - ReactiveFormsModule, - InlineSVGModule.forRoot(), - TranslateModule.forChild(), - NouisliderModule, - NgbModule, - NgxMdModule, - CoreModule, - ], - exports: [ - SwitchComponent, - ThermostatComponent, - ThermostatManageComponent, - OutletComponent, - FanComponent, - FanManageComponent, - Fanv2Component, - Fanv2ManageComponent, - UnknownComponent, - LightbulbComponent, - LightbulbManageComponent, - LightsensorComponent, - LockmechanismComponent, - TemperaturesensorComponent, - GaragedooropenerComponent, - MotionsensorComponent, - OccupancysensorComponent, - HumiditysensorComponent, - AirqualitysensorComponent, - WindowcoveringComponent, - WindowcoveringManageComponent, - TelevisionComponent, - ContactsensorComponent, - BatteryserviceComponent, - SpeakerComponent, - SpeakerManageComponent, - SecuritysystemComponent, - SecuritysystemManageComponent, - LeaksensorComponent, - ValveComponent, - ValveManageComponent, - IrrigationSystemComponent, - AirpurifierComponent, - AirpurifierManageComponent, - HeaterCoolerComponent, - HeaterCoolerManageComponent, - ], - providers: [ - AccessoriesService, - ], + entryComponents: [ + InfoModalComponent, + ThermostatManageComponent, + LightbulbManageComponent, + FanManageComponent, + Fanv2ManageComponent, + WindowcoveringManageComponent, + SpeakerManageComponent, + SecuritysystemManageComponent, + ValveManageComponent, + AirpurifierManageComponent, + HeaterCoolerManageComponent, + ], + declarations: [ + InfoModalComponent, + SwitchComponent, + ThermostatComponent, + ThermostatManageComponent, + OutletComponent, + FanComponent, + FanManageComponent, + Fanv2Component, + Fanv2ManageComponent, + UnknownComponent, + LightbulbComponent, + LightbulbManageComponent, + LightsensorComponent, + LockmechanismComponent, + TemperaturesensorComponent, + GaragedooropenerComponent, + MotionsensorComponent, + OccupancysensorComponent, + HumiditysensorComponent, + AirqualitysensorComponent, + WindowcoveringComponent, + WindowcoveringManageComponent, + TelevisionComponent, + ContactsensorComponent, + BatteryserviceComponent, + SpeakerComponent, + SpeakerManageComponent, + SecuritysystemComponent, + SecuritysystemManageComponent, + LeaksensorComponent, + ValveComponent, + ValveManageComponent, + IrrigationSystemComponent, + AirpurifierComponent, + AirpurifierManageComponent, + HeaterCoolerComponent, + HeaterCoolerManageComponent, + ], + imports: [ + CommonModule, + FormsModule, + ReactiveFormsModule, + InlineSVGModule.forRoot(), + TranslateModule.forChild(), + NouisliderModule, + NgbModule, + NgxMdModule, + CoreModule, + ], + exports: [ + SwitchComponent, + ThermostatComponent, + ThermostatManageComponent, + OutletComponent, + FanComponent, + FanManageComponent, + Fanv2Component, + Fanv2ManageComponent, + UnknownComponent, + LightbulbComponent, + LightbulbManageComponent, + LightsensorComponent, + LockmechanismComponent, + TemperaturesensorComponent, + GaragedooropenerComponent, + MotionsensorComponent, + OccupancysensorComponent, + HumiditysensorComponent, + AirqualitysensorComponent, + WindowcoveringComponent, + WindowcoveringManageComponent, + TelevisionComponent, + ContactsensorComponent, + BatteryserviceComponent, + SpeakerComponent, + SpeakerManageComponent, + SecuritysystemComponent, + SecuritysystemManageComponent, + LeaksensorComponent, + ValveComponent, + ValveManageComponent, + IrrigationSystemComponent, + AirpurifierComponent, + AirpurifierManageComponent, + HeaterCoolerComponent, + HeaterCoolerManageComponent, + ], + providers: [ + AccessoriesService, + ], }) export class AccessoriesCoreModule { } diff --git a/ui/src/app/core/accessories/types/door/door.component.html b/ui/src/app/core/accessories/types/door/door.component.html new file mode 100644 index 000000000..d29da18b9 --- /dev/null +++ b/ui/src/app/core/accessories/types/door/door.component.html @@ -0,0 +1,23 @@ +
+
+
+
+
{{ service.customName || service.serviceName }}
+
+ {{ 'accessories.control.label_closed' | translate }} + + {{ service.values.CurrentPosition }}% {{ 'accessories.control.label_open' | translate }} + + {{ 'accessories.control.label_open' | translate }} +
+
+ {{ 'accessories.control.label_opening' | translate }}... +
+
+ {{ 'accessories.control.label_closing' | translate }}... +
+
+
\ No newline at end of file diff --git a/ui/src/app/core/accessories/types/door/door.component.scss b/ui/src/app/core/accessories/types/door/door.component.scss new file mode 100644 index 000000000..083eaf5e3 --- /dev/null +++ b/ui/src/app/core/accessories/types/door/door.component.scss @@ -0,0 +1,6 @@ +.door-mode-control { + .btn { + font-size: 1.4rem; + text-transform: initial; + } +} \ No newline at end of file diff --git a/ui/src/app/core/accessories/types/door/door.component.ts b/ui/src/app/core/accessories/types/door/door.component.ts new file mode 100644 index 000000000..eb6aea236 --- /dev/null +++ b/ui/src/app/core/accessories/types/door/door.component.ts @@ -0,0 +1,36 @@ +import { Component, OnInit, Input } from '@angular/core'; +import { NgbModal } from '@ng-bootstrap/ng-bootstrap'; +import { ServiceTypeX } from '../../accessories.interfaces'; + +import { DoorManageComponent } from './door.manage.component'; + +@Component({ + selector: 'app-door', + templateUrl: './door.component.html', + styleUrls: ['./door.component.scss'], +}) +export class DoorComponent implements OnInit { + @Input() public service: ServiceTypeX; + + constructor( + private modalService: NgbModal, + ) { } + + ngOnInit() { } + + onClick() { + if (this.service.values.TargetPosition) { + this.service.getCharacteristic('TargetPosition').setValue(0); + } else { + this.service.getCharacteristic('TargetPosition').setValue(100); + } + } + + onLongClick() { + const ref = this.modalService.open(DoorManageComponent, { + size: 'sm', + }); + ref.componentInstance.service = this.service; + } + +} diff --git a/ui/src/app/core/accessories/types/door/door.manage.component.html b/ui/src/app/core/accessories/types/door/door.manage.component.html new file mode 100644 index 000000000..768c67106 --- /dev/null +++ b/ui/src/app/core/accessories/types/door/door.manage.component.html @@ -0,0 +1,35 @@ +
+
+
+ +
+
+ +
+ +
+ {{ 'accessories.control.label_closed' | translate }} + + {{ service.values.CurrentPosition }}% {{ 'accessories.control.label_open' | translate }} + + Open +
+
+ {{ 'accessories.control.label_opening' | translate }}... +
+
+ {{ 'accessories.control.label_closing' | translate }}... +
+ +
+ +

{{ 'accessories.control.label_target' | translate }}: {{ targetPosition.value }}%

+ + + +
+
\ No newline at end of file diff --git a/ui/src/app/core/accessories/types/door/door.manage.component.ts b/ui/src/app/core/accessories/types/door/door.manage.component.ts new file mode 100644 index 000000000..fcaf6ee8b --- /dev/null +++ b/ui/src/app/core/accessories/types/door/door.manage.component.ts @@ -0,0 +1,59 @@ +import { Component, OnInit, Input } from '@angular/core'; +import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; +import { ServiceTypeX } from '../../accessories.interfaces'; + +import { Subject } from 'rxjs'; +import { debounceTime, distinctUntilChanged } from 'rxjs/operators'; + +@Component({ + selector: 'app-door-manage', + templateUrl: './door.manage.component.html', + styleUrls: ['./door.component.scss'], +}) +export class DoorManageComponent implements OnInit { + @Input() public service: ServiceTypeX; + public targetMode: any; + public targetPosition: any; + public targetPositionChanged: Subject = new Subject(); + + constructor( + public activeModal: NgbActiveModal, + ) { + this.targetPositionChanged + .pipe( + debounceTime(300), + distinctUntilChanged(), + ) + .subscribe((value) => { + if (this.service.getCharacteristic('CurrentPosition').value < this.targetPosition.value) { + this.service.values.PositionState = 1; + } else if (this.service.getCharacteristic('CurrentPosition').value > this.targetPosition.value) { + this.service.values.PositionState = 0; + } + this.service.getCharacteristic('TargetPosition').setValue(this.targetPosition.value); + }); + } + + ngOnInit() { + this.targetMode = this.service.values.On; + this.loadTargetPosition(); + } + + loadTargetPosition() { + const TargetPosition = this.service.getCharacteristic('TargetPosition'); + + if (TargetPosition) { + this.targetPosition = { + value: TargetPosition.value, + min: TargetPosition.minValue, + max: TargetPosition.maxValue, + step: TargetPosition.minStep, + }; + } + } + + onTargetPositionChange() { + this.targetPositionChanged.next(this.targetPosition.value); + } + +} diff --git a/ui/src/app/core/accessories/types/window/window.component.html b/ui/src/app/core/accessories/types/window/window.component.html new file mode 100644 index 000000000..9b37d5ed6 --- /dev/null +++ b/ui/src/app/core/accessories/types/window/window.component.html @@ -0,0 +1,23 @@ +
+
+
+
+
{{ service.customName || service.serviceName }}
+
+ {{ 'accessories.control.label_closed' | translate }} + + {{ service.values.CurrentPosition }}% {{ 'accessories.control.label_open' | translate }} + + {{ 'accessories.control.label_open' | translate }} +
+
+ {{ 'accessories.control.label_opening' | translate }}... +
+
+ {{ 'accessories.control.label_closing' | translate }}... +
+
+
\ No newline at end of file diff --git a/ui/src/app/core/accessories/types/window/window.component.scss b/ui/src/app/core/accessories/types/window/window.component.scss new file mode 100644 index 000000000..9f4dde81a --- /dev/null +++ b/ui/src/app/core/accessories/types/window/window.component.scss @@ -0,0 +1,6 @@ +.window-mode-control { + .btn { + font-size: 1.4rem; + text-transform: initial; + } +} \ No newline at end of file diff --git a/ui/src/app/core/accessories/types/window/window.component.ts b/ui/src/app/core/accessories/types/window/window.component.ts new file mode 100644 index 000000000..606bb1718 --- /dev/null +++ b/ui/src/app/core/accessories/types/window/window.component.ts @@ -0,0 +1,36 @@ +import { Component, OnInit, Input } from '@angular/core'; +import { NgbModal } from '@ng-bootstrap/ng-bootstrap'; +import { ServiceTypeX } from '../../accessories.interfaces'; + +import { WindowManageComponent } from './window.manage.component'; + +@Component({ + selector: 'app-window', + templateUrl: './window.component.html', + styleUrls: ['./window.component.scss'], +}) +export class WindowComponent implements OnInit { + @Input() public service: ServiceTypeX; + + constructor( + private modalService: NgbModal, + ) { } + + ngOnInit() { } + + onClick() { + if (this.service.values.TargetPosition) { + this.service.getCharacteristic('TargetPosition').setValue(0); + } else { + this.service.getCharacteristic('TargetPosition').setValue(100); + } + } + + onLongClick() { + const ref = this.modalService.open(WindowManageComponent, { + size: 'sm', + }); + ref.componentInstance.service = this.service; + } + +} diff --git a/ui/src/app/core/accessories/types/window/window.manage.component.html b/ui/src/app/core/accessories/types/window/window.manage.component.html new file mode 100644 index 000000000..768c67106 --- /dev/null +++ b/ui/src/app/core/accessories/types/window/window.manage.component.html @@ -0,0 +1,35 @@ +
+
+
+ +
+
+ +
+ +
+ {{ 'accessories.control.label_closed' | translate }} + + {{ service.values.CurrentPosition }}% {{ 'accessories.control.label_open' | translate }} + + Open +
+
+ {{ 'accessories.control.label_opening' | translate }}... +
+
+ {{ 'accessories.control.label_closing' | translate }}... +
+ +
+ +

{{ 'accessories.control.label_target' | translate }}: {{ targetPosition.value }}%

+ + + +
+
\ No newline at end of file diff --git a/ui/src/app/core/accessories/types/window/window.manage.component.ts b/ui/src/app/core/accessories/types/window/window.manage.component.ts new file mode 100644 index 000000000..aad6b8faf --- /dev/null +++ b/ui/src/app/core/accessories/types/window/window.manage.component.ts @@ -0,0 +1,59 @@ +import { Component, OnInit, Input } from '@angular/core'; +import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; +import { ServiceTypeX } from '../../accessories.interfaces'; + +import { Subject } from 'rxjs'; +import { debounceTime, distinctUntilChanged } from 'rxjs/operators'; + +@Component({ + selector: 'app-window-manage', + templateUrl: './window.manage.component.html', + styleUrls: ['./window.component.scss'], +}) +export class WindowManageComponent implements OnInit { + @Input() public service: ServiceTypeX; + public targetMode: any; + public targetPosition: any; + public targetPositionChanged: Subject = new Subject(); + + constructor( + public activeModal: NgbActiveModal, + ) { + this.targetPositionChanged + .pipe( + debounceTime(300), + distinctUntilChanged(), + ) + .subscribe((value) => { + if (this.service.getCharacteristic('CurrentPosition').value < this.targetPosition.value) { + this.service.values.PositionState = 1; + } else if (this.service.getCharacteristic('CurrentPosition').value > this.targetPosition.value) { + this.service.values.PositionState = 0; + } + this.service.getCharacteristic('TargetPosition').setValue(this.targetPosition.value); + }); + } + + ngOnInit() { + this.targetMode = this.service.values.On; + this.loadTargetPosition(); + } + + loadTargetPosition() { + const TargetPosition = this.service.getCharacteristic('TargetPosition'); + + if (TargetPosition) { + this.targetPosition = { + value: TargetPosition.value, + min: TargetPosition.minValue, + max: TargetPosition.maxValue, + step: TargetPosition.minStep, + }; + } + } + + onTargetPositionChange() { + this.targetPositionChanged.next(this.targetPosition.value); + } + +} diff --git a/ui/src/app/modules/accessories/accessories.component.html b/ui/src/app/modules/accessories/accessories.component.html index efaf9368c..872b45608 100644 --- a/ui/src/app/modules/accessories/accessories.component.html +++ b/ui/src/app/modules/accessories/accessories.component.html @@ -66,6 +66,10 @@
Window Covering + Window + + Door + Television BatteryService diff --git a/ui/src/app/modules/status/widgets/accessories-widget/accessories-widget.component.html b/ui/src/app/modules/status/widgets/accessories-widget/accessories-widget.component.html index 3a3812696..11612763e 100644 --- a/ui/src/app/modules/status/widgets/accessories-widget/accessories-widget.component.html +++ b/ui/src/app/modules/status/widgets/accessories-widget/accessories-widget.component.html @@ -34,6 +34,10 @@ Window Covering + Window + + Door + Television Security System diff --git a/ui/src/assets/hap-icons/door-closed.svg b/ui/src/assets/hap-icons/door-closed.svg new file mode 100644 index 000000000..73ab9079b --- /dev/null +++ b/ui/src/assets/hap-icons/door-closed.svg @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/ui/src/assets/hap-icons/door-open.svg b/ui/src/assets/hap-icons/door-open.svg new file mode 100644 index 000000000..7b32c2efb --- /dev/null +++ b/ui/src/assets/hap-icons/door-open.svg @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/ui/src/assets/hap-icons/window-closed.svg b/ui/src/assets/hap-icons/window-closed.svg new file mode 100644 index 000000000..9cd0713ae --- /dev/null +++ b/ui/src/assets/hap-icons/window-closed.svg @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/ui/src/assets/hap-icons/window-open.svg b/ui/src/assets/hap-icons/window-open.svg new file mode 100644 index 000000000..3ebbc4e8a --- /dev/null +++ b/ui/src/assets/hap-icons/window-open.svg @@ -0,0 +1,3 @@ + + + \ No newline at end of file From e1f9c630c4470b3e7a225a4c09368d92d1487075 Mon Sep 17 00:00:00 2001 From: feilner Date: Mon, 9 Nov 2020 13:54:22 +0000 Subject: [PATCH 2/4] add modules --- ui/src/app/core/accessories/accessories.module.ts | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/ui/src/app/core/accessories/accessories.module.ts b/ui/src/app/core/accessories/accessories.module.ts index 537f621dc..96f99ffe0 100644 --- a/ui/src/app/core/accessories/accessories.module.ts +++ b/ui/src/app/core/accessories/accessories.module.ts @@ -61,6 +61,8 @@ import { InfoModalComponent } from './info-modal/info-modal.component'; FanManageComponent, Fanv2ManageComponent, WindowcoveringManageComponent, + WindowManageComponent, + DoorManageComponent, SpeakerManageComponent, SecuritysystemManageComponent, ValveManageComponent, @@ -90,6 +92,10 @@ import { InfoModalComponent } from './info-modal/info-modal.component'; AirqualitysensorComponent, WindowcoveringComponent, WindowcoveringManageComponent, + WindowComponent, + WindowManageComponent, + DoorComponent, + DoorManageComponent, TelevisionComponent, ContactsensorComponent, BatteryserviceComponent, @@ -139,6 +145,10 @@ import { InfoModalComponent } from './info-modal/info-modal.component'; AirqualitysensorComponent, WindowcoveringComponent, WindowcoveringManageComponent, + WindowComponent, + WindowManageComponent, + DoorComponent, + DoorManageComponent, TelevisionComponent, ContactsensorComponent, BatteryserviceComponent, From c9d296771da8b74372ac91b283a11cc8992bf9ba Mon Sep 17 00:00:00 2001 From: feilner Date: Mon, 9 Nov 2020 13:54:22 +0000 Subject: [PATCH 3/4] add modules --- .../core/accessories/accessories.module.ts | 218 +++++++++--------- 1 file changed, 114 insertions(+), 104 deletions(-) diff --git a/ui/src/app/core/accessories/accessories.module.ts b/ui/src/app/core/accessories/accessories.module.ts index 537f621dc..e8039d148 100644 --- a/ui/src/app/core/accessories/accessories.module.ts +++ b/ui/src/app/core/accessories/accessories.module.ts @@ -54,109 +54,119 @@ import { HeaterCoolerManageComponent } from './types/heatercooler/heatercooler.m import { InfoModalComponent } from './info-modal/info-modal.component'; @NgModule({ - entryComponents: [ - InfoModalComponent, - ThermostatManageComponent, - LightbulbManageComponent, - FanManageComponent, - Fanv2ManageComponent, - WindowcoveringManageComponent, - SpeakerManageComponent, - SecuritysystemManageComponent, - ValveManageComponent, - AirpurifierManageComponent, - HeaterCoolerManageComponent, - ], - declarations: [ - InfoModalComponent, - SwitchComponent, - ThermostatComponent, - ThermostatManageComponent, - OutletComponent, - FanComponent, - FanManageComponent, - Fanv2Component, - Fanv2ManageComponent, - UnknownComponent, - LightbulbComponent, - LightbulbManageComponent, - LightsensorComponent, - LockmechanismComponent, - TemperaturesensorComponent, - GaragedooropenerComponent, - MotionsensorComponent, - OccupancysensorComponent, - HumiditysensorComponent, - AirqualitysensorComponent, - WindowcoveringComponent, - WindowcoveringManageComponent, - TelevisionComponent, - ContactsensorComponent, - BatteryserviceComponent, - SpeakerComponent, - SpeakerManageComponent, - SecuritysystemComponent, - SecuritysystemManageComponent, - LeaksensorComponent, - ValveComponent, - ValveManageComponent, - IrrigationSystemComponent, - AirpurifierComponent, - AirpurifierManageComponent, - HeaterCoolerComponent, - HeaterCoolerManageComponent, - ], - imports: [ - CommonModule, - FormsModule, - ReactiveFormsModule, - InlineSVGModule.forRoot(), - TranslateModule.forChild(), - NouisliderModule, - NgbModule, - NgxMdModule, - CoreModule, - ], - exports: [ - SwitchComponent, - ThermostatComponent, - ThermostatManageComponent, - OutletComponent, - FanComponent, - FanManageComponent, - Fanv2Component, - Fanv2ManageComponent, - UnknownComponent, - LightbulbComponent, - LightbulbManageComponent, - LightsensorComponent, - LockmechanismComponent, - TemperaturesensorComponent, - GaragedooropenerComponent, - MotionsensorComponent, - OccupancysensorComponent, - HumiditysensorComponent, - AirqualitysensorComponent, - WindowcoveringComponent, - WindowcoveringManageComponent, - TelevisionComponent, - ContactsensorComponent, - BatteryserviceComponent, - SpeakerComponent, - SpeakerManageComponent, - SecuritysystemComponent, - SecuritysystemManageComponent, - LeaksensorComponent, - ValveComponent, - ValveManageComponent, - IrrigationSystemComponent, - AirpurifierComponent, - AirpurifierManageComponent, - HeaterCoolerComponent, - HeaterCoolerManageComponent, - ], - providers: [ - AccessoriesService, - ], + entryComponents: [ + InfoModalComponent, + ThermostatManageComponent, + LightbulbManageComponent, + FanManageComponent, + Fanv2ManageComponent, + WindowcoveringManageComponent, + WindowManageComponent, + DoorManageComponent, + SpeakerManageComponent, + SecuritysystemManageComponent, + ValveManageComponent, + AirpurifierManageComponent, + HeaterCoolerManageComponent, + ], + declarations: [ + InfoModalComponent, + SwitchComponent, + ThermostatComponent, + ThermostatManageComponent, + OutletComponent, + FanComponent, + FanManageComponent, + Fanv2Component, + Fanv2ManageComponent, + UnknownComponent, + LightbulbComponent, + LightbulbManageComponent, + LightsensorComponent, + LockmechanismComponent, + TemperaturesensorComponent, + GaragedooropenerComponent, + MotionsensorComponent, + OccupancysensorComponent, + HumiditysensorComponent, + AirqualitysensorComponent, + WindowcoveringComponent, + WindowcoveringManageComponent, + WindowComponent, + WindowManageComponent, + DoorComponent, + DoorManageComponent, + TelevisionComponent, + ContactsensorComponent, + BatteryserviceComponent, + SpeakerComponent, + SpeakerManageComponent, + SecuritysystemComponent, + SecuritysystemManageComponent, + LeaksensorComponent, + ValveComponent, + ValveManageComponent, + IrrigationSystemComponent, + AirpurifierComponent, + AirpurifierManageComponent, + HeaterCoolerComponent, + HeaterCoolerManageComponent, + ], + imports: [ + CommonModule, + FormsModule, + ReactiveFormsModule, + InlineSVGModule.forRoot(), + TranslateModule.forChild(), + NouisliderModule, + NgbModule, + NgxMdModule, + CoreModule, + ], + exports: [ + SwitchComponent, + ThermostatComponent, + ThermostatManageComponent, + OutletComponent, + FanComponent, + FanManageComponent, + Fanv2Component, + Fanv2ManageComponent, + UnknownComponent, + LightbulbComponent, + LightbulbManageComponent, + LightsensorComponent, + LockmechanismComponent, + TemperaturesensorComponent, + GaragedooropenerComponent, + MotionsensorComponent, + OccupancysensorComponent, + HumiditysensorComponent, + AirqualitysensorComponent, + WindowcoveringComponent, + WindowcoveringManageComponent, + WindowComponent, + WindowManageComponent, + DoorComponent, + DoorManageComponent, + TelevisionComponent, + ContactsensorComponent, + BatteryserviceComponent, + SpeakerComponent, + SpeakerManageComponent, + SecuritysystemComponent, + SecuritysystemManageComponent, + LeaksensorComponent, + ValveComponent, + ValveManageComponent, + IrrigationSystemComponent, + AirpurifierComponent, + AirpurifierManageComponent, + HeaterCoolerComponent, + HeaterCoolerManageComponent, + ], + providers: [ + AccessoriesService, + ], }) export class AccessoriesCoreModule { } From c22d0837043233ca288bec6adc0cab6fd44f4575 Mon Sep 17 00:00:00 2001 From: Feilner Date: Mon, 9 Nov 2020 14:16:01 +0000 Subject: [PATCH 4/4] add new line at end of the file --- ui/src/app/core/accessories/types/door/door.component.html | 3 ++- ui/src/app/core/accessories/types/door/door.component.scss | 3 ++- .../app/core/accessories/types/door/door.manage.component.html | 3 ++- ui/src/app/core/accessories/types/window/window.component.html | 3 ++- ui/src/app/core/accessories/types/window/window.component.scss | 3 ++- .../core/accessories/types/window/window.manage.component.html | 3 ++- 6 files changed, 12 insertions(+), 6 deletions(-) diff --git a/ui/src/app/core/accessories/types/door/door.component.html b/ui/src/app/core/accessories/types/door/door.component.html index d29da18b9..d95223fe4 100644 --- a/ui/src/app/core/accessories/types/door/door.component.html +++ b/ui/src/app/core/accessories/types/door/door.component.html @@ -20,4 +20,5 @@ {{ 'accessories.control.label_closing' | translate }}... - \ No newline at end of file + + diff --git a/ui/src/app/core/accessories/types/door/door.component.scss b/ui/src/app/core/accessories/types/door/door.component.scss index 083eaf5e3..558befd64 100644 --- a/ui/src/app/core/accessories/types/door/door.component.scss +++ b/ui/src/app/core/accessories/types/door/door.component.scss @@ -3,4 +3,5 @@ font-size: 1.4rem; text-transform: initial; } -} \ No newline at end of file +} + diff --git a/ui/src/app/core/accessories/types/door/door.manage.component.html b/ui/src/app/core/accessories/types/door/door.manage.component.html index 768c67106..b9297b831 100644 --- a/ui/src/app/core/accessories/types/door/door.manage.component.html +++ b/ui/src/app/core/accessories/types/door/door.manage.component.html @@ -32,4 +32,5 @@
- \ No newline at end of file + + diff --git a/ui/src/app/core/accessories/types/window/window.component.html b/ui/src/app/core/accessories/types/window/window.component.html index 9b37d5ed6..53e2f3e8e 100644 --- a/ui/src/app/core/accessories/types/window/window.component.html +++ b/ui/src/app/core/accessories/types/window/window.component.html @@ -20,4 +20,5 @@ {{ 'accessories.control.label_closing' | translate }}... - \ No newline at end of file + + diff --git a/ui/src/app/core/accessories/types/window/window.component.scss b/ui/src/app/core/accessories/types/window/window.component.scss index 9f4dde81a..d483bd167 100644 --- a/ui/src/app/core/accessories/types/window/window.component.scss +++ b/ui/src/app/core/accessories/types/window/window.component.scss @@ -3,4 +3,5 @@ font-size: 1.4rem; text-transform: initial; } -} \ No newline at end of file +} + diff --git a/ui/src/app/core/accessories/types/window/window.manage.component.html b/ui/src/app/core/accessories/types/window/window.manage.component.html index 768c67106..b9297b831 100644 --- a/ui/src/app/core/accessories/types/window/window.manage.component.html +++ b/ui/src/app/core/accessories/types/window/window.manage.component.html @@ -32,4 +32,5 @@
- \ No newline at end of file + +