Changeset 1622 for extensions/net.sf.basedb.reggie/trunk/resources/bloodform.jsp

Timestamp:

Apr 25, 2012, 2:36:02 PM (11 years ago)

Author:

Nicklas Nordborg

Message:

References #381: Handle core biopsies

Added support to the consent registration wizard and fixed blood registration wizard to also find consent-related and patient information in other blood samples for the same case (with or without 'C' suffix).

File:

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

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

@@ -41 +41 @@
 <script language="JavaScript">
 
-var debug = false;
+var debug = true;
 var currentStep = 1;
 var pnrIsValid = false;
@@ -51 +51 @@
 var patientInfo = null;
 var bloodInfo = null;
-var caseInfo = null;
+var consentInfo = null;
 
 function init()
@@ -165 +165 @@
     return;
   }
-  if (!isValidCaseName(caseName))
+  if (!isValidCaseName(caseName, true)) // Allow 'C' suffix to be used
   {
     setInputStatus('case', 'Only 7-digits name is allowed.', 'invalid');
@@ -333 +333 @@
   bloodInfo = response.bloodInfo;
   patientInfo = response.patientInfo;
-  caseInfo = response.caseInfo;
+  consentInfo = response.consentInfo;
   
   if (patientInfo)
@@ -452 +452 @@
       Forms.selectListOption(frm.bloodSample, 'PreNeo');
     }
-    if (caseInfo && caseInfo.consent)
-    {
-      frm.copyConsent.value = caseInfo.id;
-      var html = "From case '" + caseInfo.name + "' (" + caseInfo.consent;
-      if (caseInfo.consentDate) html += '; ' + caseInfo.consentDate;
+    if (consentInfo && consentInfo.consent)
+    {
+      frm.copyConsent.value = consentInfo.id;
+      var html = "From '" + consentInfo.name + "' (" + consentInfo.consent;
+      if (consentInfo.consentDate) html += '; ' + consentInfo.consentDate;
       html += ')';
       setInnerHTML('copyConsent.text', html);