Changeset 3482

Timestamp:

09/08/10 11:46:57 (17 months ago)

Author:

erikroos

Message:

Corrected some major errors in calculation of animal numbers.

File:

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

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

@@ -26 +26 @@
         List<String> speciesList = new ArrayList<String>();
         private int year;
+        private String type;
         
         public VWAReport4(Database db) {
@@ -37 +38 @@
                 try {
                         this.year = year;
+                        this.type = type;
                         
                         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd", Locale.US);
@@ -62 +64 @@
                                 if (valueList.size() > 0) {
                                         String animalType = valueList.get(0).getValue();
-                                        // Remove animals that are not of the correct type
+                                        // Ignore animals that are not of the correct type for this report
                                         if ((animalType.equals("A. Gewoon dier") && !type.equals("A")) ||
                                                 (animalType.equals("B. Transgeen dier") && !type.equals("B")) ||
@@ -70 +72 @@
                                                 skipAnimal = true;
                                         }
+                                } else {
+                                        skipAnimal = true; // Ignore animals that have no type
                                 }
                                 if (skipAnimal) continue;
                                 
-                                // Get status
+                                // Get status Alive
                                 boolean aliveEndOfPrevYear = false;
                                 boolean aliveEndOfThisYear = false;
@@ -94 +98 @@
                                                 }
                                         }
-                                }
+                                } else {
+                                        // Don't consider animals that have (had) no 'Alive' status
+                                        skipAnimal = true;
+                                }
+                                if (skipAnimal) continue;
+                                
+                                // Get status Dead (if any)
                                 q = db.query(ObservedValue.class);
                                 q.addRules(new QueryRule("observationTarget", Operator.EQUALS, targetid));
                                 q.addRules(new QueryRule("observableFeature", Operator.EQUALS, featid));
-                                q.addRules(new QueryRule("value", Operator.EQUALS, "Died"));
+                                q.addRules(new QueryRule("value", Operator.EQUALS, "Dead"));
                                 valueList = q.find();
                                 if (valueList.size() > 0) {
@@ -114 +124 @@
                                         }
                                 } else {
+                                        // Born before or in the year of interest and not dead yet
                                         aliveEndOfThisYear = true;
                                 }
@@ -151 +162 @@
                                         }
                                 }
-                        }
+                        } // end of loop through all animals
                         animalList.removeAll(removeList);
                         // Maybe do extra stuff with this list of relevant animals?
@@ -189 +200 @@
         @Override
         public String toString() {
-                String output = "<br /><p><strong>Report for the year " + year + "</strong></p>";
+                String output = "<br /><p><strong>Report 4" + type + " for the year " + year + "</strong></p>";
                 output += "<br /><table border='1' cellpadding='5' cellspacing='5'>";
                 output += "<tr>";