Added maintenance field

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

@@ -191,12 +191,12 @@ public class BarkbeetleController extends HttpServlet {
                     request.setAttribute("userIsCountyAdmin",SessionControllerGetter.getUserBean().authorizeUser(user, VipsLogicRole.BARKBEETLE_COUNTY_ADMIN));
                     request.setAttribute("seasonTrapsite", trapsite);
                     request.setAttribute("isExtended", trapsite.getTrapsiteType().getTrapsiteTypeId().equals(TrapsiteType.TRAPSITE_TYPE_EXTENDED));
-                    Set<Integer> missingWeeks = new HashSet(trapsite.getTrapsiteType().getTrapsiteTypeId().equals(TrapsiteType.TRAPSITE_TYPE_STANDARD)?
+                    Set<Integer> missingWeeks = new HashSet<Integer>(trapsite.getTrapsiteType().getTrapsiteTypeId().equals(TrapsiteType.TRAPSITE_TYPE_STANDARD)?
                             Arrays.asList(new Integer[]{21,24,28,33})
                             : Arrays.asList(new Integer[]{21,24,28,33,37}));
                     //request.setAttribute("weeks", weeks);
                     request.setAttribute("traps", trapsite.getTrapsiteType().getTrapsiteTypeId().equals(TrapsiteType.TRAPSITE_TYPE_STANDARD)? 4 : 2 );
-                    List<TrapsiteRegistration> trapsiteReg = new ArrayList(trapsite.getTrapsiteRegistrationCollection());
+                    List<TrapsiteRegistration> trapsiteReg = new ArrayList<TrapsiteRegistration>(trapsite.getTrapsiteRegistrationCollection());
                     request.setAttribute("firstTimeReg", trapsiteReg.isEmpty());
 
                     // Finding which registrations are present, removing them from "missing" collection
@@ -273,8 +273,8 @@ public class BarkbeetleController extends HttpServlet {
                         });
                         BarkbeetleBean.getInstance().storeTrapsiteRegistrations(trapsite.getSeasonTrapsiteId(), registrations);
                         // Also, store the observedAttacksDescription on the SeasonTrapsite object
-                        String observedAttacksDescription = request.getParameter("observedAttacksDescription");
-                        trapsite.setObservedAttacksDescription(observedAttacksDescription);
+                        trapsite.setObservedAttacksDescription(request.getParameter("observedAttacksDescription"));
+                        trapsite.setMaintenanceDescription(request.getParameter("maintenanceDescription"));
                         BarkbeetleBean.getInstance().storeSeasonTrapsite(trapsite);
                         
                         // Redirect to form

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

@@ -140,6 +140,8 @@ public class SeasonTrapsite implements Serializable, Comparable {
     private Boolean locationUpdated;
     @Column(name = "observed_attacks_description")
     private String observedAttacksDescription;
+    @Column(name = "maintenance_description")
+    private String maintenanceDescription;
 
     public SeasonTrapsite() {
     }
@@ -569,5 +571,13 @@ public class SeasonTrapsite implements Serializable, Comparable {
 	public void setObservedAttacksDescription(String observedAttacksDescription) {
 		this.observedAttacksDescription = observedAttacksDescription;
 	}
+
+	public String getMaintenanceDescription() {
+		return maintenanceDescription;
+	}
+
+	public void setMaintenanceDescription(String maintenanceDescription) {
+		this.maintenanceDescription = maintenanceDescription;
+	}
     
 }

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

@@ -128,10 +128,16 @@
 		<p>
 		
 		</p>
-		<div class="form-group" style="padding-left: 5px;">
+		<div class="form-group" style="padding-left: 5px; padding-right: 5px;">
 			<label for="observedAttacksDescription">Er det observert angrep av stor granbarkbille på stående gran i nærområdet/kommunen?
 		Beskriv hva som er observert (omfang, når, m.m.)</label>
 			<textarea class="form-control" name="observedAttacksDescription">${seasonTrapsite.observedAttacksDescription!""}</textarea>
+		</div>
+		<div class="form-group" style="padding-left: 5px; padding-right: 5px;">
+			<label for="maintenanceDescription">Registrer felledeler som må fornyes før neste sesong. Oppgi hva 
+			slags felledel (oppsamlerkopp, låsepinne, oppsamlerkopp, jordspyd, kryss, trakt, midtrør, sil, hel 
+			felle, annet) og antall</label>
+			<textarea class="form-control" name="maintenanceDescription">${seasonTrapsite.maintenanceDescription!""}</textarea>
 		</div>
 			<div class="form-group" style="padding-left: 5px;">
 				  <div class="checkbox">
@@ -201,6 +207,13 @@
 					}
 				}
 			}
+			<#if currentWeek gte 33>
+			// Check if maintenance description has content, issue warning if not
+			if(theForm["maintenanceDescription"].value.trim() == "")
+			{
+				return confirm("Etter endt sesong skal behov for reservedeler oppgis. Hvis reservedeler ikke trengs eller du vil vente med å oppgi dette, trykk OK. Hvis ikke, trykk Avbryt (Cancel) for å legge inn informasjon.");
+			}
+			</#if>
 			return true;
 		
 		}