comment

[matches/MCTX3420.git] / testing / MCTXWeb / public_html / static / mctx.control.js

diff --git a/testing/MCTXWeb/public_html/static/mctx.control.js b/testing/MCTXWeb/public_html/static/mctx.control.js
index de45e61..f414a82 100644 (file)
--- a/testing/MCTXWeb/public_html/static/mctx.control.js
+++ b/testing/MCTXWeb/public_html/static/mctx.control.js
@@ -47,7 +47,7 @@ function setSampleRate(id, val, result) {
 
 $.fn.loadSensorList = function (result, input) {
   var select = this;
-  select.empty(); //Reset list\r
+  select.empty(); //Reset list
   
   $.ajax({
     url : mctx.api + 'identify',
@@ -104,15 +104,15 @@ $.fn.setStatusUpdater = function () {
           fail = true;
       }
       
-      if (data.control_state_id !== mctx.control.state) {   \r
-        //Set logic for sensor sample rate thing\r
+      if (data.control_state_id !== mctx.control.state) {   
+        //Set logic for sensor sample rate thing
         $("#sensor-select").loadSensorList($("#samplerate-result"));      
         toggleControls(running);
         $(result).text(text);
         if (fail) {
-          $(result).parent().addClass("fail");
+          $(result).parent().addClass("fail").removeClass("pass");
         } else {
-          $(result).parent().addClass("pass");
+          $(result).parent().addClass("pass").removeClass("fail");
         }
         
         mctx.control.state = data.control_state_id;
@@ -132,8 +132,8 @@ $.fn.setStatusUpdater = function () {
 
 $.fn.startExperiment = function (group, experiment, force, result) {
  $(group).attr('disabled', 'disabled');
- \r
- var can_number = ($(this).attr("name") === "start_strain") ? 0 : 1;\r
+ 
+ var can_number = ($(this).attr("name") === "start_strain") ? 0 : 1;
  
  if (!experiment || !experiment.match(/^[a-zA-Z0-9_-]+$/)) {
    result.text("Experiment names must be composed of alphanumeric characters" + 
@@ -146,40 +146,43 @@ $.fn.startExperiment = function (group, experiment, force, result) {
  if (force) {
    data.force = 1;
  }
- \r
+ 
  //Start the experiment
  $.ajax({
    url : mctx.control.api,
    data : data
  }).done(function (data) {
    if (!result.checkStatus(data)) {
+    $(group).removeAttr('disabled');
+    return;
+   }
+   
+   //Select the can
+   $.ajax({
+    url : mctx.api + "actuators",
+    data : {name : "can_select", set : can_number}
+   }).done(function (data) {
+    if (!result.checkStatus(data)) {
+     $(group).removeAttr('disabled');
      return;
-   }\r
-   \r
-   //Select the can\r
-   $.ajax({\r
-    url : mctx.api + "actuators",\r
-    data : {name : "can_select", set : can_number}\r
-   }).done(function (data) {\r
-    if (!result.checkStatus(data)) {\r
-     return;\r
-    }\r
-    \r
-    //Enable the can\r
-    $.ajax({\r
-      url : mctx.api + 'actuators',\r
-      data : {name : "can_enable", set : 1}\r
-    }).done(function (data) {\r
-      if (!result.checkStatus(data)) {\r
-        return;\r
-      }\r
-      result.html(" ");\r
-      toggleControls(true);\r
-    }).always(function () {\r
-      $(group).removeAttr('disabled');\r
-    });\r
-   }).fail(function () {\r
-    $(group).removeAttr('disabled');\r
+    }
+    
+    //Enable the can
+    $.ajax({
+      url : mctx.api + 'actuators',
+      data : {name : "can_enable", set : 1}
+    }).done(function (data) {
+      if (!result.checkStatus(data)) {
+        $(group).removeAttr('disabled');
+        return;
+      }
+      result.html(" ");
+      toggleControls(true);
+    }).fail(function () {
+      $(group).removeAttr('disabled');
+    });
+   }).fail(function () {
+    $(group).removeAttr('disabled');
    });
  }).fail(function () {
    $(group).removeAttr('disabled');
@@ -219,7 +222,7 @@ $.fn.setPressure = function(pressure, result) {
   
   var set = pressure['set'] + "_" + pressure['wait'] + "_" +
             pressure['step'] + "_" + pressure['count'];
-  $.ajax({
+  return $.ajax({
     url : mctx.api + "actuators",
     data : {name : "pregulator", set : set}
   }).done(function (data) {