Changeset 1522


Ignore:
Timestamp:
Jan 24, 2012, 1:27:22 PM (11 years ago)
Author:
Nicklas Nordborg
Message:

References #350: Blood referral form registration wizard

Fixed an issue where the blood registration wizard tried to register a blood sample even though a case with consent=No already existed.

Location:
extensions/net.sf.basedb.reggie/trunk
Files:
2 edited

Legend:

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

    r1518 r1522  
    404404 
    405405  var updateMode = bloodInfo.id && bloodInfo.patient;
    406    
    407406  Main.show('bloodSection');
    408407 
    409408  if (updateMode)
    410409  {
    411    
     410    setInnerHTML('step3.title', 'Update blood \''+bloodInfo.name+'\'');
    412411    if (bloodInfo.samplingDate != null)
    413412    {
  • extensions/net.sf.basedb.reggie/trunk/src/net/sf/basedb/reggie/servlet/BloodRegistrationServlet.java

    r1518 r1522  
    9797          jsonBlood.put("name", caseName + ".b");
    9898          Case theCase = Case.findByName(dc, caseName);
    99           if (theCase != null) patient = Patient.findByCase(dc, theCase);
     99          if (theCase != null)
     100          {
     101            // Check that the registration is not prohibited
     102            theCase.verifyConsent(dc, null);
     103            patient = Patient.findByCase(dc, theCase);
     104          }
    100105        }
    101106       
Note: See TracChangeset for help on using the changeset viewer.