diff --git a/client/app/components/coordinator/js/ros_scripts.js b/client/app/components/coordinator/js/ros_scripts.js index b38e6e2..e4ce5a4 100644 --- a/client/app/components/coordinator/js/ros_scripts.js +++ b/client/app/components/coordinator/js/ros_scripts.js @@ -578,7 +578,8 @@ function startTeachRecoding() { async.waterfall([ function(callback) { triggerService('/left/aescape/hardware/calibrateRobotiq', false, function(err, res){ - callback(err, res); + //callback(err, res); + callback(null, null); }); }, function(response, callback) { diff --git a/client/app/components/coordinator/js/update_guis.js b/client/app/components/coordinator/js/update_guis.js index cfbf376..32f29d4 100644 --- a/client/app/components/coordinator/js/update_guis.js +++ b/client/app/components/coordinator/js/update_guis.js @@ -77,7 +77,7 @@ function displayTaggingOptions(mode) { }, 600) var $fileNameSelect = $(fileNameSelector).selectize({ - valueField: '_id', + valueField: 'name', labelField: 'name', searchField: ['name'], options: [], @@ -149,11 +149,10 @@ function hideTaggingOptions(mode, updateValues=false) { if(updateValues) { var bagLabel = $(bagLabelSelector).val(); var category = $(categorySelector).val(); - var tags = $(tagSelector).val(); + var tags = $(tagSelector).val() || []; getBagList(function(results){ if(!(results && results[0] && results[0]._id)) { - console.log(results); displayMessage(false, "Could not retrieve the last recorded bag :("); return; } @@ -164,7 +163,7 @@ function hideTaggingOptions(mode, updateValues=false) { } else { displayMessage("Bag data saved successfully!"); //clear selectize - $(fileNameSelector).selectize()[0].selectize.destroy(); + $(bagLabelSelector).selectize()[0].selectize.destroy(); $(categorySelector).selectize()[0].selectize.destroy(); $(tagSelector).selectize()[0].selectize.destroy(); } @@ -180,7 +179,7 @@ function updateBagMetadata(mode, bag_id, bag_label, category, tags, callback) { if(!mode) { return callback(); } - if(!bag_name) { + if(!bag_id) { return callback(); } @@ -233,6 +232,7 @@ function displayLoadingOptions() { ''; }, option: function(item, escape) { + name = item.name; category = item.category || 'None'; return '