Changeset 1736

Timestamp:

Nov 16, 2012, 2:30:26 PM (9 years ago)

Author:

Nicklas Nordborg

Message:

Fixes #429: Blood samples should store sampling date as creation date

File:

• extensions/net.sf.basedb.reggie/trunk/src/net/sf/basedb/reggie/servlet/BloodRegistrationServlet.java (modified) (4 diffs)

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

@@ -17 +17 @@
 import net.sf.basedb.core.AnnotationType;
 import net.sf.basedb.core.Application;
+import net.sf.basedb.core.BioMaterialEvent;
 import net.sf.basedb.core.BioSource;
 import net.sf.basedb.core.DbControl;
@@ -195 +196 @@
         blood.setItemSubtype(Subtype.BLOOD.load(dc));
         blood.setName(bloodName);
-        blood.getCreationEvent().setSource(patient);
+        BioMaterialEvent creationEvent = blood.getCreationEvent();
+        creationEvent.setSource(patient);
         dc.saveItem(blood);
 
@@ -203 +205 @@
         String bloodSample = Values.getStringOrNull((String)jsonBlood.get("bloodSample"));
         
-        if (samplingDate != null) Annotationtype.BLOOD_SAMPLING_DATETIME.setAnnotationValue(dc, blood, samplingDate);
-        if (freezerDate != null) Annotationtype.BLOOD_FREEZER_DATETIME.setAnnotationValue(dc, blood, freezerDate);
+        creationEvent.setEventDate(samplingDate);
+        Annotationtype.BLOOD_SAMPLING_DATETIME.setAnnotationValue(dc, blood, samplingDate);
+        Annotationtype.BLOOD_FREEZER_DATETIME.setAnnotationValue(dc, blood, freezerDate);
         Annotationtype.BLOOD_SERUM.setAnnotationValue(dc, blood, jsonBlood.get("serum"));
         Annotationtype.BLOOD_SAMPLE.setAnnotationValue(dc, blood, bloodSample);
@@ -237 +240 @@
         String bloodSample = Values.getStringOrNull((String)jsonBlood.get("bloodSample"));
         
-        if (samplingDate != null) Annotationtype.BLOOD_SAMPLING_DATETIME.setAnnotationValue(dc, blood, samplingDate);
-        if (freezerDate != null) Annotationtype.BLOOD_FREEZER_DATETIME.setAnnotationValue(dc, blood, freezerDate);
+        blood.getCreationEvent().setEventDate(samplingDate);
+        
+        Annotationtype.BLOOD_SAMPLING_DATETIME.setAnnotationValue(dc, blood, samplingDate);
+        Annotationtype.BLOOD_FREEZER_DATETIME.setAnnotationValue(dc, blood, freezerDate);
         Annotationtype.BLOOD_SERUM.setAnnotationValue(dc, blood, jsonBlood.get("serum"));
         Annotationtype.BLOOD_SAMPLE.setAnnotationValue(dc, blood, bloodSample);