Changeset 3488

Timestamp:

09/09/10 10:01:26 (17 months ago)

Author:

erikroos

Message:

Total numbers in Yearly Report 4 now internally consistent

File:

• molgenis_projects/molgenis4phenotype/handwritten/java/plugin/yearlyreportplugin/VWAReport4.java (modified) (4 diffs)

molgenis_projects/molgenis4phenotype/handwritten/java/plugin/yearlyreportplugin/VWAReport4.java

@@ -42 +42 @@
                         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd", Locale.US);
                         Date startOfYear = sdf.parse(year + "-01-01");
-                        Date endOfYear = sdf.parse(year + "-12-31");
+                        Date endOfYear = sdf.parse((year + 1) + "-01-01");
                         
                         List<Integer> aliveEndOfPrevYearList = new ArrayList<Integer>();
@@ -97 +97 @@
                                                         aliveEndOfPrevYear = true; // can be changed later if we find out this one is dead!
                                                 }
+                                        } else {
+                                                // Don't consider animals that have no 'Alive' status start date
+                                                skipAnimal = true;
                                         }
                                 } else {
@@ -137 +140 @@
                                 if (valueList.size() > 0) {
                                         int speciesid = valueList.get(0).getRelatedObservationTarget();
-                                        if (!speciesIdList.contains(speciesid)) {
+                                        if (!speciesIdList.contains(speciesid)) { // new species
                                                 speciesIdList.add(speciesid);
                                                 // Plus, store numbers on status for right species
@@ -150 +153 @@
                                                         aliveEndOfPrevYearList.add(0);
                                                 }
-                                        } else {
+                                        } else { // species already in list
                                                 int specid = speciesIdList.indexOf(speciesid);
                                                 if (aliveEndOfPrevYear) {