Changeset 2138

Timestamp:

Nov 14, 2013, 9:21:34 AM (10 years ago)

Author:

olle

Message:

Refs #449. Wizard for registration of follow-up blood samples updated to proceed to step 2 after an <Enter> key press, when the input RCCID and personal numbers are valid and standard (previously it was necessary to click the "Next" button):

1. JSP script bloodfollowupform.jsp in reggie/resources/personal/ updated by moving disabling of RCCID and personal number input fields from function getPatientInfo() to function goNext(manual), after checking that the input is OK. Previous design was problematic for follow-up blood samples, since function personalNumberOnChange() calls getPatientInfo() to check if a patient exists with input personal number, which resulted in the personal number input field being disabled, as soon as the last digit in a valid personal number was entered, making it unresponsive to key press.

File:

• extensions/net.sf.basedb.reggie/branches/2.13-stable/resources/personal/bloodfollowupform.jsp (modified) (3 diffs)

extensions/net.sf.basedb.reggie/branches/2.13-stable/resources/personal/bloodfollowupform.jsp

@@ -153 +153 @@
     if (step1InputOk)
     {
+      frm.rccidNumber.disabled = true;
+      frm.personalNumber.disabled = true;
+      // Check if patient exists with input personal number 
       getPatientInfo();
       if (patientInfo != null && patientInfo.id)
@@ -287 +290 @@
   if (pnrIsValid)
   {
+    // Check if patient exists with input personal number 
     getPatientInfo();
     if (patientInfo == null || !patientInfo.id)
@@ -302 +306 @@
 {
   // Check entered pnr with AJAX
-  var frm = document.forms['reggie'];
-  frm.rccidNumber.disabled = true;
-  frm.personalNumber.disabled = true;
-  //currentStep = 1;
-  
+  var frm = document.forms['reggie']; 
   var pnr = frm.personalNumber.value;
   if (pnr.length == 10 && pnrIsValid)