Changeset 1802


Ignore:
Timestamp:
Jan 16, 2013, 1:36:06 PM (7 years ago)
Author:
Nicklas Nordborg
Message:

References #424 and #425. Changed plate design to use 5 pools of 16 on each plate. This leaves just 1 column on each side free for extra biomaterial.

Location:
extensions/net.sf.basedb.reggie/branches/ticket-422/resources/libprep
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • extensions/net.sf.basedb.reggie/branches/ticket-422/resources/libprep/mrna_protocol2.jsp

    r1800 r1802  
    533533      {
    534534        %>
    535         <th id="col.<%=c%>"><%=colF.format(c)%></td>
     535        <th id="col.<%=c%>"><%=colF.format(c)%></th>
    536536        <%
    537537      }
     
    550550        {
    551551          %>
    552           <td class="well col-<%=c%> <%=c>=2 && c<=9 ? "primary" : "secondary" %> <%=c % 2 == 0 ? "pool-left" : "pool-right" %>" id="well.<%=r%>.<%=c%>"></td>
     552          <td class="well col-<%=c%> <%=c>=1 && c<=10 ? "primary" : "secondary" %> <%=c % 2 == 1 ? "pool-left" : "pool-right" %>" id="well.<%=r%>.<%=c%>"></td>
    553553          <%
    554554        }
     
    561561    <tr>
    562562      <th></th>
     563      <th></th>
    563564      <%
    564565      String[] poolNames = { "i", "ii", "iii", "iv", "v", "vi", "vii", "viii", "ix", "x", "xi", "xii" };
    565       for (int i = 0; i < columns / 2; ++i)
     566      for (int i = 0; i < (columns - 2) / 2; ++i)
    566567      {
    567568        %>
     
    570571      }
    571572      %>
     573      <th></th>
    572574    </tr>
    573575    </table>
  • extensions/net.sf.basedb.reggie/branches/ticket-422/resources/libprep/select_rna.jsp

    r1800 r1802  
    9292
    9393  /**
    94     Get all wells in the given pool number. First pool is 0.
     94    Get all wells in the given pool number. Each pool is two columns.
     95    First pool i 0 and starts in column 1 (column 0 and 11 doesn't belong to
     96    any pool).
    9597  */
    9698  plate.getPool = function(pool)
    9799  {
    98100    var result = [];
    99     for (var i = pool*2*plate.rows; result.length < plate.rows*2; i++)
     101    for (var i = (1+pool*2)*plate.rows; result.length < plate.rows*2; i++)
    100102    {
    101103      result[result.length] = plate.wells[i];
     
    426428  var c = this.column;
    427429  var cls = 'well col-'+c;
    428   cls += (c >= 2 && c <= 9) ? ' primary' : ' secondary';
    429   cls += c % 2 == 0 ? ' pool-left' : ' pool-right';
     430  cls += (c >= 1 && c <= 10) ? ' primary' : ' secondary';
     431  cls += c % 2 == 1 ? ' pool-left' : ' pool-right';
    430432  if (this.selected) cls += ' selected';
    431433  if (this.clipboard) cls += ' clipboard';
     
    10891091  {
    10901092    // All primary pools or all empty in the primary pools (will be filtered later)
    1091     for (var i = 1; i < 5; i++)
     1093    for (var i = 0; i < 5; i++)
    10921094    {
    10931095      wells = wells.concat(Plate.getPool(i));
     
    13291331  }
    13301332 
    1331   if (numRna < 64)
    1332   {
    1333     if (!confirm('Less than 64 wells have RNA in them. Continue anyway?')) return;
     1333  if (numRna < 80)
     1334  {
     1335    if (!confirm('Less than 80 wells have RNA in them. Continue anyway?')) return;
    13341336  }
    13351337 
     
    17121714              onmouseover="highlightColumn(<%=c%>, true)"
    17131715              onmouseout="highlightColumn(<%=c%>, false)"
    1714               title="Select/deselect all wells in this column"><%=colF.format(c)%></td>
     1716              title="Select/deselect all wells in this column"><%=colF.format(c)%></th>
    17151717            <%
    17161718          }
     
    17481750        <tr>
    17491751          <th></th>
     1752          <th class="link" id="col.0.dup"
     1753              onclick="toggleColumn(0)"
     1754              onmouseover="highlightColumn(0, true)"
     1755              onmouseout="highlightColumn(0, false)"
     1756              title="Select/deselect all wells in this column"></th>
    17501757          <%
    17511758          String[] poolNames = { "i", "ii", "iii", "iv", "v", "vi", "vii", "viii", "ix", "x", "xi", "xii" };
    1752           for (int i = 0; i < columns / 2; ++i)
     1759          for (int i = 0; i < (columns - 2) / 2; ++i)
    17531760          {
    17541761            %>
     
    17621769          }
    17631770          %>
     1771          <th></th>
    17641772        </tr>
    17651773        </table>
Note: See TracChangeset for help on using the changeset viewer.