Merge pull request #56 from geo-data/show-battery

Add a battery level column to the Recorder Table.

docroot/table/config.js

@@ -7,6 +7,7 @@ config = {
 	fulldate:	"Date/Time",
 	name:		"Name",
 	user:		"User",
+	batt:		"Battery",
 	tid:		"TID",
 	cc:		"CC",
 	addr:		"Address"

docroot/table/index.html

@@ -183,6 +183,25 @@
                             render: 'tid',
                             "targets" : [5],
                     },
+                    {
+                            className: 'batt',
+                            name: 'batt',
+                            title: config.column_titles.batt,
+                            visible: true,
+							data: null,
+							render: function(data, type, row) {
+								if (typeof data.batt === 'undefined' || data.batt === null) {
+									return '-';
+								}
+
+								var t = "{{batt}}%";
+								if (data.batt < 25) {
+									t = '<span class="warning">' + t + '</span>';
+								}
+								return Mustache.render(t, data);
+							},
+							"targets" : [6],
+                    },
                     {
                             className: 'cc',
                             name: 'cc',
@@ -193,7 +212,7 @@
 			    	var t = "<img src='flags/{{cc}}.png' title='{{cc}}'/>";
 				return Mustache.render(t, data);
 			    },
-                            "targets" : [6],
+                            "targets" : [7],
                     },
                     {
                             className: 'addr',
@@ -205,7 +224,7 @@
 			    	var t = "<a target='_new' href='http://maps.google.com/?q={{lat}},{{lon}}'>{{addr}}</a>";
 				return Mustache.render(t, data);
 			    },
-                            "targets" : [7],
+                            "targets" : [8],
                     },
             ],
     
@@ -262,6 +281,7 @@
         <li>Toggle</li>
     	<li><button class='toggle-vis' data-column='0'>topic</button></li>
     	<li><button class='toggle-vis' data-column='4'>user</button></li>
+    	<li><button class='toggle-vis' data-column='6'>battery</button></li>
     </ul>
 
   </body>

docroot/table/otable.css

@@ -18,3 +18,7 @@ td.user { font-size: 80%; }
   padding-left: 0;
     }
 #togglers li { float: left; padding-right: 4px; }
+
+.warning {
+  color: red;
+}