From eb5e7106a5ef269be4938efc68f6b0778f1a8eb1 Mon Sep 17 00:00:00 2001
From: Thiemann96 <e_thie10@uni-muenster.de>
Date: Mon, 17 Feb 2020 15:16:33 +0100
Subject: [PATCH] remove sensors

---
 src/assets/i18n/en.json                    |  2 +-
 src/pages/configuration/configuration.html |  8 ++++----
 src/pages/configuration/configuration.ts   | 11 ++++++++---
 3 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/src/assets/i18n/en.json b/src/assets/i18n/en.json
index 8e64bc8..b0b7363 100644
--- a/src/assets/i18n/en.json
+++ b/src/assets/i18n/en.json
@@ -100,6 +100,6 @@
   },
   "CONFIG":{
     "TITLE":"Initial configuration",
-    "BUTTON":"Upload standard senseBox Sketch!"
+    "BUTTON":"Upload!"
   }
 }
diff --git a/src/pages/configuration/configuration.html b/src/pages/configuration/configuration.html
index 498f823..8643788 100644
--- a/src/pages/configuration/configuration.html
+++ b/src/pages/configuration/configuration.html
@@ -41,14 +41,14 @@
                   <ion-input [(ngModel)]="senseboxid" placeholder="5c4f75e83580950019240779"></ion-input>
                 </ion-item>
               </ion-row>
-              <ion-row *ngFor="let sensor of sensors;let i=index;let last = last;let first=first" (click)="viewSensor(sensor)">
+              <ion-row *ngFor="let sensor of sensors;let i=index;let last = last;let first=first" >
                 <ion-col col-8>
-                  <ion-item>
+                  <ion-item (click)="viewSensor(sensor)">
                     <ion-label>{{sensor.title}}  {{sensor.id}}</ion-label>
                   </ion-item>
                   </ion-col>
                   <ion-col *ngIf="!first" col-2>
-                    <button ion-item (click)="removeSensor()">
+                    <button ion-item (click)="removeSensor(sensor)">
                       <ion-icon name="remove" item-start></ion-icon>
                     </button>
                   </ion-col>  
@@ -60,7 +60,7 @@
             </ion-row>
               <ion-row>
                 <button ion-item (click)="uploadStandardSketch()">
-                  <ion-icon name="refresh" item-start></ion-icon>
+                  <ion-icon name="send" item-start></ion-icon>
                   <ion-label>
                     <h2 translate>CONFIG.BUTTON</h2>
                   </ion-label>
diff --git a/src/pages/configuration/configuration.ts b/src/pages/configuration/configuration.ts
index 482bed5..05f44d9 100644
--- a/src/pages/configuration/configuration.ts
+++ b/src/pages/configuration/configuration.ts
@@ -52,7 +52,7 @@ export class ConfigurationPage {
       PASSWORD:this.pw,
       INGRESS_DOMAIN:"ingress.opensensemap.org",
       SENSEBOX_ID:this.senseboxid,
-      NUM_SENSORS:6,
+      NUM_SENSORS:this.sensors.length,
       TEMPERSENSOR_ID:this.temp,
       RELLUFSENSOR_ID:this.humi,
       BELEUCSENSOR_ID:this.lux,
@@ -69,8 +69,6 @@ export class ConfigurationPage {
   }
 
   addSensor(){
-    console.log("adding sensor");
-    
     let addModal = this.modalCtrl.create(AddItemPage);
 
     addModal.onDidDismiss((sensor)=>{
@@ -85,6 +83,7 @@ export class ConfigurationPage {
 
   saveSensor(sensor){
     this.sensors.push(sensor);
+    // add define statements
   }
   
   viewSensor(sensor){
@@ -93,6 +92,12 @@ export class ConfigurationPage {
     })
   }
 
+  removeSensor(sensor){
+    this.sensors = this.sensors.filter((sensorF)=>{
+      return sensor!=sensorF
+      })
+    }
+
   ionViewDidLoad() {
     this.sensors =[
       {title:"Temperatur",type:"temp",id:"09327523"},