The webserver now looks ad data directly from mySQL

Added alert signal for data not seen for a long day (time turns red)
Added a serialmonitor / comunicator page

Author: ggilestro

smart_incubator/server/smart_controller.py

@@ -116,6 +116,23 @@ def retrieve_day(self, incubator, days=0, full=False):
         data = self.query(select_query)
         return data
 
+    def getAllIDs(self):
+        """
+        """
+        select_query = "SELECT DISTINCT(id) as id FROM incubators ORDER BY id ASC;"
+        data = self.query(select_query)
+        return [i['id'] for i in data]
+
+    def retrieve_last_line(self, incubator):
+        """
+        """
+        if incubator == 'all' or incubator < 0:
+            select_query = "SELECT * FROM incubators.incubators WHERE device_time IN (SELECT MAX(device_time) FROM incubators.incubators GROUP BY id) ORDER BY id;"
+        else:
+            select_query = "SELECT * FROM incubators WHERE id = %s ORDER BY device_time DESC LIMIT 1;" % incubator
+            
+        data = self.query(select_query)
+        return data
 
 class SerialController(threading.Thread):
     def __init__(self, port=None, baud=115200, filename=None, db_credentials=None):
@@ -132,7 +149,9 @@ def __init__(self, port=None, baud=115200, filename=None, db_credentials=None):
         self._delta_time_threshold = 15 # we sync time when and only when device had drifter more than this value (seconds)
         self._dd_mode_map = {0:'DD', 1:'LD', 2:'LL', 3:'DL', 4:'MM'}
 
-        self._datatail = collections.deque(maxlen=100) #keeps last 100 lines in memory
+        self._datatail = collections.deque(maxlen=100) #keeps last 100 lines in memory as dict
+        self._serial_queue = collections.deque(maxlen=100) #keeps last 100 lines in memory as raw lines
+        
         self._is_stopped = False
 
         self._filename = filename
@@ -265,8 +284,21 @@ def getHistory(self, incubator,days=0):
         if self._database:
             return self._database.retrieve_day(incubator, days)
 
-    
     def getlastData(self, incubator, json_mode=True):
+        """
+        """
+        if self._database:
+            if json_mode:
+                return json.dumps(self._database.retrieve_last_line(incubator))
+            else:
+                return self._database.retrieve_last_line(incubator)
+                
+    def getSerialBuffer(self):
+        """
+        """
+        return self._serial_queue
+    
+    def getlastDataFromBuffer(self, incubator, json_mode=True):
         """
         """
         if incubator == "all" or incubator < 0 :
@@ -301,6 +333,15 @@ def __iter__(self):
             self._sync_time( fields["id"], fields["device_time"])
             yield fields
 
+    def sendRaw(self, line):
+        """
+        """
+        line = line.strip().encode('ascii')
+        logging.debug("Sending " + line)
+        self._serial.write(line + '\n')
+        return True
+        
+
     def sendCommand(self, inc_id, cmd, value):
         """
         """
@@ -365,15 +406,21 @@ def run(self):
         """
         while not self._is_stopped:
             serial_line = self._serial.readline()
+            self._serial_queue.append(serial_line)
+            
             fields = self._parse_serial_line(serial_line)
             if fields is None:
                 continue
 
             self._sync_time( fields["id"], fields["device_time"])
-            self._datatail.append(fields) # a queue is kept for frequent access of recent events
+
+            
+            if self._filename: 
+                self._write_row_to_file(fields)
+                self._datatail.append(fields)
 
-            if self._filename: self._write_row_to_file(fields)
-            elif self._database: self._database.insert_row(fields)
+            elif self._database: 
+                self._database.insert_row(fields)
 
 
 
@@ -392,22 +439,35 @@ def __init__(self, host, port, serial_fetcher):
         self._serial_fetcher.start()
 
     def _route(self):
-        self._app.route('/', method="GET", callback=self._index)
-        self._app.route('/static/<filepath:path>', callback=self._get_static)        
-        self._app.route('/json/<inc_id>', callback=self._incubator_json)
-        self._app.route('/incubator/<inc_id>/<days>', callback=self._get_incubator)
+        self._app.get('/', callback=self._index)
+        self._app.get('/serial', callback=self._serialmonitor)
         self._app.route('/graph/<inc_id>', callback=self._get_graph, method=["post", "get"])
-        self._app.route('/listen/<status>', callback=self._listen_to_serial)
-        self._app.route('/quit', callback=self._quit)
+
+        self._app.get('/json/<inc_id>', callback=self._incubator_json)
+        self._app.get('/incubator/<inc_id>/<days>', callback=self._get_incubator)
+
+        self._app.post('/send', callback=self._send_to_serial)
+
+        self._app.get('/static/<filepath:path>', callback=self._get_static)        
+        self._app.get('/listen/<status>', callback=self._listen_to_serial)
+        self._app.get('/quit', callback=self._quit)
 
     def start(self):
         self._app.run(host=self._host, port=self._port)
 
+    def _get_static(self, filepath):
+        return static_file(filepath, root="./static")
+
     def _index(self):
         return static_file('index.html', root="static")
+
+    def _serialmonitor(self):
+        return static_file('serialmonitor.html', root="static")
 
-    def _get_static(self, filepath):
-        return static_file(filepath, root="./static")
+    def _send_to_serial(self):
+        myDict = request.json['myDict']
+        self._serial_fetcher.sendRaw ( myDict['line'] )
+        return {"result": "OK"}
 
     def _get_graph(self, inc_id):
 
@@ -428,7 +488,16 @@ def _get_graph(self, inc_id):
         return  template('static/graph.tpl', rep)
 
     def _incubator_json(self, inc_id=0):
-        return self._serial_fetcher.getlastData(inc_id)
+        """
+        """
+        if inc_id == 'serial':
+
+            serial = list(self._serial_fetcher.getSerialBuffer())
+            serial.reverse()
+            data = {'result': ''.join(serial) }
+            return data
+        else:
+            return self._serial_fetcher.getlastData(inc_id)
 
     def _get_incubator(self, inc_id, days):
 

smart_incubator/server/static/css/style.css

@@ -55,6 +55,18 @@
         color: #777;
         text-decoration: none;
     }
+    
+    .current-time {
+        color: #777;
+        float: left;
+        padding: 15px 15px;
+        font-size: 14px;
+        line-height: 20px;
+        font-family: "Helvetica Neue",Helvetica,Arial,sans-serif;
+        color: #777;
+        text-decoration: none;
+    }
+    
 
     .navbar-right {
         float: right!important;
@@ -336,3 +348,26 @@
         margin-right: 0px;
         float: right;
 }
+
+    .serialmonitor {
+        margin:0 auto;
+        overflow:hidden;
+        float:left;
+        align: center;
+        #display: block;
+        width: 1170px;
+        #padding-left: 200px;
+        #padding-right: 200px;    
+    
+    }
+    
+    .serialmonitor #serialoutput {
+        width: 80%;
+        height: 250px;
+    }
+    
+    .serialmonitor #serialinput {
+        width: 80%;
+        height: 50px;
+    }
+    

smart_incubator/server/static/index.html

@@ -52,6 +52,7 @@
         $(document).ready(function(){ 
             loadDashboard();
             refreshDashboard();
+            checkTimeValues();
         }); 
     </script>
 
@@ -64,16 +65,20 @@
     <div class="container">
         <div class="navbar-header">
             <a class="navbar-brand" href="/">Incubators</a>
+            <div class="current-time"></div>
         </div>
-
         <ul class="nav navbar-nav navbar-right">
-            <li><a href="localhost/" target="_blank">Ethoscopes</a></li>
+            <li><a href="/serial" target="_blank">SerialMonitor </a></li>
+            <li><a href="http://etho-node.lab.gilest.ro" target="_blank">Ethoscopes</a></li>
         </ul>
     </div>
     </nav>
 </header>
 
-<div class="dashboard container" id="main"></div>
+<div class="dashboard container" id="main">
+<div class="serialmonitor"></div>
+</div>
+
 </body>
 
 </html>

smart_incubator/server/static/js/script.js

@@ -51,8 +51,17 @@ function refreshDashboard(){
           function(data) {
             $.each(data, function(i, item) {
 
-                var time = moment(item.device_time*1000).format("DD-MM-YYYY HH:mm");
-                var temperature = item.temperature;
+                is_timestamp = new Date(item.device_time*1000).getTime() > 0;
+                
+                if (is_timestamp) { 
+                    var timestamp = item.device_time;
+                } else {
+                    var k = moment(item.device_time);
+                    var timestamp = (k + k.utcOffset()*60*1000)/1000;
+                }
+
+               var time = moment(timestamp*1000).format("DD-MM-YYYY HH:mm");
+               var temperature = item.temperature;
 
                 if (Math.abs(item.temperature - item.set_temp ) > 0.5) 
                     { $('#' + item.id).find('.temperature').css('color','#934c4c'); }
@@ -72,13 +81,52 @@ function refreshDashboard(){
             $('#' + item.id).find('.humidity').html(item.humidity);
             $('#' + item.id).find('.humidity').attr('title', item.humidity + " / " + item.set_hum);
 
-            $('#' + item.id).find('.time').find("p").html(time);
+            $('#' + item.id).find('.time').find("p").html(item.device_time);
+            $('#' + item.id).find('.time').attr('title', timestamp);
 
             })
           }); 
-     window.setTimeout(refreshDashboard,5000);
+     window.setTimeout(refreshDashboard,10000);
   }
 
+function refreshSerialMonitor(){
+    
+      updateClock();
+      $.getJSON(
+            "/json/serial",
+            function (data) { 
+                  $('#serialoutput').val(data.result);
+            }
+        );            
+      window.setTimeout(refreshSerialMonitor,1000);
+}
+
+function updateClock() {
+    $('.current-time').text(moment().utc());
+}
+
+function checkTimeValues(){
+    
+
+    var now = moment().utc();
+    updateClock();
+    
+    $('.time').each( function (i) {
+        
+        var timestamp = $(this).attr('title');
+        var time = moment( timestamp * 1000);
+        var delta = now - time; // in ms
+
+        alert_range = 15 * 60 * 1000; //15minutes
+        
+        if (delta >= alert_range) { 
+            $(this).find('p').css('color','#934c4c');
+        } else {
+            $(this).find('p').css('color','#777');
+        }
+    })
+    window.setTimeout(checkTimeValues,1000)
+}
 
 function show_alert_box() {