Author: bleny Date: 2010-11-12 19:57:23 +0000 (Fri, 12 Nov 2010) New Revision: 774 Log: sort contacts by boarding date Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/WaoQueryBuilder.java trunk/wao-business/src/main/xmi/wao.zargo trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/Contacts.properties trunk/wao-ui/src/main/webapp/Contacts.tml Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/WaoQueryBuilder.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/WaoQueryBuilder.java 2010-11-12 19:37:20 UTC (rev 773) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/WaoQueryBuilder.java 2010-11-12 19:57:23 UTC (rev 774) @@ -27,6 +27,7 @@ import fr.ifremer.wao.bean.SamplingFilter; import fr.ifremer.wao.bean.UserFilter; import fr.ifremer.wao.entity.Company; +import fr.ifremer.wao.entity.Contact; import fr.ifremer.wao.entity.SampleRow; import fr.ifremer.wao.entity.WaoUser; import org.apache.commons.collections.CollectionUtils; @@ -568,6 +569,10 @@ filter.setFromDate(fromDate); filter.setPeriod(period); + if (filter.isSortedByBoardingDate()) { + query.addOrder(contactProperty.$property(Contact.TIDE_BEGIN_DATE + " DESC")); + } + // ORDER_BY if (StringUtils.isNotEmpty(orderBy)) { query.addOrder(contactProperty.$property(orderBy)); Modified: trunk/wao-business/src/main/xmi/wao.zargo =================================================================== (Binary files differ) Modified: trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/Contacts.properties =================================================================== --- trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/Contacts.properties 2010-11-12 19:37:20 UTC (rev 773) +++ trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/Contacts.properties 2010-11-12 19:57:23 UTC (rev 774) @@ -59,6 +59,7 @@ commentAdmin-label: Commentaire programme commentCoordinator-label: Commentaire soci\u00e9t\u00e9 dataReliability-label: Qualit\u00e9 de la donn\u00e9e +sortedByBoardingDate-label: Trier les contacts (ordre anti-chronologique) # Form labels contactsForm-errors-banner: Le contact n'a pas \u00e9t\u00e9 sauvegard\u00e9 \u00e0 cause des erreurs suivantes : Modified: trunk/wao-ui/src/main/webapp/Contacts.tml =================================================================== --- trunk/wao-ui/src/main/webapp/Contacts.tml 2010-11-12 19:37:20 UTC (rev 773) +++ trunk/wao-ui/src/main/webapp/Contacts.tml 2010-11-12 19:57:23 UTC (rev 774) @@ -150,8 +150,10 @@ <input t:type="checkbox" t:id="commentAdmin" value="contactFilter.commentAdmin" /> <label for="commentAdmin">programme</label> </t:if> - <!--</t:if>--> </div> + <div> + <input t:type="checkbox" t:id="sortedByBoardingDate" value="contactFilter.sortedByBoardingDate" /> <t:label t:for="sortedByBoardingDate" /> + </div> <div class="t-beaneditor-row aright"> <input t:type="submit" class="ico search-32px" t:id="search" value="Search" title="Rechercher les contacts correspondants aux filtres saisies" /> <input t:type="submit" class="ico undo" t:id="reset" value="Reset" title="Remettre les filtres par défaut" />