diff --git a/tsdriver.py b/tsdriver.py new file mode 100644 index 0000000..d19091f --- /dev/null +++ b/tsdriver.py @@ -0,0 +1,145 @@ +#!/usr/bin/python + +import types +import traceback +import binascii +import threading +import time +import thread +import os +import struct +import sys +import serial +import minimalmodbus +import pickle +import re +from device_base import deviceBase + +import requests +try: + import json +except: + import simplejson as json + +channels = {} +min_upload_time = 30 +addr = 'http://192.168.1.30:3000' + + +def setupChannels(): + tagJSObj = json.loads(requests.get(addr + "/json/tag").text) + if tagJSObj['status'] == "OK": + for t in tagJSObj['tags']: + channels[str(t['tagName'])] = { + 'tagID': t['id'], + 'last_value': -999, + 'data_type': "float", + 'last_time_uploaded': 0, + 'change_amount': (t['maxExpected'] - t['minExpected']) / 20, + 'min_time_between_uploads': min_upload_time + } + +# channels = { +# "DC_Bus_Voltage": { +# "last_value": -999, +# "data_type": "float", +# "change_amount": 5, +# "last_time_uploaded": 0, +# "min_time_between_uploads": 30 +# }, +# "Output_Frequency": { +# "last_value": -999, +# "data_type": "float", +# "change_amount": 1, +# "last_time_uploaded": 0, +# "min_time_between_uploads": 30 +# }, +# "Output_Current": { +# "last_value": -999, +# "data_type": "float", +# "change_amount": .2, +# "last_time_uploaded": 0, +# "min_time_between_uploads": 30 +# }, +# "Output_Voltage": { +# "last_value": -999, +# "data_type": "float", +# "change_amount": 5, +# "last_time_uploaded": 0, +# "min_time_between_uploads": 30 +# } +# } + + +class start(threading.Thread, deviceBase): + + + def __init__(self, name=None, number=None, mac=None, Q=None, mcu=None, companyId=None, offset=None, mqtt=None, Nodes=None): + threading.Thread.__init__(self) + deviceBase.__init__(self, name=name, number=number, mac=mac, Q=Q, mcu=mcu, companyId=companyId, offset=offset, mqtt=mqtt, Nodes=Nodes) + + self.daemon = True + self.version = "1" + self.device_address = addr + self.finished = threading.Event() + threading.Thread.start(self) + self.sendtodbJSON("device_address", self.device_address, 0) + setupChannels() + # this is a required function for all drivers, its goal is to upload some piece of data + # about your device so it can be seen on the web + def register(self): + channels["status"]["last_value"] = "" + + def run(self): + self.runLoopStatus = "" + last_OK_state = 0 + while True: + if len(channels) > 0: + try: + for i in channels: + runLoopStatus = i + valData = self.checkTag(i) + if valData: + nowVal = valData['val'] + ch = channels[i] + if (abs(ch['last_value'] - nowVal) > ch['change_amount']) or ((time.time() - ch['last_time_uploaded']) > ch['min_time_between_uploads']): + self.sendtodbJSON(i, nowVal, 0) + ch['last_time_uploaded'] = time.time() + ch['last_value'] = nowVal + + runLoopStatus = "Complete" + OK_state = 1 + if not OK_state == last_OK_state: + self.sendtodbJSON("driver_ok", OK_state, 0) + last_OK_state = OK_state + time.sleep(3) + except Exception, e: + OK_state = 0 + if not OK_state == last_OK_state: + self.sendtodbJSON("driver_ok", OK_state, 0) + last_OK_state = OK_state + sleep_timer = 20 + print "Error during {0} of run loop: {1}\nWill try again in {2} seconds...".format(runLoopStatus, e, sleep_timer) + time.sleep(sleep_timer) + else: + setupChannels() + time.sleep(30) + + def checkTag(self, tagID): + tagData = json.loads(requests.get(self.device_address + "/json/val/"+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"]) + + def tagserver_sync(self, name, value): + self.sendtodb("connected", "true", 0) + return True + + def tagserver_address(self, name, value): + self.device_address = value + return True + + def tagserver_gpsUpdate(self, name, value): + gps = self.mcu.gps + print("GPS found me at {0}".format(gps)) + self.sendtodb("gps", gps, 0) + return True diff --git a/www/dbcreate_SQLite.sql b/www/dbcreate_SQLite.sql index a8fa8bc..dbcaefa 100644 --- a/www/dbcreate_SQLite.sql +++ b/www/dbcreate_SQLite.sql @@ -1,10 +1,12 @@ CREATE TABLE IF NOT EXISTS tags ( id INTEGER PRIMARY KEY, tagName TEXT, - dateAdded TIMESTAMP DEFAULT CURRENT_TIMESTAMP, + vanityName TEXT, + description TEXT, units TEXT, minExpected REAL, maxExpected REAL, + dateAdded TIMESTAMP DEFAULT CURRENT_TIMESTAMP, deleted INTEGER DEFAULT 0 ); diff --git a/www/functions_SQLite.js b/www/functions_SQLite.js index 08b7194..51e31ee 100644 --- a/www/functions_SQLite.js +++ b/www/functions_SQLite.js @@ -127,9 +127,10 @@ exports.latestTagValue = function(req, res){ var db = new sqlite3.Database(dbFile); db.serialize(function(){ - var query = "SELECT * FROM vals WHERE id = (SELECT MAX(id) FROM vals WHERE tagID = (SELECT id FROM tags WHERE tagName = ?))"; + var query = "SELECT * FROM vals WHERE id = (SELECT MAX(id) FROM vals WHERE tagID = ?)"; var prepQuery = db.prepare(query); - prepQuery.run(req.params.tag, function(err) { + prepQuery.all(req.params.tag, function(err, rows) { + console.log(rows); prepQuery.finalize(); db.close(); if (err) { @@ -189,7 +190,7 @@ exports.allValues = function(req, res){ var db = new sqlite3.Database(dbFile); db.serialize(function(){ - var query = "SELECT t.tagName as tagName, t.units as units, t.id as t_id, t.minExpected as min, t.maxExpected as max, MAX(v.id) as v_id, v.val as val, v.dateAdded as dtime FROM vals v JOIN tags t ON v.tagID = t.id WHERE t.deleted = 0 GROUP BY v.tagID"; + var query = "SELECT t.tagName as tagName, t.vanityName as vanityName, t.description as description, t.units as units, t.id as t_id, t.minExpected as min, t.maxExpected as max, MAX(v.id) as v_id, v.val as val, v.dateAdded as dtime FROM vals v JOIN tags t ON v.tagID = t.id WHERE t.deleted = 0 GROUP BY v.tagID"; var prepQuery = db.prepare(query); prepQuery.all(req.params.id, function(err, rows) { prepQuery.finalize(); diff --git a/www/public/img/loading.gif b/www/public/img/loading.gif new file mode 100644 index 0000000..780423b Binary files /dev/null and b/www/public/img/loading.gif differ diff --git a/www/public/js/controller.js b/www/public/js/controller.js index 2cb050e..a0d98a5 100644 --- a/www/public/js/controller.js +++ b/www/public/js/controller.js @@ -157,7 +157,7 @@ tsCtrlrs.controller('tagsCtrl', function($scope, $route, $http, $routeParams, Pa tsCtrlrs.controller('tagValsCtrl', function($scope, $route, $http, $routeParams, Page, Alerts, $log, tags) { Page.setTitle('Tag Series'); - Page.setPage('dashboard'); + Page.setPage('tags'); $scope.loading = true; var getTag = tags.getTag($routeParams.tagID); getTag.then(function(tagData){ diff --git a/www/public/js/tooltip.js b/www/public/js/tooltip.js new file mode 100644 index 0000000..250e48e --- /dev/null +++ b/www/public/js/tooltip.js @@ -0,0 +1,514 @@ +/* ======================================================================== + * Bootstrap: tooltip.js v3.3.6 + * http://getbootstrap.com/javascript/#tooltip + * Inspired by the original jQuery.tipsy by Jason Frame + * ======================================================================== + * Copyright 2011-2016 Twitter, Inc. + * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) + * ======================================================================== */ + + ++function ($) { + 'use strict'; + + // TOOLTIP PUBLIC CLASS DEFINITION + // =============================== + + var Tooltip = function (element, options) { + this.type = null + this.options = null + this.enabled = null + this.timeout = null + this.hoverState = null + this.$element = null + this.inState = null + + this.init('tooltip', element, options) + } + + Tooltip.VERSION = '3.3.6' + + Tooltip.TRANSITION_DURATION = 150 + + Tooltip.DEFAULTS = { + animation: true, + placement: 'top', + selector: false, + template: '', + trigger: 'hover focus', + title: '', + delay: 0, + html: false, + container: false, + viewport: { + selector: 'body', + padding: 0 + } + } + + Tooltip.prototype.init = function (type, element, options) { + this.enabled = true + this.type = type + this.$element = $(element) + this.options = this.getOptions(options) + this.$viewport = this.options.viewport && $($.isFunction(this.options.viewport) ? this.options.viewport.call(this, this.$element) : (this.options.viewport.selector || this.options.viewport)) + this.inState = { click: false, hover: false, focus: false } + + if (this.$element[0] instanceof document.constructor && !this.options.selector) { + throw new Error('`selector` option must be specified when initializing ' + this.type + ' on the window.document object!') + } + + var triggers = this.options.trigger.split(' ') + + for (var i = triggers.length; i--;) { + var trigger = triggers[i] + + if (trigger == 'click') { + this.$element.on('click.' + this.type, this.options.selector, $.proxy(this.toggle, this)) + } else if (trigger != 'manual') { + var eventIn = trigger == 'hover' ? 'mouseenter' : 'focusin' + var eventOut = trigger == 'hover' ? 'mouseleave' : 'focusout' + + this.$element.on(eventIn + '.' + this.type, this.options.selector, $.proxy(this.enter, this)) + this.$element.on(eventOut + '.' + this.type, this.options.selector, $.proxy(this.leave, this)) + } + } + + this.options.selector ? + (this._options = $.extend({}, this.options, { trigger: 'manual', selector: '' })) : + this.fixTitle() + } + + Tooltip.prototype.getDefaults = function () { + return Tooltip.DEFAULTS + } + + Tooltip.prototype.getOptions = function (options) { + options = $.extend({}, this.getDefaults(), this.$element.data(), options) + + if (options.delay && typeof options.delay == 'number') { + options.delay = { + show: options.delay, + hide: options.delay + } + } + + return options + } + + Tooltip.prototype.getDelegateOptions = function () { + var options = {} + var defaults = this.getDefaults() + + this._options && $.each(this._options, function (key, value) { + if (defaults[key] != value) options[key] = value + }) + + return options + } + + Tooltip.prototype.enter = function (obj) { + var self = obj instanceof this.constructor ? + obj : $(obj.currentTarget).data('bs.' + this.type) + + if (!self) { + self = new this.constructor(obj.currentTarget, this.getDelegateOptions()) + $(obj.currentTarget).data('bs.' + this.type, self) + } + + if (obj instanceof $.Event) { + self.inState[obj.type == 'focusin' ? 'focus' : 'hover'] = true + } + + if (self.tip().hasClass('in') || self.hoverState == 'in') { + self.hoverState = 'in' + return + } + + clearTimeout(self.timeout) + + self.hoverState = 'in' + + if (!self.options.delay || !self.options.delay.show) return self.show() + + self.timeout = setTimeout(function () { + if (self.hoverState == 'in') self.show() + }, self.options.delay.show) + } + + Tooltip.prototype.isInStateTrue = function () { + for (var key in this.inState) { + if (this.inState[key]) return true + } + + return false + } + + Tooltip.prototype.leave = function (obj) { + var self = obj instanceof this.constructor ? + obj : $(obj.currentTarget).data('bs.' + this.type) + + if (!self) { + self = new this.constructor(obj.currentTarget, this.getDelegateOptions()) + $(obj.currentTarget).data('bs.' + this.type, self) + } + + if (obj instanceof $.Event) { + self.inState[obj.type == 'focusout' ? 'focus' : 'hover'] = false + } + + if (self.isInStateTrue()) return + + clearTimeout(self.timeout) + + self.hoverState = 'out' + + if (!self.options.delay || !self.options.delay.hide) return self.hide() + + self.timeout = setTimeout(function () { + if (self.hoverState == 'out') self.hide() + }, self.options.delay.hide) + } + + Tooltip.prototype.show = function () { + var e = $.Event('show.bs.' + this.type) + + if (this.hasContent() && this.enabled) { + this.$element.trigger(e) + + var inDom = $.contains(this.$element[0].ownerDocument.documentElement, this.$element[0]) + if (e.isDefaultPrevented() || !inDom) return + var that = this + + var $tip = this.tip() + + var tipId = this.getUID(this.type) + + this.setContent() + $tip.attr('id', tipId) + this.$element.attr('aria-describedby', tipId) + + if (this.options.animation) $tip.addClass('fade') + + var placement = typeof this.options.placement == 'function' ? + this.options.placement.call(this, $tip[0], this.$element[0]) : + this.options.placement + + var autoToken = /\s?auto?\s?/i + var autoPlace = autoToken.test(placement) + if (autoPlace) placement = placement.replace(autoToken, '') || 'top' + + $tip + .detach() + .css({ top: 0, left: 0, display: 'block' }) + .addClass(placement) + .data('bs.' + this.type, this) + + this.options.container ? $tip.appendTo(this.options.container) : $tip.insertAfter(this.$element) + this.$element.trigger('inserted.bs.' + this.type) + + var pos = this.getPosition() + var actualWidth = $tip[0].offsetWidth + var actualHeight = $tip[0].offsetHeight + + if (autoPlace) { + var orgPlacement = placement + var viewportDim = this.getPosition(this.$viewport) + + placement = placement == 'bottom' && pos.bottom + actualHeight > viewportDim.bottom ? 'top' : + placement == 'top' && pos.top - actualHeight < viewportDim.top ? 'bottom' : + placement == 'right' && pos.right + actualWidth > viewportDim.width ? 'left' : + placement == 'left' && pos.left - actualWidth < viewportDim.left ? 'right' : + placement + + $tip + .removeClass(orgPlacement) + .addClass(placement) + } + + var calculatedOffset = this.getCalculatedOffset(placement, pos, actualWidth, actualHeight) + + this.applyPlacement(calculatedOffset, placement) + + var complete = function () { + var prevHoverState = that.hoverState + that.$element.trigger('shown.bs.' + that.type) + that.hoverState = null + + if (prevHoverState == 'out') that.leave(that) + } + + $.support.transition && this.$tip.hasClass('fade') ? + $tip + .one('bsTransitionEnd', complete) + .emulateTransitionEnd(Tooltip.TRANSITION_DURATION) : + complete() + } + } + + Tooltip.prototype.applyPlacement = function (offset, placement) { + var $tip = this.tip() + var width = $tip[0].offsetWidth + var height = $tip[0].offsetHeight + + // manually read margins because getBoundingClientRect includes difference + var marginTop = parseInt($tip.css('margin-top'), 10) + var marginLeft = parseInt($tip.css('margin-left'), 10) + + // we must check for NaN for ie 8/9 + if (isNaN(marginTop)) marginTop = 0 + if (isNaN(marginLeft)) marginLeft = 0 + + offset.top += marginTop + offset.left += marginLeft + + // $.fn.offset doesn't round pixel values + // so we use setOffset directly with our own function B-0 + $.offset.setOffset($tip[0], $.extend({ + using: function (props) { + $tip.css({ + top: Math.round(props.top), + left: Math.round(props.left) + }) + } + }, offset), 0) + + $tip.addClass('in') + + // check to see if placing tip in new offset caused the tip to resize itself + var actualWidth = $tip[0].offsetWidth + var actualHeight = $tip[0].offsetHeight + + if (placement == 'top' && actualHeight != height) { + offset.top = offset.top + height - actualHeight + } + + var delta = this.getViewportAdjustedDelta(placement, offset, actualWidth, actualHeight) + + if (delta.left) offset.left += delta.left + else offset.top += delta.top + + var isVertical = /top|bottom/.test(placement) + var arrowDelta = isVertical ? delta.left * 2 - width + actualWidth : delta.top * 2 - height + actualHeight + var arrowOffsetPosition = isVertical ? 'offsetWidth' : 'offsetHeight' + + $tip.offset(offset) + this.replaceArrow(arrowDelta, $tip[0][arrowOffsetPosition], isVertical) + } + + Tooltip.prototype.replaceArrow = function (delta, dimension, isVertical) { + this.arrow() + .css(isVertical ? 'left' : 'top', 50 * (1 - delta / dimension) + '%') + .css(isVertical ? 'top' : 'left', '') + } + + Tooltip.prototype.setContent = function () { + var $tip = this.tip() + var title = this.getTitle() + + $tip.find('.tooltip-inner')[this.options.html ? 'html' : 'text'](title) + $tip.removeClass('fade in top bottom left right') + } + + Tooltip.prototype.hide = function (callback) { + var that = this + var $tip = $(this.$tip) + var e = $.Event('hide.bs.' + this.type) + + function complete() { + if (that.hoverState != 'in') $tip.detach() + that.$element + .removeAttr('aria-describedby') + .trigger('hidden.bs.' + that.type) + callback && callback() + } + + this.$element.trigger(e) + + if (e.isDefaultPrevented()) return + + $tip.removeClass('in') + + $.support.transition && $tip.hasClass('fade') ? + $tip + .one('bsTransitionEnd', complete) + .emulateTransitionEnd(Tooltip.TRANSITION_DURATION) : + complete() + + this.hoverState = null + + return this + } + + Tooltip.prototype.fixTitle = function () { + var $e = this.$element + if ($e.attr('title') || typeof $e.attr('data-original-title') != 'string') { + $e.attr('data-original-title', $e.attr('title') || '').attr('title', '') + } + } + + Tooltip.prototype.hasContent = function () { + return this.getTitle() + } + + Tooltip.prototype.getPosition = function ($element) { + $element = $element || this.$element + + var el = $element[0] + var isBody = el.tagName == 'BODY' + + var elRect = el.getBoundingClientRect() + if (elRect.width == null) { + // width and height are missing in IE8, so compute them manually; see https://github.com/twbs/bootstrap/issues/14093 + elRect = $.extend({}, elRect, { width: elRect.right - elRect.left, height: elRect.bottom - elRect.top }) + } + var elOffset = isBody ? { top: 0, left: 0 } : $element.offset() + var scroll = { scroll: isBody ? document.documentElement.scrollTop || document.body.scrollTop : $element.scrollTop() } + var outerDims = isBody ? { width: $(window).width(), height: $(window).height() } : null + + return $.extend({}, elRect, scroll, outerDims, elOffset) + } + + Tooltip.prototype.getCalculatedOffset = function (placement, pos, actualWidth, actualHeight) { + return placement == 'bottom' ? { top: pos.top + pos.height, left: pos.left + pos.width / 2 - actualWidth / 2 } : + placement == 'top' ? { top: pos.top - actualHeight, left: pos.left + pos.width / 2 - actualWidth / 2 } : + placement == 'left' ? { top: pos.top + pos.height / 2 - actualHeight / 2, left: pos.left - actualWidth } : + /* placement == 'right' */ { top: pos.top + pos.height / 2 - actualHeight / 2, left: pos.left + pos.width } + + } + + Tooltip.prototype.getViewportAdjustedDelta = function (placement, pos, actualWidth, actualHeight) { + var delta = { top: 0, left: 0 } + if (!this.$viewport) return delta + + var viewportPadding = this.options.viewport && this.options.viewport.padding || 0 + var viewportDimensions = this.getPosition(this.$viewport) + + if (/right|left/.test(placement)) { + var topEdgeOffset = pos.top - viewportPadding - viewportDimensions.scroll + var bottomEdgeOffset = pos.top + viewportPadding - viewportDimensions.scroll + actualHeight + if (topEdgeOffset < viewportDimensions.top) { // top overflow + delta.top = viewportDimensions.top - topEdgeOffset + } else if (bottomEdgeOffset > viewportDimensions.top + viewportDimensions.height) { // bottom overflow + delta.top = viewportDimensions.top + viewportDimensions.height - bottomEdgeOffset + } + } else { + var leftEdgeOffset = pos.left - viewportPadding + var rightEdgeOffset = pos.left + viewportPadding + actualWidth + if (leftEdgeOffset < viewportDimensions.left) { // left overflow + delta.left = viewportDimensions.left - leftEdgeOffset + } else if (rightEdgeOffset > viewportDimensions.right) { // right overflow + delta.left = viewportDimensions.left + viewportDimensions.width - rightEdgeOffset + } + } + + return delta + } + + Tooltip.prototype.getTitle = function () { + var title + var $e = this.$element + var o = this.options + + title = $e.attr('data-original-title') + || (typeof o.title == 'function' ? o.title.call($e[0]) : o.title) + + return title + } + + Tooltip.prototype.getUID = function (prefix) { + do prefix += ~~(Math.random() * 1000000) + while (document.getElementById(prefix)) + return prefix + } + + Tooltip.prototype.tip = function () { + if (!this.$tip) { + this.$tip = $(this.options.template) + if (this.$tip.length != 1) { + throw new Error(this.type + ' `template` option must consist of exactly 1 top-level element!') + } + } + return this.$tip + } + + Tooltip.prototype.arrow = function () { + return (this.$arrow = this.$arrow || this.tip().find('.tooltip-arrow')) + } + + Tooltip.prototype.enable = function () { + this.enabled = true + } + + Tooltip.prototype.disable = function () { + this.enabled = false + } + + Tooltip.prototype.toggleEnabled = function () { + this.enabled = !this.enabled + } + + Tooltip.prototype.toggle = function (e) { + var self = this + if (e) { + self = $(e.currentTarget).data('bs.' + this.type) + if (!self) { + self = new this.constructor(e.currentTarget, this.getDelegateOptions()) + $(e.currentTarget).data('bs.' + this.type, self) + } + } + + if (e) { + self.inState.click = !self.inState.click + if (self.isInStateTrue()) self.enter(self) + else self.leave(self) + } else { + self.tip().hasClass('in') ? self.leave(self) : self.enter(self) + } + } + + Tooltip.prototype.destroy = function () { + var that = this + clearTimeout(this.timeout) + this.hide(function () { + that.$element.off('.' + that.type).removeData('bs.' + that.type) + if (that.$tip) { + that.$tip.detach() + } + that.$tip = null + that.$arrow = null + that.$viewport = null + }) + } + + + // TOOLTIP PLUGIN DEFINITION + // ========================= + + function Plugin(option) { + return this.each(function () { + var $this = $(this) + var data = $this.data('bs.tooltip') + var options = typeof option == 'object' && option + + if (!data && /destroy|hide/.test(option)) return + if (!data) $this.data('bs.tooltip', (data = new Tooltip(this, options))) + if (typeof option == 'string') data[option]() + }) + } + + var old = $.fn.tooltip + + $.fn.tooltip = Plugin + $.fn.tooltip.Constructor = Tooltip + + + // TOOLTIP NO CONFLICT + // =================== + + $.fn.tooltip.noConflict = function () { + $.fn.tooltip = old + return this + } + +}(jQuery); diff --git a/www/public/partials/dashboard.html b/www/public/partials/dashboard.html index 23b4773..6798d9a 100644 --- a/www/public/partials/dashboard.html +++ b/www/public/partials/dashboard.html @@ -1,22 +1,29 @@ -
+
-
-

Error Caught!

- 
{{message}}
+
+

Loading Dashboard...

+
-
-
-
-
- +
+
+
+
+

Error Caught!

+ 
{{message}}
-
- 
{{vals}}
+
+
+
+
+ +
+
+
\ No newline at end of file diff --git a/www/public/partials/tagVals.html b/www/public/partials/tagVals.html index 39540b4..a7ac036 100644 --- a/www/public/partials/tagVals.html +++ b/www/public/partials/tagVals.html @@ -1,37 +1,48 @@ -
+
-
-

Error Caught!

- 
{{message}}
+
+

Loading Tag data...

+
-
-
-
-
- +
+
+
+
+

Error Caught!

+ 
{{message}}
-
-

{{tag.tagName}}

- - - - - - - - - - - - - - - -
IDValueDate Added
{{val.id}}{{val.val}} {{tag.units}}{{val.dateAdded}}
+
+ +
+
+
+
+ +
+
+
+

{{tag.vanityName}}

+ + + + + + + + + + + + + + + +
IDValueDate Added
{{val.id}}{{val.val}} {{tag.units}}{{val.dateAdded}}
+
-
+
\ No newline at end of file diff --git a/www/public/partials/tags.html b/www/public/partials/tags.html index d1cb55e..50ea561 100644 --- a/www/public/partials/tags.html +++ b/www/public/partials/tags.html @@ -1,39 +1,50 @@ -
+
-
-

Error Caught!

- 
{{message}}
+
+

Loading Tags..

+
-
-
-
- - - - - - - - - - - - - - - - - - - - - - - -
IDNameMin Expected ValueMax Expected ValueUnits
{{tag.id}}{{tag.tagName}}{{tag.minExpected}}{{tag.maxExpected}}{{tag.units}}
+
+
+
+
+

Error Caught!

+ 
{{message}}
+
+
+
+ +
+
+
+ + + + + + + + + + + + + + + + + + + + + + + +
IDNameMin Expected ValueMax Expected ValueUnits
{{tag.id}}{{tag.vanityName}} ({{tag.tagName}}){{tag.minExpected}}{{tag.maxExpected}}{{tag.units}}
+
\ No newline at end of file diff --git a/www/views/angularIndex.html b/www/views/angularIndex.html index 115be5c..b1aae5e 100644 --- a/www/views/angularIndex.html +++ b/www/views/angularIndex.html @@ -38,7 +38,7 @@ --> - + @@ -65,7 +65,6 @@