Changeset 1430

Timestamp:

Oct 31, 2011, 1:22:42 PM (12 years ago)

Author:

Martin Svensson

Message:

References #330 Added some new checks before the partitions are saved: There must be at least one weight set for each tube.
The nofPieces must be set.
The his-sample is not automatically placed in a box.

This commit also contains corrections of misspelled words in the inputs of the OperatorPartitionComment?.
The different parts in the OperatorPartitionComment? are now separated with ';' instead of ':'

Location:

extensions/net.sf.basedb.reggie/trunk

Files:

• resources/partitionform.jsp (modified) (9 diffs)
• src/net/sf/basedb/reggie/servlet/PartitionRegistrationServlet.java (modified) (1 diff)

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

@@ -37 +37 @@
 var apWeightsAreValid;
 var hisWeightsAreValid;
+var oneOrMoreWeightsAreSet;
 var nofPiecesAreValid;
 
@@ -85 +86 @@
   for (var i=0; i<spWeightsAreValid.length; i++)
   {
+    
     if (spWeightsAreValid[i] == false ||
         apWeightsAreValid[i] == false ||
         hisWeightsAreValid[i] == false ||
         nofPiecesAreValid[i] == false)
+    {
+      return false;
+    }
+    if (oneOrMoreWeightsAreSet[i] == false)
     {
       return false;
@@ -138 +144 @@
     hisWeightsAreValid = Array();
     nofPiecesAreValid = Array();
+    oneOrMoreWeightsAreSet = Array();
+    for (var i=0;i<selectedTubes.length;i++)
+    {
+      spWeightsAreValid[i] = true;
+      apWeightsAreValid[i] = true;
+      hisWeightsAreValid[i] = true;
+      nofPiecesAreValid[i] = false;
+      oneOrMoreWeightsAreSet[i] = false;
+    }
         
     inputWeightHtml = '';
@@ -152 +167 @@
     
     var appearanceOptions = '<option selected ></option>';  
-    appearanceOptions += '<option value="HOMOGENUS">Homogenus</option>';
-    appearanceOptions += '<option value="HETEROGENUS">Heterogenus</option>';
+    appearanceOptions += '<option value="HOMOGENOUS">Homogenous</option>';
+    appearanceOptions += '<option value="HETEROGENOUS">Heterogenous</option>';
     
     var necrosisOptions = '<option selected value="0">0</option>';
@@ -172 +187 @@
     {
       var tube = selectedTubes[i];
-      var nextStep = i<(selectedTubes.length-1) ? 'focusOnEnter(event, \'bloody'+(i+1)+'\')' : 'doOnTabOrEnter(event, goCreate)';
+      var nextStep = i<(selectedTubes.length-1) ? 'focusOnEnter(event, \'bloody'+(i+1)+'\')' : '';
       
       inputWeightHtml += '<tr>';
@@ -190 +205 @@
       inputWeightHtml += '<td>'+fatTitle+'<select name=fat'+i+' onfocus="messageOnFocus(3,'+i+')" onkeypress="focusOnEnter(event, \'coloured'+i+'\')">'+fatOptions+'</select></td>';
       inputWeightHtml += '<td>'+colouredTitle+'<input type=checkbox name=coloured'+i+' onfocus="messageOnFocus(4,'+i+')" onkeypress="checkOnNumber(event, this);focusOnEnter(event, \'nofPieces'+i+'\')" /></td>'
-      inputWeightHtml += '<td>'+nofTitle+'<input name="nofPieces'+i+'" onfocus="messageOnFocus(5,'+i+')" onchange="nofPiecesOnChange('+i+')" onkeypress="focusOnEnter(event, \'spWeight'+i+'\')" size=2 /></td>';
-      inputWeightHtml += '<td>'+spTitle+'<input name="spWeight'+i+'" onfocus="messageOnFocus(6,'+i+')" onchange="spWeightOnChange('+i+')" onkeypress="focusOnEnter(event, \'hisWeight'+i+'\')" size=2 /></td>';
-      inputWeightHtml += '<td>'+hisTitle+'<input name="hisWeight'+i+'" onfocus="messageOnFocus(7,'+i+')" onchange="hisWeightOnChange('+i+')" onkeypress="focusOnEnter(event, \'apWeight'+i+'\')" size=2 /></td>';
-      inputWeightHtml += '<td>'+apTitle+'<input name="apWeight'+i+'" onfocus="messageOnFocus(8,'+i+')" onchange="apWeightOnChange('+i+')" onkeypress="'+nextStep+'" size=2 /></td>';      
+      inputWeightHtml += '<td>'+nofTitle+'<input name="nofPieces'+i+'" onfocus="messageOnFocus(5,'+i+')" onblur="nofPiecesOnChange('+i+')" onkeypress="focusOnEnter(event, \'spWeight'+i+'\')" size=2 /></td>';
+      inputWeightHtml += '<td>'+spTitle+'<input name="spWeight'+i+'" onfocus="messageOnFocus(6,'+i+')" onblur="spWeightOnChange('+i+')" onkeypress="focusOnEnter(event, \'hisWeight'+i+'\')" size=2 /></td>';
+      inputWeightHtml += '<td>'+hisTitle+'<input name="hisWeight'+i+'" onfocus="messageOnFocus(7,'+i+')" onblur="hisWeightOnChange('+i+')" onkeypress="focusOnEnter(event, \'apWeight'+i+'\')" size=2 /></td>';
+      inputWeightHtml += '<td>'+apTitle+'<input name="apWeight'+i+'" onfocus="messageOnFocus(8,'+i+')" onblur="apWeightOnChange('+i+')" onkeypress="'+nextStep+'" size=2 /></td>';      
       inputWeightHtml += '</tr>';
       inputWeightHtml += '</table>';
@@ -291 +306 @@
     setInputStatus(tubeIndex, 'APWeight is invalid.', 'invalid');
     return;
-  }   
+  }
+  
+  var spWeightValue = frm.elements['spWeight'+tubeIndex].value;
+  var apWeightValue = frm.elements['apWeight'+tubeIndex].value;
+  var hisWeightValue = frm.elements['hisWeight'+tubeIndex].value; 
+  if (spWeightValue == '' && apWeightValue == '' && hisWeightValue == '')
+  {
+    oneOrMoreWeightsAreSet[tubeIndex] = false;
+    setInputStatus(tubeIndex, 'No weight is defined.', 'invalid');
+    return;
+  }
+  oneOrMoreWeightsAreSet[tubeIndex] = true; 
   setInputStatus(tubeIndex, '', 'valid');
 }
@@ -376 +402 @@
     if (fieldInput == '0')
     {
-      frm.elements[inputName].value = '';
-    } 
-  } 
+      fieldInput = '';      
+      frm.elements[inputName].value = fieldInput;
+    }
+  } 
+  if (fieldInput == '')
+  {
+    nofPiecesAreValid[tubeIndex] = false;
+    updateInputStatus(tubeIndex);
+    return;
+  }
   nofPiecesAreValid[tubeIndex] = true;
   updateInputStatus(tubeIndex);
@@ -483 +516 @@
     // Generate partition comment string
     if (frm.elements['bloody'+i].checked == true) partitionComment += 'BLOODY';
-    if (appearanceValue != '') partitionComment += (partitionComment.length>0 ? ':' : '') + appearanceValue;
-    if (necrosisValue != '0') partitionComment += (partitionComment.length>0 ? ':' : '') + 'NECROSIS'+necrosisValue+'%';
-    if (fatValue != '0') partitionComment += (partitionComment.length>0 ? ':' : '') + 'FAT'+fatValue+'%';
-    if (frm.elements['coloured'+i].checked == true) partitionComment += partitionComment.length>0 ? ':COLOURED' : 'COLOURED';
+    if (appearanceValue != '') partitionComment += (partitionComment.length>0 ? ';' : '') + appearanceValue;
+    if (necrosisValue != '0') partitionComment += (partitionComment.length>0 ? ';' : '') + 'NECROSIS'+necrosisValue+'%';
+    if (fatValue != '0') partitionComment += (partitionComment.length>0 ? ';' : '') + 'FAT'+fatValue+'%';
+    if (frm.elements['coloured'+i].checked == true) partitionComment += partitionComment.length>0 ? ';COLOURED' : 'COLOURED';
     
     specimenTube.operatorPartitionComment = partitionComment.length > 0 ? partitionComment : null;

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

@@ -208 +208 @@
                 
                 Reggie.setAnnotationValue(hisSample, partitionDateType, partitionDate);
-                
-                // Set box position
-                if (specimenBoxName != null)
-                {
-                  String hisBoxName = "His" + specimenBoxName.substring(2);               
-                  ItemQuery<BioPlate> hisBoxQuery = BioPlate.getQuery();
-                  hisBoxQuery.restrict(Restrictions.eq(Hql.property("name"), Expressions.string(hisBoxName)));
-                  List<BioPlate> hisBoxes = hisBoxQuery.list(dc);
-                  if (hisBoxes.size()>1)
-                  {
-                    throw new InvalidDataException("More then one his-box were found with name: "+hisBoxName+". " +
-                        "This wizard can not be used until this is fixed.");
-                  }
-                  else if (hisBoxes.size()<1)
-                  {
-                    throw new InvalidDataException("No his-box was found with name: "+hisBoxName+". " +
-                        "This wizard can not be used until this is fixed.");
-                  }
-                  BioPlate hisBox = hisBoxes.get(0);
-                  if (!hisBox.getBioWell(specimenWell.getRow(), specimenWell.getColumn()).isEmpty())
-                  {
-                    throw new InvalidDataException("Position [" + specimenWell.getRow() + "," + specimenWell.getColumn() + "]" +
-                        " is not empty in box: " + hisBoxName);
-                  }
-                  hisSample.setBioWell(hisBox.getBioWell(specimenWell.getRow(), specimenWell.getColumn()));                 
-                }               
               }
             }