-
Notifications
You must be signed in to change notification settings - Fork 374
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
33 changed files
with
413 additions
and
33 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
35 changes: 35 additions & 0 deletions
35
...c/app/core/accessories/types/humidifierdehumidifier/humidifierdehumidifier.component.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,35 @@ | ||
| <div class="accessory-box" [ngClass]="{'switch-on': service.values.Active === 1}" appLongclick | ||
| (longclick)="onLongClick()" (shortclick)="onClick()"> | ||
| <div class="d-flex flex-column h-100"> | ||
| <div class="humidity-drop humidity-drop-collapse" | ||
| [ngClass]="{ | ||
| 'dehumidifying': service.values.CurrentHumidifierDehumidifierState === 3 && service.values.Active === 1, | ||
| 'humidifying': service.values.CurrentHumidifierDehumidifierState === 2 && service.values.Active === 1, | ||
| 'no-current-state': service.values.CurrentHumidifierDehumidifierState === 1 && service.values.Active === 1 | ||
| }"> | ||
| <div class="humidity-drop-text" [innerText]="(service.values.CurrentRelativeHumidity) + '%'"></div> | ||
| </div> | ||
| <div class="accessory-label mt-auto">{{ service.customName || service.serviceName }}</div> | ||
| <div class="accessory-label grey-text" *ngIf="service.values.Active === 0"> | ||
| {{ 'accessories.control.label_off' | translate }} | ||
| </div> | ||
| <div class="accessory-label grey-text" | ||
| *ngIf="service.values.Active === 1 && service.getCharacteristic('RelativeHumidityDehumidifierThreshold') && service.getCharacteristic('RelativeHumidityHumidifierThreshold')" | ||
| [ngSwitch]="service.values.TargetHumidifierDehumidifierState"> | ||
| <span *ngSwitchCase="1"> | ||
| {{ service.values.RelativeHumidityHumidifierThreshold }}% | ||
| </span> | ||
| <span *ngSwitchCase="2"> | ||
| {{ service.values.RelativeHumidityDehumidifierThreshold }}% | ||
| </span> | ||
| <span *ngSwitchCase="0"> | ||
| {{ service.values.RelativeHumidityHumidifierThreshold }}%-{{ service.values.RelativeHumidityDehumidifierThreshold }}% | ||
| </span> | ||
| </div> | ||
| <div class="accessory-label grey-text" | ||
| *ngIf="service.values.Active === 1 && (!service.getCharacteristic('RelativeHumidityDehumidifierThreshold') || !service.getCharacteristic('RelativeHumidityHumidifierThreshold'))"> | ||
| {{ 'accessories.control.label_on' | translate }} | ||
| </div> | ||
| </div> | ||
|
|
||
| </div> |
52 changes: 52 additions & 0 deletions
52
...c/app/core/accessories/types/humidifierdehumidifier/humidifierdehumidifier.component.scss
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,52 @@ | ||
| .humidity-drop { | ||
| position: relative; | ||
| display: inline-block; | ||
| width: 50px; | ||
| height: 50px; | ||
| line-height: 50px; | ||
| border-radius: 5% 55% 70% 55%; | ||
| font-size: 15px; | ||
| text-align: center; | ||
| margin-bottom: 6px; | ||
| background-color: grey; | ||
| color: lightgrey; | ||
| transform: rotate(45deg); | ||
| } | ||
|
|
||
| .humidity-drop-collapse { | ||
| @media (max-width: 575px) { | ||
| width: 31px; | ||
| height: 31px; | ||
| line-height: 31px; | ||
| font-size: 10px; | ||
| margin-bottom: 7px; | ||
| } | ||
| } | ||
|
|
||
| .humidity-drop-text { | ||
| transform: rotate(-45deg); | ||
| } | ||
|
|
||
| .humidifying { | ||
| background-color: #33b5e5; | ||
| color: #FFF; | ||
| } | ||
|
|
||
| .dehumidifying { | ||
| background-color: #FF8800; | ||
| color: #FFF; | ||
| } | ||
|
|
||
| .no-current-state { | ||
| background-color: #42d672; | ||
| color: #FFF; | ||
| -webkit-transition: all .15 ease-in-out; | ||
| transition: all .15 ease-in-out; | ||
| } | ||
|
|
||
| .humidity-mode-control { | ||
| .btn { | ||
| font-size: 1.4rem; | ||
| text-transform: initial; | ||
| } | ||
| } |
34 changes: 34 additions & 0 deletions
34
ui/src/app/core/accessories/types/humidifierdehumidifier/humidifierdehumidifier.component.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,34 @@ | ||
| import { Component, OnInit, Input } from '@angular/core'; | ||
| import { NgbModal } from '@ng-bootstrap/ng-bootstrap'; | ||
| import { ServiceTypeX } from '../../accessories.interfaces'; | ||
|
|
||
| import { HumidifierDehumidifierManageComponent } from './humidifierdehumidifier.manage.component'; | ||
|
|
||
| @Component({ | ||
| selector: 'app-humidifierdehumidifier', | ||
| templateUrl: './humidifierdehumidifier.component.html', | ||
| styleUrls: ['./humidifierdehumidifier.component.scss'], | ||
| }) | ||
| export class HumidifierDehumidifierComponent implements OnInit { | ||
| @Input() public service: ServiceTypeX; | ||
| model = 1; | ||
|
|
||
| constructor( | ||
| private modalService: NgbModal, | ||
| ) { } | ||
|
|
||
| ngOnInit() { | ||
| } | ||
|
|
||
| onClick() { | ||
| this.service.getCharacteristic('Active').setValue(!this.service.values.Active); | ||
| } | ||
|
|
||
| onLongClick() { | ||
| const ref = this.modalService.open(HumidifierDehumidifierManageComponent, { | ||
| size: 'sm', | ||
| }); | ||
| ref.componentInstance.service = this.service; | ||
| } | ||
|
|
||
| } |
68 changes: 68 additions & 0 deletions
68
...ore/accessories/types/humidifierdehumidifier/humidifierdehumidifier.manage.component.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,68 @@ | ||
| <div class="modal-content"> | ||
| <div class="modal-header"> | ||
| <h5 class="modal-title" [innerText]="service.customName || service.serviceName"></h5> | ||
| <button type="button" class="close" data-dismiss="modal" aria-label="Close" | ||
| (click)="activeModal.dismiss('Cross click')"> | ||
| <span aria-hidden="true">×</span> | ||
| </button> | ||
| </div> | ||
| <div class="modal-body text-center"> | ||
|
|
||
| <div class="humidity-drop mb-3" | ||
| [ngClass]="{ | ||
| 'dehumidifying': service.values.CurrentHumidifierDehumidifierState === 3 && service.values.Active === 1, | ||
| 'humidifying': service.values.CurrentHumidifierDehumidifierState === 2 && service.values.Active === 1, | ||
| 'no-current-state': service.values.CurrentHumidifierDehumidifierState === 1 && service.values.Active === 1 | ||
| }"> | ||
| <div class="humidity-drop-text" | ||
| [innerText]="(service.values.CurrentRelativeHumidity) + '%'"></div></div> | ||
|
|
||
| <div class="humidity-mode-control btn-group-vertical btn-group-toggle d-flex justify-content-center mb-4" | ||
| ngbRadioGroup name="radioBasic" [(ngModel)]="targetMode" (change)="onTargetStateChange()"> | ||
| <label ngbButtonLabel class="btn-primary m-0"> | ||
| <input ngbButton type="radio" [value]="0"> {{ 'accessories.control.label_auto' | translate }} | ||
| </label> | ||
| <label ngbButtonLabel class="btn-primary m-0"> | ||
| <input ngbButton type="radio" [value]="1"> {{ 'accessories.control.label_humidifying' | translate }} | ||
| </label> | ||
| <label ngbButtonLabel class="btn-primary m-0"> | ||
| <input ngbButton type="radio" [value]="2"> {{ 'accessories.control.label_dehumidifying' | translate }} | ||
| </label> | ||
| <label ngbButtonLabel class="btn-primary m-0"> | ||
| <input ngbButton type="radio" [value]="'off'"> {{ 'accessories.control.label_off' | translate }} | ||
| </label> | ||
| </div> | ||
|
|
||
| <div *ngIf="service.values.Active === 1 && RelativeHumidityHumidifierThreshold && RelativeHumidityDehumidifierThreshold"> | ||
| <h5>{{ 'accessories.control.label_target_humidity' | translate }}</h5> | ||
|
|
||
| <div [ngSwitch]="targetMode"> | ||
| <div *ngSwitchCase="0"> | ||
| <p> | ||
| {{ autoHumidity[0] }}% - | ||
| {{ autoHumidity[1] }}% | ||
| </p> | ||
| <nouislider [min]="RelativeHumidityHumidifierThreshold.minValue" [max]="RelativeHumidityDehumidifierThreshold.maxValue" | ||
| [step]="RelativeHumidityDehumidifierThreshold.minStep" [(ngModel)]="autoHumidity" | ||
| (ngModelChange)="onHumidityStateChange()"> | ||
| </nouislider> | ||
| </div> | ||
| <div *ngSwitchCase="1"> | ||
| <p>{{ targetHumidifierHumidity }}%</p> | ||
| <nouislider [min]="RelativeHumidityHumidifierThreshold.minValue" [max]="RelativeHumidityHumidifierThreshold.maxValue" | ||
| [step]="RelativeHumidityHumidifierThreshold.minStep" [(ngModel)]="targetHumidifierHumidity" | ||
| (ngModelChange)="onHumidityStateChange()"> | ||
| </nouislider> | ||
| </div> | ||
| <div *ngSwitchCase="2"> | ||
| <p>{{ targetDehumidifierHumidity }}%</p> | ||
| <nouislider [min]="RelativeHumidityDehumidifierThreshold.minValue" [max]="RelativeHumidityDehumidifierThreshold.maxValue" | ||
| [step]="RelativeHumidityDehumidifierThreshold.minStep" [(ngModel)]="targetDehumidifierHumidity" | ||
| (ngModelChange)="onHumidityStateChange()"> | ||
| </nouislider> | ||
| </div> | ||
| </div> | ||
| </div> | ||
|
|
||
| </div> | ||
| </div> |
84 changes: 84 additions & 0 deletions
84
.../core/accessories/types/humidifierdehumidifier/humidifierdehumidifier.manage.component.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,84 @@ | ||
| 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 } from 'rxjs/operators'; | ||
|
|
||
| @Component({ | ||
| selector: 'app-humidifierdehumidifier-manage', | ||
| templateUrl: './humidifierdehumidifier.manage.component.html', | ||
| styleUrls: ['./humidifierdehumidifier.component.scss'], | ||
| }) | ||
| export class HumidifierDehumidifierManageComponent implements OnInit { | ||
| @Input() public service: ServiceTypeX; | ||
| public targetMode: any; | ||
| public targetHumidity: any; | ||
| public targetHumidityChanged: Subject<any> = new Subject<any>(); | ||
|
|
||
| public RelativeHumidityDehumidifierThreshold; | ||
| public RelativeHumidityHumidifierThreshold; | ||
|
|
||
| public targetDehumidifierHumidity: number; | ||
| public targetHumidifierHumidity: number; | ||
| public autoHumidity: [number, number]; | ||
|
|
||
| constructor( | ||
| public activeModal: NgbActiveModal, | ||
| ) { | ||
| this.targetHumidityChanged | ||
| .pipe( | ||
| debounceTime(300), | ||
| ) | ||
| .subscribe((value) => { | ||
| switch (this.targetMode) { | ||
| case 0: | ||
| // auto | ||
| this.service.getCharacteristic('RelativeHumidityHumidifierThreshold').setValue(this.autoHumidity[0]); | ||
| this.service.getCharacteristic('RelativeHumidityDehumidifierThreshold').setValue(this.autoHumidity[1]); | ||
| break; | ||
| case 1: | ||
| // humidifier | ||
| this.service.getCharacteristic('RelativeHumidityHumidifierThreshold').setValue(this.targetHumidifierHumidity); | ||
| break; | ||
| case 2: | ||
| // dehumidifier | ||
| this.service.getCharacteristic('RelativeHumidityDehumidifierThreshold').setValue(this.targetDehumidifierHumidity); | ||
| break; | ||
| } | ||
| }); | ||
| } | ||
|
|
||
| ngOnInit() { | ||
| this.targetMode = this.service.values.Active ? this.service.values.TargetHumidifierDehumidifierState : 'off'; | ||
|
|
||
| this.RelativeHumidityDehumidifierThreshold = this.service.getCharacteristic('RelativeHumidityDehumidifierThreshold'); | ||
| this.RelativeHumidityHumidifierThreshold = this.service.getCharacteristic('RelativeHumidityHumidifierThreshold'); | ||
|
|
||
| this.loadTargetHumidity(); | ||
| } | ||
|
|
||
| loadTargetHumidity() { | ||
| this.targetDehumidifierHumidity = this.service.getCharacteristic('RelativeHumidityDehumidifierThreshold')?.value as number; | ||
| this.targetHumidifierHumidity = this.service.getCharacteristic('RelativeHumidityHumidifierThreshold')?.value as number; | ||
| this.autoHumidity = [this.targetHumidifierHumidity, this.targetDehumidifierHumidity]; | ||
| } | ||
|
|
||
| onTargetStateChange() { | ||
| if (this.targetMode === 'off') { | ||
| this.service.getCharacteristic('Active').setValue(0); | ||
| } else { | ||
| if (this.service.getCharacteristic('Active').value === 0) { | ||
| this.service.getCharacteristic('Active').setValue(1); | ||
| } | ||
| this.service.getCharacteristic('TargetHumidifierDehumidifierState').setValue(this.targetMode); | ||
| } | ||
|
|
||
| this.loadTargetHumidity(); | ||
| } | ||
|
|
||
| onHumidityStateChange() { | ||
| this.targetHumidityChanged.next(); | ||
| } | ||
|
|
||
| } |
5 changes: 3 additions & 2 deletions
5
ui/src/app/core/accessories/types/humiditysensor/humiditysensor.component.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,7 +1,8 @@ | ||
| <div class="accessory-box"> | ||
| <div class="d-flex flex-column h-100"> | ||
| <div [inlineSVG]="'/assets/hap-icons/humidity.svg'" aria-label="Humidity Sensor" class="accessory-svg"></div> | ||
| <div class="humidity-drop humidity-drop-collapse"> | ||
| <div class="humidity-drop-text" [innerText]="(service.values.CurrentRelativeHumidity) + '%'"></div> | ||
| </div> | ||
| <div class="accessory-label mt-auto">{{ service.customName || service.serviceName }}</div> | ||
| <div class="accessory-label grey-text">{{ service.values.CurrentRelativeHumidity }}%</div> | ||
| </div> | ||
| </div> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,28 @@ | ||
| .humidity-drop { | ||
| position: relative; | ||
| display: inline-block; | ||
| width: 50px; | ||
| height: 50px; | ||
| line-height: 50px; | ||
| border-radius: 5% 55% 70% 55%; | ||
| font-size: 15px; | ||
| text-align: center; | ||
| margin-bottom: 6px; | ||
| background-color: grey; | ||
| color: lightgrey; | ||
| transform: rotate(45deg); | ||
| } | ||
|
|
||
| .humidity-drop-collapse { | ||
| @media (max-width: 575px) { | ||
| width: 31px; | ||
| height: 31px; | ||
| line-height: 31px; | ||
| font-size: 10px; | ||
| margin-bottom: 7px; | ||
| } | ||
| } | ||
|
|
||
| .humidity-drop-text { | ||
| transform: rotate(-45deg); | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.