diff --git a/pom.xml b/pom.xml index c3cb5b9ed540f534f67824ff06b9b4d3bcdcb3a3..b942c53a5dd01548fee6ae7d81bd110e56e68088 100755 --- a/pom.xml +++ b/pom.xml @@ -209,7 +209,7 @@ <dependency> <groupId>no.nibio.vips</groupId> <artifactId>VIPSCommon</artifactId> - <version>2.1.0</version> + <version>2.1.1</version> </dependency> <dependency> <groupId>javax</groupId> diff --git a/src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts.properties b/src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts.properties index 5c6eb4c324a40baf08b9b49a76f5bb125b8efe75..371c54a886e0d3644e001e800c0e22ebc2497e44 100755 --- a/src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts.properties +++ b/src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts.properties @@ -1048,3 +1048,5 @@ pointOfInterestType_6=Apiary site pointOfInterestType_7=Nursery privacyStatement=Privacy statement privacyStatementFileName=Privacy_statement_NIBIO-VIPS.pdf +thresholdDSVMax=DSV threshold for high infection risk +thresholdDSVTempMin=Minimum temperature for DSV calculation diff --git a/src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts_bs.properties b/src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts_bs.properties index f6fb956e5b93dd1ea434d52c9d3239853782d761..e95e775b8edf19dd0387429372de2d01c205aee8 100755 --- a/src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts_bs.properties +++ b/src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts_bs.properties @@ -1042,3 +1042,5 @@ pointOfInterestType_6=Apiary site pointOfInterestType_7=Nursery privacyStatement=Privacy statement privacyStatementFileName=Privacy_statement_NIBIO-VIPS.pdf +thresholdDSVMax=DSV threshold for high infection risk +thresholdDSVTempMin=Minimum temperature for DSV calculation diff --git a/src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts_hr.properties b/src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts_hr.properties index 272dd07caa811a3ddf203b798b95ae5b6ca25e60..994f99dae2373c6bb287931b341d014cc1584640 100755 --- a/src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts_hr.properties +++ b/src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts_hr.properties @@ -1040,3 +1040,5 @@ pointOfInterestType_6=Apiary site pointOfInterestType_7=Nursery privacyStatement=Privacy statement privacyStatementFileName=Privacy_statement_NIBIO-VIPS.pdf +thresholdDSVMax=DSV threshold for high infection risk +thresholdDSVTempMin=Minimum temperature for DSV calculation diff --git a/src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts_nb.properties b/src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts_nb.properties index f04c559b3dd47d0d428696dd35a1b2c02a12faa6..e8bdd3980144cbdb23e94bbd9ac0d45469463b41 100755 --- a/src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts_nb.properties +++ b/src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts_nb.properties @@ -1048,3 +1048,5 @@ pointOfInterestType_6=Big\u00e5rdsplass pointOfInterestType_7=Planteskole privacyStatement=Personvernerkl\u00e6ring privacyStatementFileName=Personvernerklaering_NIBIO-VIPS.pdf +thresholdDSVMax=DSV-terskel for h\u00f8y infeksjonsrisiko +thresholdDSVTempMin=Minimumstemperatur for beregning av DSV diff --git a/src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts_sr.properties b/src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts_sr.properties index ba8dce69d8a63614ca1582a26769d699fa33df11..33ee218c4ff36c296acf147cefdfb87f0bf9ba48 100755 --- a/src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts_sr.properties +++ b/src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts_sr.properties @@ -1042,3 +1042,5 @@ pointOfInterestType_6=Apiary site pointOfInterestType_7=Nursery privacyStatement=Privacy statement privacyStatementFileName=Privacy_statement_NIBIO-VIPS.pdf +thresholdDSVMax=DSV threshold for high infection risk +thresholdDSVTempMin=Minimum temperature for DSV calculation diff --git a/src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts_zh_CN.properties b/src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts_zh_CN.properties index eccfa4a8bae7b2ad1eea5cfe8c83a7eef0a2a1a0..e5f1e363df022af7d9242c0e0f9ff8cf139f93a1 100755 --- a/src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts_zh_CN.properties +++ b/src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts_zh_CN.properties @@ -1036,3 +1036,5 @@ pointOfInterestType_6=Apiary site pointOfInterestType_7=Nursery privacyStatement=Privacy statement privacyStatementFileName=Privacy_statement_NIBIO-VIPS.pdf +thresholdDSVMax=DSV threshold for high infection risk +thresholdDSVTempMin=Minimum temperature for DSV calculation diff --git a/src/main/webapp/formdefinitions/models/ALTERNARIA.json b/src/main/webapp/formdefinitions/models/ALTERNARIA.json index 95efe7e55169355532ae47460c1a43a33f2664a8..58d32e991cbe2e818e81fcf982ceaf3a505708c6 100644 --- a/src/main/webapp/formdefinitions/models/ALTERNARIA.json +++ b/src/main/webapp/formdefinitions/models/ALTERNARIA.json @@ -42,6 +42,18 @@ "dataType" : "DATE", "dateFormat" : "yyyy-MM-dd", "required" : false + }, + { + "name" : "thresholdDSVMax", + "dataType" : "DOUBLE", + "defaultValue" : "20.0", + "required" : false + } , + { + "name" : "thresholdDSVTempMin", + "dataType" : "DOUBLE", + "defaultValue" : "13.0", + "required" : false } ] }