Ignore:
Timestamp:
Jan 9, 2014, 1:12:04 PM (8 years ago)
Author:
Nicklas Nordborg
Message:

Fixes #553: Set different volume and mixing strategy for pools on a plate

Added a section in the plate view so that the "Average volume/lib" and "Mixing strategy" can be selected for each pool. Only minor changes required in the protocol generation since most of it was already working per pool.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • extensions/net.sf.basedb.reggie/trunk/resources/libprep/pool_protocol2.jsp

    r2140 r2184  
    248248  function viewAsList(pools, schema, barcodeVariant)
    249249  {
    250     for (var i = 0; i < pools.length; i++)
    251     {
    252       var pool = pools[i];
    253       var wellsInPool = POOL_CURRENT_SCHEMA ? Plate.getPool(i) : null;
     250    for (var poolNo = 0; poolNo < pools.length; poolNo++)
     251    {
     252      var pool = pools[poolNo];
     253      var realPoolNo = schema.getPoolNumForColumn(pool.libraries[0].bioWell.column);
     254
     255      var wellsInPool = POOL_CURRENT_SCHEMA ? Plate.getPool(realPoolNo) : null;
    254256     
    255257      var html = '';
     
    314316      poolData += Numbers.formatNumber(pool.molarity, 2)+'nM; ';
    315317      poolData += Numbers.formatNumber(pool.volume, 1) + 'µl';
     318      poolData += '<br>Mixing strategy: ' + pool.mixingStrategy;
    316319      poolData += '</div>';
    317320      setInnerHTML('molarity.'+pool.id, poolData);
     
    372375
    373376    WellPainter.barcodeVariant = barcodeVariant;
    374     WellPainter.mixingStrategy = pools[0].mixingStrategy;
    375     Plate.paint(Plate.getWells());
    376377    PoolSchema.buildPoolTableRow(schema, 12);
    377378    Main.show('plateview');
     
    380381    {
    381382      var pool = pools[poolNo];
     383      var realPoolNo = schema.getPoolNumForColumn(pool.libraries[0].bioWell.column);
     384      WellPainter.mixingStrategy = pool.mixingStrategy;
     385      Plate.paint(Plate.getPool(realPoolNo));
     386     
    382387      var poolData = '<div class="pool-data">';
    383388      poolData += pool.libraries.length + ' libs • ';
     
    388393        poolData += ' • <span class="pool-eb">'+Numbers.formatNumber(pool.extra.ebVolumeExtra, 1, 'µl')+'</span>';
    389394      }
     395      poolData += '<br>Mixing strategy: ' + pool.mixingStrategy;
    390396      poolData += '<div class="comments">'+pool.comments+'</div>';
    391397      poolData += '</div>';
    392398     
    393       var realPoolNo = schema.getPoolNumForColumn(pool.libraries[0].bioWell.column);
    394399      document.getElementById('pool.'+realPoolNo).innerHTML = pool.name + poolData;
    395400    }
     
    658663  }
    659664 
    660   #pool-row
    661   {
     665  #pool-row th
     666  {
     667    border-top: 0;
     668    border-bottom: 1px solid #808080;
    662669    vertical-align: top;
     670    padding: 0;
    663671  }
    664672 
     
    782790    %>
    783791    <table class="plate" style="margin: 0em 0 0 0; width: 100%; display: none;" id="plateview">
     792    <tr id="pool-row">
     793      <th colspan="13">&nbsp;</th>
     794    </tr>
    784795    <%
    785796    WellCoordinateFormatter rowF = new WellCoordinateFormatter(true);
     
    818829    %>
    819830    </tbody>
    820     <tr id="pool-row">
    821       <th colspan="13">&nbsp;</th>
    822     </tr>
    823831    </table>
    824832    <div style="margin: 1em;">
Note: See TracChangeset for help on using the changeset viewer.