Added chronological ordering of ForecastResult

src/main/java/no/bioforsk/vips/logic/entity/ForecastResult.java

@@ -15,16 +15,15 @@ import javax.persistence.GenerationType;
 import javax.persistence.Id;
 import javax.persistence.NamedQueries;
 import javax.persistence.NamedQuery;
+import javax.persistence.OrderBy;
 import javax.persistence.Table;
 import javax.persistence.Temporal;
 import javax.persistence.TemporalType;
 import javax.persistence.Transient;
 import javax.xml.bind.annotation.XmlRootElement;
 import no.bioforsk.vips.entity.Result;
-import no.bioforsk.vips.logic.entity.helpers.HstoreHelper;
 import org.codehaus.jackson.annotate.JsonIgnore;
 import org.codehaus.jackson.annotate.JsonProperty;
-import org.codehaus.jackson.annotate.JsonValue;
 import org.codehaus.jackson.map.ObjectMapper;
 import org.codehaus.jackson.type.TypeReference;
 
@@ -36,11 +35,11 @@ import org.codehaus.jackson.type.TypeReference;
 @Table(name = "forecast_result")
 @XmlRootElement
 @NamedQueries({
-    @NamedQuery(name = "ForecastResult.findAll", query = "SELECT f FROM ForecastResult f"),
-    @NamedQuery(name = "ForecastResult.findByForecastResultId", query = "SELECT f FROM ForecastResult f WHERE f.forecastResultId = :forecastResultId"),
-    @NamedQuery(name = "ForecastResult.findByResultValidTime", query = "SELECT f FROM ForecastResult f WHERE f.resultValidTime = :resultValidTime"),
-    @NamedQuery(name = "ForecastResult.findByWarningStatus", query = "SELECT f FROM ForecastResult f WHERE f.warningStatus = :warningStatus")})
-public class ForecastResult implements Serializable {
+    @NamedQuery(name = "ForecastResult.findAll", query = "SELECT f FROM ForecastResult f ORDER BY f.resultValidTime ASC"),
+    @NamedQuery(name = "ForecastResult.findByForecastResultId", query = "SELECT f FROM ForecastResult f WHERE f.forecastResultId = :forecastResultId ORDER BY f.resultValidTime ASC"),
+    @NamedQuery(name = "ForecastResult.findByResultValidTime", query = "SELECT f FROM ForecastResult f WHERE f.resultValidTime = :resultValidTime ORDER BY f.resultValidTime ASC"),
+    @NamedQuery(name = "ForecastResult.findByWarningStatus", query = "SELECT f FROM ForecastResult f WHERE f.warningStatus = :warningStatus ORDER BY f.resultValidTime ASC")})
+public class ForecastResult implements Serializable, Comparable {
     private static final long serialVersionUID = 1L;
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
@@ -161,4 +160,14 @@ public class ForecastResult implements Serializable {
             Logger.getLogger(ForecastResult.class.getName()).log(Level.SEVERE, null, ex);
         }
     }
+
+    @Override
+    public int compareTo(Object t) {
+        return this.compareTo((ForecastResult)t);
+    }
+    
+    public int compareTo(ForecastResult other)
+    {
+        return this.getResultValidTime().compareTo(other.getResultValidTime());
+    }
 }