Completes POCONSOLE-75. adds seed data for default parameters, pagination for backup and restore values
This commit is contained in:
Patrick McDonagh
@@ -4,12 +4,15 @@ poconsole.controller('backupRestoreCtrl', function($scope, $route, $http, $route
|
||||
|
||||
$scope.data_types = [ 'REAL', 'INT', 'BOOL'];
|
||||
|
||||
$scope.loadBRTagList = function(){
|
||||
$scope.loadBRTagList = function(page_num){
|
||||
$scope.loading = true;
|
||||
var getBRTagList = BackupRestore.getBRTags();
|
||||
var getBRTagList = BackupRestore.getBRTagPage(page_num);
|
||||
getBRTagList.then(function(data) {
|
||||
$scope.loading = false;
|
||||
|
||||
$scope.num_pages = data.total_pages;
|
||||
$scope.page_num = data.page;
|
||||
$scope.total = data.num_results;
|
||||
$scope.per_page = 10;
|
||||
$scope.brTags = data.objects.map(function(t){
|
||||
if (t.tag_type == "REAL"){
|
||||
t.value = parseFloat(t.value);
|
||||
@@ -20,7 +23,7 @@ poconsole.controller('backupRestoreCtrl', function($scope, $route, $http, $route
|
||||
});
|
||||
});
|
||||
};
|
||||
$scope.loadBRTagList(); //Run this function on controller startup to load list
|
||||
$scope.loadBRTagList(1); //Run this function on controller startup to load list
|
||||
|
||||
var getAllDevices = Device.getAllDevices();
|
||||
getAllDevices.then(function(d){
|
||||
@@ -30,7 +33,7 @@ poconsole.controller('backupRestoreCtrl', function($scope, $route, $http, $route
|
||||
$scope.submitAddBRTag = function(){
|
||||
var createStatus = BackupRestore.createBRTag($scope.newBRTag);
|
||||
createStatus.then(function(data){
|
||||
$scope.loadBRTagList();
|
||||
$scope.loadBRTagList(1);
|
||||
});
|
||||
};
|
||||
|
||||
@@ -51,7 +54,7 @@ poconsole.controller('backupRestoreCtrl', function($scope, $route, $http, $route
|
||||
var deleteBRTag = BackupRestore.deleteBRTag(id);
|
||||
deleteBRTag.then(function(data){
|
||||
$scope.error = false;
|
||||
$scope.loadBRTagList();
|
||||
$scope.loadBRTagList(1);
|
||||
});
|
||||
};
|
||||
|
||||
@@ -72,21 +75,21 @@ poconsole.controller('backupRestoreCtrl', function($scope, $route, $http, $route
|
||||
$scope.submitEditBRTag = function(){
|
||||
var updateBRTag = BackupRestore.updateBRTag($scope.editBRTag);
|
||||
updateBRTag.then(function(data){
|
||||
$scope.loadBRTagList();
|
||||
$scope.loadBRTagList(1);
|
||||
});
|
||||
};
|
||||
|
||||
$scope.backupBRTag = function(id){
|
||||
var backupBRTagVal = BackupRestore.backupBRTagValueSingle(id);
|
||||
backupBRTagVal.then(function(data){
|
||||
$scope.loadBRTagList();
|
||||
$scope.loadBRTagList(1);
|
||||
});
|
||||
};
|
||||
|
||||
$scope.backupBRTagsAll = function(){
|
||||
var backupBRTagVal = BackupRestore.backupBRTagValuesAll();
|
||||
backupBRTagVal.then(function(data){
|
||||
$scope.loadBRTagList();
|
||||
$scope.loadBRTagList(1);
|
||||
});
|
||||
};
|
||||
|
||||
@@ -100,7 +103,7 @@ poconsole.controller('backupRestoreCtrl', function($scope, $route, $http, $route
|
||||
$scope.restoreBRTagsAll = function(){
|
||||
var restoreBRTagVal = BackupRestore.restoreBRTagValuesAll();
|
||||
restoreBRTagVal.then(function(data){
|
||||
$scope.loadBRTagList();
|
||||
$scope.loadBRTagList(1);
|
||||
});
|
||||
};
|
||||
|
||||
|
||||
@@ -1,9 +1,11 @@
|
||||
poconsole.factory('BackupRestore', function($q, $http, $log){
|
||||
var service = {};
|
||||
|
||||
service.getBRTags = function(){
|
||||
service.getBRTagPage = function(page_num){
|
||||
var deferred = $q.defer();
|
||||
$http.get('/api/backup_restore').success(function(data) {
|
||||
var url = '/api/backup_restore?page=' + parseInt(page_num).toString();
|
||||
console.log(url);
|
||||
$http.get(url).success(function(data) {
|
||||
deferred.resolve(data);
|
||||
});
|
||||
return deferred.promise;
|
||||
|
||||
@@ -20,6 +20,7 @@ poconsole.controller('gaugeOffCtrl',function($scope, Page, $q, $http) {
|
||||
}
|
||||
$scope.gauge_off_vals = d.objects;
|
||||
$scope.num_pages = d.total_pages;
|
||||
$scope.per_page = d.objects.length;
|
||||
$scope.page_list = [];
|
||||
$scope.page_num = d.page;
|
||||
$scope.total = d.total;
|
||||
|
||||
@@ -117,15 +117,25 @@
|
||||
<div ng-if="!error" class="container">
|
||||
<div class="row">
|
||||
<div class="col-md-12">
|
||||
<button type="button" class="btn btn-primary" data-toggle="modal" data-target="#addModal">
|
||||
Add Tag
|
||||
</button>
|
||||
<button type="button" class="btn btn-warning" ng-click="backupBRTagsAll()">
|
||||
Backup All Tags
|
||||
</button>
|
||||
<button type="button" class="btn btn-warning" ng-click="restoreBRTagsAll()">
|
||||
Restore All Tags
|
||||
</button>
|
||||
<div class="row">
|
||||
<div class="col-md-12">
|
||||
<button type="button" class="btn btn-primary" data-toggle="modal" data-target="#addModal">
|
||||
Add Tag
|
||||
</button>
|
||||
<button type="button" class="btn btn-warning" ng-click="backupBRTagsAll()">
|
||||
Backup All Tags
|
||||
</button>
|
||||
<button type="button" class="btn btn-warning" ng-click="restoreBRTagsAll()">
|
||||
Restore All Tags
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
<div class="row">
|
||||
<div class="col-md-12" style="text-align:center;">
|
||||
<dir-pagination-controls on-page-change="loadBRTagList(newPageNumber)" max-size="15"></dir-pagination-controls>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<table class="table">
|
||||
<thead>
|
||||
<tr>
|
||||
@@ -140,7 +150,7 @@
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<tr ng-repeat="tag in brTags">
|
||||
<tr dir-paginate="tag in brTags | itemsPerPage:per_page" total-items="total" current-page="page_num">
|
||||
<td>{{tag._id}}</td>
|
||||
<td>{{tag.tag}}</td>
|
||||
<td>{{tag.tag_type}}</td>
|
||||
|
||||
@@ -55,6 +55,7 @@
|
||||
<div class="row">
|
||||
<div class="col-md-12">
|
||||
<button data-toggle="modal" data-target="#deleteAllModal" class="btn btn-large btn-danger"><i class="fa fa-trash-o"></i> Delete All Stored Data</button>
|
||||
<a href="/#/backup_restore" class="btn btn-large btn-warning"><i class="fa fa-lock"></i> Backup & Restore Configuration</a>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
18
setupdb.py
18
setupdb.py
@@ -117,6 +117,24 @@ def seed():
|
||||
stroke_production = Tag(name='Stroke Production', tag_category='poc', tag='Stroke_Production', device_id=1, description='Amount of fluid produced in the current stroke', data_type='REAL', change_threshold=0.005, min_expected=0.00, max_expected=0.01, units='BBL', guarantee_sec=3600)
|
||||
db.session.add(stroke_production)
|
||||
|
||||
num_tapers = BackupRestore(tag="Card_Current.Params.Num_Tapers")
|
||||
taper_length = [BackupRestore(tag="Taper.Taper[{}].Setup.Length".format(i)) for i in range(1, 10)]
|
||||
taper_diameter = [BackupRestore(tag="Taper.Taper[{}].Setup.Diameter".format(i)) for i in range(1, 10)]
|
||||
taper_material = [BackupRestore(tag="Taper.Taper[{}].Setup.Material".format(i)) for i in range(1, 10)]
|
||||
pump_diameter = BackupRestore(tag='UnitConfig.Pump_Diameter')
|
||||
|
||||
db.session.add(num_tapers)
|
||||
for i in range(0, len(taper_length)):
|
||||
db.session.add(taper_length[i])
|
||||
|
||||
for i in range(0, len(taper_diameter)):
|
||||
db.session.add(taper_diameter[i])
|
||||
|
||||
for i in range(0, len(taper_material)):
|
||||
db.session.add(taper_material[i])
|
||||
|
||||
db.session.add(pump_diameter)
|
||||
|
||||
db.session.commit()
|
||||
|
||||
|
||||
|
||||
27
temp_seed_backup_restore.py
Normal file
27
temp_seed_backup_restore.py
Normal file
@@ -0,0 +1,27 @@
|
||||
import sys
|
||||
# the sqlalchemy db object
|
||||
from app import db
|
||||
|
||||
# we have to import the models so that sqlalchemy can detect them and create the db
|
||||
# how else would it know what to create ?
|
||||
from app.datalogger.models import *
|
||||
|
||||
num_tapers = BackupRestore(tag="Card_Current.Params.Num_Tapers")
|
||||
taper_length = [BackupRestore(tag="Taper.Taper[{}].Setup.Length".format(i)) for i in range(1, 10)]
|
||||
taper_diameter = [BackupRestore(tag="Taper.Taper[{}].Setup.Diameter".format(i)) for i in range(1, 10)]
|
||||
taper_material = [BackupRestore(tag="Taper.Taper[{}].Setup.Material".format(i)) for i in range(1, 10)]
|
||||
pump_diameter = BackupRestore(tag='UnitConfig.Pump_Diameter')
|
||||
|
||||
db.session.add(num_tapers)
|
||||
for i in range(0, len(taper_length)):
|
||||
db.session.add(taper_length[i])
|
||||
|
||||
for i in range(0, len(taper_diameter)):
|
||||
db.session.add(taper_diameter[i])
|
||||
|
||||
for i in range(0, len(taper_material)):
|
||||
db.session.add(taper_material[i])
|
||||
|
||||
db.session.add(pump_diameter)
|
||||
|
||||
db.session.commit()
|
||||
Reference in New Issue
Block a user