Changeset 1523

Timestamp:

Jan 24, 2012, 3:34:18 PM (11 years ago)

Author:

Nicklas Nordborg

Message:

References #349: Copy consent information to multiple cases

The personal information registration now checks if there is a case or blood sample with consent information and allows copying of that information to a new case.

Location:

extensions/net.sf.basedb.reggie/trunk

Files:

• resources/persinfo.jsp (modified) (10 diffs)
• src/net/sf/basedb/reggie/servlet/PersonalRegistrationServlet.java (modified) (7 diffs)

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

@@ -30 +30 @@
 <script language="JavaScript">
 
-var debug = false;
+var debug = true;
 var currentStep = 1;
 var pnrIsValid = false;
@@ -43 +43 @@
 var bloodInfo = null;
 
+var copyConsentEnabled = false;
+
 function init()
 {
@@ -248 +250 @@
   setInputStatus('laterality', updateMode && numCases > 1 ? 'NOTE! Some alternatives may be missing if there is another case for the patient.' : '', 'valid');
   lateralityIsValid = true;
-  
+    
   var laterality = selectedLaterality.value;
   if (laterality.match(/\d+/))
@@ -267 +269 @@
     laterality = null;
   }
+  
+  // If the selected laterality/case is not the same as the other case with consent enable the copy consent option
+  Main.showHide('copyConsentSection', copyConsentEnabled && selectedLaterality.value != frm.copyConsent.value);
     
   // No specimen tubes?
@@ -672 +677 @@
         cases += ' onclick="lateralityOnChange()"><label for="lateralityUnknown"><i>unknown laterality</i> [<i>new case</i>]</label><br>';
       }
+      
+      if (!updateMode && patientInfo.cases[0].consent)
+      {
+        var c = patientInfo.cases[0];
+        var html = "From case '" + c.name;
+        html += "' (" + c.consent;
+        if (c.consentDate) html += '; ' + c.consentDate;
+        html += ')';
+        setInnerHTML('copyConsent.text', html); 
+        frm.copyConsent.value = patientInfo.cases[0].id;
+        copyConsentEnabled = true;
+      }
+      
     }
     
@@ -697 +715 @@
     setInnerHTML('laterality.input', cases);
   }
+  
+  // Check the blood registration for consent information
+  if (!copyConsentEnabled && bloodInfo && bloodInfo.consent)
+  {
+    var html = "From blood '" + bloodInfo.name;
+    html += "' (" + bloodInfo.consent;
+    if (bloodInfo.consentDate) html += '; ' + bloodInfo.consentDate;
+    html += ')';
+    setInnerHTML('copyConsent.text', html); 
+    frm.copyConsent.value = bloodInfo.id;
+    copyConsentEnabled = true;
+  }
+
+  
   lateralityOnChange();
 
@@ -726 +758 @@
   caseInfo.samplingDate = Main.trimString(frm.samplingDate.value + ' ' + frm.samplingTime.value);
   caseInfo.rnaLaterDate = Main.trimString(frm.rnaLaterDate.value + ' ' + frm.rnaLaterTime.value);
+  if (frm.copyConsent.checked && frm.copyConsent.value)
+  {
+    caseInfo.copyConsent = parseInt(frm.copyConsent.value);
+  }
 
   for (var i = 0; i < frm.laterality.length; i++)
@@ -737 +773 @@
   frm.rnaLaterDate.disabled = true;
   frm.rnaLaterTime.disabled = true;
+  frm.copyConsent.disabled = true;
 
   var updateMode = caseInfo.id && caseInfo.patient;
@@ -744 +781 @@
 
   if (debug) Main.debug(JSON.stringify(submitInfo));
-  
+
   var request = Ajax.getXmlHttpRequest();
   var url = 'PersonalRegistration.servlet?ID=<%=ID%>&cmd=';
@@ -943 +980 @@
         <td class="help"><span id="laterality.message" class="message" style="display: none;"></span></td>
       </tr>
+      <tr id="copyConsentSection" style="display: none;">
+        <td class="prompt">Copy consent?</td>
+        <td class="input">
+          <input type="checkbox" name="copyConsent" id="copyConsent" value="" checked>
+          <label for="copyConsent"><span id="copyConsent.text"></span></label>
+        </td>
+        <td class="status" id="copyConsent.status"></td>
+        <td class="help"></td>
+      </tr>
       <tr id="padSection" valign="top">
         <td class="prompt">PAD</td>

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

@@ -41 +41 @@
 
   private static final long serialVersionUID = 8770173686061080429L;
-
+  private final DateToStringConverter dateTimeConverter;
+  private final DateToStringConverter dateConverter;
+  
   public PersonalRegistrationServlet()
-  {}
+  {
+    dateTimeConverter = new DateToStringConverter(new SimpleDateFormat("yyyyMMdd HHmm"));
+    dateConverter = new DateToStringConverter(new SimpleDateFormat("yyyyMMdd"));
+  }
 
   @SuppressWarnings("unchecked")
@@ -126 +131 @@
           // Check that the registration is not prohibited
           blood.verifyConsent(dc, null);
-
+          blood.loadAnnotations(dc, "consent", Reggie.ANNOTATION_CONSENT, null);
+          blood.loadAnnotations(dc, "consentDate", Reggie.ANNOTATION_CONSENT_DATE, dateConverter);
+          
           // Wrap what we have so far up into JSON objects
           jsonBlood = blood.asJSONObject();
@@ -147 +154 @@
           AnnotationType samplingDateType = Reggie.findAnnotationType(dc, Item.SAMPLE, Reggie.ANNOTATION_SAMPLING_DATETIME, true);
           AnnotationType rnaLaterDateType = Reggie.findAnnotationType(dc, Item.SAMPLE, Reggie.ANNOTATION_RNALATER_DATETIME, true);
-          DateToStringConverter dateConverter = new DateToStringConverter(new SimpleDateFormat("yyyyMMdd HHmm"));
           for (SpecimenTube tube : specimenTubes)
           {
             tube.loadAnnotations("pad", padType, null);
             tube.loadAnnotations("laterality", lateralityType, null);
-            tube.loadAnnotations("samplingDate", samplingDateType, dateConverter);
-            tube.loadAnnotations("rnaLaterDate", rnaLaterDateType, dateConverter);
+            tube.loadAnnotations("samplingDate", samplingDateType, dateTimeConverter);
+            tube.loadAnnotations("rnaLaterDate", rnaLaterDateType, dateTimeConverter);
             jsonTubes.add(tube.asJSONObject());
           }
@@ -199 +205 @@
             {
               c.loadAnnotations("laterality", lateralityType, null);
+              c.loadAnnotations(dc, "consent", Reggie.ANNOTATION_CONSENT, null);
+              c.loadAnnotations(dc, "consentDate", Reggie.ANNOTATION_CONSENT_DATE, dateConverter);
               jsonCases.add(c.asJSONObject());
             }
@@ -293 +301 @@
           {
             // Remove the pre-registered case but copy consent information first
-            AnnotationType consentType = Reggie.findAnnotationType(dc, Item.SAMPLE, Reggie.ANNOTATION_CONSENT, true);
-            AnnotationType consentDateType = Reggie.findAnnotationType(dc, Item.SAMPLE, Reggie.ANNOTATION_CONSENT_DATE, true);
-            
             Sample preCase = Sample.getById(dc, preCaseId.intValue());
-            Reggie.copyAnnotationValues(preCase, theCase, consentType, false);
-            Reggie.copyAnnotationValues(preCase, theCase, consentDateType, false);
+            copyConsentAnnotations(dc, preCase, theCase);
             dc.deleteItem(preCase);
           }
@@ -324 +328 @@
           }
           theCase.getCreationEvent().setSource(patient);
+          
+          Number copyConsentId = (Number)jsonCase.get("copyConsent");
+          if (copyConsentId != null)
+          {
+            Sample consentCase = Sample.getById(dc, copyConsentId.intValue());
+            copyConsentAnnotations(dc, consentCase, theCase);
+          }
+          
           jsonMessages.add("Case '" + originalCaseName + "' created successfully.");
         }
@@ -518 +530 @@
   }
   
-  
+  private void copyConsentAnnotations(DbControl dc, Sample from, Sample to)
+  {
+    AnnotationType consentType = Reggie.findAnnotationType(dc, Item.SAMPLE, Reggie.ANNOTATION_CONSENT, true);
+    AnnotationType consentDateType = Reggie.findAnnotationType(dc, Item.SAMPLE, Reggie.ANNOTATION_CONSENT_DATE, true);
+    
+    Reggie.copyAnnotationValues(from, to, consentType, false);
+    Reggie.copyAnnotationValues(from, to, consentDateType, false);
+  }
 }