diff --git a/src/main/java/no/nibio/vips/logic/modules/barkbeetle/BarkbeetleController.java b/src/main/java/no/nibio/vips/logic/modules/barkbeetle/BarkbeetleController.java index c320f5cc9e535a42db99008dc1ea9f6727587079..7dc4dd5e289d3556996c76ce7fb548e933145b8e 100644 --- a/src/main/java/no/nibio/vips/logic/modules/barkbeetle/BarkbeetleController.java +++ b/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())); diff --git a/src/main/webapp/formdefinitions/modules/barkbeetle/seasonTrapsiteForm.json b/src/main/webapp/formdefinitions/modules/barkbeetle/seasonTrapsiteForm.json index 768f3e639565b94d86219a15f693781fad25d10d..ebd0ec05075956d066f527695bc3038e6944a1ed 100644 --- a/src/main/webapp/formdefinitions/modules/barkbeetle/seasonTrapsiteForm.json +++ b/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", diff --git a/src/main/webapp/images/modules/barkbeetle/Instruks_utvidet_sesong.pdf b/src/main/webapp/images/modules/barkbeetle/Instruks_utvidet_sesong.pdf deleted file mode 100644 index a22bc8e7385d482d5d169cd21d3802ccc79d61f0..0000000000000000000000000000000000000000 Binary files a/src/main/webapp/images/modules/barkbeetle/Instruks_utvidet_sesong.pdf and /dev/null differ diff --git a/src/main/webapp/templates/modules/barkbeetle/barkbeetleSeasonTrapsiteForm.ftl b/src/main/webapp/templates/modules/barkbeetle/barkbeetleSeasonTrapsiteForm.ftl index a8ceec5d1769e7c919593ce4cfc46479dfc85d5f..03e9a59ee7f3363831053557c277ef30e2869c39 100644 --- a/src/main/webapp/templates/modules/barkbeetle/barkbeetleSeasonTrapsiteForm.ftl +++ b/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> diff --git a/src/main/webapp/templates/modules/barkbeetle/barkbeetleSeasonTrapsiteList.ftl b/src/main/webapp/templates/modules/barkbeetle/barkbeetleSeasonTrapsiteList.ftl index 57fbc339d4cff6d065b19267638d17ed1c570448..1b331cb8c6027b4de0c6c8e852dbad42278d2eb7 100644 --- a/src/main/webapp/templates/modules/barkbeetle/barkbeetleSeasonTrapsiteList.ftl +++ b/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