Changeset 1520

Timestamp:

Jan 23, 2012, 4:03:26 PM (11 years ago)

Author:

Nicklas Nordborg

Message:

References #348: Copy consent information to multiple cases

The consent registration wizard can now find other cases and blood samples registered for a patient and display a list of checkboxes which enable/disable consent registration for that case/blood. The drawback is that if not all cases/blood are selected, it is not possible to register a consent later for those with the wizard.

This need to be fixed, but before that I think the code need to be cleaned up a bit. I has become messy and we have similar code in the other wizards for finding case/patient/blood/consent information that I think should collected into a single place.

Location:

extensions/net.sf.basedb.reggie/trunk

Files:

• resources/consentform.jsp (modified) (6 diffs)
• src/net/sf/basedb/reggie/servlet/ConsentFormServlet.java (modified) (5 diffs)

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

@@ -29 +29 @@
 <script language="JavaScript">
 
-var debug = false;
+var debug = true;
 var currentStep = 1;
 var caseIsValid = false;
@@ -38 +38 @@
 var caseInfo = null;
 var bloodInfo = null;
+var patientInfo = null;
 
 function init()
@@ -117 +118 @@
   caseInfo = response.caseInfo;
   bloodInfo = response.bloodInfo;
+  patientInfo = response.patientInfo;
   
   if (caseInfo.consentDate)
@@ -127 +129 @@
   }
   frm.consentDate.focus();
+  
+  if (patientInfo)
+  {
+    var html = '';
+    if (patientInfo.allCases)
+    {
+      for (var i = 0; i < patientInfo.allCases.length; i++)
+      {
+        var c = patientInfo.allCases[i];
+        html += '<input type="checkbox" name="case.'+c.id+'" id="case.'+c.id+'" checked><label for="'+c.id+'">Case: ' + c.name + '</label><br>';
+      }
+    }
     
+    if (patientInfo.allBlood)
+    {
+      for (var i = 0; i < patientInfo.allBlood.length; i++)
+      {
+        var c = patientInfo.allBlood[i];
+        html += '<input type="checkbox" name="blood.'+ c.id + '" id="case.'+c.id+'" checked><label for="'+c.id+'">Blood: ' + c.name + '</label><br>';
+      }
+    }
+    
+    document.getElementById('moreCases').innerHTML = html;
+    Main.show('moreCasesSection');
+  }
+  
   if (caseInfo.consent || bloodInfo.consent)
   {
@@ -213 +240 @@
   }
   
+  if (patientInfo)
+  {
+    if (patientInfo.allCases)
+    {
+      var selectedCases = new Array();
+      for (var i = 0; i < patientInfo.allCases.length; i++)
+      {
+        var c = patientInfo.allCases[i];
+        if (frm['case.'+c.id].checked) selectedCases[selectedCases.length] = c.id;
+      }
+      caseInfo.selectedCases = selectedCases;
+    }
+    
+    if (patientInfo.allBlood)
+    {
+      var selectedBlood = new Array();
+      for (var i = 0; i < patientInfo.allBlood.length; i++)
+      {
+        var c = patientInfo.allBlood[i];
+        if (frm['blood.'+c.id].checked) selectedBlood[selectedBlood.length] = c.id;
+      }
+      bloodInfo.selectedBlood = selectedBlood;
+    }
+  }
+
   var submitInfo = new Object();
   submitInfo.caseInfo = caseInfo;
   submitInfo.bloodInfo = bloodInfo;
-
+  
   if (debug) Main.debug(JSON.stringify(submitInfo));
   var request = Ajax.getXmlHttpRequest();
@@ -380 +432 @@
           <input id="consent.yes" type="radio" name="consent" value="Yes" disabled onchange="consentOnChange()">
             <label id="consent.yes.label" for="consent.yes" class="disabled">Yes</label><br>
+          <div id="moreCasesSection" style="display: none;">
+            <table border="0" cellpadding="0" cellspacing="0">
+            <tr valign="baseline">
+              <td><img src="../../images/joust/joinbottom.gif"></td>
+              <td id="moreCases"></td>
+            </tr>
+            </table>
+          </div>
           <input id="consent.notAsked" type="radio" name="consent" value="Not asked" disabled onchange="consentOnChange()">
             <label id="consent.notAsked.label" for="consent.notAsked" class="disabled">Not asked</label>

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

@@ -75 +75 @@
         Case theCase = Case.findByName(dc, caseName);
         Blood blood = Blood.findByCaseName(dc, caseName);
+        Patient patient = null;
         
         List<SpecimenTube> specimenTubes = null;
@@ -88 +89 @@
           DateToStringConverter dateConverter = new DateToStringConverter(new SimpleDateFormat("yyyyMMdd"));
           theCase.loadAnnotations(dc, "consentDate", Reggie.ANNOTATION_CONSENT_DATE, dateConverter);
-          
+
+          // Get patient
+          patient = Patient.findByCase(dc, theCase);
+
           // Wrap it up into JSON objects
           jsonCase = theCase.asJSONObject();
@@ -117 +121 @@
           DateToStringConverter dateConverter = new DateToStringConverter(new SimpleDateFormat("yyyyMMdd"));
           blood.loadAnnotations(dc, "consentDate", Reggie.ANNOTATION_CONSENT_DATE, dateConverter);
-          
+
+          // Get patient
+          if (patient == null) patient = Patient.findByBlood(dc, blood);
+
           // Wrap it up into JSON objects
           jsonBlood = blood.asJSONObject();
         }
+        else
+        {
+          jsonBlood = new JSONObject();
+          jsonBlood.put("name", caseName+".b");
+        }
         
         json.put("bloodInfo", jsonBlood);
+        
+        if (patient != null)
+        {
+          JSONObject jsonPatient = patient.asJSONObject();
+          
+          // Load all cases for the patient
+          List<Case> allCases = Case.findByPatient(dc, patient);
+          JSONArray jsonAll = new JSONArray();
+          if (allCases.size() > 0)
+          {
+            for (Case c : allCases)
+            {
+              jsonAll.add(c.asJSONObject());
+            }
+          }
+          jsonPatient.put("allCases", jsonAll);
+          
+          // Load all blood for the patient
+          List<Blood> allBlood = Blood.findByPatient(dc, patient);
+          jsonAll = new JSONArray();
+          if (allBlood.size() > 0)
+          {
+            for (Blood b : allBlood)
+            {
+              jsonAll.add(b.asJSONObject());
+            }
+          }
+          jsonPatient.put("allBlood", jsonAll);
+          json.put("patientInfo", jsonPatient);
+        }
 
       }
@@ -198 +240 @@
             jsonMessages.add("Patient '" + vPat.getName() + "' created.");
           }
+          Reggie.setAnnotationValue(theCase, consentType, consent);
+          if (consentDate != null) Reggie.setAnnotationValue(theCase, consentDateType, consentDate);
           
           dc.saveItem(theCase);
@@ -204 +248 @@
         else
         {
-          // Load existing case
-          theCase = Sample.getById(dc, caseId.intValue());
-          jsonMessages.add("Consent for case '" + theCase.getName() + "' set to: " + consent);
-        }
-        Reggie.setAnnotationValue(theCase, consentType, consent);
-        if (consentDate != null) Reggie.setAnnotationValue(theCase, consentDateType, consentDate);
+          List<Number> selectedCases = (List<Number>)jsonCase.get("selectedCases");
+          if (selectedCases != null)
+          {
+            for (Number n : selectedCases)
+            {
+              theCase = Sample.getById(dc, n.intValue());
+              Reggie.setAnnotationValue(theCase, consentType, consent);
+              if (consentDate != null) Reggie.setAnnotationValue(theCase, consentDateType, consentDate);
+              jsonMessages.add("Consent for case '" + theCase.getName() + "' set to: " + consent);
+            }
+          }
+          else
+          {
+            // Load existing case
+            theCase = Sample.getById(dc, caseId.intValue());
+            Reggie.setAnnotationValue(theCase, consentType, consent);
+            if (consentDate != null) Reggie.setAnnotationValue(theCase, consentDateType, consentDate);
+            jsonMessages.add("Consent for case '" + theCase.getName() + "' set to: " + consent);
+          }
+        }
         
         // Blood if available
-        if (bloodId != null)
+        List<Number> selectedBlood = (List<Number>)jsonBlood.get("selectedBlood");
+        if (selectedBlood != null)
+        {
+          for (Number n : selectedBlood)
+          {
+            Sample blood = Sample.getById(dc, n.intValue());
+            jsonMessages.add("Consent for blood '" + blood.getName() + "' set to: " + consent);
+            Reggie.setAnnotationValue(blood, consentType, consent);
+            if (consentDate != null) Reggie.setAnnotationValue(blood, consentDateType, consentDate);
+          }
+          
+        }
+        else if (bloodId != null)
         {
           Sample blood = Sample.getById(dc, bloodId.intValue());