Ignore:
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:
1 edited

Legend:

Unmodified
Added
Removed
  • extensions/net.sf.basedb.reggie/trunk/resources/bloodform.jsp

    r1614 r1622  
    4141<script language="JavaScript">
    4242
    43 var debug = false;
     43var debug = true;
    4444var currentStep = 1;
    4545var pnrIsValid = false;
     
    5151var patientInfo = null;
    5252var bloodInfo = null;
    53 var caseInfo = null;
     53var consentInfo = null;
    5454
    5555function init()
     
    165165    return;
    166166  }
    167   if (!isValidCaseName(caseName))
     167  if (!isValidCaseName(caseName, true)) // Allow 'C' suffix to be used
    168168  {
    169169    setInputStatus('case', 'Only 7-digits name is allowed.', 'invalid');
     
    333333  bloodInfo = response.bloodInfo;
    334334  patientInfo = response.patientInfo;
    335   caseInfo = response.caseInfo;
     335  consentInfo = response.consentInfo;
    336336 
    337337  if (patientInfo)
     
    452452      Forms.selectListOption(frm.bloodSample, 'PreNeo');
    453453    }
    454     if (caseInfo && caseInfo.consent)
    455     {
    456       frm.copyConsent.value = caseInfo.id;
    457       var html = "From case '" + caseInfo.name + "' (" + caseInfo.consent;
    458       if (caseInfo.consentDate) html += '; ' + caseInfo.consentDate;
     454    if (consentInfo && consentInfo.consent)
     455    {
     456      frm.copyConsent.value = consentInfo.id;
     457      var html = "From '" + consentInfo.name + "' (" + consentInfo.consent;
     458      if (consentInfo.consentDate) html += '; ' + consentInfo.consentDate;
    459459      html += ')';
    460460      setInnerHTML('copyConsent.text', html);
Note: See TracChangeset for help on using the changeset viewer.