diff --git a/client/app/components/coordinator/js/ros_scripts.js b/client/app/components/coordinator/js/ros_scripts.js index 5f031c9..1e0ee35 100644 --- a/client/app/components/coordinator/js/ros_scripts.js +++ b/client/app/components/coordinator/js/ros_scripts.js @@ -317,17 +317,45 @@ bagPlayingTopic.subscribe(function(message) { function triggerService(serviceName, toSend) { + + if(!toSend) { + serviceType = 'std_srvs/demobot.Trigger' + } else { + serviceType = 'std_srvs/demobot.TriggerMessage' + } + var service = new ROSLIB.Service({ ros : ros, name : serviceName, - serviceType : 'std_srvs/Trigger' + serviceType : serviceType }); if(!toSend) { - toSend = {}; + var request = new ROSLIB.ServiceRequest({}); + } else { + var toSend = JSON.stringify(toSend); + var request = new ROSLIB.ServiceRequest({message : toSend}); } - var request = new ROSLIB.ServiceRequest(toSend); + + /* + var service = new ROSLIB.Service({ + ros : ros, + name : serviceName, + serviceType : 'std_srvs/demobot.TriggerMessage' + }); + + if(toSend) { + toSend = JSON.stringify(toSend) + } else { + toSend = "" + } + */ + + + var request = new ROSLIB.ServiceRequest({message : toSend}); + + var serviceCallTimeStamp = Date.now(); var serviceCallReturned = false; service.callService(request, function(result) { diff --git a/client/app/components/coordinator/js/update_guis.js b/client/app/components/coordinator/js/update_guis.js index 5ecbf66..abaa0ce 100644 --- a/client/app/components/coordinator/js/update_guis.js +++ b/client/app/components/coordinator/js/update_guis.js @@ -12,7 +12,7 @@ function getBagList(callback) var request = new ROSLIB.ServiceRequest({}); service.callService(request, function(result) { - callback(result.message); + callback(JSON.parse(result.message)); }); } @@ -27,7 +27,7 @@ function getBagCategoryList(callback) var request = new ROSLIB.ServiceRequest({}); service.callService(request, function(result) { - callback(result.message); + callback(JSON.parse(result.message)); }); } @@ -42,7 +42,7 @@ function getBagTagList(callback) var request = new ROSLIB.ServiceRequest({}); service.callService(request, function(result) { - callback(result.message); + callback(JSON.parse(result.message)); }); } @@ -82,8 +82,8 @@ function displayTaggingOptions(mode) { var fileNameSelectize = $fileNameSelect[0].selectize; fileNameSelectize.clearOptions() // /aescape/bags/getBagList - getBagList(function(result){ - fileNameSelectize.addOption([].map(function(bagName){ + getBagList(function(results){ + fileNameSelectize.addOption(results.map(function(bagName){ return {name : bagName} })); }) @@ -126,10 +126,9 @@ function displayTaggingOptions(mode) { } function hideTaggingOptions(mode, updateValues=false) { - var modeTag = '#' + mode + 'Tag'; + var modeTag = '#' + mode + 'Tags'; if(updateValues) { - var modeTag = '#' + mode + 'Tags'; var fileNameSelector = '#' + mode + 'BagFileName'; var categorySelector = '#' + mode + 'BagCategory'; var tagSelector = '#' + mode + 'BagTags'; @@ -138,27 +137,34 @@ function hideTaggingOptions(mode, updateValues=false) { var category = $(categorySelector).val(); var tags = $(tagSelector).val(); + getBagList(function(results){ + bag_name = results[0].filename + }) + updateBagMetadata(mode, bag_name, filename, category, tags) } //TO DO: Wait for the response from the backend before setting the display to none - document.getElementById(modeTag).setAttribute('overflow', 'hidden'); - document.getElementById(modeTag).classList.remove('open'); + document.querySelector(modeTag).setAttribute('overflow', 'hidden'); + document.querySelector(modeTag).classList.remove('open'); } function updateBagMetadata(mode, bag_name, modified_bag_name, category, tags) { if(!mode) { - return //error + //return //error } if(!bag_name) { - return // error + //return // error } - triggerService('/aescape/bags/updateBagMeta', { + + var toSend = { mode : mode, bag_name : bag_name, modified_bag_name : modified_bag_name, category : category, tags : tags - }) + } + + triggerService('/aescape/bags/updateBagMeta', toSend) } function displayLoadingOptions() { @@ -167,9 +173,6 @@ function displayLoadingOptions() { document.querySelector(selector).classList.add('open'); - //get bag list - //select last recorded bag - //do animation var $select = $('#bagList').selectize({ valueField: 'filename', labelField: 'filename', @@ -198,7 +201,6 @@ function displayLoadingOptions() { getBagList(function(results){ var selectize = $select[0].selectize; selectize.clearOptions() - results = [{'filename' : 'hellobiathco', 'category' : 'hellobiathcat', 'tags' : ['hellobiathtag', 'hellobiatag2']}] selectize.addOption(results); if(results[0]) { selectize.setValue(results[0].filename); @@ -209,7 +211,7 @@ function displayLoadingOptions() { function hideLoadingOptions() { var selector = '#bagList'; - document.getElementById(selector).setAttribute('overflow', 'hidden'); - document.getElementById(selector).classList.remove('open'); + document.querySelector(selector).setAttribute('overflow', 'hidden'); + document.querySelector(selector).classList.remove('open'); }