fixes
This commit is contained in:
@@ -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) {
|
||||
|
||||
@@ -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() {
|
||||
'</div>';
|
||||
},
|
||||
option: function(item, escape) {
|
||||
|
||||
name = item.name;
|
||||
category = item.category || 'None';
|
||||
return '<div class="bag-select-element bag-option">' +
|
||||
@@ -261,6 +261,7 @@ function displayLoadingOptions() {
|
||||
var selectize = $select[0].selectize;
|
||||
selectize.clearOptions();
|
||||
//results = [{filename : 'testfile', category: 'testcategory', tags : ['testtag1', 'testtag2', 'testtag3']}, {filename : 'testfile2', category: 'testcategory2', tags : ['testtag21', 'testtag22', 'testtag23']}]
|
||||
console.log(results);
|
||||
selectize.addOption(results);
|
||||
if(results[0]) {
|
||||
selectize.setValue(results[0].filename);
|
||||
|
||||
Reference in New Issue
Block a user