diff --git a/src/main/java/no/nibio/vips/logic/controller/servlet/ObservationController.java b/src/main/java/no/nibio/vips/logic/controller/servlet/ObservationController.java index 90482e37328535a380488e9b0c768fead31bf2e8..755bc567f09b2ef4f9f034ed9bfb204a365f7438 100755 --- a/src/main/java/no/nibio/vips/logic/controller/servlet/ObservationController.java +++ b/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())); diff --git a/src/main/java/no/nibio/vips/logic/controller/session/PointOfInterestBean.java b/src/main/java/no/nibio/vips/logic/controller/session/PointOfInterestBean.java index ad0fcba6c1ecf5b45d7d167cdb1e440bc35794ec..756c09064b37127b4740f800b39b7c37dccae036 100755 --- a/src/main/java/no/nibio/vips/logic/controller/session/PointOfInterestBean.java +++ b/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"); diff --git a/src/main/webapp/public/images/Map_pin_icon_green.svg.png b/src/main/webapp/public/images/Map_pin_icon_green.svg.png new file mode 100644 index 0000000000000000000000000000000000000000..8d69b380c7be813e5b3ffbdda0c99d96261cd7a9 Binary files /dev/null and b/src/main/webapp/public/images/Map_pin_icon_green.svg.png differ diff --git a/src/main/webapp/public/images/Map_pin_icon_green_small.png b/src/main/webapp/public/images/Map_pin_icon_green_small.png new file mode 100644 index 0000000000000000000000000000000000000000..0d45990388c4e52b1e03a544ce4a15d7d87fa8bf Binary files /dev/null and b/src/main/webapp/public/images/Map_pin_icon_green_small.png differ diff --git a/src/main/webapp/templates/observationForm.ftl b/src/main/webapp/templates/observationForm.ftl index da440f191d0b8cd269e2815c309eb8a7921eb77f..44d3661a834920900a014347931891ada0e8563a 100755 --- a/src/main/webapp/templates/observationForm.ftl +++ b/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/> diff --git a/src/main/webapp/templates/observationList.ftl b/src/main/webapp/templates/observationList.ftl index 52594948cb63419d846366bc70ace2a3b9d58413..10f856ffd2ab037069a37a22fe3f9f00dbcdcd8d 100755 --- a/src/main/webapp/templates/observationList.ftl +++ b/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>