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

Timestamp:

Nov 9, 2011, 11:36:05 AM (12 years ago)

Author:

Martin Svensson

Message:

Reference #330 #317
Partition form:
Listed tubes in step one must be places in a box which name starts with 'Sp'.
Only numerical input are now allowed in weight input fields.
Corrected some misspelled words in the Operator partition comment field.
His-sample now also get it's Original quantity set.

Specimen tube wizard:
Arrival date get 'todays date' by default.

File:

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

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

@@ -196 +196 @@
     
     var appearanceOptions = '<option selected ></option>';  
-    appearanceOptions += '<option value="HOMOGENOUS">Homogenous</option>';
-    appearanceOptions += '<option value="HETEROGENOUS">Heterogenous</option>';
+    appearanceOptions += '<option value="HOMOGENEOUS">Homogeneous</option>';
+    appearanceOptions += '<option value="HETEROGENEOUS">Heterogeneous</option>';
     
     var necrosisOptions = '<option selected value="0">0</option>';
@@ -234 +234 @@
       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+')" 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 += '<td>'+nofTitle+'<input name="nofPieces'+i+'" onfocus="messageOnFocus(5,'+i+')" onblur="nofPiecesOnChange('+i+')" onkeypress="focusOnEnter(event, \'spWeight'+i+'\');return isNumberKey(event)" size=2 /></td>';
+      inputWeightHtml += '<td>'+spTitle+'<input name="spWeight'+i+'" onfocus="messageOnFocus(6,'+i+')" onblur="spWeightOnChange('+i+')" onkeypress="focusOnEnter(event, \'hisWeight'+i+'\');return isNumberKey(event)" size=2 /></td>';
+      inputWeightHtml += '<td>'+hisTitle+'<input name="hisWeight'+i+'" onfocus="messageOnFocus(7,'+i+')" onblur="hisWeightOnChange('+i+')" onkeypress="focusOnEnter(event, \'apWeight'+i+'\');return isNumberKey(event)" size=2 /></td>';
+      inputWeightHtml += '<td>'+apTitle+'<input name="apWeight'+i+'" onfocus="messageOnFocus(8,'+i+')" onblur="apWeightOnChange('+i+')" onkeypress="'+nextStep+';return isNumberKey(event)" size=2 /></td>';      
       inputWeightHtml += '</tr>';
       inputWeightHtml += '</table>';
@@ -268 +268 @@
   }
   return true;
+}
+
+function isNumberKey(evt)
+{
+  evt = (evt) ? evt : ((window.event) ? event : null);
+    if (evt) {
+       var elem = (evt.target) ? evt.target : ((evt.srcElement) ? evt.srcElement : null);
+       if (elem) {
+           var charCode = (evt.charCode) ? evt.charCode : 
+               ((evt.which) ? evt.which : evt.keyCode);
+           if ((charCode < 32 ) || 
+               (charCode > 45 && charCode < 47) || 
+               (charCode > 47 && charCode < 58)) {
+               return true;
+           } else {
+               return false;
+           }
+       }
+    }
 }