diff --git a/src/main/java/no/nibio/vips/logic/controller/servlet/ObservationController.java b/src/main/java/no/nibio/vips/logic/controller/servlet/ObservationController.java index 66842864efdb3cdd895e6e21f3adad67788b1a73..e45c4bdc838a7a49bba075ff780733701af67f70 100755 --- a/src/main/java/no/nibio/vips/logic/controller/servlet/ObservationController.java +++ b/src/main/java/no/nibio/vips/logic/controller/servlet/ObservationController.java @@ -464,7 +464,7 @@ public class ObservationController extends HttpServlet { null : 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); this.setObservationLocationVisibility(observation, formValidation.getFormField("locationVisibility").getWebValue()); observation.setBroadcastMessage(formValidation.getFormField("broadcastMessage").getWebValue() != null); diff --git a/src/main/java/no/nibio/vips/logic/entity/Observation.java b/src/main/java/no/nibio/vips/logic/entity/Observation.java index d9d732ac8015a30460de208a2b64ca5b788874a1..baee7c23b5252bdbe7a56c450565504a62d269da 100755 --- a/src/main/java/no/nibio/vips/logic/entity/Observation.java +++ b/src/main/java/no/nibio/vips/logic/entity/Observation.java @@ -207,6 +207,8 @@ public class Observation implements Serializable, no.nibio.vips.observation.Obse { Map<String, Object> properties = new HashMap<>(); 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); } @@ -652,6 +654,7 @@ public class Observation implements Serializable, no.nibio.vips.observation.Obse this.getObservationHeading(), this.getBroadcastMessage(), this.getLocationIsPrivate(), + this.getIsPositive(), this.getObservationData(), observationDataSchema ); diff --git a/src/main/java/no/nibio/vips/logic/entity/rest/ObservationListItem.java b/src/main/java/no/nibio/vips/logic/entity/rest/ObservationListItem.java index 1e64b78a4c1fd52a10e11650c67ccc55e80632da..906627c6a53a69401975022be312ba9d3f133c17 100644 --- a/src/main/java/no/nibio/vips/logic/entity/rest/ObservationListItem.java +++ b/src/main/java/no/nibio/vips/logic/entity/rest/ObservationListItem.java @@ -35,7 +35,9 @@ public class ObservationListItem { private String observationHeading; private String observationData; private ObservationDataSchema observationDataSchema; - private Boolean broadcastMessage, locationIsPrivate; + private Boolean broadcastMessage; + private Boolean locationIsPrivate; + private Boolean isPositive; public ObservationListItem( Integer observationId, @@ -48,6 +50,7 @@ public class ObservationListItem { String observationHeading, Boolean broadcastMessage, Boolean locationIsPrivate, + Boolean isPositive, String observationData, ObservationDataSchema observationDataSchema ){ @@ -61,6 +64,7 @@ public class ObservationListItem { this.observationHeading = observationHeading; this.broadcastMessage = broadcastMessage; this.locationIsPrivate = locationIsPrivate; + this.isPositive = isPositive; this.observationData = observationData; this.observationDataSchema = observationDataSchema; } @@ -232,4 +236,12 @@ public class ObservationListItem { public void setObservationData(String observationData) { this.observationData = observationData; } + + public Boolean getIsPositive() { + return isPositive; + } + + public void setIsPositive(Boolean positive) { + isPositive = positive; + } }