Changeset 2151

Timestamp:

Nov 26, 2013, 9:52:40 AM (8 years ago)

Author:

Nicklas Nordborg

Message:

Fixes #538: Count and display number of libraries with low and high concentration in create pooled library wizards

Added three counters to the two pooling wizards:

• Separate mix: the number of libraries that need to be mixed separately before pooling
• Low quantity: the number of libraries with less remaining quantity that required to reach the target molarity/volume for the pool
• Excluded: the number of libraries that has been excluded from the pool

Location:

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

Files:

• create_manual_pool.jsp (modified) (6 diffs)
• create_pools.jsp (modified) (5 diffs)

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

@@ -341 +341 @@
   var mixingStrategy = Forms.getCheckedRadio(frm.mixing_strategy).value;
 
+  var numSeparateMix = 0;
+  var numLowQuantity = 0;
+  var numExcluded = 0;
+
   // Get all libs into an array
   var libs = [];
@@ -362 +366 @@
       PoolMix.calculateEbVolume(lib, TARGET_MOLARITY_IN_POOL, targetVolumePerLib, mixingStrategy);
     }
+    else
+    {
+      numExcluded++;
+    }
   }
     
@@ -403 +411 @@
         setInnerHTML('lib.'+lib.id+'.eb', '-');
       }
+      if (lib.eb != 0 || mixingStrategy == 'fixed') numSeparateMix++;
+      if (lib.volume > lib.actualVolume) numLowQuantity++;
     }
     
@@ -440 +450 @@
   poolData += '</div>';
   poolDiv.innerHTML = poolData;
+  
+  setInnerHTML('num_separate_mix', numSeparateMix);
+  setInnerHTML('num_low_quantity', numLowQuantity);
+  setInnerHTML('num_excluded', numExcluded);
+
 }
 
@@ -816 +831 @@
         />
       </tbl:toolbar>
-      
+
       <div id="pool-table" class="bottomborder">
       <table style="width: 100%;">
@@ -830 +845 @@
       
       <div id="lib-table" style="display: none;">
-      <table class="bottomborder">
+      <div style="margin: 1em;" class="messagecontainer note">
+        <base:icon image="info.png"/> 
+        <b>Separate mix:</b> <span id="num_separate_mix"></span>, 
+        <b>Low quantity:</b> <span id="num_low_quantity"></span>, 
+        <b>Excluded:</b> <span id="num_excluded"></span>
+      </div>
+      <table class="bottomborder topborder">
       <thead>
         <tr>

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

@@ -432 +432 @@
   var schema = PoolSchema.getById(libPlate.poolSchema);
   var barcodeVariant = PoolSchema.getBarcodeVariantByName(schema, libPlate.barcodeVariant);
+
+  var numSeparateMix = 0;
+  var numLowQuantity = 0;
+  var numExcluded = 0;
   
   for (var poolNo = 0; poolNo < Plate.getPools(); poolNo++)
@@ -442 +446 @@
       var well = wells[wellNo];
       var lib = well.extract;
-      if (lib && !lib.excludeFromPool)
-      {
-        libs[libs.length] = lib;
+      if (lib)
+      {
+        if (lib.excludeFromPool)
+        {
+          numExcluded++;
+        }
+        else
+        {
+          libs[libs.length] = lib;
+        }
       }
     }
@@ -457 +468 @@
       var lib = libs[libNo];
       calculateRemarks(lib, schema, barcodeVariant);
+      if (lib.eb != 0 || mixingStrategy == 'fixed') numSeparateMix++;
+      if (lib.volume > lib.actualVolume) numLowQuantity++;
     }
     
@@ -490 +503 @@
     frm['comment.'+poolNo].value = comments;
   }
+  
+  setInnerHTML('num_separate_mix', numSeparateMix);
+  setInnerHTML('num_low_quantity', numLowQuantity);
+  setInnerHTML('num_excluded', numExcluded);
 }
 
@@ -988 +1005 @@
       </tbl:toolbar>
       
+      <div style="margin: 1em;" class="messagecontainer note">
+        <base:icon image="info.png"/> 
+        <b>Separate mix:</b> <span id="num_separate_mix"></span>, 
+        <b>Low quantity:</b> <span id="num_low_quantity"></span>, 
+        <b>Excluded:</b> <span id="num_excluded"></span>
+      </div>
+      
       <table class="plate" style="margin: 1em 1em 1em 1em;" id="plate">
       <%