Author: bleny Date: 2011-01-05 19:35:38 +0000 (Wed, 05 Jan 2011) New Revision: 888 Log: initial contact date for contacts more user-friendly for the beginning of a new year Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Contacts.java Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Contacts.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Contacts.java 2011-01-05 19:28:19 UTC (rev 887) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Contacts.java 2011-01-05 19:35:38 UTC (rev 888) @@ -163,9 +163,17 @@ logger.debug("Init contactFilter"); } contactFilter = new ContactFilterImpl(); - GregorianCalendar beginningOfCurrentYear = new GregorianCalendar(); - beginningOfCurrentYear.set(Calendar.DAY_OF_YEAR, 1); - contactFilter.setFromDate(beginningOfCurrentYear.getTime()); + + GregorianCalendar initialFromDate = new GregorianCalendar(); + // in the firsts months of a new year go from now to 6 months before + // in the rest of the year, just start at the beginning of the current year + if (initialFromDate.get(Calendar.MONTH) < 3) { + initialFromDate.add(Calendar.MONTH, -6); + } else { + initialFromDate.set(Calendar.DAY_OF_YEAR, 1); + } + + contactFilter.setFromDate(initialFromDate.getTime()); contactFilter.setObsProgram(user.getProfile().getObsProgram()); } return contactFilter;