Changeset 1519

Timestamp:

Jan 23, 2012, 1:39:05 PM (11 years ago)

Author:

Nicklas Nordborg

Message:

References #348: Consent form registration wizard should allow 'Yes' in all cases

The consent registration wizard now check blood registrations and register consent with the blood if found.

The personal registration wizard can now handle the case were things are registered in the following order: blood, consent, case.

Location:

extensions/net.sf.basedb.reggie/trunk

Files:

• resources/consentform.jsp (modified) (4 diffs)
• resources/persinfo.jsp (modified) (3 diffs)
• src/net/sf/basedb/reggie/servlet/ConsentFormServlet.java (modified) (5 diffs)
• src/net/sf/basedb/reggie/servlet/PersonalRegistrationServlet.java (modified) (4 diffs)

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

@@ -37 +37 @@
 
 var caseInfo = null;
+var bloodInfo = null;
 
 function init()
@@ -115 +116 @@
   // Get case information from the AJAX response
   caseInfo = response.caseInfo;
-
+  bloodInfo = response.bloodInfo;
+  
   if (caseInfo.consentDate)
   {
     frm.consentDate.value = caseInfo.consentDate;
   }
+  else if (bloodInfo.consentDate)
+  {
+    frm.consentDate.value = bloodInfo.consentDate;
+  }
   frm.consentDate.focus();
-
-  
-  // caseInfo.consent = 'No';
-  // caseInfo.id = 999;
-  // caseInfo.specimen = [ 1 ];
     
-  if (caseInfo.consent)
+  if (caseInfo.consent || bloodInfo.consent)
   {
     // A consent has already been registered for this case
@@ -136 +137 @@
     frm.consentDate.disabled = true;
   }
-  else if (caseInfo.id)
+  else if (caseInfo.id || bloodInfo.id)
   {
     // There is an existing case already registered
@@ -214 +215 @@
   var submitInfo = new Object();
   submitInfo.caseInfo = caseInfo;
+  submitInfo.bloodInfo = bloodInfo;
 
   if (debug) Main.debug(JSON.stringify(submitInfo));

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

@@ -41 +41 @@
 var patientInfo = null;
 var caseInfo = null;
+var bloodInfo = null;
 
 function init()
@@ -404 +405 @@
   // Get biosource information from the AJAX response
   caseInfo = response.caseInfo;
+  bloodInfo = response.bloodInfo;
   
   if (caseInfo && caseInfo.patient)
@@ -410 +412 @@
     gotoStep2();
   }
-  
+  else if (bloodInfo && bloodInfo.patient)
+  {
+    frm.personalNumber.value = bloodInfo.patient.personalNumber;
+    gotoStep2();
+  }
 }
 

extensions/net.sf.basedb.reggie/trunk/src/net/sf/basedb/reggie/servlet/ConsentFormServlet.java

@@ -25 +25 @@
 import net.sf.basedb.reggie.converter.DateToStringConverter;
 import net.sf.basedb.reggie.converter.StringToDateConverter;
+import net.sf.basedb.reggie.dao.Blood;
 import net.sf.basedb.reggie.dao.Case;
 import net.sf.basedb.reggie.dao.Patient;
@@ -70 +71 @@
         dc = sc.newDbControl();
         
-        // Find a case by name
+        // Find a case + blood by name
         String caseName = req.getParameter("caseName");
         Case theCase = Case.findByName(dc, caseName);
+        Blood blood = Blood.findByCaseName(dc, caseName);
+        
         List<SpecimenTube> specimenTubes = null;
         JSONObject jsonCase = null;
+        JSONObject jsonBlood = null;
         
         if (theCase != null)
@@ -105 +109 @@
           jsonCase.put("specimen", jsonTubes);
         }
-        
-        // This is what we send back to the browser
         json.put("caseInfo", jsonCase);
+        
+        // Load blood information for the same case
+        if (blood != null)
+        {
+          blood.loadAnnotations(dc, "consent", Reggie.ANNOTATION_CONSENT, null);
+          DateToStringConverter dateConverter = new DateToStringConverter(new SimpleDateFormat("yyyyMMdd"));
+          blood.loadAnnotations(dc, "consentDate", Reggie.ANNOTATION_CONSENT_DATE, dateConverter);
+          
+          // Wrap it up into JSON objects
+          jsonBlood = blood.asJSONObject();
+        }
+        
+        json.put("bloodInfo", jsonBlood);
 
       }
@@ -149 +164 @@
         JSONObject jsonReq = (JSONObject)new JSONParser().parse(req.getReader());
         JSONObject jsonCase = (JSONObject)jsonReq.get("caseInfo");
+        JSONObject jsonBlood = (JSONObject)jsonReq.get("bloodInfo");
         
         dc = sc.newDbControl();
         
         Number caseId = (Number)jsonCase.get("id");
+        Number bloodId = (Number)jsonBlood.get("id");
         String consent = Values.getStringOrNull((String)jsonCase.get("consent"));
         StringToDateConverter dateConverter = new StringToDateConverter(new SimpleDateFormat("yyyyMMdd"));
@@ -194 +211 @@
         if (consentDate != null) Reggie.setAnnotationValue(theCase, consentDateType, consentDate);
         
+        // Blood if available
+        if (bloodId != null)
+        {
+          Sample blood = Sample.getById(dc, bloodId.intValue());
+          jsonMessages.add("Consent for blood '" + blood.getName() + "' set to: " + consent);
+          Reggie.setAnnotationValue(blood, consentType, consent);
+          if (consentDate != null) Reggie.setAnnotationValue(blood, consentDateType, consentDate);
+        }
+        
         dc.commit();
         json.put("messages", jsonMessages);

extensions/net.sf.basedb.reggie/trunk/src/net/sf/basedb/reggie/servlet/PersonalRegistrationServlet.java

@@ -77 +77 @@
         String caseName = req.getParameter("caseName");
         Case theCase = Case.findByName(dc, caseName);
-        Patient patient = null;
+        Blood blood = Blood.findByCaseName(dc, caseName);
+        
         List<SpecimenTube> specimenTubes = null;
         JSONObject jsonCase = null;
+        JSONObject jsonBlood = null;
         
         if (theCase != null)
@@ -104 +106 @@
 
           // Load the patient associated with the case
-          patient = Patient.findByCase(dc, theCase);
+          Patient patient = Patient.findByCase(dc, theCase);
+          // The patient can be null if (for example) we have only registered consent=yes so far
+          if (patient != null) 
+          {
+            patient.loadDefaultAnnotations(dc);
+            jsonCase.put("patient", patient.asJSONObject());
+          }
         }
         else
@@ -112 +120 @@
           jsonCase = new JSONObject();
           jsonCase.put("name", caseName);
-          
-          // Also check for a blood sample so that we can get patient information
-          Blood blood = Blood.findByCaseName(dc, caseName);
-          if (blood != null) patient = Patient.findByBlood(dc, blood);
-        }
-
-        // The patient can be null if (for example) we have only registered consent=yes so far
-        if (patient != null) 
-        {
-          patient.loadDefaultAnnotations(dc);
-          jsonCase.put("patient", patient.asJSONObject());
+        }
+        
+        if (blood != null)
+        {
+          // Check that the registration is not prohibited
+          blood.verifyConsent(dc, null);
+
+          // Wrap what we have so far up into JSON objects
+          jsonBlood = blood.asJSONObject();
+
+          // Load patient information
+          Patient patient = Patient.findByBlood(dc, blood);
+          if (patient != null) 
+          {
+            patient.loadDefaultAnnotations(dc);
+            jsonBlood.put("patient", patient.asJSONObject());
+          }
         }
         
@@ -147 +161 @@
         // This is what we send back to the browser
         json.put("caseInfo", jsonCase);
+        json.put("bloodInfo", jsonBlood);
 
       }