Merge branch 'develop' into feature/vipsutv-405-observation-time-series

src/main/java/no/nibio/vips/logic/entity/Observation.java

@@ -471,7 +471,7 @@ public class Observation implements Serializable, no.nibio.vips.observation.Obse
     @Column(name = "observation_data")
     @Override
     public String getObservationData() {
-        return observationData;
+        return this.observationData != null && this.observationData.replaceAll("\"", "").trim().length() > 0 ? this.observationData : null;
     }
 
     /**

src/main/java/no/nibio/vips/logic/entity/PointOfInterest.java

@@ -276,6 +276,10 @@ public class PointOfInterest implements Serializable, Comparable {
         {
             this.properties.put("pointOfInterestTypeId", this.getPointOfInterestTypeId());
         }
+        if(this.properties.get("pointOfInterestName") == null)
+        {
+            this.properties.put("pointOfInterestName", this.getName());
+        }
         return this.properties;
     }
 

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

@@ -287,7 +287,9 @@ public class BarkbeetleBean {
         em.createNativeQuery("DELETE FROM barkbeetle.season_trapsite_bivolt WHERE season_trapsite_id = :seasonTrapsiteId")
                 .setParameter("seasonTrapsiteId", seasonTrapsiteId)
                 .executeUpdate();
-        em.remove(stToDelete);
+        em.createNativeQuery("DELETE FROM barkbeetle.season_trapsite WHERE season_trapsite_id = :seasonTrapsiteId")
+                .setParameter("seasonTrapsiteId", seasonTrapsiteId)
+                .executeUpdate();
         return true;
     }
 

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

@@ -60,7 +60,7 @@ 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
-	public final static String FILENAME_INSTRUKS_REGISTRANTER = "Instruks_registranter_i_Barkbilleovervakingen_2024-03-04.pdf";
+	public final static String FILENAME_INSTRUKS_REGISTRANTER = "Instruks_registranter_i_Barkbilleovervakingen_2024-04-03.pdf";
 	public final static String FILENAME_INSTRUKS_BARKBILLEFYLKESKONTAKTER = "Instruks_Barkbillefylkeskontakter_2024-03-04.pdf";
 	public final static String FILENAME_KJENN_IGJEN_ANGREP = "Kjenn_igjen_angrep_stor_granbarkbille_2022-04-25.pdf";
         

src/main/java/no/nibio/vips/logic/util/HierarchyCategoryLocaleNames.java

@@ -33,7 +33,7 @@ public class HierarchyCategoryLocaleNames {
     
     public String getName(Integer hierarchyCategoryId)
     {
-        return this.nameMap.get(hierarchyCategoryId);
+        return this.nameMap.get(hierarchyCategoryId) != null ? this.nameMap.get(hierarchyCategoryId) : "";
     }
     
     public List<Integer> getHierarchyCategoryIds()

src/main/webapp/templates/observationForm.ftl

@@ -447,8 +447,9 @@
                 </#if>
                 var cropList = [
                     <#if ! observation.observationId?has_content || user.isSuperUser() || user.isOrganizationAdmin()>
+                        {organismId: -10, displayName: "${i18nBundle.missingInDatabase}", hierarchyCategoryId: -1},
                         <#list allCrops as cropOrganism>
-                        {organismId: ${cropOrganism.organismId}, displayName: "${cropOrganism.getLocalName(currentLocale.language)!""} (${cropOrganism.latinName!""}) ${hierarchyCategories.getName(cropOrganism.hierarchyCategoryId)?upper_case}", hierarchyCategoryId: ${cropOrganism.hierarchyCategoryId}}<#sep>,
+                        {organismId: ${cropOrganism.organismId?c}, displayName: "${cropOrganism.getLocalName(currentLocale.language)!""} (${cropOrganism.latinName!""}) ${hierarchyCategories.getName(cropOrganism.hierarchyCategoryId)?upper_case}", hierarchyCategoryId: ${cropOrganism.hierarchyCategoryId!"-1"}}<#sep>,
                         </#list>
                     <#else>
                         <#list allCrops as cropOrganism>