Changeset 1775

Timestamp:

Dec 11, 2012, 2:52:36 PM (11 years ago)

Author:

olle

Message:

Fixes #448. The blood registration form now accepts comments.

Location:

extensions/net.sf.basedb.reggie/trunk

Files:

• resources/bloodform.jsp (modified) (5 diffs)
• src/net/sf/basedb/reggie/servlet/BloodRegistrationServlet.java (modified) (5 diffs)
• src/net/sf/basedb/reggie/servlet/InstallServlet.java (modified) (1 diff)

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

@@ -473 +473 @@
       Forms.selectListOption(frm.bloodSample, bloodInfo.bloodSample);
     }
+    if (bloodInfo.otherPathNote)
+    {
+      frm.otherPathNote.value = bloodInfo.otherPathNote;
+    }
   }
   else
@@ -519 +523 @@
   bloodInfo.serum = frm.serum.checked ? "Yes" : "No";
   bloodInfo.bloodSample = frm.bloodSample[frm.bloodSample.selectedIndex].value;
+  bloodInfo.otherPathNote = frm.otherPathNote.value;
   if (frm.copyConsent.checked && frm.copyConsent.value)
   {
@@ -529 +534 @@
   frm.freezerTime.disabled = true;
   frm.bloodSample.disabled = true;
+  frm.otherPathNote.disabled = true;
 
   var updateMode = bloodInfo.id;
@@ -754 +760 @@
         <td class="prompt" id="bloodSample.prompt">Blood sample</td>
         <td class="input" id="bloodSample.input">
-          <select name="bloodSample">
+          <select onkeypress="focusOnEnter(event, 'otherPathNote')" 
+            name="bloodSample"
+          >
             <option selected value="">unknown
             <option value="PreNeo">PreNeo
@@ -762 +770 @@
         <td class="status" id="bloodSample.status"></td>
         <td class="help"><span id="bloodSample.message" class="message" style="display: none;"></span></td>
+      </tr>
+      <tr>
+        <td class="prompt" id="otherPathNote.prompt">Other path note</td>
+        <td class="input" id="otherPathNote.input"><textarea rows="3" cols="30" 
+          name="otherPathNote" value="" onkeypress="doOnTab(event, goNextAuto)"></textarea></td>
+        <td class="status" id="otherPathNote.status"></td>
+        <td class="help"><span id="otherPathNote.message" class="message" style="display: none;"></span></td>
       </tr>
       <tr id="copyConsentSection" style="display: none;">

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

@@ -86 +86 @@
           blood.loadAnnotations(dc, "serum", Annotationtype.BLOOD_SERUM, null);
           blood.loadAnnotations(dc, "bloodSample", Annotationtype.BLOOD_SAMPLE, null);
+          blood.loadAnnotations(dc, "otherPathNote", Annotationtype.OTHER_PATH_NOTE, null);
 
           // Wrap what we have so far up into JSON objects
@@ -203 +204 @@
         Date freezerDate = Reggie.CONVERTER_STRING_TO_DATETIME.convert((String)jsonBlood.get("freezerDate"));
         String bloodSample = Values.getStringOrNull((String)jsonBlood.get("bloodSample"));
+        String otherPathNote = Values.getStringOrNull((String)jsonBlood.get("otherPathNote"));
         
         creationEvent.setEventDate(samplingDate);
@@ -209 +211 @@
         Annotationtype.BLOOD_SERUM.setAnnotationValue(dc, blood, jsonBlood.get("serum"));
         Annotationtype.BLOOD_SAMPLE.setAnnotationValue(dc, blood, bloodSample);
+        Annotationtype.OTHER_PATH_NOTE.setAnnotationValue(dc, blood, otherPathNote);
 
         Number copyConsentId = (Number)jsonBlood.get("copyConsent");
@@ -238 +241 @@
         Date freezerDate = Reggie.CONVERTER_STRING_TO_DATETIME.convert((String)jsonBlood.get("freezerDate"));
         String bloodSample = Values.getStringOrNull((String)jsonBlood.get("bloodSample"));
+        String otherPathNote = Values.getStringOrNull((String)jsonBlood.get("otherPathNote"));
         
         blood.getCreationEvent().setEventDate(samplingDate);
@@ -245 +249 @@
         Annotationtype.BLOOD_SERUM.setAnnotationValue(dc, blood, jsonBlood.get("serum"));
         Annotationtype.BLOOD_SAMPLE.setAnnotationValue(dc, blood, bloodSample);
+        Annotationtype.OTHER_PATH_NOTE.setAnnotationValue(dc, blood, otherPathNote);
 
         jsonMessages.add("Blood '" + blood.getName() + "' updated successfully.");

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

@@ -225 +225 @@
             Annotationtype.CONSENT, Annotationtype.CONSENT_DATE,
             Annotationtype.BLOOD_SAMPLING_DATETIME, Annotationtype.BLOOD_FREEZER_DATETIME,
-            Annotationtype.BLOOD_SERUM, Annotationtype.BLOOD_SAMPLE));
+            Annotationtype.BLOOD_SERUM, Annotationtype.BLOOD_SAMPLE,
+            Annotationtype.OTHER_PATH_NOTE));
         
         jsonChecks.add(checkAnnotationTypeCategory(dc, Subtype.SPECIMEN, createIfMissing,