From 504392a48209c8c8e5a9d85a28c1e21e780c56c9 Mon Sep 17 00:00:00 2001
From: Tor-Einar Skog <tor-einar.skog@bioforsk.no>
Date: Thu, 7 Jul 2016 09:02:24 +0200
Subject: [PATCH] Change status color before first observation
---
.../DeliaRadicumFloralisObservationModel.java | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/src/main/java/no/nibio/vips/model/deliaradicumfloralisobservationmodel/DeliaRadicumFloralisObservationModel.java b/src/main/java/no/nibio/vips/model/deliaradicumfloralisobservationmodel/DeliaRadicumFloralisObservationModel.java
index 37524d5..feab648 100644
--- a/src/main/java/no/nibio/vips/model/deliaradicumfloralisobservationmodel/DeliaRadicumFloralisObservationModel.java
+++ b/src/main/java/no/nibio/vips/model/deliaradicumfloralisobservationmodel/DeliaRadicumFloralisObservationModel.java
@@ -84,22 +84,29 @@ public class DeliaRadicumFloralisObservationModel extends I18nImpl implements Mo
DecimalFormat dFormat = new DecimalFormat("###.##");
Date currentDate = startDateGrowth;
+ boolean firstValidObservationFound = false;
while(currentDate.compareTo(endDateCalculation) <= 0)
{
Result result = new ResultImpl();
result.setResultValidTime(currentDate);
Observation latestObs = getObservationValidForDate(currentDate);
- if(latestObs == null)
+ if(latestObs == null && ! firstValidObservationFound)
+ {
+ result.setWarningStatus(Result.WARNING_STATUS_NO_WARNING);
+ }
+ else if(latestObs == null)
{
result.setWarningStatus(Result.WARNING_STATUS_NO_WARNING_MISSING_DATA);
}
else if(this.getPestObservationValue(latestObs.getObservationData()) >= this.getEconomicThreshold(currentDate))
{
+ firstValidObservationFound = true;
result.setWarningStatus(Result.WARNING_STATUS_HIGH_RISK);
}
else
{
+ firstValidObservationFound = true;
result.setWarningStatus(Result.WARNING_STATUS_NO_RISK);
}
--
GitLab