senaduka/old-lab_ui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixes

Browse Source
This commit is contained in:
Matt DiCicco
2019-07-15 21:04:47 -04:00
parent 6a464fd7b5
commit 5abf44bb14
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
client/app/components/coordinator/js/ros_scripts.js
View File

@@ -578,7 +578,8 @@ function startTeachRecoding() {
async.waterfall([ async.waterfall([
function(callback) { function(callback) {
triggerService('/left/aescape/hardware/calibrateRobotiq', false, function(err, res){ triggerService('/left/aescape/hardware/calibrateRobotiq', false, function(err, res){
callback(err, res); //callback(err, res);
callback(null, null);
}); });
}, },
function(response, callback) { function(response, callback) {

11
client/app/components/coordinator/js/update_guis.js
View File

@@ -77,7 +77,7 @@ function displayTaggingOptions(mode) {
}, 600) }, 600)
var $fileNameSelect = $(fileNameSelector).selectize({ var $fileNameSelect = $(fileNameSelector).selectize({
valueField: '_id', valueField: 'name',
labelField: 'name', labelField: 'name',
searchField: ['name'], searchField: ['name'],
options: [], options: [],
@@ -149,11 +149,10 @@ function hideTaggingOptions(mode, updateValues=false) {
if(updateValues) { if(updateValues) {
var bagLabel = $(bagLabelSelector).val(); var bagLabel = $(bagLabelSelector).val();
var category = $(categorySelector).val(); var category = $(categorySelector).val();
var tags = $(tagSelector).val(); var tags = $(tagSelector).val() || [];
getBagList(function(results){ getBagList(function(results){
if(!(results && results[0] && results[0]._id)) { if(!(results && results[0] && results[0]._id)) {
console.log(results);
displayMessage(false, "Could not retrieve the last recorded bag :("); displayMessage(false, "Could not retrieve the last recorded bag :(");
return; return;
} }
@@ -164,7 +163,7 @@ function hideTaggingOptions(mode, updateValues=false) {
} else { } else {
displayMessage("Bag data saved successfully!"); displayMessage("Bag data saved successfully!");
//clear selectize //clear selectize
$(fileNameSelector).selectize()[0].selectize.destroy(); $(bagLabelSelector).selectize()[0].selectize.destroy();
$(categorySelector).selectize()[0].selectize.destroy(); $(categorySelector).selectize()[0].selectize.destroy();
$(tagSelector).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) { if(!mode) {
return callback(); return callback();
} }
if(!bag_name) { if(!bag_id) {
return callback(); return callback();
} }
@@ -233,6 +232,7 @@ function displayLoadingOptions() {
'</div>'; '</div>';
}, },
option: function(item, escape) { option: function(item, escape) {
name = item.name; name = item.name;
category = item.category || 'None'; category = item.category || 'None';
return '<div class="bag-select-element bag-option">' + return '<div class="bag-select-element bag-option">' +
@@ -261,6 +261,7 @@ function displayLoadingOptions() {
var selectize = $select[0].selectize; var selectize = $select[0].selectize;
selectize.clearOptions(); selectize.clearOptions();
//results = [{filename : 'testfile', category: 'testcategory', tags : ['testtag1', 'testtag2', 'testtag3']}, {filename : 'testfile2', category: 'testcategory2', tags : ['testtag21', 'testtag22', 'testtag23']}] //results = [{filename : 'testfile', category: 'testcategory', tags : ['testtag1', 'testtag2', 'testtag3']}, {filename : 'testfile2', category: 'testcategory2', tags : ['testtag21', 'testtag22', 'testtag23']}]
console.log(results);
selectize.addOption(results); selectize.addOption(results);
if(results[0]) { if(results[0]) {
selectize.setValue(results[0].filename); selectize.setValue(results[0].filename);