Changeset 1776

Timestamp:

Dec 11, 2012, 3:50:28 PM (11 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:

• resources/histology_block.jsp (modified) (3 diffs)
• src/net/sf/basedb/reggie/servlet/HistologyServlet.java (modified) (1 diff)

extensions/net.sf.basedb.reggie/trunk/resources/histology_block.jsp

@@ -213 +213 @@
   html += '<th>Paraffin block</th>';
   html += '<th>Storage box</th>';
+  html += '<th>Comment</th>';
   html += '</tr>';
   html += '</thead>';
@@ -223 +224 @@
 
     html += '<tr>';
-    html += '<td style="width: 150px;">' + block.name + '</td>';
+    html += '<td style="width: 120px;">' + block.name + '</td>';
     html += '<td><input type="text" name="blockBox'+blockNo+'" value="<%=lastBlockBox%>" onblur="blockBoxOnChange('+blockNo+')"';
     html += ' onkeypress="' + nextStep + '" size="10" ></td>';
+    html += '<td><input type="text" name="blockComment'+blockNo+'" value="" size="35"></td>';
     html += '</tr>';
   }
@@ -278 +280 @@
     var block = workList.blocks[blockNo];
     block.storageBox = frm['blockBox'+blockNo].value;
+    block.comment = frm['blockComment'+blockNo].value;
     frm['blockBox'+blockNo].disabled = true;
+    frm['blockComment'+blockNo].disabled = true;
   }
 

extensions/net.sf.basedb.reggie/trunk/src/net/sf/basedb/reggie/servlet/HistologyServlet.java

@@ -451 +451 @@
             paraffinBlock.setEventDate(moveDate);
             paraffinBlock.setTray(storageBox);
+            paraffinBlock.setDescription(Values.getStringOrNull((String)jsonBlock.get("comment")));
             
             // Attach the new paraffin block to the PLACE-ON-PLATE event