From c51755b96a9c87ab95623411f6a9a3b07959d894 Mon Sep 17 00:00:00 2001
From: Senad Uka <senad.uka@gmail.com>
Date: Fri, 30 Dec 2016 17:14:08 +0100
Subject: [PATCH 1/4] log shows only temperatures

---
 app/client/alarm_settings.js |  6 ------
 app/client/app.less          | 11 +++++++++++
 app/client/log.html          |  5 ++---
 app/client/log.js            |  4 ++--
 app/client/sensorData.html   |  3 ++-
 app/client/settings.js       |  6 ------
 app/client/tabs.html         |  2 +-
 7 files changed, 18 insertions(+), 19 deletions(-)

diff --git a/app/client/alarm_settings.js b/app/client/alarm_settings.js
index a1f2da9..1bcb791 100644
--- a/app/client/alarm_settings.js
+++ b/app/client/alarm_settings.js
@@ -45,9 +45,3 @@ Template.alarm_settings.events({
     Meteor.call('saveAlarmSettings', controller_id, minTemperature, maxTemperature, timeoutBox, timeoutPhone, [sms1, sms2, sms3, sms4]);
   }
 });
-
-Template.sensorData.helpers({
-  created_at_formatted: function() {
-    return moment(this.created_at).format("DD.MM.YYYY, HH:mm")
-  }
-});
diff --git a/app/client/app.less b/app/client/app.less
index ce0ae1d..1f20d64 100644
--- a/app/client/app.less
+++ b/app/client/app.less
@@ -10,6 +10,10 @@
   display: none;
 }
 
+.no-bullets {
+    list-style-type: none;
+}
+
 .huge_text {
   font-size: 2.5em;
 }
@@ -47,3 +51,10 @@
 .clickable {
   cursor:pointer;
 }
+
+.sensorData {
+  color: #101010;
+  font-family: 'PT Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif;
+  font-size: 14px;
+
+}
diff --git a/app/client/log.html b/app/client/log.html
index f08070b..3e8aa3f 100644
--- a/app/client/log.html
+++ b/app/client/log.html
@@ -1,9 +1,8 @@
 <template name="log">
 
   <div class="hello">
-    <h1> Podaci sa senzora: </h1>
-    <button id="clear_log">Očisti</button>
-    <ul>
+    
+    <ul class="no-bullets">
         {{#each sensorDataCollection}}
           {{> sensorData}}
         {{/each}}
diff --git a/app/client/log.js b/app/client/log.js
index 68837ad..a4fa85b 100644
--- a/app/client/log.js
+++ b/app/client/log.js
@@ -22,13 +22,13 @@ Template.log.events({
 
 Template.sensorData.helpers({
   created_at_formatted: function() {
-    return moment(this.created_at).format("DD.MM.YYYY, HH:mm")
+    return moment(this.created_at).format(/*"DD.MM.YYYY, */ " (HH:mm)")
   },
   all_temperatures: function(temperatures) {
     var result = '';
     if (temperatures.length > 0) {
       for (var i in temperatures) {
-        result += '' + parseFloat(temperatures[i]).toFixed(1) + ' °C ';
+        result += '' + parseFloat(temperatures[i]).toFixed(1) + ' °C  ';
       }
     }
     return result;
diff --git a/app/client/sensorData.html b/app/client/sensorData.html
index f42fc9b..8ca04b5 100644
--- a/app/client/sensorData.html
+++ b/app/client/sensorData.html
@@ -1,3 +1,4 @@
 <template name="sensorData">
-  <li>{{owner}} /  <strong>{{temperatureValue}}°C {{all_temperatures temperatures}}</strong> / <strong>{{humidityValue}}%</strong> / Bačva puna: <strong>{{tankFull}}</strong> (L0:{{tankLevel0}}-L1:{{tankLevel1}}-L2:{{tankLevel2}}-L3:{{tankLevel3}}-L4:{{tankLevel4}}-full:{{tankFull}}) / {{created_at_formatted}}</li>
+  <!--<li>{{owner}} /  <strong>{{temperatureValue}}°C {{all_temperatures temperatures}}</strong> / <strong>{{humidityValue}}%</strong> / Bačva puna: <strong>{{tankFull}}</strong> (L0:{{tankLevel0}}-L1:{{tankLevel1}}-L2:{{tankLevel2}}-L3:{{tankLevel3}}-L4:{{tankLevel4}}-full:{{tankFull}}) / {{created_at_formatted}}</li> -->
+  <li class="sensorData"><strong>{{all_temperatures temperatures}}</strong>  {{created_at_formatted}}</li>
 </template>
diff --git a/app/client/settings.js b/app/client/settings.js
index 20f7298..eab4bb8 100644
--- a/app/client/settings.js
+++ b/app/client/settings.js
@@ -35,9 +35,3 @@ Template.settings.events({
     Meteor.call('saveControllerConfig', controller_id, selectedTime, selectedDays, manualInflow);
   }
 });
-
-Template.sensorData.helpers({
-  created_at_formatted: function() {
-    return moment(this.created_at).format("DD.MM.YYYY, HH:mm")
-  }
-});
diff --git a/app/client/tabs.html b/app/client/tabs.html
index 329b939..7353533 100644
--- a/app/client/tabs.html
+++ b/app/client/tabs.html
@@ -10,7 +10,7 @@
     {{/if}}
 
     {{#if accessible 'log'}}
-    <li role="presentation" class="{{ class_for 'log' }}"><a class="clickable">Novosti</a></li>
+    <li role="presentation" class="{{ class_for 'log' }}"><a class="clickable">Danas</a></li>
     {{/if}}
 
     {{#if accessible 'surveillance'}}

From db8def7235b6dba794335dafa783442cd256880c Mon Sep 17 00:00:00 2001
From: Senad Uka <senad.uka@gmail.com>
Date: Fri, 30 Dec 2016 17:18:04 +0100
Subject: [PATCH 2/4] sms sent every time

---
 app/server/methods.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/server/methods.js b/app/server/methods.js
index d601952..9bc2ba3 100644
--- a/app/server/methods.js
+++ b/app/server/methods.js
@@ -218,7 +218,7 @@ reactToAlarmData = function(controller_id) {
   var boxSilent = config.timeoutBox && minutesSinceLastBoxContact > config.timeoutBox;
 
   var minutesSinceLastPhoneContact = state.lastPhoneContact ? moment(new Date()).diff(moment(state.lastPhoneContact), 'minutes') : -1;
-  var phoneSilent = config.timeoutPhone && minutesSinceLastPhoneContact > config.timeoutPhone;
+  var phoneSilent = false;//config.timeoutPhone && minutesSinceLastPhoneContact > config.timeoutPhone;
 
   console.log("too ", tooCold, tooHot, boxSilent, phoneSilent);
   console.log("lpc", state.lastPhoneContact);
@@ -252,7 +252,7 @@ function soundTheAlarm(controller_id, tooCold, tooHot, boxSilent, phoneSilent) {
   };
 
   var smsSent = !!state.state.alarmSmsSent;
-  var needsToSendSms = !smsSent && phoneSilent;
+  var needsToSendSms = !smsSent // && phoneSilent;
 
   var sendSmsPart = needsToSendSms ? { 'state.alarmSmsSent': true } : {};
 

From 7906e5a1a03560fd8e84eb7e27ef56605f5519b6 Mon Sep 17 00:00:00 2001
From: Senad Uka <senad.uka@gmail.com>
Date: Fri, 30 Dec 2016 17:22:51 +0100
Subject: [PATCH 3/4] sms contains controller id

---
 app/server/methods.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/server/methods.js b/app/server/methods.js
index 9bc2ba3..07d15ca 100644
--- a/app/server/methods.js
+++ b/app/server/methods.js
@@ -265,18 +265,18 @@ function soundTheAlarm(controller_id, tooCold, tooHot, boxSilent, phoneSilent) {
   });
 
   if (needsToSendSms) {
-    sendAlarmingSms(reason, state.config.smsNumbers)
+    sendAlarmingSms(controller_id,reason, state.config.smsNumbers)
   }
 }
 
-function sendAlarmingSms(reason, numbers) {
+function sendAlarmingSms(controller_id,reason, numbers) {
   for (var i in numbers) {
     var number = numbers[i];
     twilio = Twilio('AC10d7ed0bf54c1be4b1cd7133130e63f4', 'e133d3f02a69b79e93ad9ca1d73517d1');
     twilio.sendSms({
       to: number, // Any number Twilio can deliver to
       from: '+447481345235', // A number you bought from Twilio and can use for outbound communication
-      body: 'Zoblak alarm! Pokrenite aplikaciju! HITNO! http://agrar.zoblak.com' // body of the SMS message
+      body: 'Zoblak alarm! Pokrenite aplikaciju! HITNO! http://agrar.zoblak.com/alarm?controller_id=' + controller_id // body of the SMS message
     }, function(err, responseData) { //this function is executed when a response is received from Twilio
       if (!err) { // "err" is an error received during the request, if any
         // "responseData" is a JavaScript object containing data received from Twilio.

From b4da42524171b501a95e8abdb0a62aea2ab8336c Mon Sep 17 00:00:00 2001
From: Senad Uka <senad.uka@gmail.com>
Date: Thu, 5 Jan 2017 15:12:40 +0100
Subject: [PATCH 4/4] configured twilio voice, fixed bug with added slash on
 numbers

---
 app/client/alarm_settings.html     |  6 +++---
 app/public/sayings/alarm.twiml.xml |  4 ++++
 app/server/methods.js              | 28 +++++++++++++++++++++++-----
 3 files changed, 30 insertions(+), 8 deletions(-)
 create mode 100644 app/public/sayings/alarm.twiml.xml

diff --git a/app/client/alarm_settings.html b/app/client/alarm_settings.html
index 36d8b2d..30156f8 100644
--- a/app/client/alarm_settings.html
+++ b/app/client/alarm_settings.html
@@ -52,21 +52,21 @@
                                 <td>2.
                                 </td>
                                 <td>
-                                    <input required name="sms2" type="tel" id="sms2" placeholder="+3876xxxxxxxx" value={{ config 'sms2'}}/>
+                                    <input required name="sms2" type="tel" id="sms2" placeholder="+3876xxxxxxxx" value={{ config 'sms2'}} />
                                 </td>
                             </tr>
                             <tr>
                                 <td>3.
                                 </td>
                                 <td>
-                                    <input required name="sms3" type="tel" id="sms3" placeholder="+3876xxxxxxxx" value={{ config 'sms3'}}/>
+                                    <input required name="sms3" type="tel" id="sms3" placeholder="+3876xxxxxxxx" value={{ config 'sms3'}} />
                                 </td>
                             </tr>
                             <tr>
                                 <td>4.
                                 </td>
                                 <td>
-                                    <input required name="sms4" type="tel" id="sms4" placeholder="+3876xxxxxxxx" value={{ config 'sms4'}}/>
+                                    <input required name="sms4" type="tel" id="sms4" placeholder="+3876xxxxxxxx" value={{ config 'sms4'}} />
                                 </td>
                             </tr>
                         </table>
diff --git a/app/public/sayings/alarm.twiml.xml b/app/public/sayings/alarm.twiml.xml
new file mode 100644
index 0000000..ef68adf
--- /dev/null
+++ b/app/public/sayings/alarm.twiml.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Response>
+    <Say voice="woman" language="english">Zoblak Farm ALARM! ALARM! ALARM!</Say>
+</Response>
diff --git a/app/server/methods.js b/app/server/methods.js
index 07d15ca..11a169d 100644
--- a/app/server/methods.js
+++ b/app/server/methods.js
@@ -218,7 +218,7 @@ reactToAlarmData = function(controller_id) {
   var boxSilent = config.timeoutBox && minutesSinceLastBoxContact > config.timeoutBox;
 
   var minutesSinceLastPhoneContact = state.lastPhoneContact ? moment(new Date()).diff(moment(state.lastPhoneContact), 'minutes') : -1;
-  var phoneSilent = false;//config.timeoutPhone && minutesSinceLastPhoneContact > config.timeoutPhone;
+  var phoneSilent = false; //config.timeoutPhone && minutesSinceLastPhoneContact > config.timeoutPhone;
 
   console.log("too ", tooCold, tooHot, boxSilent, phoneSilent);
   console.log("lpc", state.lastPhoneContact);
@@ -254,7 +254,9 @@ function soundTheAlarm(controller_id, tooCold, tooHot, boxSilent, phoneSilent) {
   var smsSent = !!state.state.alarmSmsSent;
   var needsToSendSms = !smsSent // && phoneSilent;
 
-  var sendSmsPart = needsToSendSms ? { 'state.alarmSmsSent': true } : {};
+  var sendSmsPart = needsToSendSms ? {
+    'state.alarmSmsSent': true
+  } : {};
 
   ControllerState.update(state._id, {
     '$set': Object.assign({
@@ -265,17 +267,18 @@ function soundTheAlarm(controller_id, tooCold, tooHot, boxSilent, phoneSilent) {
   });
 
   if (needsToSendSms) {
-    sendAlarmingSms(controller_id,reason, state.config.smsNumbers)
+    sendAlarmingSms(controller_id, reason, state.config.smsNumbers);
+    callTheUser(controller_id, reason, state.config.smsNumbers);
   }
 }
 
-function sendAlarmingSms(controller_id,reason, numbers) {
+function sendAlarmingSms(controller_id, reason, numbers) {
   for (var i in numbers) {
     var number = numbers[i];
     twilio = Twilio('AC10d7ed0bf54c1be4b1cd7133130e63f4', 'e133d3f02a69b79e93ad9ca1d73517d1');
     twilio.sendSms({
       to: number, // Any number Twilio can deliver to
-      from: '+447481345235', // A number you bought from Twilio and can use for outbound communication
+      from: '+19282124174', // A number you bought from Twilio and can use for outbound communication
       body: 'Zoblak alarm! Pokrenite aplikaciju! HITNO! http://agrar.zoblak.com/alarm?controller_id=' + controller_id // body of the SMS message
     }, function(err, responseData) { //this function is executed when a response is received from Twilio
       if (!err) { // "err" is an error received during the request, if any
@@ -289,6 +292,21 @@ function sendAlarmingSms(controller_id,reason, numbers) {
   }
 }
 
+function callTheUser(controller_id, reason, numbers) {
+  for (var i in numbers) {
+    var number = numbers[i];
+    twilio = Twilio('AC10d7ed0bf54c1be4b1cd7133130e63f4', 'e133d3f02a69b79e93ad9ca1d73517d1');
+    twilio.makeCall({
+      to: number, // Any number Twilio can call
+      from: '+441143031932', // A number you bought from Twilio and can use for outbound communication
+      url: 'https://handler.twilio.com/twiml/EH9491c24474db07ec52b598baa5724f1e' // A URL that produces an XML document (TwiML) which contains instructions for the call
+    }, function(err, responseData) {
+      //executed when the call has been initiated.
+      console.log(err); // outputs "+14506667788"
+    });
+  }
+}
+
 function stopTheAlarm(controller_id, everythingIsBackToNormal = false) {
   // time of alarm stopped is reset so that scheduled job can raise the alarm
   // again