From a386b338cefbedb5cb1d92071a59017173e931a5 Mon Sep 17 00:00:00 2001
From: Wolfgang Hottgenroth <wolfgang.hottgenroth@icloud.com>
Date: Sat, 23 Jun 2018 23:43:18 +0200
Subject: [PATCH] ledbox

---
 src/app/app.component.css                     |  4 +++
 src/app/app.component.html                    |  3 +++
 src/app/app.module.ts                         |  4 ++-
 src/app/led-box/led-box.component.spec.ts     | 25 +++++++++++++++++++
 src/app/led-box/led-box.component.ts          | 24 ++++++++++++++++++
 .../led-button-group2.component.ts            |  2 +-
 .../ledindicator/ledindicator.component.ts    |  6 +++--
 7 files changed, 64 insertions(+), 4 deletions(-)
 create mode 100644 src/app/led-box/led-box.component.spec.ts
 create mode 100644 src/app/led-box/led-box.component.ts

diff --git a/src/app/app.component.css b/src/app/app.component.css
index 090c3cf..3019c78 100644
--- a/src/app/app.component.css
+++ b/src/app/app.component.css
@@ -2,6 +2,10 @@ ledbutton2 {
     float: left;
     display: block;
 }
+ledbox {
+    float: left;
+    display: block;
+}
 
 p.clear {
     clear: both;
diff --git a/src/app/app.component.html b/src/app/app.component.html
index ac92b97..0f4ca0b 100644
--- a/src/app/app.component.html
+++ b/src/app/app.component.html
@@ -55,6 +55,9 @@
           
     </mat-tab>
     <mat-tab label="Fenster">
+        <ledbox topic="led/test4" label="test4"></ledbox>
+        <ledbox topic="led/test4" label="test4"></ledbox>
+        <p class="clear"></p>
 
     </mat-tab>
     <mat-tab label="Heizung">
diff --git a/src/app/app.module.ts b/src/app/app.module.ts
index 426d179..ca78a98 100644
--- a/src/app/app.module.ts
+++ b/src/app/app.module.ts
@@ -14,6 +14,7 @@ import { OnOffButtonComponent } from './on-off-button/on-off-button.component';
 import { LedButtonGroupComponent } from './led-button-group/led-button-group.component';
 import { NumberFieldComponent } from './number-field/number-field.component';
 import { LedButtonGroup2Component } from './led-button-group2/led-button-group2.component';
+import { LedBoxComponent } from './led-box/led-box.component';
 
 
 @NgModule({
@@ -23,7 +24,8 @@ import { LedButtonGroup2Component } from './led-button-group2/led-button-group2.
     OnOffButtonComponent,
     LedButtonGroupComponent,
     NumberFieldComponent,
-    LedButtonGroup2Component
+    LedButtonGroup2Component,
+    LedBoxComponent
   ],
   imports: [
     BrowserModule,
diff --git a/src/app/led-box/led-box.component.spec.ts b/src/app/led-box/led-box.component.spec.ts
new file mode 100644
index 0000000..3aeac11
--- /dev/null
+++ b/src/app/led-box/led-box.component.spec.ts
@@ -0,0 +1,25 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { LedBoxComponent } from './led-box.component';
+
+describe('LedBoxComponent', () => {
+  let component: LedBoxComponent;
+  let fixture: ComponentFixture<LedBoxComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [ LedBoxComponent ]
+    })
+    .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(LedBoxComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/app/led-box/led-box.component.ts b/src/app/led-box/led-box.component.ts
new file mode 100644
index 0000000..bf8b38e
--- /dev/null
+++ b/src/app/led-box/led-box.component.ts
@@ -0,0 +1,24 @@
+import { Component, Input, OnInit } from '@angular/core';
+import { MqttclientService } from '../mqttclient.service'
+
+@Component({
+  selector: 'ledbox',
+  template: `
+  <div [ngStyle]="{ 'text-align': 'center', 'background-color':'lightgrey', 'border-radius':'10px', 
+  'width': '100px', 'padding':'5px', 'margin': '5px',
+  'font-family': 'sans-serif' }">
+    {{label}}<br/>
+    <led [topic]="feedbackTopic"></led>
+  </div>
+  `
+})
+export class LedBoxComponent implements OnInit {
+  @Input() topic : string
+  @Input() label : string
+
+  constructor(private mqttclientService : MqttclientService) { }
+
+  ngOnInit() {
+  }
+
+}
diff --git a/src/app/led-button-group2/led-button-group2.component.ts b/src/app/led-button-group2/led-button-group2.component.ts
index 038bd4b..ce807f9 100644
--- a/src/app/led-button-group2/led-button-group2.component.ts
+++ b/src/app/led-button-group2/led-button-group2.component.ts
@@ -9,7 +9,7 @@ import { MqttclientService } from '../mqttclient.service'
                     'font-family': 'sans-serif' }">
     {{label}}<br/>
     <button mat-mini-fab color="primary" (click)="clickOff()" [ngStyle]="{'font-size':'100%'}">off</button>
-    <led [topic]="feedbackTopic"></led>
+    <led [topic]="feedbackTopic" greenToken="ON" redToken="OFF"></led>
     <button mat-mini-fab color="primary" (click)="clickOn()" [ngStyle]="{'font-size':'100%'}">on</button>
   </div>
   `
diff --git a/src/app/ledindicator/ledindicator.component.ts b/src/app/ledindicator/ledindicator.component.ts
index f2b896d..6f3c16d 100644
--- a/src/app/ledindicator/ledindicator.component.ts
+++ b/src/app/ledindicator/ledindicator.component.ts
@@ -10,6 +10,8 @@ import { MqttclientService } from '../mqttclient.service'
 export class LedindicatorComponent implements OnInit {
 
   @Input() topic : string = 'invalid'
+  @Input() greenToken : string = 'green'
+  @Input() redToken : string = 'red'
   color : string = 'red'
 
 
@@ -18,9 +20,9 @@ export class LedindicatorComponent implements OnInit {
 
   ngOnInit() {
     this.mqttclientService.register(this.topic, (message: string) => {
-      if (message == 'ON') {
+      if (message == this.greenToken) {
         this.color = '#40FF00'
-      } else if (message == 'OFF') {
+      } else if (message == this.redToken) {
         this.color = 'red'
       } else {
         this.color = 'lightgrey'