November 2012 - Coser-commits - mailman.cloud.codelutin.com

r1098 - trunk/coser-ui
by echatellier＠users.forge.codelutin.com 30 Nov '12

30 Nov '12

Author: echatellier Date: 2012-11-30 12:04:17 +0100 (Fri, 30 Nov 2012) New Revision: 1098 Url: http://forge.codelutin.com/projects/coser/repository/revisions/1098 Log: Fix codebase Modified: trunk/coser-ui/pom.xml Modified: trunk/coser-ui/pom.xml =================================================================== --- trunk/coser-ui/pom.xml 2012-11-30 11:03:40 UTC (rev 1097) +++ trunk/coser-ui/pom.xml 2012-11-30 11:04:17 UTC (rev 1098) @@ -246,9 +246,9 @@ <value>true</value> </property> </activation> - <properties> +  <build> <plugins> <plugin>

1 0

r1097 - trunk/coser-ui
by echatellier＠users.forge.codelutin.com 30 Nov '12

30 Nov '12

Author: echatellier Date: 2012-11-30 12:03:40 +0100 (Fri, 30 Nov 2012) New Revision: 1097 Url: http://forge.codelutin.com/projects/coser/repository/revisions/1097 Log: Fix jarsigner with jdk 7 Modified: trunk/coser-ui/pom.xml Modified: trunk/coser-ui/pom.xml =================================================================== --- trunk/coser-ui/pom.xml 2012-11-30 09:59:44 UTC (rev 1096) +++ trunk/coser-ui/pom.xml 2012-11-30 11:03:40 UTC (rev 1097) @@ -246,9 +246,9 @@ <value>true</value> </property> </activation> -  + </properties> <build> <plugins> <plugin> @@ -339,6 +339,15 @@ <include>org.swinglabs:jxlayer</include> </includes> </jnlpExtension> + <jnlpExtension> + <name>bouncycastle</name> + <title>BouncyCastle</title> + <vendor>BouncyCastle</vendor> + <includes> + <include>bouncycastle:bcmail-jdk14</include> + <include>bouncycastle:bcprov-jdk14</include> + </includes> + </jnlpExtension> </jnlpExtensions> <sign>

1 0

r1096 - in trunk: . coser-business coser-ui coser-web
by echatellier＠users.forge.codelutin.com 30 Nov '12

30 Nov '12

Author: echatellier Date: 2012-11-30 10:59:44 +0100 (Fri, 30 Nov 2012) New Revision: 1096 Url: http://forge.codelutin.com/projects/coser/repository/revisions/1096 Log: [maven-release-plugin] prepare for next development iteration Modified: trunk/coser-business/pom.xml trunk/coser-ui/pom.xml trunk/coser-web/pom.xml trunk/pom.xml Modified: trunk/coser-business/pom.xml =================================================================== --- trunk/coser-business/pom.xml 2012-11-30 09:59:36 UTC (rev 1095) +++ trunk/coser-business/pom.xml 2012-11-30 09:59:44 UTC (rev 1096) @@ -6,7 +6,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coser</artifactId> - <version>1.4</version> + <version>1.4.1-SNAPSHOT</version> </parent> <groupId>fr.ifremer.coser</groupId> Modified: trunk/coser-ui/pom.xml =================================================================== --- trunk/coser-ui/pom.xml 2012-11-30 09:59:36 UTC (rev 1095) +++ trunk/coser-ui/pom.xml 2012-11-30 09:59:44 UTC (rev 1096) @@ -6,7 +6,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coser</artifactId> - <version>1.4</version> + <version>1.4.1-SNAPSHOT</version> </parent> <groupId>fr.ifremer.coser</groupId> Modified: trunk/coser-web/pom.xml =================================================================== --- trunk/coser-web/pom.xml 2012-11-30 09:59:36 UTC (rev 1095) +++ trunk/coser-web/pom.xml 2012-11-30 09:59:44 UTC (rev 1096) @@ -6,7 +6,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coser</artifactId> - <version>1.4</version> + <version>1.4.1-SNAPSHOT</version> </parent> <groupId>fr.ifremer.coser</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-11-30 09:59:36 UTC (rev 1095) +++ trunk/pom.xml 2012-11-30 09:59:44 UTC (rev 1096) @@ -11,7 +11,7 @@ <groupId>fr.ifremer</groupId> <artifactId>coser</artifactId> - <version>1.4</version> + <version>1.4.1-SNAPSHOT</version> <packaging>pom</packaging> <modules> @@ -353,9 +353,9 @@ </properties> <scm> - <connection>scm:svn:http://svn.forge.codelutin.com/svn/coser/tags/coser-1.4</connection> - <developerConnection>scm:svn:http://svn.forge.codelutin.com/svn/coser/tags/coser-1.4</developerConnection> - <url>http://forge.codelutin.com/repositories/browse/coser/tags/coser-1.4</url> + <connection>scm:svn:http://svn.forge.codelutin.com/svn/coser/trunk</connection> + <developerConnection>scm:svn:http://svn.forge.codelutin.com/svn/coser/trunk</developerConnection> + <url>http://forge.codelutin.com/repositories/browse/coser/trunk</url> </scm> <build>

1 0

r1095 - tags
by echatellier＠users.forge.codelutin.com 30 Nov '12

30 Nov '12

Author: echatellier Date: 2012-11-30 10:59:36 +0100 (Fri, 30 Nov 2012) New Revision: 1095 Url: http://forge.codelutin.com/projects/coser/repository/revisions/1095 Log: [maven-release-plugin] copy for tag coser-1.4 Added: tags/coser-1.4/

1 0

r1094 - in trunk: . coser-business coser-ui coser-web
by echatellier＠users.forge.codelutin.com 30 Nov '12

30 Nov '12

Author: echatellier Date: 2012-11-30 10:59:28 +0100 (Fri, 30 Nov 2012) New Revision: 1094 Url: http://forge.codelutin.com/projects/coser/repository/revisions/1094 Log: [maven-release-plugin] prepare release coser-1.4 Modified: trunk/coser-business/pom.xml trunk/coser-ui/pom.xml trunk/coser-web/pom.xml trunk/pom.xml Modified: trunk/coser-business/pom.xml =================================================================== --- trunk/coser-business/pom.xml 2012-11-30 09:55:36 UTC (rev 1093) +++ trunk/coser-business/pom.xml 2012-11-30 09:59:28 UTC (rev 1094) @@ -6,7 +6,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coser</artifactId> - <version>1.4-SNAPSHOT</version> + <version>1.4</version> </parent> <groupId>fr.ifremer.coser</groupId> Modified: trunk/coser-ui/pom.xml =================================================================== --- trunk/coser-ui/pom.xml 2012-11-30 09:55:36 UTC (rev 1093) +++ trunk/coser-ui/pom.xml 2012-11-30 09:59:28 UTC (rev 1094) @@ -6,7 +6,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coser</artifactId> - <version>1.4-SNAPSHOT</version> + <version>1.4</version> </parent> <groupId>fr.ifremer.coser</groupId> Modified: trunk/coser-web/pom.xml =================================================================== --- trunk/coser-web/pom.xml 2012-11-30 09:55:36 UTC (rev 1093) +++ trunk/coser-web/pom.xml 2012-11-30 09:59:28 UTC (rev 1094) @@ -6,7 +6,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coser</artifactId> - <version>1.4-SNAPSHOT</version> + <version>1.4</version> </parent> <groupId>fr.ifremer.coser</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-11-30 09:55:36 UTC (rev 1093) +++ trunk/pom.xml 2012-11-30 09:59:28 UTC (rev 1094) @@ -11,7 +11,7 @@ <groupId>fr.ifremer</groupId> <artifactId>coser</artifactId> - <version>1.4-SNAPSHOT</version> + <version>1.4</version> <packaging>pom</packaging> <modules> @@ -353,9 +353,9 @@ </properties> <scm> - <connection>scm:svn:http://svn.forge.codelutin.com/svn/coser/trunk</connection> - <developerConnection>scm:svn:http://svn.forge.codelutin.com/svn/coser/trunk</developerConnection> - <url>http://forge.codelutin.com/repositories/browse/coser/trunk</url> + <connection>scm:svn:http://svn.forge.codelutin.com/svn/coser/tags/coser-1.4</connection> + <developerConnection>scm:svn:http://svn.forge.codelutin.com/svn/coser/tags/coser-1.4</developerConnection> + <url>http://forge.codelutin.com/repositories/browse/coser/tags/coser-1.4</url> </scm> <build>

1 0

r1093 - trunk/coser-web
by echatellier＠users.forge.codelutin.com 30 Nov '12

30 Nov '12

Author: echatellier Date: 2012-11-30 10:55:36 +0100 (Fri, 30 Nov 2012) New Revision: 1093 Url: http://forge.codelutin.com/projects/coser/repository/revisions/1093 Log: fix deps Modified: trunk/coser-web/pom.xml Modified: trunk/coser-web/pom.xml =================================================================== --- trunk/coser-web/pom.xml 2012-11-30 09:49:28 UTC (rev 1092) +++ trunk/coser-web/pom.xml 2012-11-30 09:55:36 UTC (rev 1093) @@ -33,6 +33,10 @@ <artifactId>commons-collections</artifactId> </dependency> <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-lang3</artifactId> + </dependency> + <dependency> <groupId>org.nuiton</groupId> <artifactId>nuiton-utils</artifactId> </dependency>

1 0

r1092 - trunk
by echatellier＠users.forge.codelutin.com 30 Nov '12

30 Nov '12

Author: echatellier Date: 2012-11-30 10:49:28 +0100 (Fri, 30 Nov 2012) New Revision: 1092 Url: http://forge.codelutin.com/projects/coser/repository/revisions/1092 Log: Update parent pom Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-11-22 13:17:00 UTC (rev 1091) +++ trunk/pom.xml 2012-11-30 09:49:28 UTC (rev 1092) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>3.4.2</version> + <version>3.4.4</version> </parent> <groupId>fr.ifremer</groupId>

1 0

r1091 - in trunk/coser-web/src/main: resources/fr/ifremer/coser/web webapp/WEB-INF/content/search
by echatellier＠users.forge.codelutin.com 22 Nov '12

22 Nov '12

Author: echatellier Date: 2012-11-22 14:17:00 +0100 (Thu, 22 Nov 2012) New Revision: 1091 Url: http://forge.codelutin.com/repositories/revision/coser/1091 Log: refs #1614: Extraction des indicateurs et donn?\195?\169es depuis une recherche Modified: trunk/coser-web/src/main/resources/fr/ifremer/coser/web/package.properties trunk/coser-web/src/main/resources/fr/ifremer/coser/web/package_en.properties trunk/coser-web/src/main/resources/fr/ifremer/coser/web/package_es.properties trunk/coser-web/src/main/resources/fr/ifremer/coser/web/package_fr.properties trunk/coser-web/src/main/webapp/WEB-INF/content/search/extract-wait.jsp Modified: trunk/coser-web/src/main/resources/fr/ifremer/coser/web/package.properties =================================================================== --- trunk/coser-web/src/main/resources/fr/ifremer/coser/web/package.properties 2012-11-21 17:34:17 UTC (rev 1090) +++ trunk/coser-web/src/main/resources/fr/ifremer/coser/web/package.properties 2012-11-22 13:17:00 UTC (rev 1091) @@ -134,6 +134,7 @@ message.search.extract.waittitle=Extracting data... message.search.extract.waitparagraph1=Data are being extracting. Please wait. message.search.extract.waitparagraph2=This operation take several minutes in the case of many graphics should be generated. +message.search.extract.waitparagraph3=After downloading, close this page by returning to the home page of the site. message.search.extract.zonetype=Zone and data types message.source.download=Download message.source.paragraph1=The raw data are presented in four tables which contain the basic information by sampling unit (generally a haul) as well as the relevant information on the sampling design (strata). An additional table provides the latin names for the species codes used in the data files. Il s''agit des donn�es utilis�es pour r�aliser les calculs des indicateurs pr�sent�s. Ces donn�es ont fait l''objet de filtrages et de regroupements �ventuels par rapport aux donn�es de base de chaque s�rie, afin d''assurer la coh�rence des jeux de donn�es en vue du calcul des indicateurs. Ainsi, pour certaines s�ries, des groupes entiers (e.g. les amphihalins) ont pu �tre retir�s. Pour certaines s�ries, certaines ann�es ou certaines strates ont �t� retir�es afin de pr�server l''homog�n�it� de la s�rie. Dans des cas d''�volution du niveau de d�termination au cours de la s�rie, plusieurs taxons ont �t� regroup�s � un niveau sup�rieur. Modified: trunk/coser-web/src/main/resources/fr/ifremer/coser/web/package_en.properties =================================================================== --- trunk/coser-web/src/main/resources/fr/ifremer/coser/web/package_en.properties 2012-11-21 17:34:17 UTC (rev 1090) +++ trunk/coser-web/src/main/resources/fr/ifremer/coser/web/package_en.properties 2012-11-22 13:17:00 UTC (rev 1091) @@ -134,6 +134,7 @@ message.search.extract.waittitle=Extracting data... message.search.extract.waitparagraph1=Data are being extracting. Please wait. message.search.extract.waitparagraph2=This operation take several minutes in the case of many graphics should be generated. +message.search.extract.waitparagraph3=After downloading, close this page by returning to the home page of the site. message.search.extract.zonetype=Zone and data types message.source.download=Download message.source.paragraph1=The raw data are presented in four tables which contain the basic information by sampling unit (generally a haul) as well as the relevant information on the sampling design (strata). An additional table provides the latin names for the species codes used in the data files. Il s''agit des donn�es utilis�es pour r�aliser les calculs des indicateurs pr�sent�s. Ces donn�es ont fait l''objet de filtrages et de regroupements �ventuels par rapport aux donn�es de base de chaque s�rie, afin d''assurer la coh�rence des jeux de donn�es en vue du calcul des indicateurs. Ainsi, pour certaines s�ries, des groupes entiers (e.g. les amphihalins) ont pu �tre retir�s. Pour certaines s�ries, certaines ann�es ou certaines strates ont �t� retir�es afin de pr�server l''homog�n�it� de la s�rie. Dans des cas d''�volution du niveau de d�termination au cours de la s�rie, plusieurs taxons ont �t� regroup�s � un niveau sup�rieur. Modified: trunk/coser-web/src/main/resources/fr/ifremer/coser/web/package_es.properties =================================================================== --- trunk/coser-web/src/main/resources/fr/ifremer/coser/web/package_es.properties 2012-11-21 17:34:17 UTC (rev 1090) +++ trunk/coser-web/src/main/resources/fr/ifremer/coser/web/package_es.properties 2012-11-22 13:17:00 UTC (rev 1091) @@ -134,6 +134,7 @@ message.search.extract.waittitle=Extraction en cours... message.search.extract.waitparagraph1=Les donn�es sont en cours d'extraction. Merci de patienter. message.search.extract.waitparagraph2=Cette op�ration peut prendre plusieurs minute dans le cas ou de nombreux graphiques doivent �tre g�n�r�s. +message.search.extract.waitparagraph3=Apr�s le t�l�chargement, fermer cette page en revenant sur la page d''accueil du site. message.search.extract.zonetype=Zone et type de donn�es message.search.extract.title=Extraction des donn�es message.source.download=T�l�charger Modified: trunk/coser-web/src/main/resources/fr/ifremer/coser/web/package_fr.properties =================================================================== --- trunk/coser-web/src/main/resources/fr/ifremer/coser/web/package_fr.properties 2012-11-21 17:34:17 UTC (rev 1090) +++ trunk/coser-web/src/main/resources/fr/ifremer/coser/web/package_fr.properties 2012-11-22 13:17:00 UTC (rev 1091) @@ -134,6 +134,7 @@ message.search.extract.waittitle=Extraction en cours... message.search.extract.waitparagraph1=Les donn�es sont en cours d''extraction. Merci de patienter. message.search.extract.waitparagraph2=Cette op�ration peut prendre plusieurs minutes dans le cas o� de nombreux graphiques doivent �tre g�n�r�s. +message.search.extract.waitparagraph3=Apr�s le t�l�chargement, fermer cette page en revenant sur la page d''accueil du site. message.search.extract.zonetype=Zone et type de donn�es message.source.download=T�l�charger message.source.paragraph1=Les donn�es de base sont pr�sent�es selon quatre tables fournissant des informations de base �lev�es � l''op�ration d''�chantillonnage (en g�n�ral un trait de chalut) et organis�es selon des unit�s g�ographiques d�finies en relation avec le plan d''�chantillonnage. Une table suppl�mentaire pr�sente le r�f�rentiel taxinomique associ� aux donn�es. Il s''agit des donn�es utilis�es pour r�aliser les calculs des indicateurs pr�sent�s. Ces donn�es ont fait l''objet de filtrages et de regroupements �ventuels par rapport aux donn�es de base de chaque s�rie, afin d''assurer la coh�rence des jeux de donn�es en vue du calcul des indicateurs. Ainsi, pour certaines s�ries, des groupes entiers (e.g. les amphihalins) ont pu �tre retir�s. Pour certaines s�ries, certaines ann�es ou certaines strates ont �t� retir�es afin de pr�server l''homog�n�it� de la s�rie. Dans des cas d''�volution du niveau de d�termination au cours de la s�rie, plusieurs taxons ont �t� regroup�s � un niveau sup�rieur. Modified: trunk/coser-web/src/main/webapp/WEB-INF/content/search/extract-wait.jsp =================================================================== --- trunk/coser-web/src/main/webapp/WEB-INF/content/search/extract-wait.jsp 2012-11-21 17:34:17 UTC (rev 1090) +++ trunk/coser-web/src/main/webapp/WEB-INF/content/search/extract-wait.jsp 2012-11-22 13:17:00 UTC (rev 1091) @@ -36,5 +36,6 @@ <h3><s:text name="message.search.extract.waittitle" /></h3> <p><s:text name="message.search.extract.waitparagraph1" /></p> <p><s:text name="message.search.extract.waitparagraph2" /></p> + <p><s:text name="message.search.extract.waitparagraph3" /></p> </body> </html> \ No newline at end of file

1 0

r1090 - trunk/coser-business/src/main/java/fr/ifremer/coser/services
by echatellier＠users.forge.codelutin.com 21 Nov '12

21 Nov '12

Author: echatellier Date: 2012-11-21 18:34:17 +0100 (Wed, 21 Nov 2012) New Revision: 1090 Url: http://forge.codelutin.com/repositories/revision/coser/1090 Log: Modification de la mise en page du pdf Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/services/WebService.java Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/services/WebService.java =================================================================== --- trunk/coser-business/src/main/java/fr/ifremer/coser/services/WebService.java 2012-11-21 17:26:31 UTC (rev 1089) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/services/WebService.java 2012-11-21 17:34:17 UTC (rev 1090) @@ -2852,7 +2852,7 @@ htmlContent.append("<div style='page-break-after: always'>"); htmlContent.append("<img src='file://" + chartFile.getAbsolutePath() + "' />"); - + htmlContent.append("<br />"); htmlContent.append(l_(locale, "coser.business.extract.extractdata") + " :"); htmlContent.append("<pre>").append(content).append("</pre>"); htmlContent.append("</div>");

1 0

r1089 - in trunk: coser-business/src/main/java/fr/ifremer/coser/services coser-business/src/main/resources/i18n coser-business/src/test/java/fr/ifremer/coser/services coser-web/src/main/java/fr/ifremer/coser/web/actions/search coser-web/src/main/resources/fr/ifremer/coser/web coser-web/src/main/webapp/WEB-INF/content/search
by echatellier＠users.forge.codelutin.com 21 Nov '12

21 Nov '12

Author: echatellier Date: 2012-11-21 18:26:31 +0100 (Wed, 21 Nov 2012) New Revision: 1089 Url: http://forge.codelutin.com/repositories/revision/coser/1089 Log: Retour extraction des donn?\195?\169es Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/services/PublicationService.java trunk/coser-business/src/main/java/fr/ifremer/coser/services/WebService.java trunk/coser-business/src/main/resources/i18n/coser-business_en_GB.properties trunk/coser-business/src/main/resources/i18n/coser-business_fr_FR.properties trunk/coser-business/src/test/java/fr/ifremer/coser/services/ControlServiceTest.java trunk/coser-business/src/test/java/fr/ifremer/coser/services/WebServiceTest.java trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/search/ExtractAction.java trunk/coser-web/src/main/resources/fr/ifremer/coser/web/package.properties trunk/coser-web/src/main/resources/fr/ifremer/coser/web/package_en.properties trunk/coser-web/src/main/resources/fr/ifremer/coser/web/package_es.properties trunk/coser-web/src/main/resources/fr/ifremer/coser/web/package_fr.properties trunk/coser-web/src/main/webapp/WEB-INF/content/search/extract-input.jsp trunk/coser-web/src/main/webapp/WEB-INF/content/search/extract-success.jsp Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/services/PublicationService.java =================================================================== --- trunk/coser-business/src/main/java/fr/ifremer/coser/services/PublicationService.java 2012-11-21 16:48:17 UTC (rev 1088) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/services/PublicationService.java 2012-11-21 17:26:31 UTC (rev 1089) @@ -1195,7 +1195,8 @@ Map<String, Map<Integer, Double[]>> indicatorGraphData = new HashMap<String, Map<Integer, Double[]>>(); Map<String, String> indicatorLists = new HashMap<String, String>(); Map<String, DataStorage> indicatorStorages = new HashMap<String, DataStorage>(); - Iterator<String[]> estComIndIterator = dataStorage.iterator(true); + Iterator<String[]> estComIndIterator = dataStorage.iterator(false); + String[] headers = estComIndIterator.next(); while (estComIndIterator.hasNext()) { // Campagne Indicateur Liste Strate Annee Estimation EcartType CV String[] tuple = estComIndIterator.next(); @@ -1242,6 +1243,11 @@ DataStorage subDataStorage = indicatorStorages.get(indicatorCode); if (subDataStorage == null) { subDataStorage = new MemoryDataStorage(); + if ("fr".equals(locale.getLanguage())) { + subDataStorage.add(new String[]{"Campagne", "Indice", "Liste", "Strate", "Année", "Estimation", "EcartType", "CV"}); + } else { + subDataStorage.add(new String[]{"Survey", "Index", "List", "Stratum", "Year", "Estimate", "StandardDeviation", "CV"}); + } indicatorStorages.put(indicatorCode, subDataStorage); } subDataStorage.add(tuple); @@ -1447,6 +1453,11 @@ DataStorage subDataStorage = (DataStorage)indicatorStorages.get(indicatorCode, speciesCode); if (subDataStorage == null) { subDataStorage = new MemoryDataStorage(); + if ("fr".equals(locale.getLanguage())) { + subDataStorage.add(new String[]{"Campagne", "Indice", "Liste", "Espèce", "Strate", "Annee", "Estimation", "EcartType", "CV"}); + } else { + subDataStorage.add(new String[]{"Survey", "Index", "List", "Species", "Stratum", "Year", "Estimate", "StandardDeviation", "CV"}); + } indicatorStorages.put(indicatorCode, speciesCode, subDataStorage); } subDataStorage.add(tuple); Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/services/WebService.java =================================================================== --- trunk/coser-business/src/main/java/fr/ifremer/coser/services/WebService.java 2012-11-21 16:48:17 UTC (rev 1088) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/services/WebService.java 2012-11-21 17:26:31 UTC (rev 1089) @@ -2521,7 +2521,7 @@ try { tempDir = FileUtil.createTempDirectory("coser-extract-", "-tmp"); - File subDir = new File(tempDir, "extract"); + File subDir = new File(tempDir, "Indicateurs_Ifremer"); subDir.mkdirs(); // les sources se retrouve dans le zip a cote du pdf @@ -2554,7 +2554,7 @@ // generate pdf if necessary if (MapUtils.isNotEmpty(pdfMaps) || MapUtils.isNotEmpty(pdfCharts)) { - File pdfFile = new File(subDir, "extract.pdf"); + File pdfFile = new File(subDir, "Indicateurs_Ifremer.pdf"); generateExtractPDF(pdfFile, pdfMaps, pdfCharts, locale); } @@ -2853,7 +2853,7 @@ htmlContent.append("<div style='page-break-after: always'>"); htmlContent.append("<img src='file://" + chartFile.getAbsolutePath() + "' />"); - htmlContent.append("Données du graphique :"); + htmlContent.append(l_(locale, "coser.business.extract.extractdata") + " :"); htmlContent.append("<pre>").append(content).append("</pre>"); htmlContent.append("</div>"); Modified: trunk/coser-business/src/main/resources/i18n/coser-business_en_GB.properties =================================================================== --- trunk/coser-business/src/main/resources/i18n/coser-business_en_GB.properties 2012-11-21 16:48:17 UTC (rev 1088) +++ trunk/coser-business/src/main/resources/i18n/coser-business_en_GB.properties 2012-11-21 17:26:31 UTC (rev 1089) @@ -102,6 +102,7 @@ coser.business.control.step.observation=Checking observation number \: %s (%d%%) coser.business.control.step.xworks=Line checks \: %s (%d%%) coser.business.extract.creationdate=Creation date \: +coser.business.extract.extractdata=Data coser.business.extract.extracttitle=Extract coser.business.extract.projectAuthor=Project author \: coser.business.extract.projectComment=Project comment \: Modified: trunk/coser-business/src/main/resources/i18n/coser-business_fr_FR.properties =================================================================== --- trunk/coser-business/src/main/resources/i18n/coser-business_fr_FR.properties 2012-11-21 16:48:17 UTC (rev 1088) +++ trunk/coser-business/src/main/resources/i18n/coser-business_fr_FR.properties 2012-11-21 17:26:31 UTC (rev 1089) @@ -102,6 +102,7 @@ coser.business.control.step.observation=Vérification du nombre d'observation \: %s (%d%%) coser.business.control.step.xworks=Validation par lignes \: %s (%d%%) coser.business.extract.creationdate=Date de création \: +coser.business.extract.extractdata=Données du graphique coser.business.extract.extracttitle=Extraction coser.business.extract.projectAuthor=Auteur du projet \: coser.business.extract.projectComment=Commentaire du projet \: Modified: trunk/coser-business/src/test/java/fr/ifremer/coser/services/ControlServiceTest.java =================================================================== --- trunk/coser-business/src/test/java/fr/ifremer/coser/services/ControlServiceTest.java 2012-11-21 16:48:17 UTC (rev 1088) +++ trunk/coser-business/src/test/java/fr/ifremer/coser/services/ControlServiceTest.java 2012-11-21 17:26:31 UTC (rev 1089) @@ -34,14 +34,11 @@ import fr.ifremer.coser.CoserBusinessException; import fr.ifremer.coser.CoserConstants.Category; -import fr.ifremer.coser.bean.Control; import fr.ifremer.coser.bean.Project; import fr.ifremer.coser.control.ControlError; import fr.ifremer.coser.data.Catch; import fr.ifremer.coser.data.Haul; import fr.ifremer.coser.data.Length; -import fr.ifremer.coser.storage.DataStorage; -import fr.ifremer.coser.storage.MemoryDataStorage; /** * Test about control service (validation...). Modified: trunk/coser-business/src/test/java/fr/ifremer/coser/services/WebServiceTest.java =================================================================== --- trunk/coser-business/src/test/java/fr/ifremer/coser/services/WebServiceTest.java 2012-11-21 16:48:17 UTC (rev 1088) +++ trunk/coser-business/src/test/java/fr/ifremer/coser/services/WebServiceTest.java 2012-11-21 17:26:31 UTC (rev 1089) @@ -27,11 +27,9 @@ import java.io.File; import java.io.IOException; -import java.io.InputStream; import java.net.URL; import java.util.ArrayList; import java.util.Arrays; -import java.util.Collections; import java.util.List; import java.util.Locale; import java.util.Map; Modified: trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/search/ExtractAction.java =================================================================== --- trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/search/ExtractAction.java 2012-11-21 16:48:17 UTC (rev 1088) +++ trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/search/ExtractAction.java 2012-11-21 17:26:31 UTC (rev 1089) @@ -290,6 +290,6 @@ } public String getFilename() { - return "extract.zip"; + return "Indicateurs_Ifremer.zip"; } } Modified: trunk/coser-web/src/main/resources/fr/ifremer/coser/web/package.properties =================================================================== --- trunk/coser-web/src/main/resources/fr/ifremer/coser/web/package.properties 2012-11-21 16:48:17 UTC (rev 1088) +++ trunk/coser-web/src/main/resources/fr/ifremer/coser/web/package.properties 2012-11-21 17:26:31 UTC (rev 1089) @@ -45,6 +45,8 @@ message.common.jsreadmore=Read more message.common.noresults=No results available message.common.population=population +message.common.selectall=Select all +message.common.selectnone=Unselect all message.common.selectfacade=Select an area message.common.selectindicator=Select an indicator message.common.selectpop=Select a population @@ -128,7 +130,7 @@ message.search.extract.extract=Extract message.search.extract.speciesindicators=Indicators and species message.search.extract.title=Extract data -message.search.extract.updatelists=Update lists +message.search.extract.updatelists=Next message.search.extract.waittitle=Extracting data... message.search.extract.waitparagraph1=Data are being extracting. Please wait. message.search.extract.waitparagraph2=This operation take several minutes in the case of many graphics should be generated. Modified: trunk/coser-web/src/main/resources/fr/ifremer/coser/web/package_en.properties =================================================================== --- trunk/coser-web/src/main/resources/fr/ifremer/coser/web/package_en.properties 2012-11-21 16:48:17 UTC (rev 1088) +++ trunk/coser-web/src/main/resources/fr/ifremer/coser/web/package_en.properties 2012-11-21 17:26:31 UTC (rev 1089) @@ -45,6 +45,8 @@ message.common.jsreadmore=Read more message.common.noresults=No results available message.common.population=population +message.common.selectall=Select all +message.common.selectnone=Unselect all message.common.selectfacade=Select an area message.common.selectindicator=Select an indicator message.common.selectpop=Select a population @@ -128,7 +130,7 @@ message.search.extract.extract=Extract message.search.extract.speciesindicators=Indicators and species message.search.extract.title=Extract data -message.search.extract.updatelists=Update lists +message.search.extract.updatelists=Next message.search.extract.waittitle=Extracting data... message.search.extract.waitparagraph1=Data are being extracting. Please wait. message.search.extract.waitparagraph2=This operation take several minutes in the case of many graphics should be generated. Modified: trunk/coser-web/src/main/resources/fr/ifremer/coser/web/package_es.properties =================================================================== --- trunk/coser-web/src/main/resources/fr/ifremer/coser/web/package_es.properties 2012-11-21 16:48:17 UTC (rev 1088) +++ trunk/coser-web/src/main/resources/fr/ifremer/coser/web/package_es.properties 2012-11-21 17:26:31 UTC (rev 1089) @@ -45,6 +45,8 @@ message.common.jsreadmore=Voir la suite message.common.noresults=Aucun r�sultat disponible. message.common.population=population +message.common.selectall=Tout s�lectionner +message.common.selectnone=Tout d�-s�lectionner message.common.selectfacade=S�lectionnez une fa�ade message.common.selectindicator=S�lectionnez un indicateur message.common.selectpop=S�lectionnez une population @@ -128,7 +130,7 @@ message.search.extract.extract=Extraire message.search.extract.speciesindicators=Esp�ces et indicateurs message.search.extract.title=Extraction des donn�es -message.search.extract.updatelists=Mise � jour des listes +message.search.extract.updatelists=Suite message.search.extract.waittitle=Extraction en cours... message.search.extract.waitparagraph1=Les donn�es sont en cours d'extraction. Merci de patienter. message.search.extract.waitparagraph2=Cette op�ration peut prendre plusieurs minute dans le cas ou de nombreux graphiques doivent �tre g�n�r�s. Modified: trunk/coser-web/src/main/resources/fr/ifremer/coser/web/package_fr.properties =================================================================== --- trunk/coser-web/src/main/resources/fr/ifremer/coser/web/package_fr.properties 2012-11-21 16:48:17 UTC (rev 1088) +++ trunk/coser-web/src/main/resources/fr/ifremer/coser/web/package_fr.properties 2012-11-21 17:26:31 UTC (rev 1089) @@ -45,6 +45,8 @@ message.common.jsreadmore=Voir la suite message.common.noresults=Aucun r�sultat disponible. message.common.population=population +message.common.selectall=Tout s�lectionner +message.common.selectnone=Tout d�-s�lectionner message.common.selectfacade=S�lectionnez une fa�ade message.common.selectindicator=S�lectionnez un indicateur message.common.selectpop=S�lectionnez une population @@ -128,7 +130,7 @@ message.search.extract.extract=Extraire message.search.extract.speciesindicators=Esp�ces et indicateurs message.search.extract.title=Extraction des donn�es -message.search.extract.updatelists=Mise � jour des listes +message.search.extract.updatelists=Suite message.search.extract.waittitle=Extraction en cours... message.search.extract.waitparagraph1=Les donn�es sont en cours d''extraction. Merci de patienter. message.search.extract.waitparagraph2=Cette op�ration peut prendre plusieurs minutes dans le cas o� de nombreux graphiques doivent �tre g�n�r�s. Modified: trunk/coser-web/src/main/webapp/WEB-INF/content/search/extract-input.jsp =================================================================== --- trunk/coser-web/src/main/webapp/WEB-INF/content/search/extract-input.jsp 2012-11-21 16:48:17 UTC (rev 1088) +++ trunk/coser-web/src/main/webapp/WEB-INF/content/search/extract-input.jsp 2012-11-21 17:26:31 UTC (rev 1089) @@ -49,10 +49,12 @@ </select></td> <td style="vertical-align:top"> <img src="<s:url value='/images/stock_select_table.png' />" - onClick="javascript:coserSelectAll($('#selectZones'))" /> + onClick="javascript:coserSelectAll($('#selectZones'))" + title="<s:text name="message.common.selectall" />" /> <br /> <img src="<s:url value='/images/stock_select_clear.png' />" - onClick="javascript:coserUnSelectAll($('#selectZones'))" /></td> + onClick="javascript:coserUnSelectAll($('#selectZones'))" + title="<s:text name="message.common.selectnone" />" /></td> </tr> <tr> <td><s:text name="message.common.datatypes" /> :</td> @@ -81,10 +83,12 @@ </select></td> <td style="vertical-align:top"> <img src="<s:url value='/images/stock_select_table.png' />" - onClick="javascript:coserSelectAll($('#selectTypes'))" /> + onClick="javascript:coserSelectAll($('#selectTypes'))" + title="<s:text name="message.common.selectall" />"/> <br /> <img src="<s:url value='/images/stock_select_clear.png' />" - onClick="javascript:coserUnSelectAll($('#selectTypes'))" /></td> + onClick="javascript:coserUnSelectAll($('#selectTypes'))" + title="<s:text name="message.common.selectnone" />" /></td> </tr> <tr> <td colspan="2"><s:submit value="%{getText('message.search.extract.updatelists')}" /></td> @@ -95,26 +99,7 @@ <h2><s:text name="message.search.extract.speciesindicators" /></h2> <table style="width:100%"> - <tr> - <td><s:text name="message.common.species" /> :</td> - <td> - <select name="selectSpecies" multiple="multiple" style="width:100%" size="10" id="selectSpecies"> - <s:iterator value="species" var="specy"> - <option value="<s:property value="key" />" - <s:if test="selectSpecies.contains(#specy.key)"> - selected="selected" - </s:if>> - <s:property value="value" /></option> - </s:iterator> - </select></td> - <td style="vertical-align:top"> - <img src="<s:url value='/images/stock_select_table.png' />" - onClick="javascript:coserSelectAll($('#selectSpecies'))" /> - <br /> - <img src="<s:url value='/images/stock_select_clear.png' />" - onClick="javascript:coserUnSelectAll($('#selectSpecies'))" /></td> - </tr> - <s:if test="comIndicators.size() != 0"> + <s:if test="comIndicators.size() != 0"> <tr> <td><s:text name="message.common.indicatorsof" /><br /> <s:text name="message.common.community" /> :</td> @@ -130,10 +115,12 @@ </select></td> <td style="vertical-align:top"> <img src="<s:url value='/images/stock_select_table.png' />" - onClick="javascript:coserSelectAll($('#selectComIndicators'))" /> + onClick="javascript:coserSelectAll($('#selectComIndicators'))" + title="<s:text name="message.common.selectall" />" /> <br /> <img src="<s:url value='/images/stock_select_clear.png' />" - onClick="javascript:coserUnSelectAll($('#selectComIndicators'))" /></td> + onClick="javascript:coserUnSelectAll($('#selectComIndicators'))" + title="<s:text name="message.common.selectnone" />" /></td> </tr> </s:if> <s:if test="popIndicators.size() != 0"> @@ -152,13 +139,36 @@ </select></td> <td style="vertical-align:top"> <img src="<s:url value='/images/stock_select_table.png' />" - onClick="javascript:coserSelectAll($('#selectPopIndicators'))" /> + onClick="javascript:coserSelectAll($('#selectPopIndicators'))" + title="<s:text name="message.common.selectall" />" /> <br /> <img src="<s:url value='/images/stock_select_clear.png' />" - onClick="javascript:coserUnSelectAll($('#selectPopIndicators'))" /></td> + onClick="javascript:coserUnSelectAll($('#selectPopIndicators'))" + title="<s:text name="message.common.selectnone" />" /></td> </tr> </s:if> <tr> + <td><s:text name="message.common.species" /> :</td> + <td> + <select name="selectSpecies" multiple="multiple" style="width:100%" size="10" id="selectSpecies"> + <s:iterator value="species" var="specy"> + <option value="<s:property value="key" />" + <s:if test="selectSpecies.contains(#specy.key)"> + selected="selected" + </s:if>> + <s:property value="value" /></option> + </s:iterator> + </select></td> + <td style="vertical-align:top"> + <img src="<s:url value='/images/stock_select_table.png' />" + onClick="javascript:coserSelectAll($('#selectSpecies'))" + title="<s:text name="message.common.selectall" />" /> + <br /> + <img src="<s:url value='/images/stock_select_clear.png' />" + onClick="javascript:coserUnSelectAll($('#selectSpecies'))" + title="<s:text name="message.common.selectnone" />" /></td> + </tr> + <tr> <td colspan="2"><s:submit name="submitAction" value="%{getText('message.search.extract.extract')}" /></td> </tr> </table> Modified: trunk/coser-web/src/main/webapp/WEB-INF/content/search/extract-success.jsp =================================================================== --- trunk/coser-web/src/main/webapp/WEB-INF/content/search/extract-success.jsp 2012-11-21 16:48:17 UTC (rev 1088) +++ trunk/coser-web/src/main/webapp/WEB-INF/content/search/extract-success.jsp 2012-11-21 17:26:31 UTC (rev 1089) @@ -53,14 +53,14 @@ <s:iterator value="selectTypes"> <input type="hidden" name="selectTypes" value="<s:property />" /> </s:iterator> - <s:iterator value="selectSpecies"> - <input type="hidden" name="selectSpecies" value="<s:property />" /> + <s:iterator value="selectComIndicators"> + <input type="hidden" name="selectComIndicators" value="<s:property />" /> </s:iterator> <s:iterator value="selectPopIndicators"> <input type="hidden" name="selectPopIndicators" value="<s:property />" /> </s:iterator> - <s:iterator value="selectComIndicators"> - <input type="hidden" name="selectComIndicators" value="<s:property />" /> + <s:iterator value="selectSpecies"> + <input type="hidden" name="selectSpecies" value="<s:property />" /> </s:iterator> <s:checkbox name="accepted" fieldValue="true" label="%{getText('message.quality.acceptance')}"/> <s:submit value="%{getText('message.source.download')}"></s:submit>

1 0