Changeset 1776


Ignore:
Timestamp:
Dec 11, 2012, 3:50:28 PM (7 years ago)
Author:
Nicklas Nordborg
Message:

References #446: The Paraffin block registration wizard should have comment fields

Added a single-line comment field on the same line as the storage box in the table. It looked a bit strange with a larger text box on a separate line. Maybe I'll change it later since there is not enough room to fit the comment field on the same line in the HE glass registration wizard.

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

Legend:

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

    r1726 r1776  
    213213  html += '<th>Paraffin block</th>';
    214214  html += '<th>Storage box</th>';
     215  html += '<th>Comment</th>';
    215216  html += '</tr>';
    216217  html += '</thead>';
     
    223224
    224225    html += '<tr>';
    225     html += '<td style="width: 150px;">' + block.name + '</td>';
     226    html += '<td style="width: 120px;">' + block.name + '</td>';
    226227    html += '<td><input type="text" name="blockBox'+blockNo+'" value="<%=lastBlockBox%>" onblur="blockBoxOnChange('+blockNo+')"';
    227228    html += ' onkeypress="' + nextStep + '" size="10" ></td>';
     229    html += '<td><input type="text" name="blockComment'+blockNo+'" value="" size="35"></td>';
    228230    html += '</tr>';
    229231  }
     
    278280    var block = workList.blocks[blockNo];
    279281    block.storageBox = frm['blockBox'+blockNo].value;
     282    block.comment = frm['blockComment'+blockNo].value;
    280283    frm['blockBox'+blockNo].disabled = true;
     284    frm['blockComment'+blockNo].disabled = true;
    281285  }
    282286
  • extensions/net.sf.basedb.reggie/trunk/src/net/sf/basedb/reggie/servlet/HistologyServlet.java

    r1774 r1776  
    451451            paraffinBlock.setEventDate(moveDate);
    452452            paraffinBlock.setTray(storageBox);
     453            paraffinBlock.setDescription(Values.getStringOrNull((String)jsonBlock.get("comment")));
    453454           
    454455            // Attach the new paraffin block to the PLACE-ON-PLATE event
Note: See TracChangeset for help on using the changeset viewer.