From acd264712453e45016ec789af29b1ffafae430d6 Mon Sep 17 00:00:00 2001
From: Wolfgang Hottgenroth <wolfgang.hottgenroth@icloud.com>
Date: Sat, 23 Jun 2018 18:43:25 +0200
Subject: [PATCH] different led button group

---
 src/app/app.component.html                    |  8 ++--
 src/app/app.module.ts                         |  4 +-
 .../led-button-group2.component.spec.ts       | 25 +++++++++++
 .../led-button-group2.component.ts            | 41 +++++++++++++++++++
 .../ledindicator/ledindicator.component.ts    |  2 +-
 5 files changed, 74 insertions(+), 6 deletions(-)
 create mode 100644 src/app/led-button-group2/led-button-group2.component.spec.ts
 create mode 100644 src/app/led-button-group2/led-button-group2.component.ts

diff --git a/src/app/app.component.html b/src/app/app.component.html
index 607b352..6807861 100644
--- a/src/app/app.component.html
+++ b/src/app/app.component.html
@@ -1,16 +1,16 @@
 <table id="maintable">
   <tr>
     <td>
-      <ledbutton topic="led/test1" label="Küche Deckenlampe"></ledbutton>
+      <ledbutton2 topic="led/test1" label="Küche Deckenlampe"></ledbutton2>
     </td>
     <td>
-      <ledbutton topic="led/test2" label="Keller normal"></ledbutton>
+      <ledbutton2 topic="led/test2" label="Keller normal"></ledbutton2>
     </td>
     <td>
-      <ledbutton topic="led/test3" label="Keller hell"></ledbutton>
+      <ledbutton2 topic="led/test3" label="Keller hell"></ledbutton2>
     </td>
     <td>
-      <ledbutton topic="led/test4" label="test4"></ledbutton>
+      <ledbutton2 topic="led/test4" label="test4"></ledbutton2>
     </td>
   </tr>
   <tr>
diff --git a/src/app/app.module.ts b/src/app/app.module.ts
index 97cc3bf..9367c91 100644
--- a/src/app/app.module.ts
+++ b/src/app/app.module.ts
@@ -7,6 +7,7 @@ import { LedindicatorComponent } from './ledindicator/ledindicator.component';
 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';
 
 
 @NgModule({
@@ -15,7 +16,8 @@ import { NumberFieldComponent } from './number-field/number-field.component';
     LedindicatorComponent,
     OnOffButtonComponent,
     LedButtonGroupComponent,
-    NumberFieldComponent
+    NumberFieldComponent,
+    LedButtonGroup2Component
   ],
   imports: [
     BrowserModule
diff --git a/src/app/led-button-group2/led-button-group2.component.spec.ts b/src/app/led-button-group2/led-button-group2.component.spec.ts
new file mode 100644
index 0000000..2ae671a
--- /dev/null
+++ b/src/app/led-button-group2/led-button-group2.component.spec.ts
@@ -0,0 +1,25 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { LedButtonGroup2Component } from './led-button-group2.component';
+
+describe('LedButtonGroup2Component', () => {
+  let component: LedButtonGroup2Component;
+  let fixture: ComponentFixture<LedButtonGroup2Component>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [ LedButtonGroup2Component ]
+    })
+    .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(LedButtonGroup2Component);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/app/led-button-group2/led-button-group2.component.ts b/src/app/led-button-group2/led-button-group2.component.ts
new file mode 100644
index 0000000..e76f239
--- /dev/null
+++ b/src/app/led-button-group2/led-button-group2.component.ts
@@ -0,0 +1,41 @@
+import { Component, Input, OnInit } from '@angular/core';
+import { MqttclientService } from '../mqttclient.service'
+
+@Component({
+  selector: 'ledbutton2',
+  template: `
+  <div [ngStyle]="{ 'text-align': 'center', 'border': '2px solid black', 
+                    'width': '150px', 'padding':'5px',
+                    'font-family': 'sans-serif' }">
+    {{label}}<br/>
+    <button (click)="clickOff()" [ngStyle]="{'font-size':'100%'}">off</button>
+    <led [topic]="feedbackTopic"></led>
+    <button (click)="clickOn()" [ngStyle]="{'font-size':'100%'}">on</button>
+  </div>
+  `
+})
+export class LedButtonGroup2Component implements OnInit {
+
+  actionTopic : string
+  feedbackTopic : string
+  @Input('topic') topicPre : string
+  @Input() label : string
+
+  constructor(private mqttclientService : MqttclientService) { }
+
+  ngOnInit() {
+    this.actionTopic = this.topicPre + '/state'
+    this.feedbackTopic = this.topicPre + '/feedback'
+  }
+
+
+  clickOn() {
+    this.mqttclientService.publish(this.actionTopic, "ON")
+  }
+
+  clickOff() {
+    this.mqttclientService.publish(this.actionTopic, "OFF")
+  }
+
+
+}
diff --git a/src/app/ledindicator/ledindicator.component.ts b/src/app/ledindicator/ledindicator.component.ts
index 6e19b59..f2b896d 100644
--- a/src/app/ledindicator/ledindicator.component.ts
+++ b/src/app/ledindicator/ledindicator.component.ts
@@ -4,7 +4,7 @@ import { MqttclientService } from '../mqttclient.service'
 @Component({
   selector: 'led',
   template: `
-  <span [ngStyle]="{'color':color, 'font-size':'500%'}">&#x25cf;</span>
+  <span [ngStyle]="{'color':color, 'font-size':'200%', 'padding-right':'5px', 'padding-left':'5px'}">&#x25cf;</span>
   `
 })
 export class LedindicatorComponent implements OnInit {