Changeset 1929 for extensions/net.sf.basedb.reggie/trunk/resources/libprep/mrna_protocol2.jsp

Timestamp:

Apr 12, 2013, 2:34:01 PM (9 years ago)

Author:

Nicklas Nordborg

Message:

References #424, #425, #457, #479. Re-designed protocols to make the header section a bit more compact when the comment text is large. Display a warning when the remaining RNA quanitity is below 1.5 times the required amount (eg. 1.1µg or 1.22µg).

File:

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

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

@@ -61 +61 @@
   var debug = false;
   var currentStep = 1;
-  
+
+  var QUANTITY_REGULAR = 1.1;
+  var QUANTITY_QC = 1.22;
+  var LOW_QUANTITY_WARNING_FACTOR = 1.5;
+
   function init()
   {
@@ -139 +143 @@
     rna.external = rna.name == EXTERNAL_RNA_NAME;
     
-    // Set the 'QC' flag if more than 1.2µg is used
-    rna.qc = rna.usedQuantity > 1.2;
+    // Set the 'QC' flag if more than 1.1µg is used
+    rna.qc = rna.usedQuantity > QUANTITY_REGULAR;
     
     <%
@@ -171 +175 @@
         remarks[remarks.length] = 'No quantity';
       }
-      else if (rna.remainingQuantity < (rna.qc ? 1.22 : 1.1))
+      else if (rna.remainingQuantity < (rna.qc ? QUANTITY_QC : QUANTITY_REGULAR) * LOW_QUANTITY_WARNING_FACTOR)
       {
         remarks[remarks.length] = 'Low quantity';
@@ -495 +499 @@
   <h1>Lab protocol for mRNA and cDNA preparation <span class="reggie">Reggie <%=reggie.getAbout().getVersion() %></span></h1>
 
-  <table style="width: 100%; border: 0px;" class="protocolheader">
+  <table style="width: 100%;" class="protocolheader">
   <tr valign="top">
-    <th style="width: 30%;">Work plate: <%=HTML.encodeTags(plate.getName())%></th>
-    <th style="width: 20%; text-align: right;">Comments:&nbsp;</th>
-    <td rowspan="3"><%=HTML.niceFormat(plate.getDescription()) %></td>
+    <th style="width: 40%;">Work plate: <%=HTML.encodeTags(plate.getName())%></th>
+    <th style="width: 60%;">Comments:</th>
   </tr>
-  <tr>
-    <th style="width: 50%;" colspan="2">Date+operator for mRNA:</th>
+  <tr valign="top">
+    <th style="width: 40%; padding-bottom: 1.5em;">Date+operator for mRNA:</th>
+    <td rowspan="2"><%=HTML.niceFormat(plate.getDescription()) %></td>
   </tr>
-  <tr>
-    <th style="width: 50%;" colspan="2">Date+operator for cDNA:</th>
+  <tr valign="top">
+    <th style="width: 40%; padding-bottom: 1.5em;">Date+operator for cDNA:</th>
   </tr>
   </table>