diff --git a/flask/app/datalogger/datalogger.py b/flask/app/datalogger/datalogger.py
index 82a01fa..39e94a8 100644
--- a/flask/app/datalogger/datalogger.py
+++ b/flask/app/datalogger/datalogger.py
@@ -13,8 +13,8 @@ manager.create_api(Tag, methods=['GET', 'POST', 'DELETE', 'PUT'], results_per_pa
manager.create_api(Tag_val, methods=['GET', 'POST', 'DELETE'], allow_delete_many=True)
manager.create_api(Card, methods=['GET', 'POST', 'DELETE'], allow_delete_many=True)
manager.create_api(GaugeOffVal, methods=['GET', 'POST', 'DELETE'], allow_delete_many=True)
-manager.create_api(WellTest, methods=['GET', 'POST', 'DELETE'], allow_delete_many=True)
-manager.create_api(Note, methods=['GET', 'POST', 'DELETE'], allow_delete_many=True)
-manager.create_api(EventConfig, methods=['GET', 'POST', 'DELETE'], allow_delete_many=True)
+manager.create_api(WellTest, methods=['GET', 'POST', 'DELETE', 'PUT'], allow_delete_many=True)
+manager.create_api(Note, methods=['GET', 'POST', 'DELETE', 'PUT'], allow_delete_many=True)
+manager.create_api(EventConfig, methods=['GET', 'POST', 'DELETE', 'PUT'])
manager.create_api(Event, methods=['GET', 'POST', 'DELETE'], allow_delete_many=True)
manager.create_api(RunStatus, methods=['GET', 'POST', 'DELETE'], allow_delete_many=True)
diff --git a/flask/app/static/js/welltest.controller.js b/flask/app/static/js/welltest.controller.js
index 10a77b1..50226aa 100644
--- a/flask/app/static/js/welltest.controller.js
+++ b/flask/app/static/js/welltest.controller.js
@@ -1,9 +1,9 @@
-poconsole.controller('wellTestCtrl', function($scope, $route, $http, $routeParams, Page, wellTest) {
+poconsole.controller('wellTestCtrl', function($scope, $route, $http, $routeParams, Page, WellTest) {
Page.setTitle('Well Tests');
Page.setPage('welltest');
$scope.loadWellTestData = function(page_number){
- var getData = wellTest.getWellTestPage(page_number);
+ var getData = WellTest.getWellTestPage(page_number);
getData.then(function(d){
for(var j = 0; j < d.objects.length; j++){
// console.log({'Date Before':d.objects[j].created_on});
@@ -11,9 +11,6 @@ poconsole.controller('wellTestCtrl', function($scope, $route, $http, $routeParam
// console.log({'Date After':d.objects[j].created_on});
}
$scope.well_test_vals = d.objects;
-
- console.log($scope.well_test_vals);
-
$scope.num_pages = d.total_pages;
$scope.page_list = [];
$scope.page_num = d.page;
@@ -38,5 +35,66 @@ poconsole.controller('wellTestCtrl', function($scope, $route, $http, $routeParam
$scope.loadWellTestData(1);
+ $scope.startCreateWellTest = function(){
+ $scope.newWellTest = {
+ 'duration_hours': 24,
+ 'volume_h2o_actual': 0,
+ 'volume_oil_actual': 0,
+ 'volume_gas_actual': 0,
+ 'volume_h2o_projected': 0,
+ 'volume_oil_projected': 0,
+ 'volume_gas_projected': 0,
+ 'api_gravity_oil': 2.0,
+ 'spc_gravity_h2o': 1.011,
+ 'created_on': Date.create()
+ };
+ };
+
+ $scope.submitNewWellTest = function(){
+ var temp_date = Date.create($scope.newWellTest.created_on);
+ $scope.newWellTest.created_on = temp_date.utc().format('{yyyy}-{MM}-{dd}T{HH}:{mm}:00.00000');
+ var createWellTest = WellTest.createWellTest($scope.newWellTest);
+ createWellTest.then(function(response_data){
+ console.log("Response from API");
+ console.log(response_data);
+ $scope.loadWellTestData(1);
+ });
+ };
+
+ $scope.startEditWellTest = function(id){
+ var getEditWellTestData = WellTest.getWellTest(id);
+ getEditWellTestData.then(function(d){
+ $scope.editWellTest = d;
+ $scope.editWellTest.created_on = Date.utc.create($scope.editWellTest.created_on);
+ });
+ };
+
+ $scope.submitEditWellTest = function(){
+ var temp_date = Date.create($scope.editWellTest.created_on);
+ $scope.editWellTest.created_on = temp_date.utc().format('{yyyy}-{MM}-{dd}T{HH}:{mm}:00.00000');
+ var updateWellTest = WellTest.updateWellTest($scope.editWellTest);
+ updateWellTest.then(function(response_data){
+ console.log("Response from API");
+ console.log(response_data);
+ $scope.loadWellTestData(1);
+ });
+ };
+
+ $scope.openDeleteWellTest = function(id){
+ var getDeleteWellTestData = WellTest.getWellTest(id);
+ getDeleteWellTestData.then(function(d){
+ $scope.deleteWellTest = d;
+ });
+ };
+
+ $scope.submitDeleteWellTest = function(){
+ var deleteSelectedWellTest = WellTest.deleteWellTest($scope.deleteWellTest._id);
+ deleteSelectedWellTest.then(function(data){
+ $scope.loadWellTestData(1);
+ });
+ };
+
+
+
});
diff --git a/flask/app/static/js/welltest.factory.js b/flask/app/static/js/welltest.factory.js
index e579fec..7327659 100644
--- a/flask/app/static/js/welltest.factory.js
+++ b/flask/app/static/js/welltest.factory.js
@@ -1,4 +1,4 @@
-poconsole.factory('wellTest',function($q, $http, $log, dateConversion){
+poconsole.factory('WellTest',function($q, $http, $log, dateConversion){
var getWellTestPage = function(page_number) {
var deferred = $q.defer();
$http.get('/api/well_test_vals?q={"order_by":[{"field":"created_on","direction":"desc"}]}&page=' + page_number).success(function(data) {
@@ -7,50 +7,57 @@ poconsole.factory('wellTest',function($q, $http, $log, dateConversion){
return deferred.promise;
};
- var createWellTest = function(tag){
- $http.post('/api/tags', {
- tag: tag.tag,
- name: tag.name,
- tag_class_id: parseInt(tag.tag_class_id),
- device_id: parseInt(tag.device_id),
- units: tag.units,
- min_expected: tag.min_expected,
- max_expected: tag.max_expected,
- guarantee_sec: tag.guarantee_sec,
- change_threshold: tag.change_threshold,
- description: tag.description,
- data_type_id: parseInt(tag.data_type_id)
- }).success(function(data){
- return data;
+ var getWellTest = function(id){
+ var deferred = $q.defer();
+ $http.get('/api/well_test_vals/' + id).success(function(data) {
+ deferred.resolve(data);
});
+ return deferred.promise;
};
- var updateWellTest = function(tag){
- $log.info("updateTag called with "+ JSON.stringify(tag));
- var put_obj = {
- tag: tag.tag,
- name: tag.name,
- tag_class_id: parseInt(tag.tag_class_id),
- device_id: parseInt(tag.device_id),
- units: tag.units,
- min_expected: tag.min_expected,
- max_expected: tag.max_expected,
- guarantee_sec: tag.guarantee_sec,
- change_threshold: tag.change_threshold,
- description: tag.description,
- data_type_id: parseInt(tag.data_type_id)
+ var createWellTest = function(t){
+ var deferred = $q.defer();
+ var well_test = {
+ 'duration_hours': t.duration_hours,
+ 'volume_h2o_actual': t.volume_h2o_actual,
+ 'volume_oil_actual': t.volume_oil_actual,
+ 'volume_gas_actual': t.volume_gas_actual,
+ 'volume_h2o_projected': t.volume_h2o_projected,
+ 'volume_oil_projected': t.volume_oil_projected,
+ 'volume_gas_projected': t.volume_gas_projected,
+ 'api_gravity_oil': t.api_gravity_oil,
+ 'spc_gravity_h2o': t.spc_gravity_h2o,
+ 'created_on': t.created_on
};
- console.log({id: tag._id, put_obj: put_obj});
- $http.put('/api/tags/'+ tag._id, data=put_obj).success(function(data){
- return data;
- }).error(function(err){
- $log.warn("updateTag Error: " + err);
+ $http.post('/api/well_test_vals', well_test).success(function(data){
+ deferred.resolve(data);
});
+ return deferred.promise;
+ };
+
+ var updateWellTest = function(t){
+ var deferred = $q.defer();
+ var well_test = {
+ 'duration_hours': t.duration_hours,
+ 'volume_h2o_actual': t.volume_h2o_actual,
+ 'volume_oil_actual': t.volume_oil_actual,
+ 'volume_gas_actual': t.volume_gas_actual,
+ 'volume_h2o_projected': t.volume_h2o_projected,
+ 'volume_oil_projected': t.volume_oil_projected,
+ 'volume_gas_projected': t.volume_gas_projected,
+ 'api_gravity_oil': t.api_gravity_oil,
+ 'spc_gravity_h2o': t.spc_gravity_h2o,
+ 'created_on': t.created_on
+ };
+ $http.put('/api/well_test_vals/'+ t._id, data=well_test).success(function(data){
+ deferred.resolve(data);
+ });
+ return deferred.promise;
};
var deleteWellTest = function(id){
var deferred = $q.defer();
- var url = '/api/tags/' + id;
+ var url = '/api/well_test_vals/' + id;
$http.delete(url).success(function(data) {
deferred.resolve({
data: data
@@ -63,6 +70,7 @@ poconsole.factory('wellTest',function($q, $http, $log, dateConversion){
return {
getWellTestPage: getWellTestPage,
+ getWellTest: getWellTest,
createWellTest: createWellTest,
deleteWellTest: deleteWellTest,
updateWellTest: updateWellTest
diff --git a/flask/app/static/templates/tags.html b/flask/app/static/templates/tags.html
index 5bce1af..9661113 100644
--- a/flask/app/static/templates/tags.html
+++ b/flask/app/static/templates/tags.html
@@ -144,7 +144,7 @@
- {{editTag}}
+