nmelone/DataLogger-Generic
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Updates webpage to allow input of plc handshake tags

Browse Source
This commit is contained in:
Patrick McDonagh
2016-05-13 09:55:59 -05:00
parent 548288bd29
commit 742f610ede
3 changed files with 21 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
www/api/models/Tag_class.js
View File

@@ -42,6 +42,11 @@ module.exports = {
{ {
class_type: 'custom', class_type: 'custom',
description: 'Stroke Information' description: 'Stroke Information'
},
,
{
class_type: 'handshake',
description: 'PLC Handshake Tag'
} }
] ]
}; };

4
www/assets/js/ng/factory_tags.js
View File

@@ -55,7 +55,7 @@ poconsole.factory('tags',function($q, $http, $log, dateConversion){
$http.post('/tag/create', { $http.post('/tag/create', {
tag: tag.tag, tag: tag.tag,
name: tag.name, name: tag.name,
tag_class:5, tag_class:tag.tag_class,
deviceID: tag.deviceID, deviceID: tag.deviceID,
units: tag.units, units: tag.units,
minExpected: tag.minExpected, minExpected: tag.minExpected,
@@ -74,7 +74,7 @@ poconsole.factory('tags',function($q, $http, $log, dateConversion){
$http.post('/tag/update/'+ tag.id, { $http.post('/tag/update/'+ tag.id, {
tag: tag.tag, tag: tag.tag,
name: tag.name, name: tag.name,
tag_class:5, tag_class:tag.tag_class,
deviceID: tag.deviceID, deviceID: tag.deviceID,
units: tag.units, units: tag.units,
minExpected: tag.minExpected, minExpected: tag.minExpected,

14
www/assets/templates/tags.html
View File

@@ -28,6 +28,13 @@
<label for="data_type">Data Type</label> <label for="data_type">Data Type</label>
<select ng-model="newTag.data_type" ng-options="t as t.data_type for t in data_types track by t.id" class="form-control" id="data_type"></select> <select ng-model="newTag.data_type" ng-options="t as t.data_type for t in data_types track by t.id" class="form-control" id="data_type"></select>
</div> </div>
<div class="form-group">
<label for="tag_type">Tag Type</label>
<select ng-model="newTag.tag_class" class="form-control" id="tag_type">
<option value=5>Normal</option>
<option value=6>PLC Handshake</option>
</select>
</div>
<div class="col-md-5"> <div class="col-md-5">
<div class="form-group"> <div class="form-group">
<label for="minExpected">Minimum Value Expected</label> <label for="minExpected">Minimum Value Expected</label>
@@ -99,6 +106,13 @@
<label for="data_type">Data Type</label> <label for="data_type">Data Type</label>
<select ng-model="editTag.data_type" ng-options="t as t.data_type for t in data_types track by t.id" class="form-control" id="data_type"></select> <select ng-model="editTag.data_type" ng-options="t as t.data_type for t in data_types track by t.id" class="form-control" id="data_type"></select>
</div> </div>
<div class="form-group">
<label for="tag_type">Tag Type</label>
<select ng-model="editTag.tag_class" class="form-control" id="tag_type">
<option value=5>Normal</option>
<option value=6>PLC Handshake</option>
</select>
</div>
<div class="col-md-5"> <div class="col-md-5">
<div class="form-group"> <div class="form-group">
<label for="minExpected">Minimum Value Expected</label> <label for="minExpected">Minimum Value Expected</label>