Merge branch 'Observation' into 'develop'

Observation

See merge request !14

src/main/java/no/nibio/vips/logic/controller/servlet/ObservationController.java

@@ -170,8 +170,9 @@ public class ObservationController extends HttpServlet {
                     }
                 }
                 catch(NumberFormatException nfe) {
-                    statusTypeId = null;
-                    pestOrganismId = null;
+                    //nfe.printStackTrace();
+                    statusTypeId = -1;
+                    pestOrganismId = -1;
                     viewOthersObservations = false;
                     organizationGroupId = null;
                 }
@@ -233,6 +234,7 @@ public class ObservationController extends HttpServlet {
                 
                 Collections.sort(observations);
                 Collections.reverse(observations);
+                observations.forEach(o->System.out.println(o));
                 List<Organism> allPests = em.createNamedQuery("Organism.findAllPests").getResultList();
                 request.setAttribute("shortcuts", shortcuts);
                 request.setAttribute("allPests", SessionControllerGetter.getOrganismBean().sortOrganismsByLocalName(allPests, SessionLocaleUtil.getCurrentLocale(request).getLanguage()));

src/main/java/no/nibio/vips/logic/controller/session/PointOfInterestBean.java

@@ -202,7 +202,7 @@ public class PointOfInterestBean {
         .createAndSetIconStyle()
                 .withScale(0.55)
                 .createAndSetIcon()
-                    .withHref(iconPath + "anemometer_mono.png");
+                    .withHref(iconPath + "Map_pin_icon_green_small.png");
         
         
         

src/main/webapp/templates/observationForm.ftl

@@ -714,7 +714,7 @@
 			</div>
 		</div>
 	</div>
-	<div style="display: none;"><div id="poiMarker" title="Marker"><img src="/public/images/anemometer_mono.png"/></div></div>
+	<div style="display: none;"><div id="poiMarker" title="Marker"><img src="/public/images/Map_pin_icon_green_small.png"/></div></div>
 </div>
 </#macro>
 <@page_html/>

src/main/webapp/templates/observationList.ftl

@@ -63,8 +63,9 @@
             <div class="form-inline">
                 <div class="form-group">
                     <select class="form-control" name="statusTypeId">
-                            <#list [-1,1,2,3] as statusTypeId>
-                            <option value="${statusTypeId}" <#if statusTypeId == selectedStatusTypeId>selected="selected"</#if>><#switch statusTypeId><#case -1>${i18nBundle.allCategories}<#break><#case 1>${i18nBundle.pending}<#break><#case 2>${i18nBundle.rejected}<#break><#case 3>${i18nBundle.approved}</#switch></option>
+                            <option value="-1" <#if 1 == selectedStatusTypeId>selected="selected"</#if>>${i18nBundle.allCategories}</option>
+                            <#list [1,2,3] as statusTypeId>
+                            <option value="${statusTypeId}" <#if statusTypeId == selectedStatusTypeId>selected="selected"</#if>><#switch statusTypeId><#case 1>${i18nBundle.pending}<#break><#case 2>${i18nBundle.rejected}<#break><#case 3>${i18nBundle.approved}</#switch></option>
                             </#list>
                     </select>
                 </div>