changed filename dependancy to id

client/app/components/coordinator/js/ros_scripts.js

@@ -390,7 +390,6 @@ playbackStatus.subscribe(function(message) {
       triggerService('/right/aescape/mode/activateReadyController');
       displayMessage(true, "Loaded the selected bag file!")
     }
-    lastPlaybackStatus = status;
   }
 });
 

client/app/components/coordinator/js/update_guis.js

@@ -77,7 +77,7 @@ function displayTaggingOptions(mode) {
   }, 600)
 
   var $fileNameSelect = $(fileNameSelector).selectize({
-    valueField: 'name',
+    valueField: '_id',
     labelField: 'name',
     searchField: ['name'],
     options: [], 
@@ -89,11 +89,9 @@ function displayTaggingOptions(mode) {
   fileNameSelectize.clearOptions()
   // /aescape/bags/getBagList
   getBagList(function(results){
-    fileNameSelectize.addOption(results.map(function(element){
+    fileNameSelectize.addOption(results)
-      return {name : element.filename}
-    }));
     if(results[0]) {
-      fileNameSelectize.setValue(results[0].filename);
+      fileNameSelectize.setValue(results[0]._id);
     }
   })
   
@@ -154,13 +152,13 @@ function hideTaggingOptions(mode, updateValues=false) {
     var tags = $(tagSelector).val();
 
     getBagList(function(results){
-      if(!(results && results[0] && results[0].filename)) {
+      if(!(results && results[0] && results[0]._id)) {
         console.log(results);
         displayMessage(false, "Could not retrieve the last recorded bag :(");
         return;
       }
-      bag_name = results[0].filename;
+      bag_id = results[0]._id;
-      updateBagMetadata(mode, bag_name, bagLabel, category, tags, function(updateError) {
+      updateBagMetadata(mode, bag_id, bagLabel, category, tags, function(updateError) {
         if(updateError) {
           displayMessage(flase, updateError);
         } else {
@@ -178,7 +176,7 @@ function hideTaggingOptions(mode, updateValues=false) {
   document.querySelector(modeTag).classList.remove('open');
 }
 
-function updateBagMetadata(mode, bag_name, bag_label, category, tags, callback) {
+function updateBagMetadata(mode, bag_id, bag_label, category, tags, callback) {
   if(!mode) {
     return callback();
   }
@@ -188,7 +186,7 @@ function updateBagMetadata(mode, bag_name, bag_label, category, tags, callback)
 
   var toSend = {
     mode : mode, 
-    bag_name : bag_name, 
+    bag_id : bag_id, 
     bag_label : bag_label, 
     category : category, 
     tags : tags
@@ -214,32 +212,32 @@ function displayLoadingOptions() {
   //Putting this in a timeout to wait for the animation to finish completing
   setTimeout(function(){
     document.querySelector(selector).style.overflow = "visible";
-  }, 420)
+  }, 420) //This is not a Hitchhiker's reference. This is not a 420 reference. This value has been computed to match the speed of the larger drop down.
 
     var $select = $('#loadBagList').selectize({
-      valueField: 'filename',
+      valueField: '_id',
-      labelField: 'filename',
+      labelField: 'name',
-      searchField: ['filename', 'category', 'tags'],
+      searchField: ['name', 'category', 'tags'],
       options: [], 
       create: false,
       placeholder : "Select bag to play", 
       render : {
         item: function(item, escape) {
-          filename = item.filename;
+          name = item.name;
           category = item.category || 'None';
             return '<div class="bag-select-element">' +
               '<div class="bag-select-element">' +
-                '<span class="filename">' + escape(filename) + '</span>' +
+                '<span class="filename">' + escape(name) + '</span>' +
                 '<span class="category">' + ' (' + escape(category)  + ') ' + '</span>' + 
               '</div>' + 
             '</div>';
         },
         option: function(item, escape) {
-            filename = item.filename;
+            name = item.name;
             category = item.category || 'None';
             return '<div class="bag-select-element bag-option">' +
               '<div class="primary">' + 
-                '<div class="filename">' + escape(filename) + '</div>' +
+                '<div class="filename">' + escape(name) + '</div>' +
                 '<div class="category">' + escape(category) + '</div>' + 
               '</div>' + 
               '<div class="secondary">' + 
@@ -293,12 +291,10 @@ function hideLoadingOptions(loadBag) {
     singleArmMode = false
   }
 
-  console.log("singleArmMode");
-  console.log(singleArmMode)
   if(loadBag) {
-    var selectedBagName = $('#loadBagList').val();
+    var selectedBagId = $('#loadBagList').val();
     disableUI();
-    loadSelectedBagFile(selectedBagName, singleArmMode, function(updateError){
+    loadSelectedBagFile(selectedBagId, singleArmMode, function(updateError){
       // if(updateError) {
       //   displayMessage(false, "Something went wrong in the backend while fetching the bag files :(")
       // } else {
@@ -314,9 +310,9 @@ function hideLoadingOptions(loadBag) {
 
 
 
-function loadSelectedBagFile(selectedBagName, singleArmMode, callback) {
+function loadSelectedBagFile(selectedBagId, singleArmMode, callback) {
   var toSend = {
-    bag_name : selectedBagName, 
+    bag_id : selectedBagId, 
     single_arm : singleArmMode
   }