From 401db0337fe2bcd4120535943cf0f88314f60c7b Mon Sep 17 00:00:00 2001
From: Sam Ockman
Date: Sun, 22 Jul 2012 01:25:18 -0400
Subject: n of samples working

---
 .../static/new/javascript/trait_data_and_analysis.coffee      | 10 +++++-----
 .../wqflask/static/new/javascript/trait_data_and_analysis.js  | 11 +++++------
 wqflask/wqflask/templates/trait_data_and_analysis.html        |  5 +++--
 3 files changed, 13 insertions(+), 13 deletions(-)

(limited to 'wqflask')

diff --git a/wqflask/wqflask/static/new/javascript/trait_data_and_analysis.coffee b/wqflask/wqflask/static/new/javascript/trait_data_and_analysis.coffee
index e807ea61..03a0018b 100644
--- a/wqflask/wqflask/static/new/javascript/trait_data_and_analysis.coffee
+++ b/wqflask/wqflask/static/new/javascript/trait_data_and_analysis.coffee
@@ -38,17 +38,17 @@ $ ->
             console.log("aab")
             if the_mean != current_mean
                 console.log("setting mean")
-                $(id).html(the_mean)
+                $(id).html(the_mean).effect("highlight")
                 console.log("should be set")
-            if current_mean and the_mean != current_mean
-                $(id).effect("highlight")
 
             n_of_samples = the_values[category].length
-            current_n_of_samples = $("#n_of_samples_value").html()
+            id = "#" + process_id(category, "n_of_samples")
+            console.log("n_of_samples id:", id)
+            current_n_of_samples = $(id).html()
             console.log("cnos:", current_n_of_samples)
             console.log("n_of_samples:", n_of_samples)
             if n_of_samples != current_n_of_samples
-                $("#n_of_samples_value").html(current_n_of_samples).effect("highlight")
+                $(id).html(n_of_samples).effect("highlight")
 
 
 
diff --git a/wqflask/wqflask/static/new/javascript/trait_data_and_analysis.js b/wqflask/wqflask/static/new/javascript/trait_data_and_analysis.js
index 035b5c09..cf034fe1 100644
--- a/wqflask/wqflask/static/new/javascript/trait_data_and_analysis.js
+++ b/wqflask/wqflask/static/new/javascript/trait_data_and_analysis.js
@@ -52,18 +52,17 @@
         console.log("aab");
         if (the_mean !== current_mean) {
           console.log("setting mean");
-          $(id).html(the_mean);
+          $(id).html(the_mean).effect("highlight");
           console.log("should be set");
         }
-        if (current_mean && the_mean !== current_mean) {
-          $(id).effect("highlight");
-        }
         n_of_samples = the_values[category].length;
-        current_n_of_samples = $("#n_of_samples_value").html();
+        id = "#" + process_id(category, "n_of_samples");
+        console.log("n_of_samples id:", id);
+        current_n_of_samples = $(id).html();
         console.log("cnos:", current_n_of_samples);
         console.log("n_of_samples:", n_of_samples);
         if (n_of_samples !== current_n_of_samples) {
-          _results.push($("#n_of_samples_value").html(current_n_of_samples).effect("highlight"));
+          _results.push($(id).html(n_of_samples).effect("highlight"));
         } else {
           _results.push(void 0);
         }
diff --git a/wqflask/wqflask/templates/trait_data_and_analysis.html b/wqflask/wqflask/templates/trait_data_and_analysis.html
index 47d0827b..c951156a 100644
--- a/wqflask/wqflask/templates/trait_data_and_analysis.html
+++ b/wqflask/wqflask/templates/trait_data_and_analysis.html
@@ -3018,7 +3018,7 @@
 
                 <p id="sectionbody5"></p>
 
-                <table class="target5" cellpadding="0" cellspacing="0" width="100%">
+                <table class="target5" id="value_table" cellpadding="0" cellspacing="0" width="100%">
                   <tr>
                     <td>
                       <div>
@@ -3118,7 +3118,8 @@
 		basic_table = {{ basic_table | safe }}
 	</script>
 
-	<script type="text/javascript" src="/static/new/packages/DataTables/js/jquery.dataTables.min.js"></script>
+	<script type="text/javascript" src="/static/new/js_external/underscore-min.js"></script>-->
+	<script type="text/javascript" src="/static/new/js_external/underscore.string.min.js"></script>
 	<script type="text/javascript" src="/static/new/javascript/trait_data_and_analysis.js"></script>
 
 
-- 
cgit v1.2.3