diff options
| author | Tito Jankowski <tito@openpcr.org> | 2011-06-24 18:53:25 -0700 |
|---|---|---|
| committer | Tito Jankowski <tito@openpcr.org> | 2011-06-24 18:53:25 -0700 |
| commit | 5c26a5a05607693e4493fd70b2d6d286ef89b8b1 (patch) | |
| tree | 1631486eceac8799fce4f773dd745fe441e97b52 | |
| parent | bc6021a1bbb8fe82aba6bd1e39f172a4a6d1d410 (diff) | |
| download | openpcr-5c26a5a05607693e4493fd70b2d6d286ef89b8b1.tar.gz openpcr-5c26a5a05607693e4493fd70b2d6d286ef89b8b1.zip | |
Air UI continues to update after protocol is completed
| -rw-r--r-- | air/js/openpcr.js | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/air/js/openpcr.js b/air/js/openpcr.js index 8fad366..13b04ee 100644 --- a/air/js/openpcr.js +++ b/air/js/openpcr.js @@ -846,7 +846,7 @@ function disableEnterKey(e) writeCSV(prog_name, status["e"], secondsRemaining, 1, current_cycle, total_cycles, block_temp, lid_temp); } - else if (status["status"]=="complete") + else if (status["s"]=="complete") { // if the status of OpenPCR comes back as "complete" // show the "Home" button @@ -858,21 +858,18 @@ function disableEnterKey(e) // hide "Time remaining" span $("#timeRemaining").hide(); // update the "current temp" - var block_temp = status["blockTemp"]; + var block_temp = status["b"]; $("#blockTemp").html(block_temp); // update the lid temp - var lid_temp = status["lidTemp"]; + var lid_temp = status["l"]; $("#lidTemp").html(lid_temp); // replace the "cycle # of total#" span with "PCR took..." $("#cycleNumOfNum").html("PCR took " + humanTime(status["timeElapsed"])); // i.e. hide the "Holding for 10 sec", just show "Holding" $("#stepRemaining").hide(); // Current step name - var current_step = status["stepName"]; + var current_step = status["p"]; $("#currentStep").html(current_step); - //and "elapsed time" (elapsed time could be static) - //status["timeElapsed"] - //$("#minutesRemaining") = "PCR took" + humanTime(100); } else if (status["status"]=="stopped") { @@ -1032,6 +1029,7 @@ function disableEnterKey(e) * Goes Home */ $('#Home').live('click', function(){ + stopPCR(); listExperiments(); sp2.showPanel(0); setTimeout(clearForm,500); |