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

r1592 - in trunk: wao-business/src/main/java/fr/ifremer/wao/service wao-business/src/main/xmi wao-ui/src/main/java/fr/ifremer/wao/ui/pages
by bleny＠users.forge.codelutin.com 30 Mar '12

30 Mar '12

Author: bleny Date: 2012-03-30 11:12:41 +0200 (Fri, 30 Mar 2012) New Revision: 1592 Url: http://forge.codelutin.com/repositories/revision/wao/1592 Log: fixes #1058 Dans le plan d'?\195?\169chantillonnage, le calcul du r?\195?\169alis?\195?\169 en jour de mers ne tient pas compte des dates Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSamplingImpl.java trunk/wao-business/src/main/xmi/wao.zargo trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/SamplingPlan.java Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSamplingImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSamplingImpl.java 2012-03-29 15:01:19 UTC (rev 1591) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSamplingImpl.java 2012-03-30 09:12:41 UTC (rev 1592) @@ -1236,7 +1236,7 @@ * le temps réalisé. Ces deux données sont exprimées en nombre de jours */ @Override - protected Pair<Double, Long> executeGetObservationTimesInDays(TopiaContext transaction, SampleRow sampleRow, boolean estimatedTides) { + protected Pair<Double, Long> executeGetObservationTimesInDays(TopiaContext transaction, SampleRow sampleRow, boolean estimatedTides, PeriodDates period) { if (sampleRow.getObsProgram() != ObsProgram.OBSMER) { throw new IllegalArgumentException(); } @@ -1261,6 +1261,9 @@ // pour cette ligne du plan ServiceContact serviceContact = context.getServiceFactory().getServiceContact(); ContactFilter contactFilter = new ContactFilterImpl(); + period.initDayOfMonthExtremities(); + contactFilter.setPeriod(period); + contactFilter.setFilterOnObservationBeginDate(true); contactFilter.getSamplingFilter().setSampleRow(sampleRow); contactFilter.setState(ContactState.OBSERVATION_DONE); // on exclue les contacts qui sont invalidés par le programme Modified: trunk/wao-business/src/main/xmi/wao.zargo =================================================================== (Binary files differ) Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/SamplingPlan.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/SamplingPlan.java 2012-03-29 15:01:19 UTC (rev 1591) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/SamplingPlan.java 2012-03-30 09:12:41 UTC (rev 1592) @@ -512,7 +512,7 @@ // temps d'observation en jour observationTimesInDaysForRow = serviceSampling.getObservationTimesInDays( - row, getFilter().isEstimatedTides()); + row, getFilter().isEstimatedTides(), getFilter().getPeriod()); observationTimesInDaysPerRow.put(row, observationTimesInDaysForRow); } return observationTimesInDaysForRow; @@ -627,11 +627,18 @@ } public String getRealTidesClass() { - String result = "real-warning"; - if (getNbTidesReal() < getNbTidesExpected()) { - result += "-inf"; - } else if (getNbTidesReal() > getNbTidesExpected()) { - result += "-sup"; + Integer nbTidesReal = getNbTidesReal(); + Integer nbTidesExpected = getNbTidesExpected(); + String result; + if (nbTidesExpected == null || nbTidesReal == null) { + result = ""; + } else { + result = "real-warning"; + if (nbTidesReal < nbTidesExpected) { + result += "-inf"; + } else if (nbTidesReal > nbTidesExpected) { + result += "-sup"; + } } return result; }

1 0

r1591 - in trunk: . wao-business wao-ui
by bleny＠users.forge.codelutin.com 29 Mar '12

29 Mar '12

Author: bleny Date: 2012-03-29 17:01:19 +0200 (Thu, 29 Mar 2012) New Revision: 1591 Url: http://forge.codelutin.com/repositories/revision/wao/1591 Log: version des pom en 3.3.2-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-03-29 14:16:17 UTC (rev 1590) +++ trunk/pom.xml 2012-03-29 15:01:19 UTC (rev 1591) @@ -15,7 +15,7 @@ <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>3.4-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> <modules> <module>wao-business</module> Modified: trunk/wao-business/pom.xml =================================================================== --- trunk/wao-business/pom.xml 2012-03-29 14:16:17 UTC (rev 1590) +++ trunk/wao-business/pom.xml 2012-03-29 15:01:19 UTC (rev 1591) @@ -10,7 +10,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>3.4-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </parent> <groupId>fr.ifremer.wao</groupId> Modified: trunk/wao-ui/pom.xml =================================================================== --- trunk/wao-ui/pom.xml 2012-03-29 14:16:17 UTC (rev 1590) +++ trunk/wao-ui/pom.xml 2012-03-29 15:01:19 UTC (rev 1591) @@ -10,7 +10,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>3.4-SNAPSHOT</version> + <version>3.3.2-SNAPSHOT</version> </parent> <groupId>fr.ifremer.wao</groupId>

1 0

r1590 - trunk/wao-business/src/main/java/fr/ifremer/wao
by bleny＠users.forge.codelutin.com 29 Mar '12

29 Mar '12

Author: bleny Date: 2012-03-29 16:16:17 +0200 (Thu, 29 Mar 2012) New Revision: 1590 Url: http://forge.codelutin.com/repositories/revision/wao/1590 Log: objectName pour le MBean hibernate selon les bonnes pratiques Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/WaoContextImpl.java Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/WaoContextImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/WaoContextImpl.java 2012-03-29 13:35:17 UTC (rev 1589) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/WaoContextImpl.java 2012-03-29 14:16:17 UTC (rev 1590) @@ -289,7 +289,7 @@ rootContext = TopiaContextFactory.getContext( getConfiguration().getOptions()); MBeanServer server = ManagementFactory.getPlatformMBeanServer(); - hibernatStatisticsMbeanName = new ObjectName("Hibernate:application=Statistics"); + hibernatStatisticsMbeanName = new ObjectName("fr.ifremer.wao:type=HibernateStatistics"); if (server.isRegistered(hibernatStatisticsMbeanName)) { log.info("mbean " + hibernatStatisticsMbeanName + " already attached"); } else {

1 0

r1589 - in trunk: . wao-business wao-ui
by maven-release＠users.forge.codelutin.com 29 Mar '12

29 Mar '12

Author: maven-release Date: 2012-03-29 15:35:17 +0200 (Thu, 29 Mar 2012) New Revision: 1589 Url: http://forge.codelutin.com/repositories/revision/wao/1589 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-03-29 13:35:10 UTC (rev 1588) +++ trunk/pom.xml 2012-03-29 13:35:17 UTC (rev 1589) @@ -15,7 +15,7 @@ <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>3.3.1</version> + <version>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.1 + 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.1 + scm:svn:http://svn.forge.codelutin.com/svn/wao/trunk </developerConnection> - <url>http://forge.codelutin.com/repositories/browse/wao/tags/wao-3.3.1</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-03-29 13:35:10 UTC (rev 1588) +++ trunk/wao-business/pom.xml 2012-03-29 13:35:17 UTC (rev 1589) @@ -10,7 +10,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>3.3.1</version> + <version>3.4-SNAPSHOT</version> </parent> <groupId>fr.ifremer.wao</groupId> Modified: trunk/wao-ui/pom.xml =================================================================== --- trunk/wao-ui/pom.xml 2012-03-29 13:35:10 UTC (rev 1588) +++ trunk/wao-ui/pom.xml 2012-03-29 13:35:17 UTC (rev 1589) @@ -10,7 +10,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>3.3.1</version> + <version>3.4-SNAPSHOT</version> </parent> <groupId>fr.ifremer.wao</groupId>

1 0

r1588 - in tags: . wao-3.3.1
by maven-release＠users.forge.codelutin.com 29 Mar '12

29 Mar '12

Author: maven-release Date: 2012-03-29 15:35:10 +0200 (Thu, 29 Mar 2012) New Revision: 1588 Url: http://forge.codelutin.com/repositories/revision/wao/1588 Log: [maven-release-plugin] copy for tag wao-3.3.1 Added: tags/wao-3.3.1/ Property changes on: tags/wao-3.3.1 ___________________________________________________________________ Added: svn:ignore + *.ipr *.iws *.iml *.idea target nbactions.xml Added: svn:mergeinfo + /branches/wao-1.5.x:679-733

1 0

r1587 - in trunk: . wao-business wao-ui
by maven-release＠users.forge.codelutin.com 29 Mar '12

29 Mar '12

Author: maven-release Date: 2012-03-29 15:35:02 +0200 (Thu, 29 Mar 2012) New Revision: 1587 Url: http://forge.codelutin.com/repositories/revision/wao/1587 Log: [maven-release-plugin] prepare release wao-3.3.1 Modified: trunk/pom.xml trunk/wao-business/pom.xml trunk/wao-ui/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-03-29 12:47:39 UTC (rev 1586) +++ trunk/pom.xml 2012-03-29 13:35:02 UTC (rev 1587) @@ -15,7 +15,7 @@ <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.1</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.1 </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.1 </developerConnection> - <url>http://forge.codelutin.com/repositories/browse/wao/trunk</url> + <url>http://forge.codelutin.com/repositories/browse/wao/tags/wao-3.3.1</url> </scm> <distributionManagement> Modified: trunk/wao-business/pom.xml =================================================================== --- trunk/wao-business/pom.xml 2012-03-29 12:47:39 UTC (rev 1586) +++ trunk/wao-business/pom.xml 2012-03-29 13:35:02 UTC (rev 1587) @@ -10,7 +10,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.1</version> </parent> <groupId>fr.ifremer.wao</groupId> Modified: trunk/wao-ui/pom.xml =================================================================== --- trunk/wao-ui/pom.xml 2012-03-29 12:47:39 UTC (rev 1586) +++ trunk/wao-ui/pom.xml 2012-03-29 13:35:02 UTC (rev 1587) @@ -10,7 +10,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>3.3.1-SNAPSHOT</version> + <version>3.3.1</version> </parent> <groupId>fr.ifremer.wao</groupId>

1 0

r1586 - trunk
by bleny＠users.forge.codelutin.com 29 Mar '12

29 Mar '12

Author: bleny Date: 2012-03-29 14:47:39 +0200 (Thu, 29 Mar 2012) New Revision: 1586 Url: http://forge.codelutin.com/repositories/revision/wao/1586 Log: mont?\195?\169e de version vers maven pom 3.2.1 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-03-29 09:11:02 UTC (rev 1585) +++ trunk/pom.xml 2012-03-29 12:47:39 UTC (rev 1586) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>3.2</version> + <version>3.2.1</version> </parent> <groupId>fr.ifremer</groupId>

1 0

r1585 - in trunk: . wao-business wao-ui
by bleny＠users.forge.codelutin.com 29 Mar '12

29 Mar '12

Author: bleny Date: 2012-03-29 11:11:02 +0200 (Thu, 29 Mar 2012) New Revision: 1585 Url: http://forge.codelutin.com/repositories/revision/wao/1585 Log: version des pom en 3.3.1-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-03-29 09:07:28 UTC (rev 1584) +++ trunk/pom.xml 2012-03-29 09:11:02 UTC (rev 1585) @@ -15,7 +15,7 @@ <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>3.4-SNAPSHOT</version> + <version>3.3.1-SNAPSHOT</version> <modules> <module>wao-business</module> Modified: trunk/wao-business/pom.xml =================================================================== --- trunk/wao-business/pom.xml 2012-03-29 09:07:28 UTC (rev 1584) +++ trunk/wao-business/pom.xml 2012-03-29 09:11:02 UTC (rev 1585) @@ -10,7 +10,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>3.4-SNAPSHOT</version> + <version>3.3.1-SNAPSHOT</version> </parent> <groupId>fr.ifremer.wao</groupId> Modified: trunk/wao-ui/pom.xml =================================================================== --- trunk/wao-ui/pom.xml 2012-03-29 09:07:28 UTC (rev 1584) +++ trunk/wao-ui/pom.xml 2012-03-29 09:11:02 UTC (rev 1585) @@ -10,7 +10,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>3.4-SNAPSHOT</version> + <version>3.3.1-SNAPSHOT</version> </parent> <groupId>fr.ifremer.wao</groupId>

1 0

r1584 - trunk/wao-business/src/main/java/fr/ifremer/wao/entity
by bleny＠users.forge.codelutin.com 29 Mar '12

29 Mar '12

Author: bleny Date: 2012-03-29 11:07:28 +0200 (Thu, 29 Mar 2012) New Revision: 1584 Url: http://forge.codelutin.com/repositories/revision/wao/1584 Log: Anomalie #1040 Filtre synth?\195?\168se ne g?\195?\168re pas les contacts non valid?\195?\169s (V3.3) Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/entity/ContactDAOImpl.java 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-03-29 08:11:29 UTC (rev 1583) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/entity/ContactDAOImpl.java 2012-03-29 09:07:28 UTC (rev 1584) @@ -346,9 +346,7 @@ SortedMap<Date, Integer> actualObservationsMyMonths = new TreeMap<Date,Integer>(); TopiaQuery query = toTopiaQuery(filter); - query.addEquals(query.getMainAlias() + "." + Contact.PROPERTY_STATE, ContactState.OBSERVATION_DONE.ordinal()) - .addEquals(query.getMainAlias() + "." + Contact.PROPERTY_VALIDATION_COMPANY, true) - .addEquals(query.getMainAlias() + "." + Contact.PROPERTY_VALIDATION_PROGRAM, true); + query.addEquals(query.getMainAlias() + "." + Contact.PROPERTY_STATE, ContactState.OBSERVATION_DONE.ordinal()); Range<Date> range = Range.between(monthsPeriod.getFromDate(), monthsPeriod.getThruDate());

1 0

r1583 - trunk/wao-ui/src/main/resources
by bleny＠users.forge.codelutin.com 29 Mar '12

29 Mar '12

Author: bleny Date: 2012-03-29 10:11:29 +0200 (Thu, 29 Mar 2012) New Revision: 1583 Url: http://forge.codelutin.com/repositories/revision/wao/1583 Log: logs par d?\195?\169faut en INFO 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-03-27 09:19:17 UTC (rev 1582) +++ trunk/wao-ui/src/main/resources/log4j.properties 2012-03-29 08:11:29 UTC (rev 1583) @@ -40,7 +40,7 @@ log4j.appender.globalFile.layout=org.apache.log4j.PatternLayout log4j.appender.globalFile.layout.ConversionPattern=%5p [%t] (%c:%L) %M - %m%n -log4j.logger.fr.ifremer.wao=DEBUG +log4j.logger.fr.ifremer.wao=INFO #log4j.logger.org.nuiton.utils=INFO #log4j.logger.org.nuiton.topia=INFO

1 0