Fixes writing, removes broken functions, adds services
This commit is contained in:
@@ -3,7 +3,7 @@ FROM resin/rpi-raspbian:jessie
|
||||
RUN apt-get -y update
|
||||
COPY mysql-install.sh /tmp/mysql-install.sh
|
||||
RUN chmod +x /tmp/mysql-install.sh && /tmp/mysql-install.sh
|
||||
RUN apt-get install -y python python-dev python-pip git libffi-dev libssl-dev gcc
|
||||
RUN apt-get install -y python python-dev python-pip git libffi-dev libssl-dev gcc iputils-ping
|
||||
RUN apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
|
||||
|
||||
RUN mkdir /root/tag-logger
|
||||
|
||||
@@ -44,23 +44,23 @@ poconsole.controller('tagsCtrl', function($scope, $route, $http, $routeParams, P
|
||||
});
|
||||
};
|
||||
|
||||
$scope.openClearTagData = function(id){
|
||||
var getTag = tags.getTag(id);
|
||||
getTag.then(function(data){
|
||||
$scope.error = false;
|
||||
$scope.dTagValues = data.tag;
|
||||
$log.info("Thinking about deleting tag data with parameters: "+ JSON.stringify($scope.dTagValues));
|
||||
});
|
||||
};
|
||||
// $scope.openClearTagData = function(id){
|
||||
// var getTag = tags.getTag(id);
|
||||
// getTag.then(function(data){
|
||||
// $scope.error = false;
|
||||
// $scope.dTagValues = data.tag;
|
||||
// $log.info("Thinking about deleting tag data with parameters: "+ JSON.stringify($scope.dTagValues));
|
||||
// });
|
||||
// };
|
||||
|
||||
$scope.deleteTagValues = function(id){
|
||||
var clearSingleTagData = tags.clearSingleTagData(id);
|
||||
clearSingleTagData.then(function(data){
|
||||
$log.info("deleting tag "+ id + " status: " + data.status);
|
||||
$scope.error = false;
|
||||
$scope.loadTagList();
|
||||
});
|
||||
};
|
||||
// $scope.deleteTagValues = function(id){
|
||||
// var clearSingleTagData = tags.clearSingleTagData(id);
|
||||
// clearSingleTagData.then(function(data){
|
||||
// $log.info("deleting tag "+ id + " status: " + data.status);
|
||||
// $scope.error = false;
|
||||
// $scope.loadTagList();
|
||||
// });
|
||||
// };
|
||||
|
||||
$scope.openEditTag = function(id){
|
||||
var getTag = tags.getTag(id);
|
||||
|
||||
@@ -120,19 +120,19 @@ poconsole.factory('tags',function($q, $http, $log, dateConversion){
|
||||
return deferred.promise;
|
||||
};
|
||||
|
||||
var clearSingleTagData = function(id){
|
||||
var deferred = $q.defer();
|
||||
var url = '/api/tag_vals';
|
||||
var filters = [{"name": "id", "op": "==", "val": "%" + id.toString() + "%"}];
|
||||
var req_data = {"q": JSON.stringify({"filters": filters})};
|
||||
console.log(req_data);
|
||||
$http.delete(url, data=req_data).success(function(data) {
|
||||
deferred.resolve({
|
||||
status: data.status
|
||||
});
|
||||
});
|
||||
return deferred.promise;
|
||||
};
|
||||
// var clearSingleTagData = function(id){
|
||||
// var deferred = $q.defer();
|
||||
// var url = '/api/tag_vals';
|
||||
// var filters = [{"name": "id", "op": "==", "val": "%" + id.toString() + "%"}];
|
||||
// var req_data = {"q": JSON.stringify({"filters": filters})};
|
||||
// console.log(req_data);
|
||||
// $http.delete(url, data=req_data).success(function(data) {
|
||||
// deferred.resolve({
|
||||
// status: data.status
|
||||
// });
|
||||
// });
|
||||
// return deferred.promise;
|
||||
// };
|
||||
|
||||
var clearAllTagData = function(){
|
||||
var deferred = $q.defer();
|
||||
@@ -155,7 +155,7 @@ poconsole.factory('tags',function($q, $http, $log, dateConversion){
|
||||
createTag: createTag,
|
||||
updateTag: updateTag,
|
||||
deleteTag: deleteTag,
|
||||
clearSingleTagData: clearSingleTagData,
|
||||
// clearSingleTagData: clearSingleTagData,
|
||||
clearAllTagData: clearAllTagData
|
||||
};
|
||||
});
|
||||
|
||||
@@ -231,7 +231,7 @@
|
||||
<td>Max Expected Value</td>
|
||||
<td>Units</td>
|
||||
<td></td>
|
||||
<td></td>
|
||||
<!--<td></td>-->
|
||||
<td></td>
|
||||
</tr>
|
||||
</thead>
|
||||
@@ -244,7 +244,7 @@
|
||||
<td>{{tag.max_expected}}</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 data-toggle="modal" data-target="#clearTagDataModal" ng-click="openClearTagData(tag.id)" class="btn btn-primary">Clear Data</button></td>
|
||||
<!--<td><button data-toggle="modal" data-target="#clearTagDataModal" ng-click="openClearTagData(tag.id)" class="btn btn-primary">Clear Data</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(){
|
||||
|
||||
Reference in New Issue
Block a user