Changeset 2264

Timestamp:

Mar 4, 2014, 10:44:54 AM (9 years ago)

Author:

Nicklas Nordborg

Message:

Fixes #583: Require 'embedding date' in 'Register paraffin blocks' wizard

Location:

extensions/net.sf.basedb.reggie/branches/2.15-stable

Files:

• resources/sampleproc/histology_block.jsp (modified) (8 diffs)
• src/net/sf/basedb/reggie/servlet/HistologyServlet.java (modified) (4 diffs)

extensions/net.sf.basedb.reggie/branches/2.15-stable/resources/sampleproc/histology_block.jsp

@@ -56 +56 @@
 var debug = false;
 var currentStep = 1;
-var moveDateIsValid = false;
+var embedDateIsValid = false;
 var workList;
 
@@ -75 +75 @@
     }
     workListIsValid = true;
-    frm.moveDate.focus();
+    frm.embedDate.focus();
     Main.show('gonext');
   }
@@ -168 +168 @@
 function step1IsValid()
 {
-  return moveDateIsValid;
+  return embedDateIsValid;
 }
 
@@ -197 +197 @@
   
   frm.workList.disabled = true;
-  frm.moveDate.disabled = true;
+  frm.embedDate.disabled = true;
   frm.histologyProtocol.disabled = true;
   
@@ -273 +273 @@
   Main.hide('gocreate');
   
-  workList.moveDate = frm.moveDate.value;
+  workList.embedDate = frm.embedDate.value;
   workList.protocolId = parseInt(frm.histologyProtocol[frm.histologyProtocol.selectedIndex].value, 10);
 
@@ -327 +327 @@
 }
 
-function moveDateOnChange()
-{
-  var frm = document.forms['reggie'];
-  moveDateIsValid = false;
-  setInputStatus('moveDate', '', '');
-  
-  var moveDate = frm.moveDate.value;
-  
-  if (moveDate == '')
-  {
-    setInputStatus('moveDate', 'Missing', 'warning');
+function embedDateOnChange()
+{
+  var frm = document.forms['reggie'];
+  embedDateIsValid = false;
+  setInputStatus('embedDate', '', '');
+  
+  var embedDate = frm.embedDate.value;
+  
+  if (embedDate == '')
+  {
+    setInputStatus('embedDate', 'Missing', 'invalid');
+    return;
   }
   else
   {
     // Auto-fill the date if it's only given with 4(MMdd) or 6(yyMMdd) digits.
-    moveDate = autoFillDate(moveDate);
-    frm.moveDate.value = moveDate;
-  
-    if (!Dates.isDate(moveDate, 'yyyyMMdd'))
+    embedDate = autoFillDate(embedDate);
+    frm.embedDate.value = embedDate;
+  
+    if (!Dates.isDate(embedDate, 'yyyyMMdd'))
     {
-      setInputStatus('moveDate', 'Not a valid date', 'invalid');
+      setInputStatus('embedDate', 'Not a valid date', 'invalid');
       return;
     }
-    setInputStatus('moveDate', '', 'valid');
-  }
-  
-  moveDateIsValid = true;
+  }
+  
+  setInputStatus('embedDate', '', 'valid');
+  embedDateIsValid = true;
 }
 
@@ -405 +406 @@
         <td class="prompt">Histology work list</td>
         <td class="input"><select style="width:90%" 
-            name="workList" id="workList" 
+            name="workList" id="workList" class="required"
             onchange="histologyOnChange()"></select>
         </td>
@@ -416 +417 @@
         <td class="prompt">Embedding date</td>
         <td class="input">
-          <input type="text" name="moveDate" value="" size="12" maxlength="10" 
-            onblur="moveDateOnChange()">
+          <input type="text" class="required" name="embedDate" value="" size="12" maxlength="10" 
+            onblur="embedDateOnChange()">
         </td>
-        <td class="status" id="moveDate.status"></td>
+        <td class="status" id="embedDate.status"></td>
         <td class="help">
-          <span id="moveDate.message" class="message" style="display: none;"></span>(YYYYMMDD or MMDD)
+          <span id="embedDate.message" class="message" style="display: none;"></span>(YYYYMMDD or MMDD)
         </td>
       </tr>

extensions/net.sf.basedb.reggie/branches/2.15-stable/src/net/sf/basedb/reggie/servlet/HistologyServlet.java

@@ -549 +549 @@
         Number workListId = (Number)jsonReq.get("id");
         
-        Date moveDate = Reggie.CONVERTER_STRING_TO_DATE.convert((String)jsonReq.get("moveDate"));
+        Date embedDate = Reggie.CONVERTER_STRING_TO_DATE.convert((String)jsonReq.get("embedDate"));
         Number protocolId = (Number)jsonReq.get("protocolId");
         String storageBox = null;
@@ -557 +557 @@
         
         BioPlateEvent placeEvent = BioPlateEvent.getNew(dc, BioPlateEventType.getById(dc, BioPlateEventType.PLACE_ON_PLATE));
-        placeEvent.setEventDate(moveDate);
-        placeEvent.setName("Place Histology item on paraffin blocks");
+        placeEvent.setEventDate(embedDate);
+        placeEvent.setName("Embed Histology items on paraffin blocks");
         placeEvent.setProtocol(protocol);
         dc.saveItem(placeEvent);
@@ -605 +605 @@
             
             paraffinBlock = BioPlate.getById(dc, blockId.intValue());
-            paraffinBlock.setEventDate(moveDate);
+            paraffinBlock.setEventDate(embedDate);
             paraffinBlock.setTray(storageBox);
             paraffinBlock.setDescription(Values.getStringOrNull((String)jsonBlock.get("comment")));
@@ -620 +620 @@
           // Register date and protocol
           BioMaterialEvent createEvent = his.getCreationEvent();
-          createEvent.setEventDate(moveDate);
+          createEvent.setEventDate(embedDate);
           createEvent.setProtocol(protocol);