Changing default values (#227)

biocore · Apr 18, 2017 · cf4eae5 · cf4eae5
1 parent 6d9ccb9
commit cf4eae5
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 5 deletions.
diff --git a/knimin/static/css/qiime.css b/knimin/static/css/qiime.css
@@ -404,6 +404,10 @@ ul.mainmenu li a:hover {
 	background-color: rgba(200,250,200,1);
 }
 
+.pm-conc-max {
+	background-color: rgba(0,206,209,1);
+}
+
 .pm-conc-diff {
 	background-color: rgba(250,200,200,1);
 }

diff --git a/knimin/templates/pm_targeted_concentration_check.html b/knimin/templates/pm_targeted_concentration_check.html
@@ -29,14 +29,18 @@
     if (plate['bool_blanks'][row][col]) {
       val = $('#pm-filter-blanks').val();
       plate['color_class'][row][col] = 'pm-conc-blank';
-    } else if (val < 0 || val >= $('#pm-filter-max').val()) {
-      // If the value is negative or bigger than maximum we need to set to 0
+    } else if (val < 0) {
+      // If the value is negative we need to set to 0
       val = 0;
       plate['color_class'][row][col] = 'pm-conc-diff';
+    } else if (val >= $('#pm-filter-max').val()) {
+      // If the value is above the maximum we need to set to 2
+      val = 2;
+      plate['color_class'][row][col] = 'pm-conc-max';
     } else if (val < $('#pm-filter-min').val()) {
       // If the value is smaller than the minimum we set it to the minimum
       val = $('#pm-filter-min').val();
-      plate['color_class'][row][col] = 'pm-conc-min'
+      plate['color_class'][row][col] = 'pm-conc-min';
     }
     return val;
   };
@@ -161,8 +165,8 @@
       <input type="number" id="pm-filter-min" min=0 value=1 step=0.001 />
     </div>
     <div class="col-xs-4 form-group">
-      <label>Maximum concentration: (ng/&mu;L)</br>(values higher than this will be set to 0)</label>
-      <input type="number" id="pm-filter-max" min=0 value=15 step=0.001 />
+      <label>Maximum concentration: (&mu;L)</br>(values higher than this will be set to 0)</label>
+      <input type="number" id="pm-filter-max" min=0 value=20 step=0.001 />
     </div>
     <div class="col-xs-4 form-group">
       <button class="btn btn-info" id="pm-epmotion"><span class='glyphicon glyphicon-export'></span> Download EPMotion file</button>