July 2011 - Wao-commits - mailman.cloud.codelutin.com

[Suiviobsmer-commits] r1392 - in trunk: . wao-business wao-ui
by bleny＠users.labs.libre-entreprise.org July 28, 2011

July 28, 2011

Author: bleny Date: 2011-07-28 10:22:34 +0000 (Thu, 28 Jul 2011) New Revision: 1392 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 2011-07-28 10:22:32 UTC (rev 1391) +++ trunk/pom.xml 2011-07-28 10:22:34 UTC (rev 1392) @@ -15,7 +15,7 @@ <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>3.0.1</version> + <version>3.1-SNAPSHOT</version> <modules> <module>wao-ui</module> @@ -348,12 +348,12 @@ <scm> <connection> - scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/tags/wao-3.0.1 + scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/trunk </connection> <developerConnection> - scm:svn:svn+ssh://${username}@labs.libre-entreprise.org/svnroot/suiviobsmer/tags/wao-3.0.1 + scm:svn:svn+ssh://${username}@labs.libre-entreprise.org/svnroot/suiviobsmer/trunk </developerConnection> - <url>http://labs.libre-entreprise.org/scm/viewvc.php/tags/wao-3.0.1?root=suiviob… + <url>http://labs.libre-entreprise.org/scm/viewvc.php/trunk/?root=suiviobsmer </url> </scm> Modified: trunk/wao-business/pom.xml =================================================================== --- trunk/wao-business/pom.xml 2011-07-28 10:22:32 UTC (rev 1391) +++ trunk/wao-business/pom.xml 2011-07-28 10:22:34 UTC (rev 1392) @@ -10,7 +10,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>3.0.1</version> + <version>3.1-SNAPSHOT</version> </parent> <groupId>fr.ifremer.wao</groupId> @@ -239,10 +239,10 @@ <scm> <url> - http://labs.libre-entreprise.org/scm/viewvc.php/tags/wao-3.0.1/?root=suivio… + http://labs.libre-entreprise.org/scm/viewvc.php/trunk/wao-business/?root=su… </url> - <connection>scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/tags/wao-3.0.1/wao-business</connection> - <developerConnection>scm:svn:svn+ssh://${username}@labs.libre-entreprise.org/svnroot/suiviobsmer/tags/wao-3.0.1/wao-business</developerConnection> + <connection>scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/trunk/wao-business</connection> + <developerConnection>scm:svn:svn+ssh://${username}@labs.libre-entreprise.org/svnroot/suiviobsmer/trunk/wao-business</developerConnection> </scm> </project> Modified: trunk/wao-ui/pom.xml =================================================================== --- trunk/wao-ui/pom.xml 2011-07-28 10:22:32 UTC (rev 1391) +++ trunk/wao-ui/pom.xml 2011-07-28 10:22:34 UTC (rev 1392) @@ -10,7 +10,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>3.0.1</version> + <version>3.1-SNAPSHOT</version> </parent> <groupId>fr.ifremer.wao</groupId> @@ -310,10 +310,10 @@ <scm> <url> - http://labs.libre-entreprise.org/scm/viewvc.php/tags/wao-3.0.1/?root=suivio… + http://labs.libre-entreprise.org/scm/viewvc.php/trunk/wao-ui/?root=suiviobs… </url> - <connection>scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/tags/wao-3.0.1/wao-ui</connection> - <developerConnection>scm:svn:svn+ssh://${username}@labs.libre-entreprise.org/svnroot/suiviobsmer/tags/wao-3.0.1/wao-ui</developerConnection> + <connection>scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/trunk/wao-ui</connection> + <developerConnection>scm:svn:svn+ssh://${username}@labs.libre-entreprise.org/svnroot/suiviobsmer/trunk/wao-ui</developerConnection> </scm> </project>

1 0

[Suiviobsmer-commits] r1391 - in tags: . wao-3.0.1
by bleny＠users.labs.libre-entreprise.org July 28, 2011

July 28, 2011

Author: bleny Date: 2011-07-28 10:22:32 +0000 (Thu, 28 Jul 2011) New Revision: 1391 Log: [maven-release-plugin] copy for tag wao-3.0.1 Added: tags/wao-3.0.1/ Property changes on: tags/wao-3.0.1 ___________________________________________________________________ Added: svn:ignore + *.ipr *.iws *.iml *.idea target nbactions.xml Added: svn:mergeinfo + /branches/wao-1.5.x:679-733

1 0

[Suiviobsmer-commits] r1390 - in trunk: . wao-business wao-ui
by bleny＠users.labs.libre-entreprise.org July 28, 2011

July 28, 2011

Author: bleny Date: 2011-07-28 09:41:32 +0000 (Thu, 28 Jul 2011) New Revision: 1390 Log: [maven-release-plugin] prepare release wao-3.0.1 Modified: trunk/pom.xml trunk/wao-business/pom.xml trunk/wao-ui/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-07-28 09:09:05 UTC (rev 1389) +++ trunk/pom.xml 2011-07-28 09:41:32 UTC (rev 1390) @@ -15,7 +15,7 @@ <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>3.0.1-SNAPSHOT</version> + <version>3.0.1</version> <modules> <module>wao-ui</module> @@ -348,12 +348,12 @@ <scm> <connection> - scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/trunk + scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/tags/wao-3.0.1 </connection> <developerConnection> - scm:svn:svn+ssh://${username}@labs.libre-entreprise.org/svnroot/suiviobsmer/trunk + scm:svn:svn+ssh://${username}@labs.libre-entreprise.org/svnroot/suiviobsmer/tags/wao-3.0.1 </developerConnection> - <url>http://labs.libre-entreprise.org/scm/viewvc.php/trunk/?root=suiviobsmer + <url>http://labs.libre-entreprise.org/scm/viewvc.php/tags/wao-3.0.1?root=suiviob… </url> </scm> Modified: trunk/wao-business/pom.xml =================================================================== --- trunk/wao-business/pom.xml 2011-07-28 09:09:05 UTC (rev 1389) +++ trunk/wao-business/pom.xml 2011-07-28 09:41:32 UTC (rev 1390) @@ -10,7 +10,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>3.0.1-SNAPSHOT</version> + <version>3.0.1</version> </parent> <groupId>fr.ifremer.wao</groupId> @@ -239,10 +239,10 @@ <scm> <url> - http://labs.libre-entreprise.org/scm/viewvc.php/trunk/wao-business/?root=su… + http://labs.libre-entreprise.org/scm/viewvc.php/tags/wao-3.0.1/?root=suivio… </url> - <connection>scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/trunk/wao-business</connection> - <developerConnection>scm:svn:svn+ssh://${username}@labs.libre-entreprise.org/svnroot/suiviobsmer/trunk/wao-business</developerConnection> + <connection>scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/tags/wao-3.0.1/wao-business</connection> + <developerConnection>scm:svn:svn+ssh://${username}@labs.libre-entreprise.org/svnroot/suiviobsmer/tags/wao-3.0.1/wao-business</developerConnection> </scm> </project> Modified: trunk/wao-ui/pom.xml =================================================================== --- trunk/wao-ui/pom.xml 2011-07-28 09:09:05 UTC (rev 1389) +++ trunk/wao-ui/pom.xml 2011-07-28 09:41:32 UTC (rev 1390) @@ -10,7 +10,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>3.0.1-SNAPSHOT</version> + <version>3.0.1</version> </parent> <groupId>fr.ifremer.wao</groupId> @@ -310,10 +310,10 @@ <scm> <url> - http://labs.libre-entreprise.org/scm/viewvc.php/trunk/wao-ui/?root=suiviobs… + http://labs.libre-entreprise.org/scm/viewvc.php/tags/wao-3.0.1/?root=suivio… </url> - <connection>scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/trunk/wao-ui</connection> - <developerConnection>scm:svn:svn+ssh://${username}@labs.libre-entreprise.org/svnroot/suiviobsmer/trunk/wao-ui</developerConnection> + <connection>scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/tags/wao-3.0.1/wao-ui</connection> + <developerConnection>scm:svn:svn+ssh://${username}@labs.libre-entreprise.org/svnroot/suiviobsmer/tags/wao-3.0.1/wao-ui</developerConnection> </scm> </project>

1 0

[Suiviobsmer-commits] r1389 - in trunk: . src/announcement
by bleny＠users.labs.libre-entreprise.org July 28, 2011

July 28, 2011

Author: bleny Date: 2011-07-28 09:09:05 +0000 (Thu, 28 Jul 2011) New Revision: 1389 Log: prepare release 3.0.1 Added: trunk/src/announcement/release-email-3.0.1.txt Modified: trunk/changelog.txt Modified: trunk/changelog.txt =================================================================== --- trunk/changelog.txt 2011-07-26 11:58:16 UTC (rev 1388) +++ trunk/changelog.txt 2011-07-28 09:09:05 UTC (rev 1389) @@ -3,8 +3,16 @@ Historique des versions +3.1 +--- + +Anomalies ++++++++++ + +- [bleny] #2660 : Régressions dans Wao 3.0 + 3.0 ------ +--- Evolution +++++++++ Added: trunk/src/announcement/release-email-3.0.1.txt =================================================================== --- trunk/src/announcement/release-email-3.0.1.txt (rev 0) +++ trunk/src/announcement/release-email-3.0.1.txt 2011-07-28 09:09:05 UTC (rev 1389) @@ -0,0 +1,17 @@ +La nouvelle version 3.0.1 de l'applicatif Wao est disponible. + +Nouveautés : + +- [bleny] #2660 : Régressions dans Wao 3.0 + +Documentation : + +http://suiviobsmer.labs.libre-entreprise.org/wao/ + +Téléchargement : + +https://labs.libre-entreprise.org/frs/?group_id=154 + +Cordialement, + +L'équipe Wao

1 0

[Suiviobsmer-commits] r1388 - trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages
by bleny＠users.labs.libre-entreprise.org July 26, 2011

July 26, 2011

Author: bleny Date: 2011-07-26 11:58:16 +0000 (Tue, 26 Jul 2011) New Revision: 1388 Log: may fix unreproducable bug (?) Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Boats.java Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Boats.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Boats.java 2011-07-26 08:43:57 UTC (rev 1387) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Boats.java 2011-07-26 11:58:16 UTC (rev 1388) @@ -464,7 +464,15 @@ } else { boatSelected = getBoats().get(boatSelectedImmatriculation); if (boatSelected == null) { - throw new IllegalStateException("immatriculation selected among an obsolete list of boats"); + log.warn("immatriculation selected among an obsolete list of boats. imma=" + + boatSelectedImmatriculation + " filter=" + + getBoatFilter()); + boats = null; + boatSelected = getBoats().get(boatSelectedImmatriculation); + if (boatSelected == null) { + log.error("boat selected is still null"); + throw new IllegalStateException(); + } } } return boatSelected;

1 0

[Suiviobsmer-commits] r1387 - in trunk/wao-business/src: main/resources/i18n test/java/fr/ifremer/wao/entity
by bleny＠users.labs.libre-entreprise.org July 26, 2011

July 26, 2011

Author: bleny Date: 2011-07-26 08:43:57 +0000 (Tue, 26 Jul 2011) New Revision: 1387 Log: fix tests ; add missing values in i18n Modified: 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/test/java/fr/ifremer/wao/entity/BoatImplTest.java 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-07-26 08:00:26 UTC (rev 1386) +++ trunk/wao-business/src/main/resources/i18n/wao-business_en_GB.properties 2011-07-26 08:43:57 UTC (rev 1387) @@ -131,6 +131,7 @@ wao.business.contact.validation.commentAdminNecessaryForDataReliability=You must precise in admin comment why data reliability is '%s' wao.business.contact.validation.commentMissingForState=You must give a comment for state '%s' wao.business.contact.validation.contactStateMotifMissing=You must precise a motif for the refusal +wao.business.contact.validation.contactStateMotifUnwanted=You must not give a motif wao.business.contact.validation.dataReliabilityMissingForValidation=You must provide data reliability before validating wao.business.contact.validation.missingHoursOfBeginEndObservation=You must provide accurate time for the beginning and the end of observation wao.business.entity.UserProfile.description=%s on %s%s 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-07-26 08:00:26 UTC (rev 1386) +++ trunk/wao-business/src/main/resources/i18n/wao-business_fr_FR.properties 2011-07-26 08:43:57 UTC (rev 1387) @@ -132,6 +132,7 @@ wao.business.contact.validation.commentAdminNecessaryForDataReliability=Il faut préciser dans le commentaire administrateur pourquoi la donnée est '%s' wao.business.contact.validation.commentMissingForState=Il faut préciser un commentaire pour l'état '%s' wao.business.contact.validation.contactStateMotifMissing=Il faut préciser un motif de refus +wao.business.contact.validation.contactStateMotifUnwanted=Il ne faut pas préciser de motif de refus wao.business.contact.validation.dataReliabilityMissingForValidation=Il faut préciser la qualité de la donnée avant de valider wao.business.contact.validation.missingHoursOfBeginEndObservation=Il faut préciser les heures exactes de début et de fin d'observation wao.business.entity.UserProfile.description=%s sur %s%s Modified: trunk/wao-business/src/test/java/fr/ifremer/wao/entity/BoatImplTest.java =================================================================== --- trunk/wao-business/src/test/java/fr/ifremer/wao/entity/BoatImplTest.java 2011-07-26 08:00:26 UTC (rev 1386) +++ trunk/wao-business/src/test/java/fr/ifremer/wao/entity/BoatImplTest.java 2011-07-26 08:43:57 UTC (rev 1387) @@ -102,7 +102,6 @@ contact1.setContactState(ContactState.CONTACT_DEFINITELY_REFUSED); contact1.setContactStateMotif(obsMerFixtures.defaultContactStateMotif()); - contact1.setComment("why contact was definitely refused"); contact1.setDataReliability(DataReliability.RELIABLE); contact1.setValidationProgram(Boolean.TRUE); serviceContact.saveContact(obsMerFixtures.jeanMichmucheAsObserver(), contact1, false); @@ -112,6 +111,7 @@ Assert.assertTrue(result); contact1.setContactState(ContactState.OBSERVATION_DONE); + contact1.setContactStateMotif(null); contact1.setObservationBeginDate(DateUtil.createDate(3, 3, 2010)); contact1.setObservationEndDate(DateUtil.createDate(4, 3, 2010)); contact1.setMainObserver(obsMerFixtures.jeanMichmuche()); @@ -122,6 +122,7 @@ Assert.assertTrue(result); contact1.setContactState(ContactState.OBSERVATION_CANCELLED); + contact1.setContactStateMotif(null); contact1.setComment("why it was cancelled"); serviceContact.saveContact(obsMerFixtures.jeanMichmucheAsObserver(), contact1, false); @@ -130,6 +131,7 @@ Assert.assertTrue(result); contact1.setContactState(ContactState.CONTACT_REFUSED); + contact1.setContactStateMotif(obsMerFixtures.defaultContactStateMotif()); serviceContact.saveContact(obsMerFixtures.jeanMichmucheAsObserver(), contact1, false); result = boat.canCreateContact(ObsProgram.OBSMER, obsMerFixtures.tartanpion());

1 0

[Suiviobsmer-commits] r1386 - trunk/wao-business/src/main/java/fr/ifremer/wao/service
by bleny＠users.labs.libre-entreprise.org July 26, 2011

July 26, 2011

Author: bleny Date: 2011-07-26 08:00:26 +0000 (Tue, 26 Jul 2011) New Revision: 1386 Log: provide a motif only when refusal Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceContactImpl.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-07-26 07:59:59 UTC (rev 1385) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceContactImpl.java 2011-07-26 08:00:26 UTC (rev 1386) @@ -414,6 +414,11 @@ } else { + if (contact.getContactStateMotif() != null) { + success = false; + message = WaoUtils._("wao.business.contact.validation.contactStateMotifUnwanted"); + } + Contact oldContact = null; if (contact.getTopiaId() != null) { oldContact = executeGetContact(transaction, contact.getTopiaId());

1 0

[Suiviobsmer-commits] r1385 - trunk/wao-ui/src/main/webapp
by bleny＠users.labs.libre-entreprise.org July 26, 2011

July 26, 2011

Author: bleny Date: 2011-07-26 07:59:59 +0000 (Tue, 26 Jul 2011) New Revision: 1385 Log: import of motives in ObsMer, not ObsDeb Modified: trunk/wao-ui/src/main/webapp/Administration.tml Modified: trunk/wao-ui/src/main/webapp/Administration.tml =================================================================== --- trunk/wao-ui/src/main/webapp/Administration.tml 2011-07-21 15:50:33 UTC (rev 1384) +++ trunk/wao-ui/src/main/webapp/Administration.tml 2011-07-26 07:59:59 UTC (rev 1385) @@ -181,7 +181,7 @@ <t:importFieldSet t:label="${message:wao.ui.import.terrestrialLocationsLabel}" t:engine="terrestrialLocationsImportEngine" /> - <t:if test="currentUser.obsDeb"> + <t:if test="currentUser.obsMer"> <t:importFieldSet t:label="${message:wao.ui.import.contactStateMotivesLabel}" t:engine="contactStateMotivesImportEngine" /> </t:if>

1 0

[Suiviobsmer-commits] r1384 - in trunk: . wao-business wao-ui
by bleny＠users.labs.libre-entreprise.org July 21, 2011

July 21, 2011

Author: bleny Date: 2011-07-21 15:50:33 +0000 (Thu, 21 Jul 2011) New Revision: 1384 Log: change version to 3.0.1 Modified: trunk/pom.xml trunk/wao-business/pom.xml trunk/wao-ui/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-07-21 15:41:49 UTC (rev 1383) +++ trunk/pom.xml 2011-07-21 15:50:33 UTC (rev 1384) @@ -15,7 +15,7 @@ <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>3.1-SNAPSHOT</version> + <version>3.0.1-SNAPSHOT</version> <modules> <module>wao-ui</module> Modified: trunk/wao-business/pom.xml =================================================================== --- trunk/wao-business/pom.xml 2011-07-21 15:41:49 UTC (rev 1383) +++ trunk/wao-business/pom.xml 2011-07-21 15:50:33 UTC (rev 1384) @@ -10,7 +10,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>3.1-SNAPSHOT</version> + <version>3.0.1-SNAPSHOT</version> </parent> <groupId>fr.ifremer.wao</groupId> Modified: trunk/wao-ui/pom.xml =================================================================== --- trunk/wao-ui/pom.xml 2011-07-21 15:41:49 UTC (rev 1383) +++ trunk/wao-ui/pom.xml 2011-07-21 15:50:33 UTC (rev 1384) @@ -10,7 +10,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>3.1-SNAPSHOT</version> + <version>3.0.1-SNAPSHOT</version> </parent> <groupId>fr.ifremer.wao</groupId>

1 0

[Suiviobsmer-commits] r1383 - trunk/wao-business/src/main/java/fr/ifremer/wao/service
by bleny＠users.labs.libre-entreprise.org July 21, 2011

July 21, 2011

Author: bleny Date: 2011-07-21 15:41:49 +0000 (Thu, 21 Jul 2011) New Revision: 1383 Log: more contact validation for ObsDeb Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceContactImpl.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-07-21 10:32:18 UTC (rev 1382) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceContactImpl.java 2011-07-21 15:41:49 UTC (rev 1383) @@ -273,6 +273,25 @@ if (contact.getObsProgram() == ObsProgram.OBSDEB) { + if (contact.getLandingDate() != null) { + if (success && contact.getObservationBeginDate() != null) { + Date dayBeforeObservation = DateUtils.addDays(contact.getObservationBeginDate(), -1); + boolean landingDateIsValid = + DateUtils.isSameDay(contact.getObservationBeginDate(), contact.getLandingDate()) + || DateUtils.isSameDay(dayBeforeObservation, contact.getLandingDate()); + if ( ! landingDateIsValid) { + success = false; + message = "La date de débarquement doit être la veille ou le jour de l'observation"; + } + } + + if (success && contact.getObservationEndDate() != null + && contact.getObservationEndDate().before(contact.getLandingDate())) { + success = false; + message = "La débarquement ne peut avoir eu lieu après le fin de l'observation"; + } + } + if (contact.getContactState() == ContactState.OBSERVATION_DONE) { if (success && contact.getTerrestrialLocation() == null) {

1 0