Removing the "Extended season trap site type"

src/main/java/no/nibio/vips/logic/modules/barkbeetle/BarkbeetleController.java

@@ -140,7 +140,11 @@ public class BarkbeetleController extends HttpServlet {
                     FormValidation formValidation = FormValidator.validateForm("modules/barkbeetle/seasonTrapsiteForm", request, getServletContext());
                     if(formValidation.isValid())
                     {
-                        
+                        // New trapsites are always activated
+                    	if(trapsite.getSeasonTrapsiteId() == null)
+                    	{
+                    		trapsite.setActivated(true);
+                    	}
                         trapsite.setSeason(formValidation.getFormField("season").getValueAsInteger());
                         trapsite.setTrapsiteType(BarkbeetleBean.getInstance().getTrapsiteType(formValidation.getFormField("trapsiteTypeId").getValueAsInteger()));
                         

src/main/webapp/formdefinitions/modules/barkbeetle/seasonTrapsiteForm.json

@@ -31,9 +31,7 @@
         {
             "name" : "trapsiteTypeId",
             "dataType" : "INTEGER",
-            "fieldType" : "SELECT_SINGLE",
-            "required" : true,
-            "nullValue" : "-1"
+            "required" : true
         },
         {
             "name" : "userId",

src/main/webapp/templates/modules/barkbeetle/barkbeetleSeasonTrapsiteForm.ftl

@@ -208,20 +208,8 @@
 	<form id="${formId}" role="form" action="/barkbeetle?action=seasonTrapsiteFormSubmit" method="POST" onsubmit="return validateForm(this);"">
 		<input type="hidden" name="seasonTrapsiteId" value="${seasonTrapsite.seasonTrapsiteId!"-1"}"/>
 		<input type="hidden" name="locationUpdated" value="<#if seasonTrapsite.locationUpdated?has_content>${seasonTrapsite.locationUpdated?c}<#else>false</#if>"/>
+		<input type="hidden" name="trapsiteTypeId" value="1"/>
 		<div class="form-group">
-	    <label for="trapsiteType">Type fellelokalitet *</label>
-	    <select class="form-control" name="trapsiteTypeId" onblur="validateField(this);">
-			<#list seasonTrapsiteTypes as trapsite>
-				<option value="${trapsite.trapsiteTypeId}"
-				<#if (seasonTrapsite.trapsiteType?has_content && seasonTrapsite.trapsiteType.trapsiteTypeId == trapsite.trapsiteTypeId) 
-				||  (!(seasonTrapsite.trapsiteType?has_content) && trapsite.trapsiteTypeId == 1)>
-				selected="selected"</#if>
-				>${trapsite.description}</option>
-			</#list>
-		
-	     </select>
-	</div>
-	<div class="form-group">
 			<label for="season">Sesong *</label>
 			<input type="text" class="form-control" name="season" placeholder="Sesong" value="${season}" onblur="validateField(this);"/>
 			<span class="help-block" id="${formId}_season_validation"></span>

src/main/webapp/templates/modules/barkbeetle/barkbeetleSeasonTrapsiteList.ftl

@@ -49,9 +49,7 @@
 	Barkbillefylkeskontakter</a>,
 	<a href="/images/modules/barkbeetle/Instruks_registranter_i_Barkbilleovervakingen.pdf" target="new">Instruks registranter</a>, og 
 	<a href="/images/modules/barkbeetle/Montering_av_barkbillefelle.pdf">Monteringsanvisning
-	Beka-felle</a> (kun noen få har i tillegg 
-	<a href="/images/modules/barkbeetle/Instruks_utvidet_sesong.pdf" target="new">utvidet 
-	sesong</a> med egen instruksjon).</p>
+	Beka-felle</a>.</p>
 	
 	<p><strong>Barkbillefylkeskontakt</strong> oppretter her lokaliteter for sitt fylke («Legg til 
 	ny») og tildeler disse registranter som sørger for fellemontering, tømming