Skip to content

Commit

Permalink
Merge pull request #1263 from Feilner/smokeSensor
Browse files Browse the repository at this point in the history
Smoke sensor
  • Loading branch information
oznu authored Jan 17, 2022
2 parents 0bbfa82 + 01b189c commit 80805d6
Show file tree
Hide file tree
Showing 6 changed files with 60 additions and 0 deletions.
2 changes: 2 additions & 0 deletions ui/src/app/core/accessories/accessories.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ import { SpeakerManageComponent } from './types/speaker/speaker.manage.component
import { SecuritysystemComponent } from './types/securitysystem/securitysystem.component';
import { SecuritysystemManageComponent } from './types/securitysystem/securitysystem.manage.component';
import { LeaksensorComponent } from './types/leaksensor/leaksensor.component';
import { SmokesensorComponent } from './types/smokesensor/smokesensor.component';
import { ValveComponent } from './types/valve/valve.component';
import { ValveManageComponent } from './types/valve/valve.manage.component';
import { IrrigationSystemComponent } from './types/irrigationsystem/irrigationsystem.component';
Expand Down Expand Up @@ -109,6 +110,7 @@ import { AccessoryTileComponent } from './accessory-tile/accessory-tile.componen
SecuritysystemComponent,
SecuritysystemManageComponent,
LeaksensorComponent,
SmokesensorComponent,
ValveComponent,
ValveManageComponent,
IrrigationSystemComponent,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,8 @@
</app-securitysystem>
<app-leaksensor *ngSwitchCase="'LeakSensor'" [service]="service">Leak Sensor
</app-leaksensor>
<app-smokesensor *ngSwitchCase="'SmokeSensor'" [service]="service">Smoke Sensor
</app-smokesensor>
<app-valve *ngSwitchCase="'Valve'" [service]="service">Valve
</app-valve>
<app-irrigationsystem *ngSwitchCase="'IrrigationSystem'" [service]="service">Irrigation System
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
<div class="accessory-box" [ngClass]="{
'switch-on': service.values.SmokeDetected,
'switch-off': !service.values.SmokeDetected
}">
<div class="d-flex flex-column h-100">
<div [inlineSVG]="'/assets/hap-icons/smokesensor.svg'" aria-label="Smoke Sensor" class="accessory-svg"></div>
<div class="accessory-label mt-auto">{{ service.customName || service.serviceName }}</div>
<div class="accessory-label red-text" *ngIf="service.values.SmokeDetected">
{{ 'accessories.control.label_triggered' | translate }}
</div>
</div>
</div>

Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
::ng-deep {
.switch-off {
svg {
.smoke_sensor_trigger_lines {
display: none;
}
.smoke_sensor_box {
fill: #808080;
}
}
}
}

Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
import { Component, OnInit, Input } from '@angular/core';
import { ServiceTypeX } from '../../accessories.interfaces';

@Component({
selector: 'app-smokesensor',
templateUrl: './smokesensor.component.html',
styleUrls: ['./smokesensor.component.scss'],
})
export class SmokesensorComponent implements OnInit {
@Input() public service: ServiceTypeX;

constructor() { }

ngOnInit() {
}

}
13 changes: 13 additions & 0 deletions ui/src/assets/hap-icons/smokesensor.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 80805d6

Please sign in to comment.