Changeset 1409 for extensions/net.sf.basedb.reggie/trunk/resources/partitionform.jsp

Timestamp:

Oct 18, 2011, 3:49:05 PM (11 years ago)

Author:

Martin Svensson

Message:

References #330 The partition wizard is now ready for testing. No more known bugs/issues exists.

File:

• extensions/net.sf.basedb.reggie/trunk/resources/partitionform.jsp (modified) (5 diffs)

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

@@ -134 +134 @@
       nofPiecesTitle = '';
       
-      var doOnTab = i==(tubes.length-1) ? 'doOnTab(event, goCreate)' : '';
+      var doOnTab = i==(tubes.length-1) ? 'doOnTab(event, goCreate)' : 'focusOnEnter(event, \'spWeight'+(i+1)+'\')';
       inputWeightHtml += '<tr>';
       inputWeightHtml += '<td class="subprompt">'+caseInfo.name+'.'+(i+1)+' ['+tubes[i].box+'&nbsp;'+tubes[i].row+tubes[i].column+']</td>';
@@ -140 +140 @@
       inputWeightHtml += '<table style=width:90%>';     
       inputWeightHtml += '<tr>';
-      inputWeightHtml += '<td>' + spInputTitle + '<input size=3 type="text" onChange="spWeightOnChange('+i+')" name="spWeight'+i+'" /></td>';
-      inputWeightHtml += '<td>' + apInputTitle + '<input size=3 type="text" onChange="apWeightOnChange('+i+')" name="apWeight'+i+'" /></td>';
-      inputWeightHtml += '<td>' + hisInputTitle + '<input size=3 type="text" onChange="hisWeightOnChange('+i+')" name="hisWeight'+i+'" /></td>';
+      inputWeightHtml += '<td>' + spInputTitle + '<input size=3 type="text" onkeypress="focusOnEnter(event, \'apWeight'+i+'\')" onChange="spWeightOnChange('+i+')" name="spWeight'+i+'" /></td>';
+      inputWeightHtml += '<td>' + apInputTitle + '<input size=3 type="text" onkeypress="focusOnEnter(event, \'hisWeight'+i+'\')" onChange="apWeightOnChange('+i+')" name="apWeight'+i+'" /></td>';
+      inputWeightHtml += '<td>' + hisInputTitle + '<input size=3 type="text" onkeypress="focusOnEnter(event, \'nofPieces'+i+'\')" onChange="hisWeightOnChange('+i+')" name="hisWeight'+i+'" /></td>';
       inputWeightHtml += '<td>' + nofPiecesTitle + '<input size=3 type="text" onkeypress="'+doOnTab+'" onChange="nofPiecesOnChange('+i+')" name="nofPieces'+i+'" /></td>';
       inputWeightHtml += '</tr>';
@@ -225 +225 @@
       frm.elements[inputName].value = '';
     } 
-  } 
+  }
   apWeightsAreValid[tubeIndex] = true;
   updateInputStatus(tubeIndex);
@@ -292 +292 @@
       setInputStatus('partitionDate', 'Not a valid date', 'invalid');
       return;
-    }
-    if (todaysDate < new Date(partitionDate.substring(0,4), partitionDate.substring(4,6), partitionDate.substring(6)))
+    }   
+    if (todaysDate < new Date(partitionDate.substring(0,4), new Number(partitionDate.substring(4,6)-1), partitionDate.substring(6)))
     {
       setInputStatus('partitionDate', 'Future dates are not valid','invalid');
@@ -342 +342 @@
   var partitionCommentValue = frm.elements['partitionComment'].value;
   caseInfo.partitionDate = partitionDateValue;
-  if (partitionCommentValue != null) caseInfo.partitionComment = partitionCommentValue;
+  if (partitionCommentValue != null) caseInfo.otherPartitionComment = partitionCommentValue;
   
   for (var i=0; i<nofTubes; i++)