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

[Suiviobsmer-commits] r1113 - in trunk/wao-business/src: main/java/fr/ifremer/wao/bean main/java/fr/ifremer/wao/service test/java/fr/ifremer/wao/service
by bleny＠users.labs.libre-entreprise.org 29 Mar '11

29 Mar '11

Author: bleny Date: 2011-03-29 13:36:48 +0000 (Tue, 29 Mar 2011) New Revision: 1113 Log: add logs and test for obsdeb sampling plan Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/bean/SamplingFilterImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSamplingImpl.java trunk/wao-business/src/test/java/fr/ifremer/wao/service/ObsDebTest.java Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/bean/SamplingFilterImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/bean/SamplingFilterImpl.java 2011-03-29 09:42:22 UTC (rev 1112) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/bean/SamplingFilterImpl.java 2011-03-29 13:36:48 UTC (rev 1113) @@ -27,6 +27,8 @@ import fr.ifremer.wao.entity.SampleRow; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang.builder.ToStringBuilder; +import org.nuiton.util.beans.BeanUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -103,4 +105,11 @@ } return sampleRow; } + + @Override + public String toString() { + ToStringBuilder toStringBuilder = new ToStringBuilder(this); + String toString = toStringBuilder.reflectionToString(this); + return toString; + } } 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 2011-03-29 09:42:22 UTC (rev 1112) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSamplingImpl.java 2011-03-29 13:36:48 UTC (rev 1113) @@ -583,11 +583,16 @@ if (ObsProgram.OBSDEB.equals(filter.getObsProgram())) { // force load for (SampleRow row : rows) { - row.getObservationUnit().getPort(); + row.getObservationUnit(); row.sizeElligibleBoat(); } } + if (log.isDebugEnabled()) { + log.debug("Querying sample-rows with filter " + filter.toString() + + " returns " + rows.size() + " lines."); + } + return rows; } @@ -989,6 +994,7 @@ SampleRowLog sampleRowLog = executeGetNewSampleRowLog(sampleRow, connectedUser); executeCreateUpdateSampleRow(transaction, sampleRow, new ArrayList<Boat>(), sampleRowLog); + result.incNbImported(); } catch (Exception e) { errorArgs.add(-1); errorArgs.add(sampleRow == null ? "" : sampleRow.getCode()); Modified: trunk/wao-business/src/test/java/fr/ifremer/wao/service/ObsDebTest.java =================================================================== --- trunk/wao-business/src/test/java/fr/ifremer/wao/service/ObsDebTest.java 2011-03-29 09:42:22 UTC (rev 1112) +++ trunk/wao-business/src/test/java/fr/ifremer/wao/service/ObsDebTest.java 2011-03-29 13:36:48 UTC (rev 1113) @@ -36,10 +36,13 @@ import fr.ifremer.wao.entity.UserProfileImpl; import fr.ifremer.wao.entity.WaoUser; import fr.ifremer.wao.entity.WaoUserImpl; +import fr.ifremer.wao.io.ImportResults; import org.apache.commons.lang.StringUtils; import org.junit.Assert; import org.junit.Ignore; import org.junit.Test; +import org.nuiton.util.DateUtil; +import org.nuiton.util.PeriodDates; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -78,18 +81,26 @@ public void adminCanImportSamplingPlan() throws WaoBusinessException { adminCanImportTerrestrialDistrict(); InputStream input = getClass().getResourceAsStream("/import/samplingPlan-obsdeb.csv"); - manager.getServiceSampling().importSamplingPlanCsv(input, asAdministrator()); + ImportResults importResults = manager.getServiceSampling().importSamplingPlanCsv(input, asAdministrator()); + Assert.assertEquals(2, importResults.getNbRowsImported()); + Assert.assertEquals(0, importResults.getNbRowsRefused()); } /** * As an admin, i should be able to read sampling plan */ @Test - @Ignore("not yet implemented") public void adminCanReadSamplingPlan() throws WaoBusinessException { - adminCanImportTerrestrialDistrict(); - SamplingFilter samplingFilter = manager.getServiceSampling().newSamplingFilter(asAdministrator()); - List<SampleRow> sampleRows = manager.getServiceSampling().getSampleRowsByFilter(samplingFilter); + + // given a sampling plan + adminCanImportSamplingPlan(); + + // as an administrator, i can get the sampling plan + ServiceSampling serviceSampling = manager.getServiceSampling(); + + SamplingFilter samplingFilter = serviceSampling.newSamplingFilter(asAdministrator()); + List<SampleRow> sampleRows = serviceSampling.getSampleRowsByFilter(samplingFilter); + if (log.isDebugEnabled()) { log.debug(sampleRows.toString()); } @@ -100,7 +111,31 @@ sampleRow.getObservationUnit().getObservationUnitCode(); sampleRow.getDay(); sampleRow.getGroupName(); + + // all the rows have a code Assert.assertTrue(StringUtils.isNotEmpty(sampleRow.getCode())); } } + + @Test + @Ignore("not yet implemented") + public void usersCanFilterSamplingPlan() throws WaoBusinessException { + + // given a sampling plan + adminCanImportSamplingPlan(); + + ServiceSampling serviceSampling = manager.getServiceSampling(); + + // i can filter the sampling plan + SamplingFilter samplingFilter = serviceSampling.newSamplingFilter(asAdministrator()); + samplingFilter = serviceSampling.newSamplingFilter(asAdministrator()); + samplingFilter.setPeriod(new PeriodDates(DateUtil.createDate(20, 2, 2010), + DateUtil.createDate(27, 2, 2010))); + + // service should have returned the line with date 25/02/2010 + List<SampleRow> sampleRows = serviceSampling.getSampleRowsByFilter(samplingFilter); + Assert.assertEquals(1, sampleRows.size()); + Assert.assertEquals("2011_889", sampleRows.get(0).getCode()); + } + }

1 0

[Suiviobsmer-commits] r1112 - in trunk/wao-business/src/main: java/fr/ifremer/wao/service xmi
by bleny＠users.labs.libre-entreprise.org 29 Mar '11

29 Mar '11

Author: bleny Date: 2011-03-29 09:42:22 +0000 (Tue, 29 Mar 2011) New Revision: 1112 Log: bug fix import sampling plan Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSamplingImpl.java trunk/wao-business/src/main/xmi/wao.zargo 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 2011-03-28 16:05:23 UTC (rev 1111) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSamplingImpl.java 2011-03-29 09:42:22 UTC (rev 1112) @@ -264,7 +264,7 @@ SampleRowDAO dao = WaoDAOHelper.getSampleRowDAO(transaction); SampleRow oldRow = null; - if (row.getCode() == null) { + if (StringUtils.isEmpty(row.getCode())) { // all rows must have a unique code, the code has a year as prefix // like '2011_' so we must know on which year the row is active @@ -295,15 +295,32 @@ // We call the service in another transaction, to prevent // putting an entity in with the same id in the same session oldRow = getSampleRowByCode(null, row.getCode()); + + if (log.isDebugEnabled()) { + log.debug("we want to update row with code " + row.getCode()); + + if (oldRow == null) { + log.debug("no older row with code " + row.getCode() + " found."); + } else { + log.debug("older row with code " + oldRow.getCode() + " found (topiaId=" + + oldRow.getTopiaId() + ", historic size=" + oldRow.sizeSampleRowLog() + ")"); + } + } } boolean rowIsNew = oldRow == null; if (rowIsNew) { + if (log.isDebugEnabled()) { + log.debug("sample row is new, creating"); + } if (row.getTopiaId() == null) { context.prepareTopiaId(SampleRow.class, row); } dao.create(row); } else { + if (log.isDebugEnabled()) { + log.debug("sample row is not new, updating"); + } // check that code is not already used in another program if ( ! row.getObsProgram().equals(oldRow.getObsProgram())) { @@ -325,7 +342,8 @@ // update the row by copying the new data in the old entity // taking care to not remove any sample row log entries - BinderModelBuilder<SampleRow, SampleRow> sampleRowBinderModelBuilder = BinderModelBuilder.newEmptyBuilder(SampleRow.class); + BinderModelBuilder<SampleRow, SampleRow> sampleRowBinderModelBuilder = + BinderModelBuilder.newEmptyBuilder(SampleRow.class); if (ObsProgram.OBSDEB.equals(row.getObsProgram())) { sampleRowBinderModelBuilder.addSimpleProperties( SampleRow.PROPERTY_COMMENT, SampleRow.PROPERTY_COMMENT, Modified: trunk/wao-business/src/main/xmi/wao.zargo =================================================================== (Binary files differ)

1 0

[Suiviobsmer-commits] r1111 - in trunk: . wao-business wao-ui
by bleny＠users.labs.libre-entreprise.org 28 Mar '11

28 Mar '11

Author: bleny Date: 2011-03-28 16:05:23 +0000 (Mon, 28 Mar 2011) New Revision: 1111 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-03-28 16:05:21 UTC (rev 1110) +++ trunk/pom.xml 2011-03-28 16:05:23 UTC (rev 1111) @@ -15,7 +15,7 @@ <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>2.1.2</version> + <version>3.0-SNAPSHOT</version> <modules> <module>wao-ui</module> @@ -329,12 +329,12 @@ <scm> <connection> - scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/tags/wao-2.1.2 + 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-2.1.2 + scm:svn:svn+ssh://${username}@labs.libre-entreprise.org/svnroot/suiviobsmer/trunk </developerConnection> - <url>http://labs.libre-entreprise.org/scm/viewvc.php/tags/wao-2.1.2?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-03-28 16:05:21 UTC (rev 1110) +++ trunk/wao-business/pom.xml 2011-03-28 16:05:23 UTC (rev 1111) @@ -10,7 +10,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>2.1.2</version> + <version>3.0-SNAPSHOT</version> </parent> <groupId>fr.ifremer.wao</groupId> @@ -235,10 +235,10 @@ <scm> <url> - http://labs.libre-entreprise.org/scm/viewvc.php/tags/wao-2.1.2/?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-2.1.2/wao-business</connection> - <developerConnection>scm:svn:svn+ssh://${username}@labs.libre-entreprise.org/svnroot/suiviobsmer/tags/wao-2.1.2/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-03-28 16:05:21 UTC (rev 1110) +++ trunk/wao-ui/pom.xml 2011-03-28 16:05:23 UTC (rev 1111) @@ -10,7 +10,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>2.1.2</version> + <version>3.0-SNAPSHOT</version> </parent> <groupId>fr.ifremer.wao</groupId> @@ -310,10 +310,10 @@ <scm> <url> - http://labs.libre-entreprise.org/scm/viewvc.php/tags/wao-2.1.2/?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-2.1.2/wao-ui</connection> - <developerConnection>scm:svn:svn+ssh://${username}@labs.libre-entreprise.org/svnroot/suiviobsmer/tags/wao-2.1.2/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] r1110 - in tags: . wao-2.1.2
by bleny＠users.labs.libre-entreprise.org 28 Mar '11

28 Mar '11

Author: bleny Date: 2011-03-28 16:05:21 +0000 (Mon, 28 Mar 2011) New Revision: 1110 Log: [maven-release-plugin] copy for tag wao-2.1.2 Added: tags/wao-2.1.2/ Property changes on: tags/wao-2.1.2 ___________________________________________________________________ Added: svn:ignore + *.ipr *.iws *.iml *.idea target nbactions.xml Added: svn:mergeinfo + /branches/wao-1.5.x:679-733

1 0

[Suiviobsmer-commits] r1109 - in trunk: . wao-business wao-ui
by bleny＠users.labs.libre-entreprise.org 28 Mar '11

28 Mar '11

Author: bleny Date: 2011-03-28 16:04:23 +0000 (Mon, 28 Mar 2011) New Revision: 1109 Log: [maven-release-plugin] prepare release wao-2.1.2 Modified: trunk/pom.xml trunk/wao-business/pom.xml trunk/wao-ui/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-03-28 15:51:12 UTC (rev 1108) +++ trunk/pom.xml 2011-03-28 16:04:23 UTC (rev 1109) @@ -15,7 +15,7 @@ <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>2.1.2-SNAPSHOT</version> + <version>2.1.2</version> <modules> <module>wao-ui</module> @@ -329,12 +329,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-2.1.2 </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-2.1.2 </developerConnection> - <url>http://labs.libre-entreprise.org/scm/viewvc.php/trunk/?root=suiviobsmer + <url>http://labs.libre-entreprise.org/scm/viewvc.php/tags/wao-2.1.2?root=suiviob… </url> </scm> Modified: trunk/wao-business/pom.xml =================================================================== --- trunk/wao-business/pom.xml 2011-03-28 15:51:12 UTC (rev 1108) +++ trunk/wao-business/pom.xml 2011-03-28 16:04:23 UTC (rev 1109) @@ -10,7 +10,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>2.1.2-SNAPSHOT</version> + <version>2.1.2</version> </parent> <groupId>fr.ifremer.wao</groupId> @@ -235,10 +235,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-2.1.2/?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-2.1.2/wao-business</connection> + <developerConnection>scm:svn:svn+ssh://${username}@labs.libre-entreprise.org/svnroot/suiviobsmer/tags/wao-2.1.2/wao-business</developerConnection> </scm> </project> Modified: trunk/wao-ui/pom.xml =================================================================== --- trunk/wao-ui/pom.xml 2011-03-28 15:51:12 UTC (rev 1108) +++ trunk/wao-ui/pom.xml 2011-03-28 16:04:23 UTC (rev 1109) @@ -10,7 +10,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>2.1.2-SNAPSHOT</version> + <version>2.1.2</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-2.1.2/?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-2.1.2/wao-ui</connection> + <developerConnection>scm:svn:svn+ssh://${username}@labs.libre-entreprise.org/svnroot/suiviobsmer/tags/wao-2.1.2/wao-ui</developerConnection> </scm> </project>

1 0

[Suiviobsmer-commits] r1108 - trunk/wao-business/src/test/java/fr/ifremer/wao/service
by bleny＠users.labs.libre-entreprise.org 28 Mar '11

28 Mar '11

Author: bleny Date: 2011-03-28 15:51:12 +0000 (Mon, 28 Mar 2011) New Revision: 1108 Log: update file headers Modified: trunk/wao-business/src/test/java/fr/ifremer/wao/service/ObsDebTest.java Modified: trunk/wao-business/src/test/java/fr/ifremer/wao/service/ObsDebTest.java =================================================================== --- trunk/wao-business/src/test/java/fr/ifremer/wao/service/ObsDebTest.java 2011-03-28 15:37:54 UTC (rev 1107) +++ trunk/wao-business/src/test/java/fr/ifremer/wao/service/ObsDebTest.java 2011-03-28 15:51:12 UTC (rev 1108) @@ -1,3 +1,26 @@ +/* + * #%L + * Wao :: Business + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2011 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ package fr.ifremer.wao.service; import fr.ifremer.wao.AbstractServiceTest;

1 0

[Suiviobsmer-commits] r1107 - in trunk: . src/announcement wao-business wao-business/src/main/xmi wao-business/src/test/java/fr/ifremer/wao/service wao-ui
by bleny＠users.labs.libre-entreprise.org 28 Mar '11

28 Mar '11

Author: bleny Date: 2011-03-28 15:37:54 +0000 (Mon, 28 Mar 2011) New Revision: 1107 Log: prepare release 2.1.2 Added: trunk/src/announcement/release-email-2.1.2.txt trunk/wao-business/src/test/java/fr/ifremer/wao/service/ObsDebTest.java Modified: trunk/changelog.txt trunk/pom.xml trunk/wao-business/pom.xml trunk/wao-business/src/main/xmi/wao.zargo trunk/wao-ui/pom.xml Modified: trunk/changelog.txt =================================================================== --- trunk/changelog.txt 2011-03-28 14:39:20 UTC (rev 1106) +++ trunk/changelog.txt 2011-03-28 15:37:54 UTC (rev 1107) @@ -3,6 +3,15 @@ Historique des versions +2.1.2 +----- + +Anomalies ++++++++++ + +- [bleny] #2639 : Les contacts ne sont plus filtrés par société + + 2.1.1 ----- Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-03-28 14:39:20 UTC (rev 1106) +++ trunk/pom.xml 2011-03-28 15:37:54 UTC (rev 1107) @@ -15,7 +15,7 @@ <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>3.0-SNAPSHOT</version> + <version>2.1.2-SNAPSHOT</version> <modules> <module>wao-ui</module> Added: trunk/src/announcement/release-email-2.1.2.txt =================================================================== --- trunk/src/announcement/release-email-2.1.2.txt (rev 0) +++ trunk/src/announcement/release-email-2.1.2.txt 2011-03-28 15:37:54 UTC (rev 1107) @@ -0,0 +1,17 @@ +La nouvelle version 2.1.2 de l'applicatif Wao est disponible. + +Corrections : + +- [bleny] #2639 : Les contacts ne sont plus filtrés par société + +Documentation : + +http://suiviobsmer.labs.libre-entreprise.org/wao/ + +Téléchargement : + +https://labs.libre-entreprise.org/frs/?group_id=154 + +Cordialement, + +L'équipe Wao Modified: trunk/wao-business/pom.xml =================================================================== --- trunk/wao-business/pom.xml 2011-03-28 14:39:20 UTC (rev 1106) +++ trunk/wao-business/pom.xml 2011-03-28 15:37:54 UTC (rev 1107) @@ -10,7 +10,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>3.0-SNAPSHOT</version> + <version>2.1.2-SNAPSHOT</version> </parent> <groupId>fr.ifremer.wao</groupId> Modified: trunk/wao-business/src/main/xmi/wao.zargo =================================================================== (Binary files differ) Added: trunk/wao-business/src/test/java/fr/ifremer/wao/service/ObsDebTest.java =================================================================== --- trunk/wao-business/src/test/java/fr/ifremer/wao/service/ObsDebTest.java (rev 0) +++ trunk/wao-business/src/test/java/fr/ifremer/wao/service/ObsDebTest.java 2011-03-28 15:37:54 UTC (rev 1107) @@ -0,0 +1,83 @@ +package fr.ifremer.wao.service; + +import fr.ifremer.wao.AbstractServiceTest; +import fr.ifremer.wao.WaoBusinessException; +import fr.ifremer.wao.bean.ConnectedUser; +import fr.ifremer.wao.bean.ConnectedUserImpl; +import fr.ifremer.wao.bean.ObsProgram; +import fr.ifremer.wao.bean.SamplingFilter; +import fr.ifremer.wao.bean.SamplingFilterImpl; +import fr.ifremer.wao.bean.UserRole; +import fr.ifremer.wao.entity.SampleRow; +import fr.ifremer.wao.entity.UserProfile; +import fr.ifremer.wao.entity.UserProfileImpl; +import fr.ifremer.wao.entity.WaoUser; +import fr.ifremer.wao.entity.WaoUserImpl; +import org.apache.commons.lang.StringUtils; +import org.junit.Assert; +import org.junit.Ignore; +import org.junit.Test; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import java.io.InputStream; +import java.util.List; + +/** + * @author bleny + */ +public class ObsDebTest extends AbstractServiceTest { + + private static final Logger log = LoggerFactory.getLogger(ObsDebTest.class); + + protected ConnectedUser asAdministrator() { + WaoUser waoUser = new WaoUserImpl(); + UserProfile userProfile = new UserProfileImpl(ObsProgram.OBSDEB, UserRole.ADMIN, true); + ConnectedUser connectedUser = new ConnectedUserImpl(); + connectedUser.setUser(waoUser); + connectedUser.setProfile(userProfile); + return connectedUser; + } + + /** + * As an admin, i must be able to import terrestrial divisions + */ + @Test + public void adminCanImportTerrestrialDistrict() { + InputStream input = getClass().getResourceAsStream("/import/purifiedTerrestrialDivisions.csv"); + manager.getServiceReferential().importTerrestrialDivisions(input); + } + + /** + * As an admin, i must be able to import a sampling plan + */ + @Test + public void adminCanImportSamplingPlan() throws WaoBusinessException { + adminCanImportTerrestrialDistrict(); + InputStream input = getClass().getResourceAsStream("/import/samplingPlan-obsdeb.csv"); + manager.getServiceSampling().importSamplingPlanCsv(input, asAdministrator()); + } + + /** + * As an admin, i should be able to read sampling plan + */ + @Test + @Ignore("not yet implemented") + public void adminCanReadSamplingPlan() throws WaoBusinessException { + adminCanImportTerrestrialDistrict(); + SamplingFilter samplingFilter = manager.getServiceSampling().newSamplingFilter(asAdministrator()); + List<SampleRow> sampleRows = manager.getServiceSampling().getSampleRowsByFilter(samplingFilter); + if (log.isDebugEnabled()) { + log.debug(sampleRows.toString()); + } + Assert.assertEquals(2, sampleRows.size()); + + for (SampleRow sampleRow : sampleRows) { + // i must be able to read those values without error + sampleRow.getObservationUnit().getObservationUnitCode(); + sampleRow.getDay(); + sampleRow.getGroupName(); + Assert.assertTrue(StringUtils.isNotEmpty(sampleRow.getCode())); + } + } +} Modified: trunk/wao-ui/pom.xml =================================================================== --- trunk/wao-ui/pom.xml 2011-03-28 14:39:20 UTC (rev 1106) +++ trunk/wao-ui/pom.xml 2011-03-28 15:37:54 UTC (rev 1107) @@ -10,7 +10,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>3.0-SNAPSHOT</version> + <version>2.1.2-SNAPSHOT</version> </parent> <groupId>fr.ifremer.wao</groupId>

1 0

[Suiviobsmer-commits] r1106 - in trunk: wao-business/src/main/java/fr/ifremer/wao/service wao-business/src/main/resources/i18n wao-business/src/main/xmi wao-ui/src/main/java/fr/ifremer/wao/ui/pages
by bleny＠users.labs.libre-entreprise.org 28 Mar '11

28 Mar '11

Author: bleny Date: 2011-03-28 14:39:20 +0000 (Mon, 28 Mar 2011) New Revision: 1106 Log: move contact filter creation to service Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceContactImpl.java 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/main/xmi/wao.zargo trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Contacts.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-03-28 14:20:35 UTC (rev 1105) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceContactImpl.java 2011-03-28 14:39:20 UTC (rev 1106) @@ -37,6 +37,7 @@ import fr.ifremer.wao.WaoUtils; import fr.ifremer.wao.bean.ConnectedUser; import fr.ifremer.wao.bean.ContactFilter; +import fr.ifremer.wao.bean.ContactFilterImpl; import fr.ifremer.wao.bean.ContactState; import fr.ifremer.wao.bean.ContactStatus; import fr.ifremer.wao.bean.ContactStatus.NullSampleMonthException; @@ -106,7 +107,9 @@ import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.ArrayList; +import java.util.Calendar; import java.util.Date; +import java.util.GregorianCalendar; import java.util.HashMap; import java.util.Iterator; import java.util.LinkedList; @@ -1461,4 +1464,24 @@ } } + @Override + protected ContactFilter executeNewContactFilter(TopiaContext transaction, ConnectedUser connectedUser) { + + ContactFilter contactFilter = new ContactFilterImpl(); + + GregorianCalendar initialFromDate = new GregorianCalendar(); + // in the firsts months of a new year go from now to 6 months before + // in the rest of the year, just start at the beginning of the current year + if (initialFromDate.get(Calendar.MONTH) < 3) { + initialFromDate.add(Calendar.MONTH, -6); + } else { + initialFromDate.set(Calendar.DAY_OF_YEAR, 1); + } + + contactFilter.setFromDate(initialFromDate.getTime()); + contactFilter.setObsProgram(connectedUser.getProfile().getObsProgram()); + contactFilter.setEstimatedTides(true); + + return contactFilter; + } } 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-03-28 14:20:35 UTC (rev 1105) +++ trunk/wao-business/src/main/resources/i18n/wao-business_en_GB.properties 2011-03-28 14:39:20 UTC (rev 1106) @@ -163,6 +163,7 @@ wao.error.serviceContact.getNbContacts= wao.error.serviceContact.getNewContact= wao.error.serviceContact.importContactCsv= +wao.error.serviceContact.newContactFilter= wao.error.serviceContact.saveComment= wao.error.serviceContact.saveContact= wao.error.serviceContact.sendContactDoneEmail= 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-03-28 14:20:35 UTC (rev 1105) +++ trunk/wao-business/src/main/resources/i18n/wao-business_fr_FR.properties 2011-03-28 14:39:20 UTC (rev 1106) @@ -163,6 +163,7 @@ wao.error.serviceContact.getNbContacts=Impossible de compter le nombre de contacts filtr\u00E9s wao.error.serviceContact.getNewContact=Impossible d'instancier un nouveau contact wao.error.serviceContact.importContactCsv=Impossible d'importer les contacts +wao.error.serviceContact.newContactFilter= wao.error.serviceContact.saveComment= wao.error.serviceContact.saveContact=Impossible de sauvegarder le contact wao.error.serviceContact.sendContactDoneEmail= Modified: trunk/wao-business/src/main/xmi/wao.zargo =================================================================== (Binary files differ) 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 2011-03-28 14:20:35 UTC (rev 1105) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Contacts.java 2011-03-28 14:39:20 UTC (rev 1106) @@ -162,20 +162,7 @@ if (logger.isDebugEnabled()) { logger.debug("Init contactFilter"); } - contactFilter = new ContactFilterImpl(); - - GregorianCalendar initialFromDate = new GregorianCalendar(); - // in the firsts months of a new year go from now to 6 months before - // in the rest of the year, just start at the beginning of the current year - if (initialFromDate.get(Calendar.MONTH) < 3) { - initialFromDate.add(Calendar.MONTH, -6); - } else { - initialFromDate.set(Calendar.DAY_OF_YEAR, 1); - } - - contactFilter.setFromDate(initialFromDate.getTime()); - contactFilter.setObsProgram(user.getProfile().getObsProgram()); - contactFilter.setEstimatedTides(true); + contactFilter = serviceContact.newContactFilter(user); } return contactFilter; }

1 0

[Suiviobsmer-commits] r1105 - trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages
by sletellier＠users.labs.libre-entreprise.org 28 Mar '11

28 Mar '11

Author: sletellier Date: 2011-03-28 14:20:35 +0000 (Mon, 28 Mar 2011) New Revision: 1105 Log: Revert, fix initialisation of filter Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Contacts.java 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 2011-03-28 13:06:40 UTC (rev 1104) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Contacts.java 2011-03-28 14:20:35 UTC (rev 1105) @@ -62,7 +62,6 @@ import org.apache.tapestry5.annotations.Property; import org.apache.tapestry5.annotations.SessionState; import org.apache.tapestry5.beaneditor.BeanModel; -import org.apache.tapestry5.corelib.components.Form; import org.apache.tapestry5.corelib.components.Zone; import org.apache.tapestry5.ioc.Messages; import org.apache.tapestry5.ioc.annotations.Inject; @@ -134,8 +133,7 @@ } // The company of connected user will be contributed to abstractFilteredPage - // TODO sletellier remove it ? : up in initSelectFilters -// initCompanyFilter(); + initCompanyFilter(); } @Log

1 0

[Suiviobsmer-commits] r1104 - trunk/wao-business/src/main/java/fr/ifremer/wao/bean
by bleny＠users.labs.libre-entreprise.org 28 Mar '11

28 Mar '11

Author: bleny Date: 2011-03-28 13:06:40 +0000 (Mon, 28 Mar 2011) New Revision: 1104 Log: fix build Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/bean/SamplingFilterValuesImpl.java Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/bean/SamplingFilterValuesImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/bean/SamplingFilterValuesImpl.java 2011-03-28 13:04:38 UTC (rev 1103) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/bean/SamplingFilterValuesImpl.java 2011-03-28 13:06:40 UTC (rev 1104) @@ -357,4 +357,9 @@ } return new ArrayList<E>(collection); } + + @Override + public void fill(List<SampleRow> sampleRows) { + throw new UnsupportedOperationException("not yet implemented"); + } } //SamplingFilterValuesImpl

1 0