Changeset 2148

Timestamp:

Nov 19, 2013, 1:16:34 PM (10 years ago)

Author:

Nicklas Nordborg

Message:

Merge changes from Reggie/2.13-stable development branch back to trunk.

Location:

extensions/net.sf.basedb.reggie/trunk

Files:

• . (modified) (1 prop)
• resources/personal/bloodfollowupform.jsp (modified) (5 diffs)
• resources/personal/bloodform.jsp (modified) (2 diffs)

extensions/net.sf.basedb.reggie/trunk/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) 
@@ -358 +358 @@
   {
     // Auto-fill the date if it's only given with 4(MMdd) or 6(yyMMdd) digits.
-    samplingDate = autoFillDate(samplingDate);
+    samplingDate = autoFillDate(samplingDate, true);
     frm.samplingDate.value = samplingDate;
 
@@ -394 +394 @@
   {
     // Auto-fill the date if it's only given with 4(MMdd) or 6(yyMMdd) digits.
-    freezerDate = autoFillDate(freezerDate);
+    freezerDate = autoFillDate(freezerDate, true);
     frm.freezerDate.value = freezerDate;
 

extensions/net.sf.basedb.reggie/trunk/resources/personal/bloodform.jsp

@@ -272 +272 @@
   {
     // Auto-fill the date if it's only given with 4(MMdd) or 6(yyMMdd) digits.
-    samplingDate = autoFillDate(samplingDate);
+    samplingDate = autoFillDate(samplingDate, true);
     frm.samplingDate.value = samplingDate;
 
@@ -308 +308 @@
   {
     // Auto-fill the date if it's only given with 4(MMdd) or 6(yyMMdd) digits.
-    freezerDate = autoFillDate(freezerDate);
+    freezerDate = autoFillDate(freezerDate, true);
     frm.freezerDate.value = freezerDate;