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

[Suiviobsmer-commits] r1184 - in trunk/wao-ui/src/main: resources/fr/ifremer/wao/ui/components webapp webapp/css
by bleny＠users.labs.libre-entreprise.org 12 Apr '11

12 Apr '11

Author: bleny Date: 2011-04-12 09:14:02 +0000 (Tue, 12 Apr 2011) New Revision: 1184 Log: fix layout for obsdeb sampling plan Modified: trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/SamplingFilterComponent.tml trunk/wao-ui/src/main/webapp/ObsDebSamplingPlan.tml trunk/wao-ui/src/main/webapp/css/common.css trunk/wao-ui/src/main/webapp/css/main.css Modified: trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/SamplingFilterComponent.tml =================================================================== --- trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/SamplingFilterComponent.tml 2011-04-12 09:13:48 UTC (rev 1183) +++ trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/SamplingFilterComponent.tml 2011-04-12 09:14:02 UTC (rev 1184) @@ -26,7 +26,7 @@ <div t:type="zone" t:id="filtersZone" t:visible="prop:filtersVisible" id="so-sampling-filters" style="margin: 10px; padding: 10px;"> <fieldset> <legend>${legendMsg}</legend> - <div class="so-filters-form" style="padding: 10px;"> + <div class="so-filters-form"> <form t:type="form" t:id="filtersForm" t:zone="so-sampling-filters" action="post"> <t:errors/> <div style="float: left; margin-right: 15px;"> Modified: trunk/wao-ui/src/main/webapp/ObsDebSamplingPlan.tml =================================================================== --- trunk/wao-ui/src/main/webapp/ObsDebSamplingPlan.tml 2011-04-12 09:13:48 UTC (rev 1183) +++ trunk/wao-ui/src/main/webapp/ObsDebSamplingPlan.tml 2011-04-12 09:14:02 UTC (rev 1184) @@ -25,19 +25,26 @@ xmlns:t="http://tapestry.apache.org/schema/tapestry_5_1_0.xsd" xmlns:p="tapestry:parameter"> <h1 class="fleft">${message:wao.ui.samplingPlan.title}</h1> - <div style="clear: left;" class="actions-top"> - <t:actionlink t:id="showFilters" t:zone="so-sampling-filters"> - ${message:wao.ui.misc.advancedSearch} - </t:actionlink> + + <ul id="so-submenu" style="clear: left;"> + <li> + <t:actionlink t:id="showFilters" t:zone="so-sampling-filters"> + ${message:wao.ui.misc.advancedSearch} + </t:actionlink> + </li> <t:unless test="connectedUser.observer"> - <t:actionlink t:id="showImport" t:zone="importZone"> - ${message:wao.ui.misc.import} + <li> + <t:actionlink t:id="showImport" t:zone="importZone"> + ${message:wao.ui.misc.import} + </t:actionlink> + </li> + </t:unless> + <li> + <t:actionlink t:id="exportSamplingPlan"> + ${message:wao.ui.misc.export} </t:actionlink> - </t:unless> - <t:actionlink t:id="exportSamplingPlan"> - ${message:wao.ui.misc.export} - </t:actionlink> - </div> + </li> + </ul> <div style="clear: both;" /> Modified: trunk/wao-ui/src/main/webapp/css/common.css =================================================================== --- trunk/wao-ui/src/main/webapp/css/common.css 2011-04-12 09:13:48 UTC (rev 1183) +++ trunk/wao-ui/src/main/webapp/css/common.css 2011-04-12 09:14:02 UTC (rev 1184) @@ -255,6 +255,7 @@ color: black; } + /* Common for forms (userProfile and administration forms) */ fieldset.user-form { width: 50%; Modified: trunk/wao-ui/src/main/webapp/css/main.css =================================================================== --- trunk/wao-ui/src/main/webapp/css/main.css 2011-04-12 09:13:48 UTC (rev 1183) +++ trunk/wao-ui/src/main/webapp/css/main.css 2011-04-12 09:14:02 UTC (rev 1184) @@ -169,6 +169,30 @@ color: white; } +#so-submenu { + text-align: center; +} + +#so-submenu li { + display: inline; + margin-left: 10px; +} + +#so-submenu li:first-child { + margin-left: 0px; +} + +#so-submenu a { + text-decoration: none; + color: #19a28d; + font-weight: bold; +} + +#so-submenu a:hover { + text-decoration: underline; + color: black; +} + div#so-footer { clear: both; margin-top: 20px;

1 0

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

12 Apr '11

Author: bleny Date: 2011-04-12 09:13:48 +0000 (Tue, 12 Apr 2011) New Revision: 1183 Log: fix bug when filling companies values for sampling filter Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/bean/SamplingFilterValuesImpl.java trunk/wao-business/src/test/java/fr/ifremer/wao/service/ObsDebTest.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-04-11 16:44:35 UTC (rev 1182) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/bean/SamplingFilterValuesImpl.java 2011-04-12 09:13:48 UTC (rev 1183) @@ -382,6 +382,7 @@ protected void fillSampleRow(SampleRow sampleRow) { ObsProgram obsProgram = sampleRow.getObsProgram(); + addCompanies(sampleRow.getCompany()); if (ObsProgram.OBSDEB.equals(obsProgram)) { addAllObservers(sampleRow.getObservers()); addObservationUnits(sampleRow.getObservationUnit()); @@ -395,7 +396,6 @@ for (DCF5Code dcf5Code : dcf5Codes) { addFishingGearDCFCodes(dcf5Code.getFishingGearDCF()); addTargetSpeciesDCFCodes(dcf5Code.getTargetSpeciesDCF()); - addCompanies(sampleRow.getCompany()); } } if (ObsProgram.OBSVENTE.equals(obsProgram)) { 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-04-11 16:44:35 UTC (rev 1182) +++ trunk/wao-business/src/test/java/fr/ifremer/wao/service/ObsDebTest.java 2011-04-12 09:13:48 UTC (rev 1183) @@ -236,9 +236,10 @@ // and the possible values (here we only check that this // doesn't raise any error SamplingFilterValues samplingFilterValues = serviceSampling.getPossibleValuesForFilter(samplingFilter); - samplingFilterValues.getSampleRows(); - samplingFilterValues.getObservationUnits(); - samplingFilterValues.getObservers(); + Assert.assertEquals(4, samplingFilterValues.getSampleRows().size()); + Assert.assertEquals(2, samplingFilterValues.getObservationUnits().size()); + Assert.assertEquals(0, samplingFilterValues.getObservers().size()); + Assert.assertEquals(2, samplingFilterValues.getCompanies().size()); samplingFilter = serviceSampling.newSamplingFilter(joshAsAdministrator()); samplingFilter.setPeriod(new PeriodDates(DateUtil.createDate(20, 2, 2010),

1 0

[Suiviobsmer-commits] r1182 - in trunk/wao-business/src: main/java/fr/ifremer/wao/service main/resources/i18n main/xmi test/java/fr/ifremer/wao/service
by bleny＠users.labs.libre-entreprise.org 11 Apr '11

11 Apr '11

Author: bleny Date: 2011-04-11 16:44:35 +0000 (Mon, 11 Apr 2011) New Revision: 1182 Log: add stub for observer to export ical Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSamplingImpl.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-business/src/test/java/fr/ifremer/wao/service/ObsDebTest.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 2011-04-11 15:45:05 UTC (rev 1181) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSamplingImpl.java 2011-04-11 16:44:35 UTC (rev 1182) @@ -1508,4 +1508,20 @@ return validationResult; } + + @Override + protected InputStream executeExportSamplingPlanICalendar(TopiaContext transaction, ConnectedUser connectedUser) throws TopiaException { + SamplingFilter samplingFilter = executeNewSamplingFilter(transaction, connectedUser); + List<SampleRow> samplingPlan = executeGetSampleRowsByFilter(transaction, samplingFilter); + + // TODO 20110411 bleny make it generate an iCal + for (SampleRow sampleRow : samplingPlan) { + Date day = sampleRow.getDay(); + String eventDescription = sampleRow.getObservationUnit().getDescription(); + + // add an event at 'day' in iCal + } + + return null; + } } 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-04-11 15:45:05 UTC (rev 1181) +++ trunk/wao-business/src/main/resources/i18n/wao-business_en_GB.properties 2011-04-11 16:44:35 UTC (rev 1182) @@ -197,6 +197,7 @@ wao.error.serviceSampling.createUpdateSampleRow= wao.error.serviceSampling.deleteSampleRow= wao.error.serviceSampling.exportSamplingPlanCsv= +wao.error.serviceSampling.exportSamplingPlanICalendar= wao.error.serviceSampling.getDCFGears= wao.error.serviceSampling.getDCFSpecies= wao.error.serviceSampling.getNewProfession= 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-04-11 15:45:05 UTC (rev 1181) +++ trunk/wao-business/src/main/resources/i18n/wao-business_fr_FR.properties 2011-04-11 16:44:35 UTC (rev 1182) @@ -197,6 +197,7 @@ wao.error.serviceSampling.createUpdateSampleRow=Impossible de sauvegarder la ligne d'\u00E9chantillon wao.error.serviceSampling.deleteSampleRow=Impossible de supprimer la ligne d'\u00E9chantillon \: %1$s wao.error.serviceSampling.exportSamplingPlanCsv=Impossible d'exporter le plan d'\u00E9chantillonnage sur la p\u00E9riode du %1$s au %2$s +wao.error.serviceSampling.exportSamplingPlanICalendar= wao.error.serviceSampling.getDCFGears= wao.error.serviceSampling.getDCFSpecies= wao.error.serviceSampling.getNewProfession= Modified: trunk/wao-business/src/main/xmi/wao.zargo =================================================================== (Binary files differ) 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-04-11 15:45:05 UTC (rev 1181) +++ trunk/wao-business/src/test/java/fr/ifremer/wao/service/ObsDebTest.java 2011-04-11 16:44:35 UTC (rev 1182) @@ -371,4 +371,20 @@ Assert.assertEquals(1, sampleRows.size()); } + @Test + @Ignore("not yet implemented") + public void observerCanExportHisRoadMapAsICalendar() throws IOException, WaoBusinessException { + // first, the coordinator must add observers + coordinatorCanAddObserversViaImport(); + + ServiceSampling serviceSampling = manager.getServiceSampling(); + + InputStream in = serviceSampling.exportSamplingPlanICalendar(joshAsObserver()); + + if (log.isDebugEnabled()) { + log.debug("exported iCal for observer is " + IOUtils.toString(in)); + } + + // TODO 20110411 bleny add assertions + } }

1 0

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

11 Apr '11

Author: bleny Date: 2011-04-11 15:45:05 +0000 (Mon, 11 Apr 2011) New Revision: 1181 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-04-11 15:45:02 UTC (rev 1180) +++ trunk/pom.xml 2011-04-11 15:45:05 UTC (rev 1181) @@ -15,7 +15,7 @@ <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>2.1.5</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.5 + 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.5 + 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.5?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-04-11 15:45:02 UTC (rev 1180) +++ trunk/wao-business/pom.xml 2011-04-11 15:45:05 UTC (rev 1181) @@ -10,7 +10,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>2.1.5</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.5/?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.5/wao-business</connection> - <developerConnection>scm:svn:svn+ssh://${username}@labs.libre-entreprise.org/svnroot/suiviobsmer/tags/wao-2.1.5/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-04-11 15:45:02 UTC (rev 1180) +++ trunk/wao-ui/pom.xml 2011-04-11 15:45:05 UTC (rev 1181) @@ -10,7 +10,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>2.1.5</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.5/?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.5/wao-ui</connection> - <developerConnection>scm:svn:svn+ssh://${username}@labs.libre-entreprise.org/svnroot/suiviobsmer/tags/wao-2.1.5/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] r1180 - in tags: . wao-2.1.5
by bleny＠users.labs.libre-entreprise.org 11 Apr '11

11 Apr '11

Author: bleny Date: 2011-04-11 15:45:02 +0000 (Mon, 11 Apr 2011) New Revision: 1180 Log: [maven-release-plugin] copy for tag wao-2.1.5 Added: tags/wao-2.1.5/ Property changes on: tags/wao-2.1.5 ___________________________________________________________________ Added: svn:ignore + *.ipr *.iws *.iml *.idea target nbactions.xml Added: svn:mergeinfo + /branches/wao-1.5.x:679-733

1 0

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

11 Apr '11

Author: bleny Date: 2011-04-11 15:36:27 +0000 (Mon, 11 Apr 2011) New Revision: 1179 Log: [maven-release-plugin] prepare release wao-2.1.5 Modified: trunk/pom.xml trunk/wao-business/pom.xml trunk/wao-ui/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-04-11 15:19:04 UTC (rev 1178) +++ trunk/pom.xml 2011-04-11 15:36:27 UTC (rev 1179) @@ -15,7 +15,7 @@ <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>2.1.5-SNAPSHOT</version> + <version>2.1.5</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.5 </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.5 </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.5?root=suiviob… </url> </scm> Modified: trunk/wao-business/pom.xml =================================================================== --- trunk/wao-business/pom.xml 2011-04-11 15:19:04 UTC (rev 1178) +++ trunk/wao-business/pom.xml 2011-04-11 15:36:27 UTC (rev 1179) @@ -10,7 +10,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>2.1.5-SNAPSHOT</version> + <version>2.1.5</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.5/?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.5/wao-business</connection> + <developerConnection>scm:svn:svn+ssh://${username}@labs.libre-entreprise.org/svnroot/suiviobsmer/tags/wao-2.1.5/wao-business</developerConnection> </scm> </project> Modified: trunk/wao-ui/pom.xml =================================================================== --- trunk/wao-ui/pom.xml 2011-04-11 15:19:04 UTC (rev 1178) +++ trunk/wao-ui/pom.xml 2011-04-11 15:36:27 UTC (rev 1179) @@ -10,7 +10,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>2.1.5-SNAPSHOT</version> + <version>2.1.5</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.5/?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.5/wao-ui</connection> + <developerConnection>scm:svn:svn+ssh://${username}@labs.libre-entreprise.org/svnroot/suiviobsmer/tags/wao-2.1.5/wao-ui</developerConnection> </scm> </project>

1 0

[Suiviobsmer-commits] r1178 - in trunk: . src/announcement
by bleny＠users.labs.libre-entreprise.org 11 Apr '11

11 Apr '11

Author: bleny Date: 2011-04-11 15:19:04 +0000 (Mon, 11 Apr 2011) New Revision: 1178 Log: add file for release Added: trunk/src/announcement/release-email-2.1.5.txt Modified: trunk/changelog.txt Modified: trunk/changelog.txt =================================================================== --- trunk/changelog.txt 2011-04-11 14:57:41 UTC (rev 1177) +++ trunk/changelog.txt 2011-04-11 15:19:04 UTC (rev 1178) @@ -3,6 +3,14 @@ Historique des versions +2.1.5 +----- + +Anomalies ++++++++++ + +- [bleny] #2639 : Les contacts ne sont plus filtrés par société + 2.1.4 ----- Added: trunk/src/announcement/release-email-2.1.5.txt =================================================================== --- trunk/src/announcement/release-email-2.1.5.txt (rev 0) +++ trunk/src/announcement/release-email-2.1.5.txt 2011-04-11 15:19:04 UTC (rev 1178) @@ -0,0 +1,17 @@ +La nouvelle version 2.1.5 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

1 0

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

11 Apr '11

Author: bleny Date: 2011-04-11 14:57:41 +0000 (Mon, 11 Apr 2011) New Revision: 1177 Log: set version to 2.1.5 Modified: trunk/pom.xml trunk/wao-business/pom.xml trunk/wao-ui/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-04-11 14:49:22 UTC (rev 1176) +++ trunk/pom.xml 2011-04-11 14:57:41 UTC (rev 1177) @@ -15,7 +15,7 @@ <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>3.0-SNAPSHOT</version> + <version>2.1.5-SNAPSHOT</version> <modules> <module>wao-ui</module> Modified: trunk/wao-business/pom.xml =================================================================== --- trunk/wao-business/pom.xml 2011-04-11 14:49:22 UTC (rev 1176) +++ trunk/wao-business/pom.xml 2011-04-11 14:57:41 UTC (rev 1177) @@ -10,7 +10,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>3.0-SNAPSHOT</version> + <version>2.1.5-SNAPSHOT</version> </parent> <groupId>fr.ifremer.wao</groupId> Modified: trunk/wao-ui/pom.xml =================================================================== --- trunk/wao-ui/pom.xml 2011-04-11 14:49:22 UTC (rev 1176) +++ trunk/wao-ui/pom.xml 2011-04-11 14:57:41 UTC (rev 1177) @@ -10,7 +10,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>3.0-SNAPSHOT</version> + <version>2.1.5-SNAPSHOT</version> </parent> <groupId>fr.ifremer.wao</groupId>

1 0

[Suiviobsmer-commits] r1176 - trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages
by bleny＠users.labs.libre-entreprise.org 11 Apr '11

11 Apr '11

Author: bleny Date: 2011-04-11 14:49:22 +0000 (Mon, 11 Apr 2011) New Revision: 1176 Log: clean import 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-04-11 14:49:00 UTC (rev 1175) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Contacts.java 2011-04-11 14:49:22 UTC (rev 1176) @@ -47,7 +47,6 @@ import fr.ifremer.wao.ui.services.ContactModelFactory; import fr.ifremer.wao.ui.services.WaoManager; import org.apache.commons.lang.BooleanUtils; -import org.apache.commons.lang.StringUtils; import org.apache.tapestry5.ComponentResources; import org.apache.tapestry5.StreamResponse; import org.apache.tapestry5.annotations.Environmental;

1 0

[Suiviobsmer-commits] r1175 - trunk/wao-business/src/main/java/fr/ifremer/wao/service
by bleny＠users.labs.libre-entreprise.org 11 Apr '11

11 Apr '11

Author: bleny Date: 2011-04-11 14:49:00 +0000 (Mon, 11 Apr 2011) New Revision: 1175 Log: fix mandatory filtering on company for contact 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-04-11 13:29:13 UTC (rev 1174) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceContactImpl.java 2011-04-11 14:49:00 UTC (rev 1175) @@ -1521,6 +1521,11 @@ initialFromDate.set(Calendar.DAY_OF_YEAR, 1); } + // DO NOT REMOVE THIS + if (connectedUser.isCoordinatorOrObserver()) { + contactFilter.setCompany(connectedUser.getUser().getCompany()); + } + contactFilter.setFromDate(initialFromDate.getTime()); contactFilter.setObsProgram(connectedUser.getProfile().getObsProgram()); contactFilter.setEstimatedTides(true);

1 0