Changeset 1948

Timestamp:

Apr 22, 2013, 1:17:39 PM (10 years ago)

Author:

Nicklas Nordborg

Message:

References #429: Generate lab protocol for pooling and flow cell preparation

Rearranged column order in list view so that work plate location is next to the volumes column.

Only show one of the 5µl and 10µl volumes. If the amount of extract is less than 1µl the 10µl values are used otherwise the 5µl values.

File:

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

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

@@ -61 +61 @@
   var debug = false;
   var currentStep = 1;
+  var LIMIT_FOR_5_ML = 2.0;
   
   function init()
@@ -139 +140 @@
         remarks[remarks.length] = 'SpeedVac';
         if (lib.molarity < 2) remarks[remarks.length] = 'Use 5 µl';
+      }
+      if (lib.volume < LIMIT_FOR_5_ML)
+      {
+        lib.volume *= 2;
+        lib.eb *= 2;
+        remarks[remarks.length] = 'Mix 10µl';
       }
     }
@@ -178 +185 @@
         setInnerHTML('molarity.'+idSuffix, Numbers.formatNumber(lib.molarity, 2));
         
-        setInnerHTML('volume.mol5.'+idSuffix, Numbers.formatNumber(lib.volume, 2));
-        setInnerHTML('eb.mol5.'+idSuffix, Numbers.formatNumber(lib.eb, 2));
-        setInnerHTML('volume.mol10.'+idSuffix, Numbers.formatNumber(lib.volume*2, 2));
-        setInnerHTML('eb.mol10.'+idSuffix, Numbers.formatNumber(lib.eb*2, 2));
+        setInnerHTML('volume.'+idSuffix, Numbers.formatNumber(lib.volume, 2));
+        setInnerHTML('eb.'+idSuffix, Numbers.formatNumber(lib.eb, 2));
         
         var indexSet = barcodeVariant.indexSets[well.column];
@@ -238 +243 @@
         var i = name.indexOf('.m');
         text += '<div class="lib">'+name.substring(0, i)+'.<br>&nbsp;'+name.substring(i)+'</div>';
-        
         text += '<div><span class="volume">'+Numbers.formatNumber(lib.volume, 1)+'µl</span>';
         text += '<span class="eb">'+Numbers.formatNumber(lib.eb, 1)+'µl</span></div>';
-        text += '<div><span class="volume">'+Numbers.formatNumber(lib.volume*2, 1)+'µl</span>';
-        text += '<span class="eb">'+Numbers.formatNumber(lib.eb*2, 1)+'µl</span></div>';
         text += '<div class="remarks">'+ lib.remarks.join('; ') + '</div>';
       }
@@ -348 +350 @@
   }
 
-  #listview .mol5, #listview .mol10
+  #listview .mix
   {
     width: 8em;
@@ -355 +357 @@
   }
   
-  #listview .empty .mol5, #listview .empty .mol10
+  #listview .empty .mix
   {
     visibility: hidden;
@@ -470 +472 @@
         <th></th>
         <th class="lib"></th>
-        <th class="workplate">Work</th>
         <th>Remain</th>
         <th>DNA</th>
-        <th>2nM, 5µl</th>
-        <th>2nM, 10µl</th>
+        <th class="workplate">Work</th>
+        <th>2nM, 5/10µl</th>
         <th></th>
       </tr>
@@ -481 +482 @@
         <th>Pool</th>
         <th class="lib">Library</th>
-        <th class="workplate">plate</th>
         <th>(ng)</th>
         <th>(nM)</th>
-        <th>(µl)</th>
+        <th class="workplate">plate</th>
         <th>(µl)</th>
         <th>Remarks</th>
@@ -513 +513 @@
           <td class="pool" id="pool.<%=idSuffix%>"></td>
           <td class="lib" id="lib.<%=idSuffix%>">empty</td>
-          <td class="workplate"><%=rowF.format(r)+colF.format(c)%></td>
           <td class="remain" id="remain.<%=idSuffix%>"></td>
           <td class="molarity" id="molarity.<%=idSuffix%>"></td>
-          <td class="mol5"><span class="volume" id="volume.mol5.<%=idSuffix%>"></span>+<span class="eb" id="eb.mol5.<%=idSuffix%>"></span></td>
-          <td class="mol10"><span class="volume" id="volume.mol10.<%=idSuffix%>"></span>+<span class="eb" id="eb.mol10.<%=idSuffix%>"></span></td>
+          <td class="workplate"><%=rowF.format(r)+colF.format(c)%></td>
+          <td class="mix"><span class="volume" id="volume.<%=idSuffix%>"></span>+<span class="eb" id="eb.<%=idSuffix%>"></span></td>
           <td class="remarks" id="remarks.<%=idSuffix%>"></td>
         </tr>