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 430da197cbf0da56dc5acf50f0a66cd7c40e041d..07c8067b0fb36db2f462098dfc4f1d834bf11e54 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 @@ -60,6 +60,9 @@ import org.locationtech.jts.geom.Point; */ public class BarkbeetleController extends HttpServlet { + // Due to version controls of PDF files, we keep the file names globally updated here + private final String FILENAME_INSTRUKS_REGISTRANTER = "Instruks_registranter_i_Barkbilleovervakingen_2022_03_01.pdf"; + private final String FILENAME_KJENN_IGJEN_ANGREP = "Kjenn_igjen_angrep_stor_granbarkbille_2022_03_01.pdf"; @EJB BarkbeetleBean barkbeetleBean; @@ -99,6 +102,7 @@ public class BarkbeetleController extends HttpServlet { //List<String> countiesSorted = new ArrayList request.setAttribute("counties", countiesSorted); request.setAttribute("messageKey", request.getParameter("messageKey")); + request.setAttribute("FILENAME_INSTRUKS_REGISTRANTER", this.FILENAME_INSTRUKS_REGISTRANTER); request.getRequestDispatcher("/modules/barkbeetle/barkbeetleSeasonTrapsiteList.ftl").forward(request, response); } else if(action.equals("listSeasonTrapsitesStatus")) @@ -109,6 +113,7 @@ public class BarkbeetleController extends HttpServlet { request.setAttribute("firstAvailableSeason", firstAvailableSeason); request.setAttribute("lastAvailableSeason", lastAvailableSeason); request.setAttribute("seasonTrapsites", barkbeetleBean.getSeasonTrapsites(season)); + request.setAttribute("FILENAME_INSTRUKS_REGISTRANTER", this.FILENAME_INSTRUKS_REGISTRANTER); request.getRequestDispatcher("/modules/barkbeetle/barkbeetleSeasonTrapsitesStatus.ftl").forward(request, response); } else if(action.equals("seasonTrapsiteMaintenanceList")) @@ -142,6 +147,7 @@ public class BarkbeetleController extends HttpServlet { request.setAttribute("seasonTrapsite", trapsite); request.setAttribute("seasonTrapsiteTypes", trapsiteTypes); request.setAttribute("messageKey", request.getParameter("messageKey")); + request.setAttribute("FILENAME_INSTRUKS_REGISTRANTER", this.FILENAME_INSTRUKS_REGISTRANTER); request.getRequestDispatcher("/modules/barkbeetle/barkbeetleSeasonTrapsiteForm.ftl").forward(request, response); } else if(action.equals("seasonTrapsiteFormSubmit")) @@ -254,6 +260,8 @@ public class BarkbeetleController extends HttpServlet { //request.setAttribute("currentWeek", 32); // TEST! request.setAttribute("registrationStatusTypes", barkbeetleBean.getRegistrationStatusTypes()); request.setAttribute("messageKey", request.getParameter("messageKey")); + request.setAttribute("FILENAME_INSTRUKS_REGISTRANTER", this.FILENAME_INSTRUKS_REGISTRANTER); + request.setAttribute("FILENAME_KJENN_IGJEN_ANGREP", this.FILENAME_KJENN_IGJEN_ANGREP); request.getRequestDispatcher("/modules/barkbeetle/barkbeetleTrapsiteRegistrationForm.ftl").forward(request, response); } else diff --git a/src/main/webapp/images/modules/barkbeetle/Instruks_registranter_i_Barkbilleovervakingen.pdf b/src/main/webapp/images/modules/barkbeetle/Instruks_registranter_i_Barkbilleovervakingen.pdf index 17fbef9a0379934049580b32052c8b0f03631ca0..c24c2b922195a576e0ffecd8ce6aef06bb56d274 100644 Binary files a/src/main/webapp/images/modules/barkbeetle/Instruks_registranter_i_Barkbilleovervakingen.pdf and b/src/main/webapp/images/modules/barkbeetle/Instruks_registranter_i_Barkbilleovervakingen.pdf differ diff --git a/src/main/webapp/images/modules/barkbeetle/Instruks_registranter_i_Barkbilleovervakingen_2022_03_01.pdf b/src/main/webapp/images/modules/barkbeetle/Instruks_registranter_i_Barkbilleovervakingen_2022_03_01.pdf new file mode 100644 index 0000000000000000000000000000000000000000..99427411af147aecf35ba2e985431d261296dc32 Binary files /dev/null and b/src/main/webapp/images/modules/barkbeetle/Instruks_registranter_i_Barkbilleovervakingen_2022_03_01.pdf differ diff --git a/src/main/webapp/images/modules/barkbeetle/Kjenn_igjen_angrep_stor_granbarkbille.pdf b/src/main/webapp/images/modules/barkbeetle/Kjenn_igjen_angrep_stor_granbarkbille.pdf index 58d5553ce9d6648334bbddcdfadfd7b2f541a29b..09f69d8604ebec42f6b09f7a6f6d086e739a0801 100644 Binary files a/src/main/webapp/images/modules/barkbeetle/Kjenn_igjen_angrep_stor_granbarkbille.pdf and b/src/main/webapp/images/modules/barkbeetle/Kjenn_igjen_angrep_stor_granbarkbille.pdf differ diff --git a/src/main/webapp/images/modules/barkbeetle/Kjenn_igjen_angrep_stor_granbarkbille_2022_03_01.pdf b/src/main/webapp/images/modules/barkbeetle/Kjenn_igjen_angrep_stor_granbarkbille_2022_03_01.pdf new file mode 100644 index 0000000000000000000000000000000000000000..58d5553ce9d6648334bbddcdfadfd7b2f541a29b Binary files /dev/null and b/src/main/webapp/images/modules/barkbeetle/Kjenn_igjen_angrep_stor_granbarkbille_2022_03_01.pdf differ diff --git a/src/main/webapp/templates/modules/barkbeetle/barkbeetleSeasonTrapsiteForm.ftl b/src/main/webapp/templates/modules/barkbeetle/barkbeetleSeasonTrapsiteForm.ftl index f7fee12496ec8ac8174417fa6597ea8eadf36371..661cb98374bd5a880c175d0e5452b27ed8172804 100644 --- a/src/main/webapp/templates/modules/barkbeetle/barkbeetleSeasonTrapsiteForm.ftl +++ b/src/main/webapp/templates/modules/barkbeetle/barkbeetleSeasonTrapsiteForm.ftl @@ -192,7 +192,7 @@ øvrige felt med stjerne må fylles inn. Fyll også inn dato og kommentar nederst i skjemaet dersom montering av feller skjer senere enn 20. april. Se utdypende informasjon i - <a href="/images/modules/barkbeetle/Instruks_registranter_i_Barkbilleovervakingen.pdf" target="new">Instruks registranter</a> + <a href="/images/modules/barkbeetle/${FILENAME_INSTRUKS_REGISTRANTER}" target="new">Instruks registranter</a> og <a href="/images/modules/barkbeetle/Montering_av_barkbillefelle.pdf">Monteringsanvisning Beka-felle</a>, samt <a href="https://vimeo.com/511036816" target="new">instruksjonsvideo</a>. </p> diff --git a/src/main/webapp/templates/modules/barkbeetle/barkbeetleSeasonTrapsiteList.ftl b/src/main/webapp/templates/modules/barkbeetle/barkbeetleSeasonTrapsiteList.ftl index e7b9f54247af126e1ed097e9b87ccd6f8c1ed880..6bc34f00eea11af6d6bf666377b2603177e5c469 100644 --- a/src/main/webapp/templates/modules/barkbeetle/barkbeetleSeasonTrapsiteList.ftl +++ b/src/main/webapp/templates/modules/barkbeetle/barkbeetleSeasonTrapsiteList.ftl @@ -47,7 +47,7 @@ (=Norlure; tilsendt fra Nibio). Les instruksjoner som er aktuelle for deg nøye, slik som <a href="/images/modules/barkbeetle/Instruks_Barkbillefylkeskontakter.pdf" target="new">Instruks Barkbillefylkeskontakter</a>, - <a href="/images/modules/barkbeetle/Instruks_registranter_i_Barkbilleovervakingen.pdf" target="new">Instruks registranter</a>, og + <a href="/images/modules/barkbeetle/${FILENAME_INSTRUKS_REGISTRANTER}" target="new">Instruks registranter</a>, og <a href="/images/modules/barkbeetle/Montering_av_barkbillefelle.pdf">Monteringsanvisning Beka-felle</a>.</p> @@ -61,7 +61,7 @@ innloggingsadgang tilsendt per epost. Se utdypende informasjon i <a href="/images/modules/barkbeetle/Instruks_Barkbillefylkeskontakter.pdf" target="new">Instruks Barkbillefylkeskontakter</a> og <a href="https://vimeo.com/511036698" target="new">instruksjonsvideo</a> (se også - <a href="/images/modules/barkbeetle/Instruks_registranter_i_Barkbilleovervakingen.pdf" target="new">Instruks + <a href="/images/modules/barkbeetle/${FILENAME_INSTRUKS_REGISTRANTER}" target="new">Instruks Registranter</a> og <a href="https://vimeo.com/511036816" target="new">instruksjonsvideo</a> for å forstå deres oppgaver).</p> <p><strong>Registranter</strong> må oppdatere informasjon under «Endre lokalitetsinfo» for @@ -71,7 +71,7 @@ hver tømming skal legges inn under «Registrer» innen torsdag i samme uke som tømming, og blir dermed del av en fortløpende kartvisning av barkbillenivået gjennom sesongen. Se utdypende informasjon i - <a href="/images/modules/barkbeetle/Instruks_registranter_i_Barkbilleovervakingen.pdf" target="new">Instruks + <a href="/images/modules/barkbeetle/${FILENAME_INSTRUKS_REGISTRANTER}" target="new">Instruks Registranter</a>, og <a href="/images/modules/barkbeetle/Montering_av_barkbillefelle.pdf">Monteringsanvisning Beka-felle</a>, samt <a href="https://vimeo.com/511036816" target="new">instruksjonsvideo</a></p> diff --git a/src/main/webapp/templates/modules/barkbeetle/barkbeetleTrapsiteRegistrationForm.ftl b/src/main/webapp/templates/modules/barkbeetle/barkbeetleTrapsiteRegistrationForm.ftl index aaff0fe62e1f3fa74e577ad35a9f7d0d07273fed..a84f63a9af15a4d2f2555a234c41945abb97e3d2 100644 --- a/src/main/webapp/templates/modules/barkbeetle/barkbeetleTrapsiteRegistrationForm.ftl +++ b/src/main/webapp/templates/modules/barkbeetle/barkbeetleTrapsiteRegistrationForm.ftl @@ -46,7 +46,7 @@ </ul> <p> Se utdypende informasjon i - <a href="/images/modules/barkbeetle/Instruks_registranter_i_Barkbilleovervakingen.pdf" target="new">Instruks registranter</a> + <a href="/images/modules/barkbeetle/${FILENAME_INSTRUKS_REGISTRANTER}" target="new">Instruks registranter</a> og <a href="/images/modules/barkbeetle/Montering_av_barkbillefelle.pdf">Monteringsanvisning Beka-felle</a> </p> @@ -127,7 +127,7 @@ </tr> <#if seasonTrapsite.season gt 2021> <tr> - <td>Er det observert angrep av stor granbarkbille på stående gran i nærområdet/kommunen? Beskriv hva som er observert (omfang, sted m.m.; <a href="/images/modules/barkbeetle/Kjenn_igjen_angrep_stor_granbarkbille.pdf" target="new">instruksjon</a>)</td> + <td>Er det observert angrep av stor granbarkbille på stående gran i nærområdet/kommunen? Beskriv hva som er observert (omfang, sted m.m.; <a href="/images/modules/barkbeetle/${FILENAME_KJENN_IGJEN_ANGREP}" target="new">instruksjon</a>)</td> <td colspan="8"> <textarea class="form-control" name="${reg.trapsiteRegistrationPK.week}_observedAttacksDescription"<#if tooEarly> disabled="disabled"</#if>>${reg.observedAttacksDescription!""}</textarea> </td>