removed redundant function, get tag info with values

www/app.js

@@ -64,7 +64,6 @@ var angular = function(req, res) {
 };
 
 app.get('/json/get/id/:tagName',                fns.getTagID);                 // Gets the id for a tag name
-app.get('/json/get/tagName/:tagID',             fns.getTagName);               // Gets the tagName for an ID
 app.get('/json/tag/add/:tagName/:units',        fns.createTag);                // Adds a tag to the scan list
 app.get('/json/tag/update/:id/:tagName/:units', fns.updateTag);                // Updates tag data
 app.get('/json/tag/delete/:tag',                fns.deleteTag);             // Removes a tag from the scan list

www/functions_SQLite.js

@@ -28,26 +28,6 @@ var getTagID = function(tagName, cb){
 	});
 };
 
-var getTagName = function(tagID, cb){
-	//Returns function(err, tagName)
-	var sqlite3 = require('sqlite3').verbose();
-	var db = new sqlite3.Database(dbFile);
-
-	db.serialize(function(){
-		var query = "SELECT tagName FROM tags WHERE id = ?";
-		var prepQuery = db.prepare(query);
-		prepQuery.all(tagID, function(err, rows){
-			prepQuery.finalize();
-			db.close();
-			if (err){
-				cb(err, null);
-			} else {
-				cb(null, rows[0].tagName);
-			}
-		})
-	});
-};
-
 exports.getTagID = function(req, res){
 	getTagID(req.params.tagName, function(err, id){
 		if (err){

www/public/js/controller.js

@@ -38,6 +38,24 @@ tsCtrlrs.factory('Alerts', function($log) {
 });
 
 tsCtrlrs.factory('tags',function($q, $http, $log){
+	var getTag = function(id) {
+        var deferred = $q.defer();
+        $http.get('/json/tag/' + id).success(function(data) {
+        	if(data.status == "OK"){
+        		deferred.resolve({
+        			tag:data.tags[0],
+        			status: data.status
+        		});
+        	} else {
+        		deferred.resolve({
+        			status:data.status,
+        			message: data.message
+        		});
+        	}
+        });
+        return deferred.promise;
+    };
+
     var getTagList = function() {
         var deferred = $q.defer();
         $http.get('/json/tag/').success(function(data) {
@@ -75,6 +93,7 @@ tsCtrlrs.factory('tags',function($q, $http, $log){
     };
 
     return {
+    	getTags: getTags,
     	getTagList: getTagList,
     	getTagHistory: getTagHistory
     };
@@ -107,15 +126,23 @@ tsCtrlrs.controller('tagsCtrl', function($scope, $route, $http, $routeParams, Pa
 
 tsCtrlrs.controller('tagValsCtrl', function($scope, $route, $http, $routeParams, Page, Alerts, $log, tags) {
 	$scope.loading = true;
-    var getTagHistory = tags.getTagHistory($routeParams.tagID);
-    getTagHistory.then(function(data) {
-    	$scope.loading = false;
-    	if (data.status == "OK"){
-    		$scope.vals = data.vals;
-    		$scope.error = false;
-    	} else {
-    		$scope.tags = [];
-    		$scope.error = data.message;
-    	}
-    });
+	var getTag = tags.getTag($routeParams.tagID);
+	getTag.then(function(tagData){
+		if (tagData.status == "OK"){
+			$scope.tag = tagData.tag;
+		    var getTagHistory = tags.getTagHistory($routeParams.tagID);
+		    getTagHistory.then(function(data) {
+		    	$scope.loading = false;
+		    	if (data.status == "OK"){
+		    		$scope.vals = data.vals;
+		    		$scope.error = false;
+		    		var getTag
+		    	} else {
+		    		$scope.error = data.message;
+		    	}
+		    });
+		} else {
+			$scope.loading = false;
+		    $scope.error = data.message;
+		}
 });