April 2012 - Wao-commits - mailman.cloud.codelutin.com

r1610 - trunk/wao-business/src/main/java/fr/ifremer/wao/entity
by bleny＠users.forge.codelutin.com April 27, 2012

April 27, 2012

Author: bleny Date: 2012-04-27 18:04:09 +0200 (Fri, 27 Apr 2012) New Revision: 1610 Url: http://forge.codelutin.com/repositories/revision/wao/1610 Log: fixes #1179 Erreur dans le calcul du programm?\195?\169 dans la synth?\195?\168se si on filtre sur une fa?\195?\167ade Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/entity/SampleRowDAOImpl.java Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/entity/SampleRowDAOImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/entity/SampleRowDAOImpl.java 2012-04-27 16:03:24 UTC (rev 1609) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/entity/SampleRowDAOImpl.java 2012-04-27 16:04:09 UTC (rev 1610) @@ -74,21 +74,24 @@ if (filterOnFishingZone) { String fishingZoneAlias = WaoQueryHelper.newFishingZoneProperty().defaultAlias(); - query.addDistinct() - .addLeftJoin(query.getMainAlias() + "." + SampleRow.PROPERTY_FISHING_ZONE, fishingZoneAlias, false); + TopiaQuery subQuery = createQuery("SR2"); + subQuery.setSelect("SR2." + SampleRow.TOPIA_ID) + .addJoin("SR2." + SampleRow.PROPERTY_FISHING_ZONE, fishingZoneAlias, false); + if (filterOnFaceName) { - query.addEquals( + subQuery.addEquals( fishingZoneAlias + "." + FishingZone.PROPERTY_FACADE_NAME, filter.getFacadeName()); } if (filterOnSectorName) { - query.addEquals( + subQuery.addEquals( fishingZoneAlias + "." + FishingZone.PROPERTY_SECTOR_NAME, filter.getSectorName()); } + query.addSubQuery(query.getMainAlias() + "." + SampleRow.TOPIA_ID + " IN (?)", subQuery); } boolean filterOnDcfGears = filter.getFishingGearDCF() != null;

1 0

r1609 - trunk/wao-ui/src/main/resources
by bleny＠users.forge.codelutin.com April 27, 2012

April 27, 2012

Author: bleny Date: 2012-04-27 18:03:24 +0200 (Fri, 27 Apr 2012) New Revision: 1609 Url: http://forge.codelutin.com/repositories/revision/wao/1609 Log: ajouts comment?\195?\169s dans la configuration du log Modified: trunk/wao-ui/src/main/resources/log4j.properties Modified: trunk/wao-ui/src/main/resources/log4j.properties =================================================================== --- trunk/wao-ui/src/main/resources/log4j.properties 2012-04-25 12:13:02 UTC (rev 1608) +++ trunk/wao-ui/src/main/resources/log4j.properties 2012-04-27 16:03:24 UTC (rev 1609) @@ -28,7 +28,7 @@ log4j.appender.console=org.apache.log4j.ConsoleAppender log4j.appender.console.layout=org.apache.log4j.PatternLayout log4j.appender.console.layout.ConversionPattern=%d %5p [%t] (%F:%L) %M - %m%n -log4j.appender.console.Threshold=DEBUG +log4j.appender.console.Threshold=TRACE log4j.appender.globalFile=org.apache.log4j.RollingFileAppender # wao.log.home must be defined when starting server @@ -46,13 +46,16 @@ # log4j.category.fr.ifremer.wao=DEBUG # log4j.category.fr.ifremer.wao.ui.services.RequiresAuthenticationFilter=DEBUG -# log4j.category.org.nuiton.util=WARN -# log4j.category.org.nuiton.util.beans.BinderProvider=ERROR +# log4j.category.fr.ifremer.wao.entity=TRACE # Migration # log4j.category.fr.ifremer.wao.WaoMigrationCallBack=TRACE # log4j.category.fr.ifremer.wao.PostgresMigrationCallback=TRACE +# nuiton +# log4j.category.org.nuiton.util=WARN +# log4j.category.org.nuiton.util.beans.BinderProvider=ERROR + # Topia # log4j.category.org.nuiton.topia=INFO # log4j.category.org.nuiton.topia.framework.TopiaConnectionProvider=TRACE

1 0

r1608 - in trunk/wao-ui/src/main: resources/fr/ifremer/wao/ui/components webapp
by bleny＠users.forge.codelutin.com April 25, 2012

April 25, 2012

Author: bleny Date: 2012-04-25 14:13:02 +0200 (Wed, 25 Apr 2012) New Revision: 1608 Url: http://forge.codelutin.com/repositories/revision/wao/1608 Log: fixes #1162 Changement adresse mail sur WAO Modified: trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/Footer.tml trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/Layout.tml trunk/wao-ui/src/main/webapp/Cartography.tml Modified: trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/Footer.tml =================================================================== --- trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/Footer.tml 2012-04-25 12:09:17 UTC (rev 1607) +++ trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/Footer.tml 2012-04-25 12:13:02 UTC (rev 1608) @@ -29,7 +29,7 @@ ${version} </a> - <t:if test="connectedUser.obsMer"> - <a href="mailto:obsmer@ifremer.fr" title="Contacter un responsable Obsmer"> + <a href="mailto:harmonie@ifremer.fr" title="Contacter un responsable Obsmer"> Obsmer </a> - </t:if> Modified: trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/Layout.tml =================================================================== --- trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/Layout.tml 2012-04-25 12:09:17 UTC (rev 1607) +++ trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/Layout.tml 2012-04-25 12:13:02 UTC (rev 1608) @@ -59,7 +59,7 @@ </div> <t:if test="connectedUser.obsMer"> <div class="fleft"> - <a href="mailto:obsmer@ifremer.fr" title="${message:wao.ui.action.contactAdmin}"> + <a href="mailto:harmonie@ifremer.fr" title="${message:wao.ui.action.contactAdmin}"> <img src="${asset:context:img/MiniLogo.jpg}" alt="Obsmer logo"/> </a> </div> Modified: trunk/wao-ui/src/main/webapp/Cartography.tml =================================================================== --- trunk/wao-ui/src/main/webapp/Cartography.tml 2012-04-25 12:09:17 UTC (rev 1607) +++ trunk/wao-ui/src/main/webapp/Cartography.tml 2012-04-25 12:13:02 UTC (rev 1608) @@ -122,7 +122,7 @@ <t:if test="user.obsMer"> <div class="acenter mtop30"> - <a href="mailto:obsmer@ifremer.fr" title="${message:wao.ui.action.contactAdmin}"> + <a href="mailto:harmonie@ifremer.fr" title="${message:wao.ui.action.contactAdmin}"> <img src="${asset:context:img/MiniLogo.jpg}" style="height: 22px;" alt="Obsmer logo"/> </a> </div>

1 0

r1607 - in trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv2/models: . operations
by bleny＠users.forge.codelutin.com April 25, 2012

April 25, 2012

Author: bleny Date: 2012-04-25 14:09:17 +0200 (Wed, 25 Apr 2012) New Revision: 1607 Url: http://forge.codelutin.com/repositories/revision/wao/1607 Log: fixes #1171 Erreur lors de l'export du plan si une ligne n'a pas de lieu associ?\195?\169 Added: trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv2/models/operations/SampleRowDistrictNameGetter.java Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv2/models/ObsMerObsVenteSamplingPlanImportExportModel.java Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv2/models/ObsMerObsVenteSamplingPlanImportExportModel.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv2/models/ObsMerObsVenteSamplingPlanImportExportModel.java 2012-04-19 12:56:25 UTC (rev 1606) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv2/models/ObsMerObsVenteSamplingPlanImportExportModel.java 2012-04-25 12:09:17 UTC (rev 1607) @@ -34,11 +34,7 @@ import fr.ifremer.wao.entity.SampleRow; import fr.ifremer.wao.entity.SampleRowImpl; import fr.ifremer.wao.entity.TerrestrialLocation; -import fr.ifremer.wao.io.csv2.models.operations.CompanyParserFormatter; -import fr.ifremer.wao.io.csv2.models.operations.DCF5CodesParserFormatter; -import fr.ifremer.wao.io.csv2.models.operations.DistrictParserFormatter; -import fr.ifremer.wao.io.csv2.models.operations.FishingZonesParserFormatter; -import fr.ifremer.wao.io.csv2.models.operations.SampleRowCodeParserFormatter; +import fr.ifremer.wao.io.csv2.models.operations.*; import org.nuiton.util.PeriodDates; import org.nuiton.util.csv.Common; import org.nuiton.util.csv.ExportableColumn; @@ -217,7 +213,7 @@ if (obsProgram == ObsProgram.OBSVENTE) { modelBuilder.newColumnForImportExport("PLAN_STRATEGIE", "samplingStrategy", new Common.ToStringParserFormatter<SamplingStrategy>(SamplingStrategy.values())); modelBuilder.newColumnForImportExport("PLAN_LIEU_CODE", SampleRow.PROPERTY_TERRESTRIAL_LOCATION, new DistrictParserFormatter(terrestrialDistricts)); - modelBuilder.newColumnForExport("PLAN_LIEU_NOM", SampleRow.PROPERTY_TERRESTRIAL_LOCATION + "." + TerrestrialLocation.PROPERTY_DISTRICT_NAME); + modelBuilder.newColumnForExport("PLAN_LIEU_NOM", new SampleRowDistrictNameGetter()); modelBuilder.newIgnoredColumn("PLAN_LIEU_NOM"); modelBuilder.newColumnForImportExport("PLAN_LIEU_COMMENT", SampleRow.PROPERTY_TERRESTRIAL_LOCATION_INFOS); } Added: trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv2/models/operations/SampleRowDistrictNameGetter.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv2/models/operations/SampleRowDistrictNameGetter.java (rev 0) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv2/models/operations/SampleRowDistrictNameGetter.java 2012-04-25 12:09:17 UTC (rev 1607) @@ -0,0 +1,17 @@ +package fr.ifremer.wao.io.csv2.models.operations; + +import fr.ifremer.wao.entity.SampleRow; +import fr.ifremer.wao.entity.TerrestrialLocation; +import org.nuiton.util.csv.ValueGetter; + +public class SampleRowDistrictNameGetter implements ValueGetter<SampleRow, String> { + + @Override + public String get(SampleRow sampleRow) throws Exception { + String districtName = ""; + if (sampleRow.getTerrestrialLocation() != null) { + districtName = sampleRow.getTerrestrialLocation().getDistrictName(); + } + return districtName; + } +}

1 0

r1606 - in trunk: . wao-business wao-ui
by maven-release＠users.forge.codelutin.com April 19, 2012

April 19, 2012

Author: maven-release Date: 2012-04-19 14:56:25 +0200 (Thu, 19 Apr 2012) New Revision: 1606 Url: http://forge.codelutin.com/repositories/revision/wao/1606 Log: [maven-release-plugin] prepare for next development iteration Modified: trunk/pom.xml trunk/wao-business/pom.xml trunk/wao-ui/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-04-19 12:56:18 UTC (rev 1605) +++ trunk/pom.xml 2012-04-19 12:56:25 UTC (rev 1606) @@ -15,7 +15,7 @@ <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>3.3.3</version> + <version>3.3.4-SNAPSHOT</version> <modules> <module>wao-business</module> @@ -354,12 +354,12 @@ <scm> <connection> - scm:svn:http://svn.forge.codelutin.com/svn/wao/tags/wao-3.3.3 + scm:svn:http://svn.forge.codelutin.com/svn/wao/trunk </connection> <developerConnection> - scm:svn:http://svn.forge.codelutin.com/svn/wao/tags/wao-3.3.3 + scm:svn:http://svn.forge.codelutin.com/svn/wao/trunk </developerConnection> - <url>http://forge.codelutin.com/repositories/browse/wao/tags/wao-3.3.3</url> + <url>http://forge.codelutin.com/repositories/browse/wao/trunk</url> </scm> <distributionManagement> Modified: trunk/wao-business/pom.xml =================================================================== --- trunk/wao-business/pom.xml 2012-04-19 12:56:18 UTC (rev 1605) +++ trunk/wao-business/pom.xml 2012-04-19 12:56:25 UTC (rev 1606) @@ -10,7 +10,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>3.3.3</version> + <version>3.3.4-SNAPSHOT</version> </parent> <groupId>fr.ifremer.wao</groupId> Modified: trunk/wao-ui/pom.xml =================================================================== --- trunk/wao-ui/pom.xml 2012-04-19 12:56:18 UTC (rev 1605) +++ trunk/wao-ui/pom.xml 2012-04-19 12:56:25 UTC (rev 1606) @@ -10,7 +10,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>3.3.3</version> + <version>3.3.4-SNAPSHOT</version> </parent> <groupId>fr.ifremer.wao</groupId>

1 0

r1605 - in tags: . wao-3.3.3
by maven-release＠users.forge.codelutin.com April 19, 2012

April 19, 2012

Author: maven-release Date: 2012-04-19 14:56:18 +0200 (Thu, 19 Apr 2012) New Revision: 1605 Url: http://forge.codelutin.com/repositories/revision/wao/1605 Log: [maven-release-plugin] copy for tag wao-3.3.3 Added: tags/wao-3.3.3/ Property changes on: tags/wao-3.3.3 ___________________________________________________________________ Added: svn:ignore + *.ipr *.iws *.iml *.idea target nbactions.xml Added: svn:mergeinfo + /branches/wao-1.5.x:679-733

1 0

r1604 - in trunk: . wao-business wao-ui
by maven-release＠users.forge.codelutin.com April 19, 2012

April 19, 2012

Author: maven-release Date: 2012-04-19 14:56:11 +0200 (Thu, 19 Apr 2012) New Revision: 1604 Url: http://forge.codelutin.com/repositories/revision/wao/1604 Log: [maven-release-plugin] prepare release wao-3.3.3 Modified: trunk/pom.xml trunk/wao-business/pom.xml trunk/wao-ui/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-04-17 12:53:39 UTC (rev 1603) +++ trunk/pom.xml 2012-04-19 12:56:11 UTC (rev 1604) @@ -15,7 +15,7 @@ <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3</version> <modules> <module>wao-business</module> @@ -354,12 +354,12 @@ <scm> <connection> - scm:svn:http://svn.forge.codelutin.com/svn/wao/trunk + scm:svn:http://svn.forge.codelutin.com/svn/wao/tags/wao-3.3.3 </connection> <developerConnection> - scm:svn:http://svn.forge.codelutin.com/svn/wao/trunk + scm:svn:http://svn.forge.codelutin.com/svn/wao/tags/wao-3.3.3 </developerConnection> - <url>http://forge.codelutin.com/repositories/browse/wao/trunk</url> + <url>http://forge.codelutin.com/repositories/browse/wao/tags/wao-3.3.3</url> </scm> <distributionManagement> Modified: trunk/wao-business/pom.xml =================================================================== --- trunk/wao-business/pom.xml 2012-04-17 12:53:39 UTC (rev 1603) +++ trunk/wao-business/pom.xml 2012-04-19 12:56:11 UTC (rev 1604) @@ -10,7 +10,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3</version> </parent> <groupId>fr.ifremer.wao</groupId> Modified: trunk/wao-ui/pom.xml =================================================================== --- trunk/wao-ui/pom.xml 2012-04-17 12:53:39 UTC (rev 1603) +++ trunk/wao-ui/pom.xml 2012-04-19 12:56:11 UTC (rev 1604) @@ -10,7 +10,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3</version> </parent> <groupId>fr.ifremer.wao</groupId>

1 0

r1603 - in trunk: . wao-business wao-ui
by bleny＠users.forge.codelutin.com April 17, 2012

April 17, 2012

Author: bleny Date: 2012-04-17 14:53:39 +0200 (Tue, 17 Apr 2012) New Revision: 1603 Url: http://forge.codelutin.com/repositories/revision/wao/1603 Log: version 3.3.3-SNAPSHOT selon roadmap Modified: trunk/pom.xml trunk/wao-business/pom.xml trunk/wao-ui/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-04-17 12:25:35 UTC (rev 1602) +++ trunk/pom.xml 2012-04-17 12:53:39 UTC (rev 1603) @@ -15,7 +15,7 @@ <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>3.4-SNAPSHOT</version> + <version>3.3.3-SNAPSHOT</version> <modules> <module>wao-business</module> Modified: trunk/wao-business/pom.xml =================================================================== --- trunk/wao-business/pom.xml 2012-04-17 12:25:35 UTC (rev 1602) +++ trunk/wao-business/pom.xml 2012-04-17 12:53:39 UTC (rev 1603) @@ -10,7 +10,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>3.4-SNAPSHOT</version> + <version>3.3.3-SNAPSHOT</version> </parent> <groupId>fr.ifremer.wao</groupId> Modified: trunk/wao-ui/pom.xml =================================================================== --- trunk/wao-ui/pom.xml 2012-04-17 12:25:35 UTC (rev 1602) +++ trunk/wao-ui/pom.xml 2012-04-17 12:53:39 UTC (rev 1603) @@ -10,7 +10,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>3.4-SNAPSHOT</version> + <version>3.3.3-SNAPSHOT</version> </parent> <groupId>fr.ifremer.wao</groupId>

1 0

r1602 - trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/data
by bleny＠users.forge.codelutin.com April 17, 2012

April 17, 2012

Author: bleny Date: 2012-04-17 14:25:35 +0200 (Tue, 17 Apr 2012) New Revision: 1602 Url: http://forge.codelutin.com/repositories/revision/wao/1602 Log: fixes #1111 Perte des onglets de pagination sur la liste des navires : le crit?\195?\168re de pagination n'?\195?\169tait jamais retir?\195?\169 de la requ?\195?\170te, tout filtrage suivant un premier filtrage ne retournait plus que 20 r?\195?\169sultats maximum Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/data/BoatDataSource.java Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/data/BoatDataSource.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/data/BoatDataSource.java 2012-04-17 10:03:54 UTC (rev 1601) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/data/BoatDataSource.java 2012-04-17 12:25:35 UTC (rev 1602) @@ -77,8 +77,13 @@ } filter.setOrderBy(filterOrder); } - - return service.getBoatsByFilter(filter); + + Map<Integer, Boat> boats = service.getBoatsByFilter(filter); + + filter.setStartIndex(null); + filter.setEndIndex(null); + + return boats; } @Override

1 0

r1601 - in trunk/wao-business/src/main/java/fr/ifremer/wao: . entity
by bleny＠users.forge.codelutin.com April 17, 2012

April 17, 2012

Author: bleny Date: 2012-04-17 12:03:54 +0200 (Tue, 17 Apr 2012) New Revision: 1601 Url: http://forge.codelutin.com/repositories/revision/wao/1601 Log: fixes #1109 Probl?\195?\168me sur le tri par nom des navires ; il manquant les alias quand dans les clauses orderBy des requ?\195?\170tes g?\195?\169n?\195?\169r?\195?\169es par les filtres Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/WaoUtils.java trunk/wao-business/src/main/java/fr/ifremer/wao/entity/BoatDAOImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/entity/ContactDAOImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/entity/SampleRowDAOImpl.java Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/WaoUtils.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/WaoUtils.java 2012-04-12 14:35:38 UTC (rev 1600) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/WaoUtils.java 2012-04-17 10:03:54 UTC (rev 1601) @@ -284,14 +284,26 @@ return code; } - public static TopiaQuery addOrderAndLimitClauses(TopiaQuery topiaQuery, WaoFilter waoFilter) { + /** + * Permet de modifier une requête pour ajouter les paramètres de pagination + * et d'ordre. + * + * @param topiaQuery la requête à modifier + * @param mainAlias alias de l'entité dans la clause SELECT de la requête + * @param waoFilter le WaoFilter (qui contient les informations de pagination et + * d'ordre) + * @return la requête modifiée + */ + public static TopiaQuery addOrderAndLimitClauses(TopiaQuery topiaQuery, String mainAlias, WaoFilter waoFilter) { if (waoFilter.getStartIndex() != null && waoFilter.getEndIndex() != null) { topiaQuery.setLimit(waoFilter.getStartIndex(), waoFilter.getEndIndex()); } if (waoFilter.getOrderBy() != null) { - topiaQuery.addOrder(waoFilter.getOrderBy()); + String prefix = mainAlias == null ? "" : mainAlias + "."; + String orderByClause = prefix + waoFilter.getOrderBy(); + topiaQuery.addOrder(orderByClause); } return topiaQuery; Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/entity/BoatDAOImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/entity/BoatDAOImpl.java 2012-04-12 14:35:38 UTC (rev 1600) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/entity/BoatDAOImpl.java 2012-04-17 10:03:54 UTC (rev 1601) @@ -167,11 +167,12 @@ protected TopiaQuery getQueryForFilter(BoatFilter filter) throws TopiaException { TopiaQuery query = toTopiaQuery(filter); - WaoUtils.addOrderAndLimitClauses(query, filter); + WaoUtils.addOrderAndLimitClauses(query, "B", filter); if (log.isDebugEnabled()) { log.debug("query to find all boats by filter is " + query); } + return query; } @@ -198,9 +199,9 @@ TopiaQuery query = toTopiaQuery(filter); - WaoUtils.addOrderAndLimitClauses(query, filter); + WaoUtils.addOrderAndLimitClauses(query, "B", filter); - WaoQueryHelper.BoatProperty boatProperty = WaoQueryHelper.newBoatProperty(); + WaoQueryHelper.BoatProperty boatProperty = WaoQueryHelper.newBoatProperty("B"); query.addFetch( boatProperty.portOfRegistry(), boatProperty.boatGroup(), Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/entity/ContactDAOImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/entity/ContactDAOImpl.java 2012-04-12 14:35:38 UTC (rev 1600) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/entity/ContactDAOImpl.java 2012-04-17 10:03:54 UTC (rev 1601) @@ -300,11 +300,10 @@ TopiaQuery query = toTopiaQuery(filter); if (filter.isSortedByBoardingDate()) { - filter.setOrderBy(null); - query.addOrder(Contact.PROPERTY_OBSERVATION_BEGIN_DATE + " DESC"); + filter.setOrderBy(Contact.PROPERTY_OBSERVATION_BEGIN_DATE + " DESC"); } - WaoUtils.addOrderAndLimitClauses(query, filter); + WaoUtils.addOrderAndLimitClauses(query, "C", filter); if (log.isDebugEnabled()) { log.debug("query to find all contacts by filter is " + query); Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/entity/SampleRowDAOImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/entity/SampleRowDAOImpl.java 2012-04-12 14:35:38 UTC (rev 1600) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/entity/SampleRowDAOImpl.java 2012-04-17 10:03:54 UTC (rev 1601) @@ -204,7 +204,7 @@ protected TopiaQuery getQueryForFind(SamplingFilter filter) { TopiaQuery query = toTopiaQuery(filter); - WaoUtils.addOrderAndLimitClauses(query, filter); + WaoUtils.addOrderAndLimitClauses(query, "SR", filter); if (log.isDebugEnabled()) { log.debug("query to find all sample rows by filter is " + query);

1 0