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

r1643 - in trunk: . wao-business wao-ui
by bleny＠users.forge.codelutin.com 01 Mar '13

01 Mar '13

Author: bleny Date: 2013-03-01 18:12:00 +0100 (Fri, 01 Mar 2013) New Revision: 1643 Url: http://forge.codelutin.com/projects/wao/repository/revisions/1643 Log: set version to 3.4-SNAPSHOT according to roadmap Modified: trunk/pom.xml trunk/wao-business/pom.xml trunk/wao-ui/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-03-01 14:24:27 UTC (rev 1642) +++ trunk/pom.xml 2013-03-01 17:12:00 UTC (rev 1643) @@ -15,7 +15,7 @@ <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>3.3.7-SNAPSHOT</version> + <version>3.4-SNAPSHOT</version> <modules> <module>wao-business</module> Modified: trunk/wao-business/pom.xml =================================================================== --- trunk/wao-business/pom.xml 2013-03-01 14:24:27 UTC (rev 1642) +++ trunk/wao-business/pom.xml 2013-03-01 17:12:00 UTC (rev 1643) @@ -10,7 +10,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>3.3.7-SNAPSHOT</version> + <version>3.4-SNAPSHOT</version> </parent> <groupId>fr.ifremer.wao</groupId> Modified: trunk/wao-ui/pom.xml =================================================================== --- trunk/wao-ui/pom.xml 2013-03-01 14:24:27 UTC (rev 1642) +++ trunk/wao-ui/pom.xml 2013-03-01 17:12:00 UTC (rev 1643) @@ -10,7 +10,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>3.3.7-SNAPSHOT</version> + <version>3.4-SNAPSHOT</version> </parent> <groupId>fr.ifremer.wao</groupId>

1 0

r1642 - trunk/wao-business/src/main/java/fr/ifremer/wao/service
by bleny＠users.forge.codelutin.com 01 Mar '13

01 Mar '13

Author: bleny Date: 2013-03-01 15:24:27 +0100 (Fri, 01 Mar 2013) New Revision: 1642 Url: http://forge.codelutin.com/projects/wao/repository/revisions/1642 Log: fixes #1163: contenu du mail auto vers Allegro 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 2013-03-01 13:51:47 UTC (rev 1641) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceContactImpl.java 2013-03-01 14:24:27 UTC (rev 1642) @@ -24,6 +24,7 @@ package fr.ifremer.wao.service; +import com.google.common.collect.ImmutableSet; import fr.ifremer.wao.WaoBusinessException; import fr.ifremer.wao.WaoContext; import fr.ifremer.wao.WaoDAOHelper; @@ -1135,12 +1136,20 @@ public boolean executeSendContactDoneEmail(TopiaContext transaction, Contact contact) throws WaoBusinessException, TopiaException { + ContactState contactState = contact.getContactState(); + ObsProgram obsProgram = contact.getObsProgram(); + boolean result = false; - boolean addBoatToObserversAllegroWallet = contact.getObsProgram() == ObsProgram.OBSMER - && (contact.getContactState().equals(ContactState.OBSERVATION_DONE) || - contact.getContactState().equals(ContactState.OBSERVATION_EXPECTED)); + boolean addBoatToObserversAllegroWallet = false; + if (obsProgram == ObsProgram.OBSMER) { + addBoatToObserversAllegroWallet = + ImmutableSet.of( + ContactState.OBSERVATION_DONE, + ContactState.OBSERVATION_EXPECTED).contains(contactState); + } + if (addBoatToObserversAllegroWallet) { ContactDAO contactDAO = WaoDAOHelper.getContactDAO(transaction); @@ -1153,6 +1162,21 @@ String boatId = boat.getTopiaId(); + String info; + + if (contactState == ContactState.OBSERVATION_EXPECTED) { + info = String.format( + "Cette demande émane de l'observation prévue le %s.", + WaoUtils.formatDate(contactReloaded.getObservationBeginDate())); + } else if (contactState == ContactState.OBSERVATION_DONE) { + info = String.format( + "Cette demande émane de l'observation réalisée entre le %s et le %s", + WaoUtils.formatDate(contactReloaded.getObservationBeginDate()), + WaoUtils.formatDate(contactReloaded.getObservationEndDate())); + } else { + throw new IllegalStateException(contactState + " should not lead to a mail sent"); + } + for (WaoUser observer : contactReloaded.getAllObservers()) { boolean boatAlreadyInWallet = observer.getAllegroWalletByTopiaId(boatId) != null; @@ -1173,20 +1197,21 @@ String subject = String.format( "%s : ajout navire \"%d\" sur portefeuille ALLEGRO de %s", - contact.getObsProgram().toString(), + obsProgram.toString(), boat.getImmatriculation(), observerEmail ); String content = String.format( "Bonjour,\n\n" + - "Merci d'ajouter le navire \"%d\" au portefeuille ALLEGRO de " + - "l'observateur %s %s %s.\n\n" + - "Cordialement,\n" + + "Merci d'ajouter le navire \"%d\" au portefeuille ALLEGRO de l'observateur %s %s %s.\n\n" + + "%s.\n\n" + + "Cordialement,\n\n" + "L'équipe Obsmer", boat.getImmatriculation(), observer.getFullName(), observer.getCompany().getName(), + info, observerEmail ); @@ -1213,10 +1238,8 @@ " Vérifiez le serveur smtp et l'adresse email de l'observateur.", eee); } - } } - } return result;

1 0

r1641 - in trunk: . wao-business wao-business/src/main/java/fr/ifremer/wao/entity
by bleny＠users.forge.codelutin.com 01 Mar '13

01 Mar '13

Author: bleny Date: 2013-03-01 14:51:47 +0100 (Fri, 01 Mar 2013) New Revision: 1641 Url: http://forge.codelutin.com/projects/wao/repository/revisions/1641 Log: update dependencies and plugins Modified: trunk/pom.xml trunk/wao-business/pom.xml trunk/wao-business/src/main/java/fr/ifremer/wao/entity/ContactDAOImpl.java Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-01-14 09:37:26 UTC (rev 1640) +++ trunk/pom.xml 2013-03-01 13:51:47 UTC (rev 1641) @@ -27,7 +27,7 @@ <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-email</artifactId> - <version>1.2</version> + <version>1.3</version> </dependency> <dependency> <groupId>org.nuiton</groupId> @@ -199,7 +199,7 @@ <dependency> <groupId>xerces</groupId> <artifactId>xercesImpl</artifactId> - <version>2.10.0</version> + <version>2.11.0</version> </dependency> <dependency> <groupId>xml-apis</groupId> @@ -215,7 +215,7 @@ <dependency> <groupId>com.h2database</groupId> <artifactId>h2</artifactId> - <version>1.3.165</version> + <version>1.3.170</version> </dependency> <dependency> <groupId>postgresql</groupId> @@ -237,7 +237,7 @@ <dependency> <groupId>org.mockito</groupId> <artifactId>mockito-core</artifactId> - <version>1.9.0</version> + <version>1.9.5</version> <scope>test</scope> </dependency> </dependencies> @@ -338,14 +338,14 @@  <nuitonI18nVersion>2.4.1</nuitonI18nVersion> - <nuitonUtilsVersion>2.4.5</nuitonUtilsVersion> + <nuitonUtilsVersion>2.6.9</nuitonUtilsVersion> <nuitonWebVersion>1.10</nuitonWebVersion> - <topiaVersion>2.6.8</topiaVersion> - <eugeneVersion>2.4.2</eugeneVersion> + <topiaVersion>2.7.1</topiaVersion> + <eugeneVersion>2.6.1</eugeneVersion> <tapestryVersion>5.2.5</tapestryVersion> <hibernateVersion>3.6.10.Final</hibernateVersion> - <jaxbVersion>2.2.5-b10</jaxbVersion> - <slf4jVersion>1.6.4</slf4jVersion> + <jaxbVersion>2.2.7-b58</jaxbVersion> + <slf4jVersion>1.7.2</slf4jVersion> </properties>  @@ -387,7 +387,7 @@ <plugin> <groupId>org.nuiton.eugene</groupId> - <artifactId>maven-eugene-plugin</artifactId> + <artifactId>eugene-maven-plugin</artifactId> <version>${eugeneVersion}</version> <configuration> <inputs>zargo</inputs> Modified: trunk/wao-business/pom.xml =================================================================== --- trunk/wao-business/pom.xml 2013-01-14 09:37:26 UTC (rev 1640) +++ trunk/wao-business/pom.xml 2013-03-01 13:51:47 UTC (rev 1641) @@ -160,7 +160,7 @@ <plugins> <plugin> <groupId>org.nuiton.eugene</groupId> - <artifactId>maven-eugene-plugin</artifactId> + <artifactId>eugene-maven-plugin</artifactId> <executions> <execution> <id>generate-entities</id> 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 2013-01-14 09:37:26 UTC (rev 1640) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/entity/ContactDAOImpl.java 2013-03-01 13:51:47 UTC (rev 1641) @@ -151,7 +151,7 @@ String query = "FROM " + Contact.class.getName() + " WHERE " + Contact.PROPERTY_MAIN_OBSERVER + " = :observer" + " OR :observer IN ELEMENTS(" + Contact.PROPERTY_SECONDARY_OBSERVERS + ")"; - List observersContact = context.find(query, "observer", observer); + List observersContact = context.findAll(query, "observer", observer); return observersContact.size() > 0; }

1 0