Author: bleny Date: 2010-11-12 19:37:20 +0000 (Fri, 12 Nov 2010) New Revision: 773 Log: contact date filter initialized at first day of the year Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceContactImpl.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Contacts.java Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceContactImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceContactImpl.java 2010-11-12 19:04:11 UTC (rev 772) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceContactImpl.java 2010-11-12 19:37:20 UTC (rev 773) @@ -146,6 +146,11 @@ Map<String, Contact> results = dao.findAllMappedByQuery(query); + // XXX bleny 20101112 prevent lazy loading failure + for (Contact contact : results.values()) { + contact.getSampleRow().getProfession().sizeDcf5code(); + } + return results; } 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 2010-11-12 19:04:11 UTC (rev 772) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Contacts.java 2010-11-12 19:37:20 UTC (rev 773) @@ -72,14 +72,15 @@ import org.apache.tapestry5.json.JSONObject; import org.apache.tapestry5.services.BeanModelSource; import org.apache.tapestry5.upload.services.UploadedFile; -import org.nuiton.util.DateUtil; import org.slf4j.Logger; import java.io.IOException; import java.io.InputStream; import java.text.DateFormat; import java.text.SimpleDateFormat; +import java.util.Calendar; import java.util.Date; +import java.util.GregorianCalendar; import java.util.List; /** @@ -163,9 +164,9 @@ logger.debug("Init contactFilter"); } contactFilter = new ContactFilterImpl(); - // Initialized to 3 months before the current day - Date fromDate = DateUtil.createDateAfterToday(0, -3, 0); - contactFilter.setFromDate(fromDate); + GregorianCalendar beginningOfCurrentYear = new GregorianCalendar(); + beginningOfCurrentYear.set(Calendar.DAY_OF_YEAR, 1); + contactFilter.setFromDate(beginningOfCurrentYear.getTime()); } return contactFilter; }