Added font-awesome and details to tags

tsdriver.py

@@ -98,7 +98,7 @@ class start(threading.Thread, deviceBase):
                 try:
                     for i in channels:
                         runLoopStatus = i
-                        valData = self.checkTag(i)
+                        valData = self.checkTag(channels[i]['tagID'])
                         if valData:
                             nowVal = valData['val']
                             ch = channels[i]
@@ -126,7 +126,7 @@ class start(threading.Thread, deviceBase):
                 time.sleep(30)
 
     def checkTag(self, tagID):
-        tagData = json.loads(requests.get(self.device_address + "/json/val/"+tagID).text)
+        tagData = json.loads(requests.get(self.device_address + "/json/val/"+str(tagID)).text)
         # {u'tag_val': {u'tagID': 1, u'dateAdded': u'2015-12-08T23:43:38.000Z', u'id': 60, u'val': 56}}
         return(tagData["tag_val"])
 

www/bower.json

@@ -20,6 +20,7 @@
     "angular-justgage": "~1.0.1",
     "angular": "angularjs#~1.4.9",
     "bootstrap": "~3.3.6",
-    "angular-route": "~1.4.9"
+    "angular-route": "~1.4.9",
+    "font-awesome": "~4.5.0"
   }
 }

www/public/js/controller.js

@@ -210,6 +210,19 @@ tsCtrlrs.controller('tagsCtrl', function($scope, $route, $http, $routeParams, Pa
         $scope.loadTagList();
     }
 
+    $scope.openDeleteTag = function(id){
+        var getTag = tags.getTag(id);
+        getTag.then(function(data){
+            if (data.status == "OK"){
+                $scope.error = false;
+                $scope.dTag = data.tag;
+                $log.info("Thinking about deleting tag with parameters: "+ JSON.stringify($scope.dTag));
+            } else {
+                $scope.error = data.message;
+            }
+        });
+    };
+
     $scope.deleteTag = function(id){
         var deleteTag = tags.deleteTag(id);
         deleteTag.then(function(data){

www/public/partials/tags.html

@@ -87,6 +87,24 @@
   </div><!-- /.modal-dialog -->
 </div><!-- /.modal -->
 
+<div class="modal fade" id="deleteModal">
+  <div class="modal-dialog">
+    <div class="modal-content">
+      <div class="modal-header">
+        <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
+        <h4 class="modal-title">Are you sure?</h4>
+      </div>
+      <div class="modal-body">
+          <div class="well" ng-if="message"><h3 class="text-danger">{{message}}</h3></div>
+          <h3>Are you sure you want to delete the tag {{dTag.vanityName}} ({{dTag.tagName}})?</h3>
+      </div>
+      <div class="modal-footer">
+		<button type="button" class="btn btn-primary" data-dismiss="modal">NO!!!!!!</button>
+		<button type="button" class="btn btn-danger" ng-click="deleteTag(dTag.id);" data-dismiss="modal">Heck yes, delete it!</button>
+      </div>
+    </div><!-- /.modal-content -->
+  </div><!-- /.modal-dialog -->
+</div><!-- /.modal -->
 
 
 
@@ -112,7 +130,7 @@
 
 	<div ng-if="!error" class="container">
 		<div class="row">
-			<div class="col-md-8">
+			<div class="col-md-12">
 				<table class="table">
 					<thead>
 						<tr>
@@ -128,12 +146,17 @@
 					<tbody>
 						<tr ng-repeat="tag in tags">
 							<td>{{tag.id}}</td>
-							<td><a href="/#/tag/{{tag.id}}">{{tag.vanityName}} ({{tag.tagName}})</a></td>
+							<td><a href="/#/tag/{{tag.id}}">{{tag.vanityName}}</a>  <i class="fa fa-info-circle" data-toggle="popover" title="{{tag.vanityName}}" data-content="Tag Name: {{tag.tagName}} </br>Details: {{tag.description}}"></i></td>
 							<td>{{tag.minExpected}}</td>
 							<td>{{tag.maxExpected}}</td>
 							<td>{{tag.units}}</td>
 							<td><button data-toggle="modal" data-target="#editModal" ng-click="openEditTag(tag.id)" class="btn btn-primary">Edit</button></td>
-							<td><button ng-click="deleteTag(tag.id)" class="btn btn-danger">Delete</button></td>
+							<td><button data-toggle="modal" data-target="#deleteModal" ng-click="openDeleteTag(tag.id)" class="btn btn-danger">Delete</button></td>
+							<script>
+								$(document).ready(function(){
+								    $('[data-toggle="popover"]').popover({html: true});
+								});
+							</script>
 						</tr>
 					</tbody>
 				</table>
@@ -143,4 +166,7 @@
 			</div>
 		</div>
 	</div>
-</div>
+</div>
+
+
+

www/views/angularIndex.html

@@ -20,27 +20,10 @@
 		<script src="/node_modules/n3-charts/node_modules/d3/d3.min.js"></script>
 	    <script src="/node_modules/n3-charts/build/LineChart.js"></script>
 	    <link rel="stylesheet" href="/node_modules/n3-charts/build/LineChart.css">
-		<!--
+		<link rel="stylesheet" href="/bower_components/font-awesome/css/font-awesome.min.css">
-		<link rel='stylesheet' href='/css/bootstrap.css'>
-		<link rel='stylesheet' href='/css/animate.css'>
-		<script src='/js/angular.min.js'></script>
-		<script src='/js/angular-route.min.js'></script>
-		<script src='/js/angular-animate.min.js'></script>
-		<script src="/js/ui-bootstrap-0.12.0.min.js"></script>
-		<script src="/js/ui-bootstrap-tpls-0.12.0.js"></script>
-		<script src='/js/ng-socket-io.min.js'></script>
-		<script src='/js/raphael-2.1.4.min.js'></script>
-		<script src='/js/justgage-1.1.0.min.js'></script>
-		<script src='/js/ng-justgage.js'></script>
-		<script src="/js/d3.js"></script>
-		<script src="/js/line-chart.min.js"></script>
-		<script type='text/javascript' src='/socket.io/socket.io.js'></script>
-
-		<script src='/js/jquery-1.11.1.min.js'></script>
-		<script src='/js/bootstrap.js'></script> -->
-		<script src="/js/tooltip.js"></script>
 		<script src="/js/router.js"></script>
 		<script src="/js/controller.js"></script>
+		
 
 	</head>