Merge branch 'AlternariaParameterization-VIPSUTV-644' into 'develop'

Alternaria parameterization vipsutv 644

See merge request !176

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>

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

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

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

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

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

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

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
         }         
         ]
 }