From 8b0367caf4ba2e3326ef977b5e7caf4b31101b0c Mon Sep 17 00:00:00 2001
From: Joerg Lehmann <joerg.lehmann@nbit.ch>
Date: Tue, 16 Jul 2019 20:20:40 +0200
Subject: [PATCH] enhance settings

---
 main.go              |  2 ++
 metrics.go           |  4 ++++
 persistence.go       | 48 ++++++++++++++++++++++++++++++++++++++++++++
 snippets/scales.html | 25 +++++++++++++++++++----
 4 files changed, 75 insertions(+), 4 deletions(-)

diff --git a/main.go b/main.go
index 5e8f47a..ce0a002 100644
--- a/main.go
+++ b/main.go
@@ -11,6 +11,8 @@ import (
 type Scale struct {
   Deveui            string
   Alias             string
+  Alarmactive       string
+  Smsnumber         string
   Last_measurement  string
   Last_temp         string
   Last_humidity     string
diff --git a/metrics.go b/metrics.go
index 4c02530..4b99ebd 100644
--- a/metrics.go
+++ b/metrics.go
@@ -14,6 +14,8 @@ import (
 type OneMetric struct {
     Deveui          string
     Alias           string
+    Alarmactive     string
+    Smsnumber       string
     Timestamp       string 
     Temperature     string 
     Humidity        string
@@ -296,5 +298,7 @@ func getLastMetrics(deveui string) OneMetric {
     }
     res.Deveui = deveui
     res.Alias = getDevAlias(deveui)
+    res.Alarmactive = getDevAlarmactive(deveui)
+    res.Smsnumber = getDevSmsnumber(deveui)
     return res
 }
diff --git a/persistence.go b/persistence.go
index a9a2687..8f10e01 100644
--- a/persistence.go
+++ b/persistence.go
@@ -64,6 +64,8 @@ type User struct {
 type Dev struct {
         Deveui        string `json:"deveui"`
 	Alias         string `json:"alias"`
+	Alarmactive   string `json:"alarmactive"`
+	Smsnumber     string `json:"smsnumber"`
 
 }
 
@@ -186,6 +188,52 @@ func getDevAlias(deveui string) string {
         return res
 }
 
+func getDevAlarmactive(deveui string) string {
+        res := "0"
+
+        if deveui == "" {
+           return res
+        }
+
+
+        conn := globalPool.Get()
+        defer conn.Close()
+
+        logit("getDevAlarmactive: Deveui: "+deveui)
+	alarmactive, err := redis.String(conn.Do("HGET", devPrefix+deveui, "alarmactive"))
+        if err == nil {
+          logit("getDevAlarmactive: alarmactive: "+alarmactive)
+          res = alarmactive
+        } else {
+          log.Print(err)
+        }
+
+        return res
+}
+
+func getDevSmsnumber(deveui string) string {
+        res := "+4179XXXXXXX"
+
+        if deveui == "" {
+           return res
+        }
+
+
+        conn := globalPool.Get()
+        defer conn.Close()
+
+        logit("getDevSmsnumber: Deveui: "+deveui)
+	smsnumber, err := redis.String(conn.Do("HGET", devPrefix+deveui, "smsnumber"))
+        if err == nil {
+          logit("getDevAlarmactive: smsnumber: "+smsnumber)
+          res = smsnumber
+        } else {
+          log.Print(err)
+        }
+
+        return res
+}
+
 func randString(n int) string {
     const alphanum = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"
     var bytes = make([]byte, n)
diff --git a/snippets/scales.html b/snippets/scales.html
index d7be501..869d553 100644
--- a/snippets/scales.html
+++ b/snippets/scales.html
@@ -10,16 +10,16 @@
     <section class="modal-card-body">
       <!-- Content ... -->
       <div class="field">
-        <label class="label">Bezeichnung (1234567812345678)</label>
+        <label id="label" class="label">Bezeichnung (1234567812345678)</label>
         <div class="control">
-          <input class="input" type="text" placeholder="Waage Volk 1">
+          <input id="alias" class="input" type="text">
         </div>
       </div>
 
       <div class="field">
         <div class="control">
         <label class="checkbox">
-          <input type="checkbox">
+          <input id="checkbox" type="checkbox">
            SMS Alarmierung aktiv
         </label>
         </div>
@@ -28,7 +28,7 @@
       <div class="field">
         <label class="label">Alarmnummer (SMS)</label>
         <div class="control">
-          <input class="input" type="text" placeholder="+41791234567">
+          <input id="smsnumber" class="input" type="text">
         </div>
       </div>
     </section>
@@ -42,6 +42,8 @@
 {{range .LastMetrics}}
 <div class="column is-full notification is-warning">
   <p class="is-size-2 is-size-5-mobile has-text-centered has-text-weight-bold" ><span id="alias_{{.Deveui}}">{{.Alias}}</span><a class="show-modal" class="block-link"><span style="float:right;" class="icon is-size-4 is-size-5-mobile"><i class="fa fa-cog"></i></span></a></p>
+  <p id="alarmactive_{{.Deveui}}" hidden>{{.Alarmactive}}</p>
+  <p id="smsnumber_{{.Deveui}}" hidden>{{.Smsnumber}}</p>
   <p id="lastmeasurement_{{.Deveui}}" class="has-text-centered">letzte &uuml;bermittelte Messung: {{.Timestamp}}</p>
   <div id="{{.Deveui}}">
     <div class="colums is-full notification is-warning">
@@ -99,6 +101,21 @@
 // A $( document ).ready() block.
 $( document ).ready(function() {
 $(".show-modal").click(function() {
+  var alias = $(this).prev().html();
+  var deveui = $(this).prev().attr('id').replace("alias_","");
+  var alarmactive = $('#alarmactive_'+deveui).html();
+  var smsnumber = $('#smsnumber_'+deveui).html();
+  
+  var label = "Bezeichnung (" + deveui + ")";
+  $("#alias").val(alias);
+  $("#label").html(label);
+  console.log(alarmactive);
+  if (alarmactive == "1") {
+    $('#checkbox').prop('checked', true);
+  } else {
+    $('#checkbox').prop('checked', false);
+  }
+  $("#smsnumber").val(smsnumber);
   $("#modal").addClass("is-active");  
 });