Changeset 1457

Timestamp:

Nov 10, 2011, 9:57:40 AM (12 years ago)

Author:

Martin Svensson

Message:

References #317, #330
Creation date is no longer set for lys-extracts
Sample date is now used to define Creation date-property for tubes

Location:

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

Files:

• PartitionRegistrationServlet.java (modified) (1 diff)
• SpecimenTubeServlet.java (modified) (3 diffs)

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

@@ -200 +200 @@
                 dc.saveItem(lysExtract);
                 
-                Reggie.setAnnotationValue(lysExtract, partitionDateType, partitionDate);                
+                lysExtract.getCreationEvent().setEventDate(null);
+                Reggie.setAnnotationValue(lysExtract, partitionDateType, partitionDate);
                 
                 // Set box position

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

@@ -241 +241 @@
         StringToDateConverter dateTimeConverter = new StringToDateConverter(new SimpleDateFormat("yyyyMMdd HHmm"));
         StringToDateConverter dateConverter = new StringToDateConverter(new SimpleDateFormat("yyyyMMdd"));        
-        Date samplingDate = dateTimeConverter.convert((String)jsonCase.get("samplingDate"));
+        Date samplingDateTime = dateTimeConverter.convert((String)jsonCase.get("samplingDate"));
+        Date createDate = dateConverter.convert((String)jsonCase.get("samplingDate"));
         Date rnaLaterDate = dateTimeConverter.convert((String)jsonCase.get("rnaLaterDate"));
         Date arrivalDate = dateConverter.convert((String)jsonCase.get("arrivalDate"));        
@@ -268 +269 @@
             dc.saveItem(specimen);
             
+            specimen.getCreationEvent().setEventDate(createDate);
             String operatorComment = Values.getStringOrNull((String)jsonSpec.get("operatorComment"));
             String specimenTypeString = Values.getStringOrNull((String)jsonSpec.get("specimenType"));
@@ -275 +277 @@
             if (arrivalDate != null) Reggie.setAnnotationValue(specimen, arrivalDateType, arrivalDate);           
             if (laterality != null) Reggie.setAnnotationValue(specimen, lateralityType, laterality);
-            if (samplingDate != null) Reggie.setAnnotationValue(specimen, samplingDateType, samplingDate);
+            if (samplingDateTime != null) Reggie.setAnnotationValue(specimen, samplingDateType, samplingDateTime);
             if (rnaLaterDate != null) Reggie.setAnnotationValue(specimen, rnaLaterDateType, rnaLaterDate);
             if (padCase != null) Reggie.setAnnotationValue(specimen, padType, padCase);