Author: bleny Date: 2011-03-28 14:39:20 +0000 (Mon, 28 Mar 2011) New Revision: 1106 Log: move contact filter creation to service Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceContactImpl.java trunk/wao-business/src/main/resources/i18n/wao-business_en_GB.properties trunk/wao-business/src/main/resources/i18n/wao-business_fr_FR.properties trunk/wao-business/src/main/xmi/wao.zargo 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 2011-03-28 14:20:35 UTC (rev 1105) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceContactImpl.java 2011-03-28 14:39:20 UTC (rev 1106) @@ -37,6 +37,7 @@ import fr.ifremer.wao.WaoUtils; import fr.ifremer.wao.bean.ConnectedUser; import fr.ifremer.wao.bean.ContactFilter; +import fr.ifremer.wao.bean.ContactFilterImpl; import fr.ifremer.wao.bean.ContactState; import fr.ifremer.wao.bean.ContactStatus; import fr.ifremer.wao.bean.ContactStatus.NullSampleMonthException; @@ -106,7 +107,9 @@ import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.ArrayList; +import java.util.Calendar; import java.util.Date; +import java.util.GregorianCalendar; import java.util.HashMap; import java.util.Iterator; import java.util.LinkedList; @@ -1461,4 +1464,24 @@ } } + @Override + protected ContactFilter executeNewContactFilter(TopiaContext transaction, ConnectedUser connectedUser) { + + ContactFilter contactFilter = new ContactFilterImpl(); + + 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(connectedUser.getProfile().getObsProgram()); + contactFilter.setEstimatedTides(true); + + return contactFilter; + } } Modified: trunk/wao-business/src/main/resources/i18n/wao-business_en_GB.properties =================================================================== --- trunk/wao-business/src/main/resources/i18n/wao-business_en_GB.properties 2011-03-28 14:20:35 UTC (rev 1105) +++ trunk/wao-business/src/main/resources/i18n/wao-business_en_GB.properties 2011-03-28 14:39:20 UTC (rev 1106) @@ -163,6 +163,7 @@ wao.error.serviceContact.getNbContacts= wao.error.serviceContact.getNewContact= wao.error.serviceContact.importContactCsv= +wao.error.serviceContact.newContactFilter= wao.error.serviceContact.saveComment= wao.error.serviceContact.saveContact= wao.error.serviceContact.sendContactDoneEmail= Modified: trunk/wao-business/src/main/resources/i18n/wao-business_fr_FR.properties =================================================================== --- trunk/wao-business/src/main/resources/i18n/wao-business_fr_FR.properties 2011-03-28 14:20:35 UTC (rev 1105) +++ trunk/wao-business/src/main/resources/i18n/wao-business_fr_FR.properties 2011-03-28 14:39:20 UTC (rev 1106) @@ -163,6 +163,7 @@ wao.error.serviceContact.getNbContacts=Impossible de compter le nombre de contacts filtr\u00E9s wao.error.serviceContact.getNewContact=Impossible d'instancier un nouveau contact wao.error.serviceContact.importContactCsv=Impossible d'importer les contacts +wao.error.serviceContact.newContactFilter= wao.error.serviceContact.saveComment= wao.error.serviceContact.saveContact=Impossible de sauvegarder le contact wao.error.serviceContact.sendContactDoneEmail= Modified: trunk/wao-business/src/main/xmi/wao.zargo =================================================================== (Binary files differ) 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-03-28 14:20:35 UTC (rev 1105) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Contacts.java 2011-03-28 14:39:20 UTC (rev 1106) @@ -162,20 +162,7 @@ if (logger.isDebugEnabled()) { logger.debug("Init contactFilter"); } - contactFilter = new ContactFilterImpl(); - - 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()); - contactFilter.setEstimatedTides(true); + contactFilter = serviceContact.newContactFilter(user); } return contactFilter; }