Skip to content
Snippets Groups Projects
Commit 403b3b6f authored by Tor-Einar Skog's avatar Tor-Einar Skog
Browse files

Add observation.isPositive [VIPSUTV-469]

parent 87dad686
No related branches found
No related tags found
No related merge requests found
...@@ -464,7 +464,7 @@ public class ObservationController extends HttpServlet { ...@@ -464,7 +464,7 @@ public class ObservationController extends HttpServlet {
null null
: formValidation.getFormField("observationData").getWebValue() : formValidation.getFormField("observationData").getWebValue()
); );
observation.setIsPositive(formValidation.getFormField("isPositiveRegistration").getWebValue() != null); observation.setIsPositive(formValidation.getFormField("isPositive").getWebValue() != null);
observation.setIsQuantified(formValidation.getFormField("isQuantified").getWebValue() != null); observation.setIsQuantified(formValidation.getFormField("isQuantified").getWebValue() != null);
this.setObservationLocationVisibility(observation, formValidation.getFormField("locationVisibility").getWebValue()); this.setObservationLocationVisibility(observation, formValidation.getFormField("locationVisibility").getWebValue());
observation.setBroadcastMessage(formValidation.getFormField("broadcastMessage").getWebValue() != null); observation.setBroadcastMessage(formValidation.getFormField("broadcastMessage").getWebValue() != null);
......
...@@ -207,6 +207,8 @@ public class Observation implements Serializable, no.nibio.vips.observation.Obse ...@@ -207,6 +207,8 @@ public class Observation implements Serializable, no.nibio.vips.observation.Obse
{ {
Map<String, Object> properties = new HashMap<>(); Map<String, Object> properties = new HashMap<>();
properties.put("observationId", this.getObservationId()); properties.put("observationId", this.getObservationId());
properties.put("isPositive", this.getIsPositive());
properties.put("timestamp", this.getTimeOfObservation() != null ? this.getTimeOfObservation().getTime() : "null");
return this.GISEntityUtil.getGeoJSONFromGis(this.geoinfo, properties); return this.GISEntityUtil.getGeoJSONFromGis(this.geoinfo, properties);
} }
...@@ -652,6 +654,7 @@ public class Observation implements Serializable, no.nibio.vips.observation.Obse ...@@ -652,6 +654,7 @@ public class Observation implements Serializable, no.nibio.vips.observation.Obse
this.getObservationHeading(), this.getObservationHeading(),
this.getBroadcastMessage(), this.getBroadcastMessage(),
this.getLocationIsPrivate(), this.getLocationIsPrivate(),
this.getIsPositive(),
this.getObservationData(), this.getObservationData(),
observationDataSchema observationDataSchema
); );
......
...@@ -35,7 +35,9 @@ public class ObservationListItem { ...@@ -35,7 +35,9 @@ public class ObservationListItem {
private String observationHeading; private String observationHeading;
private String observationData; private String observationData;
private ObservationDataSchema observationDataSchema; private ObservationDataSchema observationDataSchema;
private Boolean broadcastMessage, locationIsPrivate; private Boolean broadcastMessage;
private Boolean locationIsPrivate;
private Boolean isPositive;
public ObservationListItem( public ObservationListItem(
Integer observationId, Integer observationId,
...@@ -48,6 +50,7 @@ public class ObservationListItem { ...@@ -48,6 +50,7 @@ public class ObservationListItem {
String observationHeading, String observationHeading,
Boolean broadcastMessage, Boolean broadcastMessage,
Boolean locationIsPrivate, Boolean locationIsPrivate,
Boolean isPositive,
String observationData, String observationData,
ObservationDataSchema observationDataSchema ObservationDataSchema observationDataSchema
){ ){
...@@ -61,6 +64,7 @@ public class ObservationListItem { ...@@ -61,6 +64,7 @@ public class ObservationListItem {
this.observationHeading = observationHeading; this.observationHeading = observationHeading;
this.broadcastMessage = broadcastMessage; this.broadcastMessage = broadcastMessage;
this.locationIsPrivate = locationIsPrivate; this.locationIsPrivate = locationIsPrivate;
this.isPositive = isPositive;
this.observationData = observationData; this.observationData = observationData;
this.observationDataSchema = observationDataSchema; this.observationDataSchema = observationDataSchema;
} }
...@@ -232,4 +236,12 @@ public class ObservationListItem { ...@@ -232,4 +236,12 @@ public class ObservationListItem {
public void setObservationData(String observationData) { public void setObservationData(String observationData) {
this.observationData = observationData; this.observationData = observationData;
} }
public Boolean getIsPositive() {
return isPositive;
}
public void setIsPositive(Boolean positive) {
isPositive = positive;
}
} }
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment