Changeset 1945

Timestamp:

Apr 19, 2013, 1:40:57 PM (10 years ago)

Author:

Nicklas Nordborg

Message:

References #424: Select RNA items for library preparation

Added options to set remaining quantity and RQS/RIN levels in auto-select RNA wizard.

File:

• extensions/net.sf.basedb.reggie/trunk/resources/libprep/auto_select_rna.jsp (modified) (3 diffs)

extensions/net.sf.basedb.reggie/trunk/resources/libprep/auto_select_rna.jsp

@@ -31 +31 @@
 
 <script>
-var QUANTITY_REGULAR = 1.1;
 function autoSelect()
 {
   var options = {};
   var frm = document.forms['options'];
-  if (frm.remainingQuantity.checked) options.remainingQuantity = QUANTITY_REGULAR;
-  if (frm.qualityScore.checked) options.qualityScore = 6.0;
+  
+  var qRegular = parseFloat(frm.quantity_regular.value);
+  if (!(qRegular > 0))
+  {
+    frm.quantity_regular.focus();
+    alert('Remaining quantity must be a number >0');
+    return;
+  }
+  
+  var qualityScore = parseFloat(frm.quality_score.value);
+  if (!(qualityScore > 0))
+  {
+    frm.quality_score.focus();
+    alert('RQS/RIN must be a number >0')
+    return;
+  }
+  
+  if (frm.remainingQuantity.checked) options.remainingQuantity = qRegular;
+  if (frm.qualityScore.checked) options.qualityScore = qualityScore;
   if (frm.flag.checked) options.flag = 1;
   if (frm.reProcess.checked) options.reProcess = 1;
@@ -55 +71 @@
 {
   var frm = window.opener.document.forms['reggie'];
+  var opt = document.forms['options'];
   var qRegular = parseFloat(frm.quantity_regular.value);
-  if (qRegular > 0) QUANTITY_REGULAR = qRegular;
-  
-  setInnerHTML('quantity_regular', QUANTITY_REGULAR);
+  if (qRegular > 0) 
+  {
+    opt.quantity_regular.value = qRegular;
+  }
 }
 </script>
@@ -81 +99 @@
       <td>
         <input type="checkbox" name="remainingQuantity" id="remainingQuantity" value="1" checked>
-          <label for="remainingQuantity">Remaining quantity ≥ <span id="quantity_regular"></span> µg</label><br>
+          <label for="remainingQuantity">Remaining quantity</label> ≥ 
+            <input type="text" class="text required" name="quantity_regular" style="width: 4em;"
+              onkeypress="return Numbers.numberOnly(event)" 
+              value="1.1"> µg<br>
         <input type="checkbox" name="qualityScore" id="qualityScore" value="1" checked>
-          <label for="qualityScore">RQS/RIN ≥ 6</label><br>
+          <label for="qualityScore">RQS/RIN</label> ≥ 
+            <input type="text" class="text required" name="quality_score" style="width: 4em;"
+              onkeypress="return Numbers.numberOnly(event)" 
+              value="6"><br>
       </td>
     </tr>