Changeset 1601 for extensions/net.sf.basedb.reggie/trunk/resources/consentform.jsp

Timestamp:

Apr 16, 2012, 12:36:09 PM (11 years ago)

Author:

Nicklas Nordborg

Message:

Fixes #378: Consent registration wizard should display consent date if it is already registered

File:

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

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

@@ -132 +132 @@
   var specimenInfo = response.specimenInfo;
   
-
-  if (caseInfo && caseInfo.consentDate)
-  {
-    frm.consentDate.value = caseInfo.consentDate;
-  }
-  frm.consentDate.focus();
-  
   if (patientInfo)
   {
@@ -158 +151 @@
           numEnabled++;
         }
+        if (c.name == caseName && c.consentDate)
+        {
+          frm.consentDate.value = c.consentDate;
+        }
         html += '<input type="checkbox" name="case.'+c.id+'" id="case.'+c.id+'" checked ' + disabled +'>';
         html += '<label for="case.'+c.id+'">Case: ' + c.name + laterality + '</label><br>';
@@ -176 +173 @@
         {
           numEnabled++;
+        }
+        if (c.name.indexOf(caseName) == 0 && c.consentDate)
+        {
+          frm.consentDate.value = c.consentDate;
         }
         html += '<input type="checkbox" name="blood.'+ c.id + '" id="blood.'+c.id+'" checked ' + disabled +'>';
@@ -209 +210 @@
     setInputStatus('consent', '"' + caseInfo.consent + '" has already been registered for this case. It is not possible to change with this wizard.', '');
     Main.show('gorestart');
+    if (caseInfo.consentDate)
+    {
+      frm.consentDate.value = caseInfo.consentDate;
+    }
     frm.consentDate.disabled = true;
   }
@@ -232 +237 @@
   }
 
+  if (!frm.consentDate.disabled) frm.consentDate.focus();
 }