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

[Suiviobsmer-commits] r373 - in trunk: . wao-business wao-ui
by fdesbois＠users.labs.libre-entreprise.org 11 Mar '10

11 Mar '10

Author: fdesbois Date: 2010-03-11 10:09:02 +0000 (Thu, 11 Mar 2010) New Revision: 373 Modified: trunk/pom.xml trunk/wao-business/pom.xml trunk/wao-ui/pom.xml Log: [maven-release-plugin] prepare release wao-1.0.2 Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-03-11 09:04:57 UTC (rev 372) +++ trunk/pom.xml 2010-03-11 10:09:02 UTC (rev 373) @@ -15,7 +15,7 @@ <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>1.0.2-SNAPSHOT</version> + <version>1.0.2</version> <modules> <module>wao-ui</module> @@ -226,9 +226,9 @@  <scm> - <connection>scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/trunk</connection> - <developerConnection>scm:svn:svn+ssh://fdesbois at labs.libre-entreprise.org/svnroot/suiviobsmer/trunk</developerConnection> - <url>http://labs.libre-entreprise.org/scm/viewvc.php/trunk/?root=suiviobsmer</url> + <connection>scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/tags/wao-1.0.2</connection> + <developerConnection>scm:svn:svn+ssh://fdesbois at labs.libre-entreprise.org/svnroot/suiviobsmer/tags/wao-1.0.2</developerConnection> + <url>http://labs.libre-entreprise.org/scm/viewvc.php/tags/wao-1.0.2?root=suiviob…</url> </scm> <build> Modified: trunk/wao-business/pom.xml =================================================================== --- trunk/wao-business/pom.xml 2010-03-11 09:04:57 UTC (rev 372) +++ trunk/wao-business/pom.xml 2010-03-11 10:09:02 UTC (rev 373) @@ -10,7 +10,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>1.0.2-SNAPSHOT</version> + <version>1.0.2</version> </parent> <groupId>fr.ifremer.wao</groupId> @@ -160,9 +160,9 @@ </build> <scm> - <url>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/trunk/wao-business</connection> - <developerConnection>scm:svn:svn+ssh://fdesbois at labs.libre-entreprise.org/svnroot/suiviobsmer/trunk/wao-business</developerConnection> + <url>http://labs.libre-entreprise.org/scm/viewvc.php/tags/wao-1.0.2/wao-business…</url> + <connection>scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/tags/wao-1.0.2/wao-business</connection> + <developerConnection>scm:svn:svn+ssh://fdesbois at labs.libre-entreprise.org/svnroot/suiviobsmer/tags/wao-1.0.2/wao-business</developerConnection> </scm> </project> Modified: trunk/wao-ui/pom.xml =================================================================== --- trunk/wao-ui/pom.xml 2010-03-11 09:04:57 UTC (rev 372) +++ trunk/wao-ui/pom.xml 2010-03-11 10:09:02 UTC (rev 373) @@ -10,7 +10,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>1.0.2-SNAPSHOT</version> + <version>1.0.2</version> </parent> <groupId>fr.ifremer.wao</groupId> @@ -141,9 +141,9 @@ </repositories> <scm> - <url>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/trunk/wao-ui</connection> - <developerConnection>scm:svn:svn+ssh://fdesbois at labs.libre-entreprise.org/svnroot/suiviobsmer/trunk/wao-ui</developerConnection> + <url>http://labs.libre-entreprise.org/scm/viewvc.php/tags/wao-1.0.2/wao-ui?root=…</url> + <connection>scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/tags/wao-1.0.2/wao-ui</connection> + <developerConnection>scm:svn:svn+ssh://fdesbois at labs.libre-entreprise.org/svnroot/suiviobsmer/tags/wao-1.0.2/wao-ui</developerConnection> </scm> </project>

1 0

[Suiviobsmer-commits] r372 - trunk/wao-business/src/main/filters
by fdesbois＠users.labs.libre-entreprise.org 11 Mar '10

11 Mar '10

Author: fdesbois Date: 2010-03-11 09:04:57 +0000 (Thu, 11 Mar 2010) New Revision: 372 Modified: trunk/wao-business/src/main/filters/Wao.properties Log: Change version in properties file.... maven filters :/ Modified: trunk/wao-business/src/main/filters/Wao.properties =================================================================== --- trunk/wao-business/src/main/filters/Wao.properties 2010-03-10 17:05:15 UTC (rev 371) +++ trunk/wao-business/src/main/filters/Wao.properties 2010-03-11 09:04:57 UTC (rev 372) @@ -21,4 +21,4 @@ wao.server.path=localhost:8080/wao ## Version (not necessary to override it) -wao.version=1.0 \ No newline at end of file +wao.version=1.0.2 \ No newline at end of file

1 0

[Suiviobsmer-commits] r371 - trunk
by fdesbois＠users.labs.libre-entreprise.org 10 Mar '10

10 Mar '10

Author: fdesbois Date: 2010-03-10 17:05:15 +0000 (Wed, 10 Mar 2010) New Revision: 371 Modified: trunk/changelog.txt Log: Add changelog Modified: trunk/changelog.txt =================================================================== --- trunk/changelog.txt 2010-03-10 17:03:05 UTC (rev 370) +++ trunk/changelog.txt 2010-03-10 17:05:15 UTC (rev 371) @@ -3,6 +3,13 @@ Historique des versions +1.0.2 (patch) +------------- + +- [fdesbois] Ano #2185 : Erreur a la creation d'un contact sur le même navire + en même temps pour une même société. + + 1.0.1 (patch) -------------

1 0

[Suiviobsmer-commits] r370 - trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages
by fdesbois＠users.labs.libre-entreprise.org 10 Mar '10

10 Mar '10

Author: fdesbois Date: 2010-03-10 17:03:05 +0000 (Wed, 10 Mar 2010) New Revision: 370 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/Contacts.java Log: Ano #2185 : problem with create new contact from boat infos 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 2010-03-01 22:11:34 UTC (rev 369) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Boats.java 2010-03-10 17:03:05 UTC (rev 370) @@ -807,6 +807,13 @@ sampleRow = getSampleRow(); // Get boat from list boat = getBoats().get(boatImmatriculation); + if (log.isDebugEnabled()) { + log.debug("Create contact from BOAT list"); + log.debug("Create contact :: boat imma : " + + boat.getImmatriculation()); + log.debug("Create contact :: sampleRow code : " + + sampleRow.getCode()); + } contacts.createNewContact(boat, sampleRow); return contacts; } @@ -815,6 +822,13 @@ // Get sampleRow from elligibleBoat list ElligibleBoat elligible = getCompanyBoatInfos().getElligibleBoat(sampleRowCode); sampleRow = elligible.getSampleRow(); + if (log.isDebugEnabled()) { + log.debug("Create contact from BOAT infos"); + log.debug("Create contact :: boat imma : " + + getBoatSelected()); + log.debug("Create contact :: sampleRow code : " + + sampleRow.getCode()); + } contacts.createNewContact(getBoatSelected(), sampleRow); return contacts; } 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 2010-03-01 22:11:34 UTC (rev 369) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Contacts.java 2010-03-10 17:03:05 UTC (rev 370) @@ -627,7 +627,13 @@ public void createNewContact(Boat boat, SampleRow sampleRow) throws WaoException { contact = serviceContact.getNewContact(user, sampleRow, boat); - serviceContact.saveContact(contact, Boolean.FALSE); - contactSelectedId = contact.getTopiaId(); + // Check boat not null and validation for create the new contact + if (boat != null && boat.canCreateContact(user.getCompany())) { + serviceContact.saveContact(contact, Boolean.FALSE); + contactSelectedId = contact.getTopiaId(); + } else { + layout.getFeedBack(). + addError("Un contact en cours existe déjà pour ce navire"); + } } }

1 0

[Suiviobsmer-commits] r369 - in trunk: . wao-business wao-ui
by fdesbois＠users.labs.libre-entreprise.org 01 Mar '10

01 Mar '10

Author: fdesbois Date: 2010-03-01 22:11:34 +0000 (Mon, 01 Mar 2010) New Revision: 369 Modified: trunk/pom.xml trunk/wao-business/pom.xml trunk/wao-ui/pom.xml Log: [maven-release-plugin] prepare for next development iteration Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-03-01 22:11:25 UTC (rev 368) +++ trunk/pom.xml 2010-03-01 22:11:34 UTC (rev 369) @@ -15,7 +15,7 @@ <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>1.0.1</version> + <version>1.0.2-SNAPSHOT</version> <modules> <module>wao-ui</module> @@ -226,9 +226,9 @@  <scm> - <connection>scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/tags/wao-1.0.1</connection> - <developerConnection>scm:svn:svn+ssh://fdesbois at labs.libre-entreprise.org/svnroot/suiviobsmer/tags/wao-1.0.1</developerConnection> - <url>http://labs.libre-entreprise.org/scm/viewvc.php/tags/wao-1.0.1?root=suiviob…</url> + <connection>scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/trunk</connection> + <developerConnection>scm:svn:svn+ssh://fdesbois at labs.libre-entreprise.org/svnroot/suiviobsmer/trunk</developerConnection> + <url>http://labs.libre-entreprise.org/scm/viewvc.php/trunk/?root=suiviobsmer</url> </scm> <build> Modified: trunk/wao-business/pom.xml =================================================================== --- trunk/wao-business/pom.xml 2010-03-01 22:11:25 UTC (rev 368) +++ trunk/wao-business/pom.xml 2010-03-01 22:11:34 UTC (rev 369) @@ -10,7 +10,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>1.0.1</version> + <version>1.0.2-SNAPSHOT</version> </parent> <groupId>fr.ifremer.wao</groupId> @@ -160,9 +160,9 @@ </build> <scm> - <url>http://labs.libre-entreprise.org/scm/viewvc.php/tags/wao-1.0.1/wao-business…</url> - <connection>scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/tags/wao-1.0.1/wao-business</connection> - <developerConnection>scm:svn:svn+ssh://fdesbois at labs.libre-entreprise.org/svnroot/suiviobsmer/tags/wao-1.0.1/wao-business</developerConnection> + <url>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/trunk/wao-business</connection> + <developerConnection>scm:svn:svn+ssh://fdesbois at labs.libre-entreprise.org/svnroot/suiviobsmer/trunk/wao-business</developerConnection> </scm> </project> Modified: trunk/wao-ui/pom.xml =================================================================== --- trunk/wao-ui/pom.xml 2010-03-01 22:11:25 UTC (rev 368) +++ trunk/wao-ui/pom.xml 2010-03-01 22:11:34 UTC (rev 369) @@ -10,7 +10,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>1.0.1</version> + <version>1.0.2-SNAPSHOT</version> </parent> <groupId>fr.ifremer.wao</groupId> @@ -141,9 +141,9 @@ </repositories> <scm> - <url>http://labs.libre-entreprise.org/scm/viewvc.php/tags/wao-1.0.1/wao-ui?root=…</url> - <connection>scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/tags/wao-1.0.1/wao-ui</connection> - <developerConnection>scm:svn:svn+ssh://fdesbois at labs.libre-entreprise.org/svnroot/suiviobsmer/tags/wao-1.0.1/wao-ui</developerConnection> + <url>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/trunk/wao-ui</connection> + <developerConnection>scm:svn:svn+ssh://fdesbois at labs.libre-entreprise.org/svnroot/suiviobsmer/trunk/wao-ui</developerConnection> </scm> </project>

1 0

[Suiviobsmer-commits] r368 - tags
by fdesbois＠users.labs.libre-entreprise.org 01 Mar '10

01 Mar '10

Author: fdesbois Date: 2010-03-01 22:11:25 +0000 (Mon, 01 Mar 2010) New Revision: 368 Added: tags/wao-1.0.1/ Log: [maven-scm] copy for tag wao-1.0.1

1 0

[Suiviobsmer-commits] r367 - in trunk: . wao-business wao-ui
by fdesbois＠users.labs.libre-entreprise.org 01 Mar '10

01 Mar '10

Author: fdesbois Date: 2010-03-01 22:11:10 +0000 (Mon, 01 Mar 2010) New Revision: 367 Modified: trunk/pom.xml trunk/wao-business/pom.xml trunk/wao-ui/pom.xml Log: [maven-release-plugin] prepare release wao-1.0.1 Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-03-01 22:03:37 UTC (rev 366) +++ trunk/pom.xml 2010-03-01 22:11:10 UTC (rev 367) @@ -15,7 +15,7 @@ <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>1.0.1-SNAPSHOT</version> + <version>1.0.1</version> <modules> <module>wao-ui</module> @@ -226,9 +226,9 @@  <scm> - <connection>scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/trunk</connection> - <developerConnection>scm:svn:svn+ssh://fdesbois at labs.libre-entreprise.org/svnroot/suiviobsmer/trunk</developerConnection> - <url>http://labs.libre-entreprise.org/scm/viewvc.php/trunk/?root=suiviobsmer</url> + <connection>scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/tags/wao-1.0.1</connection> + <developerConnection>scm:svn:svn+ssh://fdesbois at labs.libre-entreprise.org/svnroot/suiviobsmer/tags/wao-1.0.1</developerConnection> + <url>http://labs.libre-entreprise.org/scm/viewvc.php/tags/wao-1.0.1?root=suiviob…</url> </scm> <build> Modified: trunk/wao-business/pom.xml =================================================================== --- trunk/wao-business/pom.xml 2010-03-01 22:03:37 UTC (rev 366) +++ trunk/wao-business/pom.xml 2010-03-01 22:11:10 UTC (rev 367) @@ -10,7 +10,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>1.0.1-SNAPSHOT</version> + <version>1.0.1</version> </parent> <groupId>fr.ifremer.wao</groupId> @@ -160,9 +160,9 @@ </build> <scm> - <url>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/trunk/wao-business</connection> - <developerConnection>scm:svn:svn+ssh://fdesbois at labs.libre-entreprise.org/svnroot/suiviobsmer/trunk/wao-business</developerConnection> + <url>http://labs.libre-entreprise.org/scm/viewvc.php/tags/wao-1.0.1/wao-business…</url> + <connection>scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/tags/wao-1.0.1/wao-business</connection> + <developerConnection>scm:svn:svn+ssh://fdesbois at labs.libre-entreprise.org/svnroot/suiviobsmer/tags/wao-1.0.1/wao-business</developerConnection> </scm> </project> Modified: trunk/wao-ui/pom.xml =================================================================== --- trunk/wao-ui/pom.xml 2010-03-01 22:03:37 UTC (rev 366) +++ trunk/wao-ui/pom.xml 2010-03-01 22:11:10 UTC (rev 367) @@ -10,7 +10,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>1.0.1-SNAPSHOT</version> + <version>1.0.1</version> </parent> <groupId>fr.ifremer.wao</groupId> @@ -141,9 +141,9 @@ </repositories> <scm> - <url>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/trunk/wao-ui</connection> - <developerConnection>scm:svn:svn+ssh://fdesbois at labs.libre-entreprise.org/svnroot/suiviobsmer/trunk/wao-ui</developerConnection> + <url>http://labs.libre-entreprise.org/scm/viewvc.php/tags/wao-1.0.1/wao-ui?root=…</url> + <connection>scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/tags/wao-1.0.1/wao-ui</connection> + <developerConnection>scm:svn:svn+ssh://fdesbois at labs.libre-entreprise.org/svnroot/suiviobsmer/tags/wao-1.0.1/wao-ui</developerConnection> </scm> </project>

1 0

[Suiviobsmer-commits] r366 - in trunk: . wao-business wao-business/src/main/java/fr/ifremer/wao/entity wao-business/src/main/resources wao-business/src/test/java/fr/ifremer/wao wao-ui
by fdesbois＠users.labs.libre-entreprise.org 01 Mar '10

01 Mar '10

Author: fdesbois Date: 2010-03-01 22:03:37 +0000 (Mon, 01 Mar 2010) New Revision: 366 Added: trunk/wao-business/src/test/java/fr/ifremer/wao/ErrorDB1_0Test.java Removed: trunk/wao-business/src/main/resources/oldmappings/ Modified: trunk/changelog.txt trunk/pom.xml trunk/wao-business/pom.xml trunk/wao-business/src/main/java/fr/ifremer/wao/entity/ContactDAOImpl.java trunk/wao-ui/pom.xml Log: - Ano #2124 : problem with contact unvalidation : problem in nuiton-utils DateUtils class -> change version to 1.1.5 - Change version snapshot to 1.0.1 to release - Delete oldmappings (no migration needed yet) - Add test class for contact errors involved by ano #2124 Modified: trunk/changelog.txt =================================================================== --- trunk/changelog.txt 2010-02-17 13:30:02 UTC (rev 365) +++ trunk/changelog.txt 2010-03-01 22:03:37 UTC (rev 366) @@ -3,6 +3,12 @@ Historique des versions +1.0.1 (patch) +------------- + +- [fdesbois] Ano #2124 : Problème sur la dévalidation d'une ligne de contact + Changement de version de Nuiton-utils vers 1.1.5 + 1.0.0 ----- @@ -52,15 +58,9 @@ Ceci permet de modifier l'ensemble des topiaId existants pour garder la cohérence avec la version 1.0. -0.4.1 ------ +0.4.1 (patch) +------------- -Evolutions -++++++++++ - -Anomalies -+++++++++ - - [fdesbois] Ano #2073 : Contacts : Erreur tableau contact sur commentaire refus 0.4.0 Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-02-17 13:30:02 UTC (rev 365) +++ trunk/pom.xml 2010-03-01 22:03:37 UTC (rev 366) @@ -15,7 +15,7 @@ <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>1.1-SNAPSHOT</version> + <version>1.0.1-SNAPSHOT</version> <modules> <module>wao-ui</module> @@ -214,7 +214,7 @@ <labs.id>154</labs.id>  - <nuitonutils.version>1.1.3</nuitonutils.version> + <nuitonutils.version>1.1.5</nuitonutils.version> <topia.version>2.3.0-beta-8</topia.version> <eugene.version>2.0.0-beta-4</eugene.version> <tapestry.version>5.1.0.5</tapestry.version> Modified: trunk/wao-business/pom.xml =================================================================== --- trunk/wao-business/pom.xml 2010-02-17 13:30:02 UTC (rev 365) +++ trunk/wao-business/pom.xml 2010-03-01 22:03:37 UTC (rev 366) @@ -10,7 +10,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>1.1-SNAPSHOT</version> + <version>1.0.1-SNAPSHOT</version> </parent> <groupId>fr.ifremer.wao</groupId> @@ -140,7 +140,7 @@ <goal>smart-generate</goal> </goals> </execution> - <execution> + </executions> </plugin> </plugins> 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 2010-02-17 13:30:02 UTC (rev 365) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/entity/ContactDAOImpl.java 2010-03-01 22:03:37 UTC (rev 366) @@ -70,8 +70,8 @@ * Only the validate contacts by company will be count. The param fromDate can be null, * in this case, all contacts will be given (no matter which date then started). * - * @param boat the boat concerned by the contact - * @param fromDate the date to start + * @param boat the boat concerned by the contact (can be null) + * @param fromDate the date to start (can be null) * @return the TopiaQuery created */ @Override @@ -79,6 +79,7 @@ TopiaQuery query = createQuery("C"). add("C." + Contact.STATE, ContactState.BOARDING_DONE.toString()). add("C." + Contact.VALIDATION_COMPANY, Boolean.TRUE). + // TODO : use addNullOr method with Topia version 2.3.0-beta-9 add("C." + Contact.VALIDATION_PROGRAM + " IS NULL OR " + "C." + Contact.VALIDATION_PROGRAM + " = :booleanTrue"). addParam("booleanTrue", Boolean.TRUE); Added: trunk/wao-business/src/test/java/fr/ifremer/wao/ErrorDB1_0Test.java =================================================================== --- trunk/wao-business/src/test/java/fr/ifremer/wao/ErrorDB1_0Test.java (rev 0) +++ trunk/wao-business/src/test/java/fr/ifremer/wao/ErrorDB1_0Test.java 2010-03-01 22:03:37 UTC (rev 366) @@ -0,0 +1,148 @@ + +package fr.ifremer.wao; + +import fr.ifremer.wao.entity.Contact; +import fr.ifremer.wao.entity.ContactDAO; +import fr.ifremer.wao.entity.SampleMonth; +import fr.ifremer.wao.entity.SampleRow; +import fr.ifremer.wao.entity.SampleRowDAO; +import java.io.BufferedWriter; +import java.io.File; +import java.io.FileWriter; +import java.io.Writer; +import java.text.DateFormat; +import java.text.SimpleDateFormat; +import java.util.Date; +import org.apache.commons.io.IOUtils; +import org.junit.After; +import org.junit.AfterClass; +import org.junit.Before; +import org.junit.BeforeClass; +import org.junit.Ignore; +import org.junit.Test; +import org.nuiton.topia.TopiaContext; +import org.nuiton.topia.TopiaException; +import org.nuiton.topia.framework.TopiaQuery; +import org.nuiton.util.ArgumentsParserException; +import org.nuiton.util.DateUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +/** + * ErrorDB1_0 + * + * Error #2124 : problem with between comparison to give the correct SampleMonth + * from a given contact date. + * + * This problem may cause errors in database on sampleRow.realTideTime calcul. + * + * This class is used to test all sampleRows who have a bad calcul on contacts. + * + * Created: 1 mars 2010 + * + * @author fdesbois + * @version $Revision$ + * + * Mise a jour: $Date$ + * par : $Author$ + */ + at Ignore +public class ErrorDB1_0Test { + + private static WaoRunner runner; + + private static final Logger log = LoggerFactory.getLogger(ErrorDB1_0Test.class); + + private static Writer writerAll; + + private static Writer writerKos; + + public ErrorDB1_0Test() { + runner = new WaoRunnerImpl(); + } + + @BeforeClass + public static void setUpClass() throws Exception { + String filename = "/tmp/wao/test_db/error_db1"; + File file = new File(filename); + file.getParentFile().mkdirs(); + if (file.exists()) { + file.delete(); + file.createNewFile(); + } + writerAll = new BufferedWriter(new FileWriter(filename)); + writerKos = new BufferedWriter(new FileWriter(filename + "_ko")); + } + + @AfterClass + public static void tearDownClass() throws Exception { + + } + + @Before + public void setUp() throws WaoException, ArgumentsParserException { + runner.start(); + } + + @After + public void tearDown() throws WaoException, TopiaException { + runner.stop(); + } + + @Test + public void testExecute() throws Exception { + + TopiaContext transaction = + WaoContext.getTopiaRootContext().beginTransaction(); + + ContactDAO dao = WaoModelDAOHelper.getContactDAO(transaction); + + + SampleRowDAO rowDAO = WaoModelDAOHelper.getSampleRowDAO(transaction); + + DateFormat dateFormat = new SimpleDateFormat("MM/yyyy"); + + for (SampleRow curr : rowDAO.findAll()) { + TopiaQuery query = + dao.createQueryDoneContactsFromDate(null, null); + String contact = query.getMainAlias(); + String tideBegin = contact + "." + Contact.TIDE_BEGIN_DATE; + + String sampleRow = contact + "." + Contact.SAMPLE_ROW; + query.add(sampleRow, curr); + + query.addGroup(sampleRow); + + for (SampleMonth month : curr.getSampleMonth()) { + Date begin = DateUtils.setFirstDayOfMonth(month.getPeriodDate()); + Date end = DateUtils.setLastDayOfMonth(month.getPeriodDate()); + + query.add(tideBegin + " BETWEEN :begin AND :end"). + addParam("begin", begin).addParam("end", end); + + int nbRealTides = query.executeCount(); + + boolean ok = month.getRealTidesValue() == nbRealTides; + String ko = ok ? "" : "## KO "; + + String msg = "[" + curr.getCode() + "] " + + dateFormat.format(month.getPeriodDate()) + " : " + + "currValue = " + month.getRealTidesValue() + " _ " + + "expectedValue = " + nbRealTides + "\n"; + + if (!ok) { + writerKos.write(msg); + writerKos.flush(); + } + + writerAll.write(ko + msg); + writerAll.flush(); + } + } + + IOUtils.closeQuietly(writerAll); + IOUtils.closeQuietly(writerKos); + transaction.closeContext(); + } + +} Property changes on: trunk/wao-business/src/test/java/fr/ifremer/wao/ErrorDB1_0Test.java ___________________________________________________________________ Added: svn:keywords + "Author Date Id Revision HeadURL" Modified: trunk/wao-ui/pom.xml =================================================================== --- trunk/wao-ui/pom.xml 2010-02-17 13:30:02 UTC (rev 365) +++ trunk/wao-ui/pom.xml 2010-03-01 22:03:37 UTC (rev 366) @@ -10,7 +10,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>1.1-SNAPSHOT</version> + <version>1.0.1-SNAPSHOT</version> </parent> <groupId>fr.ifremer.wao</groupId>

1 0

[Suiviobsmer-commits] r365 - trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components
by fdesbois＠users.labs.libre-entreprise.org 17 Feb '10

17 Feb '10

Author: fdesbois Date: 2010-02-17 13:30:02 +0000 (Wed, 17 Feb 2010) New Revision: 365 Modified: trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/Layout.tml Log: Change done in tag 1.0 for new maven-site url 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 2010-02-16 21:42:06 UTC (rev 364) +++ trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/Layout.tml 2010-02-17 13:30:02 UTC (rev 365) @@ -67,10 +67,10 @@ </t:if> </div> <div id="so-footer"> - <a href="http://suiviobsmer.labs.libre-entreprise.org/suiviobsmer/" title="Documentation de l'application" target="blank"> + <a href="http://suiviobsmer.labs.libre-entreprise.org/wao/" title="Documentation de l'application" target="blank"> WAO </a> - <a href="http://suiviobsmer.labs.libre-entreprise.org/suiviobsmer/release-note.html" title="Modifications faites pour cette version" target="blank"> + <a href="http://suiviobsmer.labs.libre-entreprise.org/wao/release-note.html" title="Modifications faites pour cette version" target="blank"> ${version} </a> - <a href="mailto:obsmer at ifremer.fr" title="Contacter un responsable Obsmer" target="blank">

1 0

[Suiviobsmer-commits] r364 - tags/wao-1.0/wao-ui/src/main/resources/fr/ifremer/wao/ui/components
by fdesbois＠users.labs.libre-entreprise.org 16 Feb '10

16 Feb '10

Author: fdesbois Date: 2010-02-16 21:42:06 +0000 (Tue, 16 Feb 2010) New Revision: 364 Modified: tags/wao-1.0/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/Layout.tml Log: missing url change for documentation Modified: tags/wao-1.0/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/Layout.tml =================================================================== --- tags/wao-1.0/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/Layout.tml 2010-02-16 20:39:15 UTC (rev 363) +++ tags/wao-1.0/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/Layout.tml 2010-02-16 21:42:06 UTC (rev 364) @@ -67,10 +67,10 @@ </t:if> </div> <div id="so-footer"> - <a href="http://suiviobsmer.labs.libre-entreprise.org/suiviobsmer/" title="Documentation de l'application" target="blank"> + <a href="http://suiviobsmer.labs.libre-entreprise.org/wao/" title="Documentation de l'application" target="blank"> WAO </a> - <a href="http://suiviobsmer.labs.libre-entreprise.org/suiviobsmer/release-note.html" title="Modifications faites pour cette version" target="blank"> + <a href="http://suiviobsmer.labs.libre-entreprise.org/wao/release-note.html" title="Modifications faites pour cette version" target="blank"> ${version} </a> - <a href="mailto:obsmer at ifremer.fr" title="Contacter un responsable Obsmer" target="blank">

1 0