Changeset 2241


Ignore:
Timestamp:
Feb 21, 2014, 8:59:52 AM (9 years ago)
Author:
Nicklas Nordborg
Message:

References #562, #545 and #546. Only display pool name once if the flow cell only contains one pool.

Location:
extensions/net.sf.basedb.reggie/trunk/resources
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • extensions/net.sf.basedb.reggie/trunk/resources/analysis/sequencing_confirm.jsp

    r2236 r2241  
    5555      if (lastPoolNum - firstPoolNum == numPools - 1)
    5656      {
    57         // Display: PoolN -- PoolY
    58         name += flowCell.pools[0].name + ' — ' + flowCell.pools[flowCell.pools.length-1].name;
     57        if (numPools > 1)
     58        {
     59          // Display: PoolN -- PoolY
     60          name += flowCell.pools[0].name + ' — ' + flowCell.pools[flowCell.pools.length-1].name;
     61        }
     62        else
     63        {
     64          name += flowCell.pools[0].name;
     65        }
    5966      }
    6067      else
  • extensions/net.sf.basedb.reggie/trunk/resources/libprep/flowcell_registration.jsp

    r2222 r2241  
    5757      if (lastPoolNum - firstPoolNum == numPools - 1)
    5858      {
    59         // Display: PoolN -- PoolY
    60         name += flowCell.pools[0].name + ' — ' + flowCell.pools[flowCell.pools.length-1].name;
     59        if (numPools > 1)
     60        {
     61          // Display: PoolN -- PoolY
     62          name += flowCell.pools[0].name + ' — ' + flowCell.pools[flowCell.pools.length-1].name;
     63        }
     64        else
     65        {
     66          name += flowCell.pools[0].name;
     67        }
    6168      }
    6269      else
  • extensions/net.sf.basedb.reggie/trunk/resources/libprep/sequencing_ended.jsp

    r2236 r2241  
    5656      if (lastPoolNum - firstPoolNum == numPools - 1)
    5757      {
    58         // Display: PoolN -- PoolY
    59         name += flowCell.pools[0].name + ' — ' + flowCell.pools[flowCell.pools.length-1].name;
     58        if (numPools > 1)
     59        {
     60          // Display: PoolN -- PoolY
     61          name += flowCell.pools[0].name + ' — ' + flowCell.pools[flowCell.pools.length-1].name;
     62        }
     63        else
     64        {
     65          name += flowCell.pools[0].name;
     66        }
    6067      }
    6168      else
Note: See TracChangeset for help on using the changeset viewer.