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

Added ability to delete config & devices from the website

Browse Source
This commit is contained in:
Patrick McDonagh
2016-05-03 11:11:02 -05:00
parent 5f09380bae
commit cdb2a2b630
16 changed files with 164 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
.gitignore vendored
View File

@@ -4,3 +4,49 @@
*.log
sftp-config.json
.remote-sync.json
########################
# sails
########################
.sails
.waterline
.rigging
.tmp
########################
# node.js / npm
########################
lib-cov
*.seed
*.log
*.csv
*.dat
*.out
*.pid
*.gz
pids
logs
results
node_modules
npm-debug.log
########################
# misc / editors
########################
*~
*#
.DS_STORE
.netbeans
nbproject
.idea
########################
# local config
########################
config/local.js

BIN
www/.tmp/public/favicon.ico
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 920 B

After

Width:  |  Height:  |  Size: 16 KiB

19
www/.tmp/public/js/ng/controller_config.js
View File

@@ -32,9 +32,18 @@ poconsole.controller('configCtrl', function($scope, Page, $log, config, devices)
}
config.submitParameter($scope.newParam);
$scope.loadConfig();
$scope.newParam.pEntry = "";
$scope.newParam.val = "";
}
};
$scope.deleteParameter = function(id){
var deleteParam = config.deleteParameter(id);
deleteParam.then(function(d){
$scope.loadConfig();
});
};
$scope.checkLogger = function(){
$scope.loggerLoading = true;
var checkLoggerStatus = config.getLoggerStatus();
@@ -73,11 +82,19 @@ poconsole.controller('configCtrl', function($scope, Page, $log, config, devices)
$scope.addDevice = function(dev){
var addDevice = devices.addDevice(dev);
getDevices.then(function(d){
addDevice.then(function(d){
$scope.getDevices();
$scope.newDevice.address = "";
});
};
$scope.deleteDevice = function(id){
var deleteDevice = devices.deleteDevice(id);
deleteDevice.then(function(d){
$scope.getDevices();
});
};
var getDeviceTypes = devices.getDeviceTypes();
getDeviceTypes.then(function(d){
$scope.device_types = d.device_types;

4
www/.tmp/public/js/ng/controller_tags.js
View File

@@ -89,4 +89,8 @@ poconsole.controller('tagsCtrl', function($scope, $route, $http, $routeParams, P
$scope.tags_to_plot = tags_to_plot.join();
};
$scope.device_label = function(data_type_obj){
return data_type_obj.address + " - " + data_type_obj.device_type.dType;
};
});

18
www/.tmp/public/js/ng/factory_config.js
View File

@@ -11,27 +11,39 @@ poconsole.factory('config',function($q, $http, $log){
};
var submitParameter = function(entry){
var deferred = $q.defer();
$http.post('/config', {
parameter: entry.parameter,
val: entry.val
}).success(function(data){
return data;
deferred.resolve({
data:data
});
});
return deferred.promise;
};
var updateParameter = function(entry){
var deferred = $q.defer();
$http.post('/config/update/' + entry.id, {
parameter: entry.parameter,
val: entry.val
}).success(function(data){
return data;
deferred.resolve({
data:data
});
});
return deferred.promise;
};
var deleteParameter = function(id){
var deferred = $q.defer();
$http.delete('/config/' + id).success(function(data){
return data;
deferred.resolve({
data:data
});
});
return deferred.promise;
};
var getLoggerStatus = function(){

12
www/.tmp/public/js/ng/factory_devices.js
View File

@@ -21,21 +21,29 @@ poconsole.factory('devices', function($q, $http, $log){
var addDevice = function(d){
$log.info(d);
var deferred = $q.defer();
$http.post('/device/create', {
address: d.address,
device_type: d.device_type.id
}).success(function(data){
return data;
deferred.resolve({
data:data
});
});
return deferred.promise;
};
var updateDevice = function(d){
var deferred = $q.defer();
$http.post('/device/update/' + d.id, {
address: d.address,
device_type: d.device_type.id
}).success(function(data){
return data;
deferred.resolve({
data:data
});
});
return deferred.promise;
};
var deleteDevice = function(id){

4
www/.tmp/public/jst.js
View File

File diff suppressed because one or more lines are too long

12
www/.tmp/public/templates/config.html
View File

@@ -39,17 +39,21 @@
<table class="table">
<thead>
<tr>
<th>ID</th>
<!-- <th>ID</th> -->
<th>Address</th>
<th>Type</th>
<!-- <th></th> -->
<th></th>
</tr>
</thead>
<tbody>
<tr ng-repeat="device in devices">
<td>{{device.id}}</td>
<!-- <td>{{device.id}}</td> -->
<td>{{device.address}}</td>
<td>{{device.device_type.dType}}</td>
<!-- <td><i class="fa fa-pencil"></i></td> -->
<td><i class="fa fa-times" ng-click="deleteDevice(device.id)"></i></td>
</tr>
</tbody>
</table>
@@ -63,6 +67,8 @@
<tr>
<th>Parameter</th>
<th>Value</th>
<!-- <th></th> -->
<th></th>
</tr>
</thead>
@@ -70,6 +76,8 @@
<tr ng-repeat="param in config">
<td>{{param.parameter}}</td>
<td>{{param.val}}</td>
<!-- <td><i class="fa fa-pencil"></i></td> -->
<td><i class="fa fa-times" ng-click="deleteParameter(param.id)"></i></td>
</tr>
</tbody>
</table>

2
www/.tmp/public/templates/tags.html
View File

@@ -81,7 +81,7 @@
<form>
<div class="form-group">
<label for="data_source">Data Source</label>
<select ng-model="editTag.deviceID" ng-options="d as d.address for d in devices track by d.id" class="form-control" id="data_source"></select>
<select ng-model="editTag.deviceID" ng-options="d as device_label(d) for d in devices track by d.id" class="form-control" id="data_source"></select>
</div>
<div class="form-group">
<label for="tag">Tag Name</label>

BIN
www/assets/favicon.ico
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 920 B

After

Width:  |  Height:  |  Size: 16 KiB

19
www/assets/js/ng/controller_config.js
View File

@@ -32,9 +32,18 @@ poconsole.controller('configCtrl', function($scope, Page, $log, config, devices)
}
config.submitParameter($scope.newParam);
$scope.loadConfig();
$scope.newParam.pEntry = "";
$scope.newParam.val = "";
}
};
$scope.deleteParameter = function(id){
var deleteParam = config.deleteParameter(id);
deleteParam.then(function(d){
$scope.loadConfig();
});
};
$scope.checkLogger = function(){
$scope.loggerLoading = true;
var checkLoggerStatus = config.getLoggerStatus();
@@ -73,11 +82,19 @@ poconsole.controller('configCtrl', function($scope, Page, $log, config, devices)
$scope.addDevice = function(dev){
var addDevice = devices.addDevice(dev);
getDevices.then(function(d){
addDevice.then(function(d){
$scope.getDevices();
$scope.newDevice.address = "";
});
};
$scope.deleteDevice = function(id){
var deleteDevice = devices.deleteDevice(id);
deleteDevice.then(function(d){
$scope.getDevices();
});
};
var getDeviceTypes = devices.getDeviceTypes();
getDeviceTypes.then(function(d){
$scope.device_types = d.device_types;

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

@@ -89,4 +89,8 @@ poconsole.controller('tagsCtrl', function($scope, $route, $http, $routeParams, P
$scope.tags_to_plot = tags_to_plot.join();
};
$scope.device_label = function(data_type_obj){
return data_type_obj.address + " - " + data_type_obj.device_type.dType;
};
});

18
www/assets/js/ng/factory_config.js
View File

@@ -11,27 +11,39 @@ poconsole.factory('config',function($q, $http, $log){
};
var submitParameter = function(entry){
var deferred = $q.defer();
$http.post('/config', {
parameter: entry.parameter,
val: entry.val
}).success(function(data){
return data;
deferred.resolve({
data:data
});
});
return deferred.promise;
};
var updateParameter = function(entry){
var deferred = $q.defer();
$http.post('/config/update/' + entry.id, {
parameter: entry.parameter,
val: entry.val
}).success(function(data){
return data;
deferred.resolve({
data:data
});
});
return deferred.promise;
};
var deleteParameter = function(id){
var deferred = $q.defer();
$http.delete('/config/' + id).success(function(data){
return data;
deferred.resolve({
data:data
});
});
return deferred.promise;
};
var getLoggerStatus = function(){

12
www/assets/js/ng/factory_devices.js
View File

@@ -21,21 +21,29 @@ poconsole.factory('devices', function($q, $http, $log){
var addDevice = function(d){
$log.info(d);
var deferred = $q.defer();
$http.post('/device/create', {
address: d.address,
device_type: d.device_type.id
}).success(function(data){
return data;
deferred.resolve({
data:data
});
});
return deferred.promise;
};
var updateDevice = function(d){
var deferred = $q.defer();
$http.post('/device/update/' + d.id, {
address: d.address,
device_type: d.device_type.id
}).success(function(data){
return data;
deferred.resolve({
data:data
});
});
return deferred.promise;
};
var deleteDevice = function(id){

12
www/assets/templates/config.html
View File

@@ -39,17 +39,21 @@
<table class="table">
<thead>
<tr>
<th>ID</th>
<!-- <th>ID</th> -->
<th>Address</th>
<th>Type</th>
<!-- <th></th> -->
<th></th>
</tr>
</thead>
<tbody>
<tr ng-repeat="device in devices">
<td>{{device.id}}</td>
<!-- <td>{{device.id}}</td> -->
<td>{{device.address}}</td>
<td>{{device.device_type.dType}}</td>
<!-- <td><i class="fa fa-pencil"></i></td> -->
<td><i class="fa fa-times" ng-click="deleteDevice(device.id)"></i></td>
</tr>
</tbody>
</table>
@@ -63,6 +67,8 @@
<tr>
<th>Parameter</th>
<th>Value</th>
<!-- <th></th> -->
<th></th>
</tr>
</thead>
@@ -70,6 +76,8 @@
<tr ng-repeat="param in config">
<td>{{param.parameter}}</td>
<td>{{param.val}}</td>
<!-- <td><i class="fa fa-pencil"></i></td> -->
<td><i class="fa fa-times" ng-click="deleteParameter(param.id)"></i></td>
</tr>
</tbody>
</table>

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

@@ -81,7 +81,7 @@
<form>
<div class="form-group">
<label for="data_source">Data Source</label>
<select ng-model="editTag.deviceID" ng-options="d as d.address for d in devices track by d.id" class="form-control" id="data_source"></select>
<select ng-model="editTag.deviceID" ng-options="d as device_label(d) for d in devices track by d.id" class="form-control" id="data_source"></select>
</div>
<div class="form-group">
<label for="tag">Tag Name</label>