diff --git a/src/main/java/no/nibio/vips/logic/modules/applefruitmoth/AppleFruitMothController.java b/src/main/java/no/nibio/vips/logic/modules/applefruitmoth/AppleFruitMothController.java index 1584a3342b8fa9a016b290a0ab764ef94651a782..c048e907b747dfe2c4904983027447bccdfa9efa 100755 --- a/src/main/java/no/nibio/vips/logic/modules/applefruitmoth/AppleFruitMothController.java +++ b/src/main/java/no/nibio/vips/logic/modules/applefruitmoth/AppleFruitMothController.java @@ -181,8 +181,8 @@ public class AppleFruitMothController extends HttpServlet { ossc.setLastUpdated(SystemTime.getSystemTime()); ossc.setWarningStatus(formValidation.getFormField("warningStatus").getValueAsInteger()); - ossc.setDegreeOfParasitation(formValidation.getFormField("degreeOfParasitation") != null ? BigDecimal.valueOf(formValidation.getFormField("degreeOfParasitation").getValueAsDouble()): null); - ossc.setThousandBerrySample(formValidation.getFormField("thousandBerrySample") != null ? BigDecimal.valueOf(formValidation.getFormField("thousandBerrySample").getValueAsDouble()): null); + ossc.setDegreeOfParasitation(formValidation.getFormField("degreeOfParasitation") != null ? formValidation.getFormField("degreeOfParasitation").getValueAsDouble(): null); + ossc.setThousandBerrySample(formValidation.getFormField("thousandBerrySample") != null ? formValidation.getFormField("thousandBerrySample").getValueAsDouble(): null); ossc.setRemarks(formValidation.getFormField("remarks") != null ? formValidation.getFormField("remarks").getWebValue() : ""); observationSite.getObservationSiteSeasonCommonDataSet().add(ossc); SessionControllerGetter.getAppleFruitMothBean().storeObservationSite(observationSite); diff --git a/src/main/java/no/nibio/vips/logic/modules/applefruitmoth/ObservationSiteSeasonCommonData.java b/src/main/java/no/nibio/vips/logic/modules/applefruitmoth/ObservationSiteSeasonCommonData.java index fe9cbb5122abfb706ea2e588ea702bd9b5c97d0f..27842f454f9411a4a4d509667ab30aa9cdc10fdd 100755 --- a/src/main/java/no/nibio/vips/logic/modules/applefruitmoth/ObservationSiteSeasonCommonData.java +++ b/src/main/java/no/nibio/vips/logic/modules/applefruitmoth/ObservationSiteSeasonCommonData.java @@ -51,9 +51,9 @@ public class ObservationSiteSeasonCommonData implements Serializable { @EmbeddedId protected ObservationSiteSeasonCommonDataPK observationSiteSeasonCommonDataPK; @Column(name = "thousand_berry_sample") - private BigDecimal thousandBerrySample; + private Double thousandBerrySample; @Column(name = "degree_of_parasitation") - private BigDecimal degreeOfParasitation; + private Double degreeOfParasitation; @Column(name = "warning_status") private Integer warningStatus; @Column(name = "remarks") @@ -83,19 +83,19 @@ public class ObservationSiteSeasonCommonData implements Serializable { this.observationSiteSeasonCommonDataPK = observationSiteSeasonCommonDataPK; } - public BigDecimal getThousandBerrySample() { + public Double getThousandBerrySample() { return thousandBerrySample; } - public void setThousandBerrySample(BigDecimal thousandBerrySample) { + public void setThousandBerrySample(Double thousandBerrySample) { this.thousandBerrySample = thousandBerrySample; } - public BigDecimal getDegreeOfParasitation() { + public Double getDegreeOfParasitation() { return degreeOfParasitation; } - public void setDegreeOfParasitation(BigDecimal degreeOfParasitation) { + public void setDegreeOfParasitation(Double degreeOfParasitation) { this.degreeOfParasitation = degreeOfParasitation; }