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

[Suiviobsmer-commits] r807 - in trunk: . wao-business wao-ui
by tchemit＠users.labs.libre-entreprise.org Nov. 26, 2010

Nov. 26, 2010

Author: tchemit Date: 2010-11-26 15:53:18 +0000 (Fri, 26 Nov 2010) New Revision: 807 Log: reformat poms optimize dependencies Modified: trunk/pom.xml trunk/wao-business/pom.xml trunk/wao-ui/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-11-26 14:35:58 UTC (rev 806) +++ trunk/pom.xml 2010-11-26 15:53:18 UTC (rev 807) @@ -1,469 +1,504 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - <modelVersion>4.0.0</modelVersion> + <modelVersion>4.0.0</modelVersion> -  -  -  +  +  +  - <parent> - <groupId>org.nuiton</groupId> - <artifactId>mavenpom4labs</artifactId> - <version>2.4.1</version> - </parent> + <parent> + <groupId>org.nuiton</groupId> + <artifactId>mavenpom4labs</artifactId> + <version>2.4.1</version> + </parent> - <groupId>fr.ifremer</groupId> - <artifactId>wao</artifactId> - <version>1.6-SNAPSHOT</version> + <groupId>fr.ifremer</groupId> + <artifactId>wao</artifactId> + <version>1.6-SNAPSHOT</version> - <modules> - <module>wao-ui</module> - <module>wao-business</module> - </modules> + <modules> + <module>wao-ui</module> + <module>wao-business</module> + </modules> - <dependencyManagement> - <dependencies> + <dependencyManagement> + <dependencies> -  - <dependency> - <groupId>org.apache.commons</groupId> - <artifactId>commons-email</artifactId> - <version>1.2</version> - </dependency> - <dependency> - <groupId>org.nuiton</groupId> - <artifactId>nuiton-utils</artifactId> - <version>${nuitonUtilsVersion}</version> - <scope>compile</scope> - <exclusions> - <exclusion> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.nuiton.web</groupId> - <artifactId>nuiton-tapestry-extra</artifactId> - <version>${nuitonWebVersion}</version> - </dependency> -  - <dependency> - <groupId>org.nuiton.topia</groupId> - <artifactId>topia-persistence</artifactId> - <version>${topiaVersion}</version> - </dependency> - <dependency> - <groupId>org.nuiton.topia</groupId> - <artifactId>topia-service-migration</artifactId> - <version>${topiaVersion}</version> - </dependency> - <dependency> - <groupId>org.apache.tapestry</groupId> - <artifactId>tapestry-core</artifactId> - <version>${tapestryVersion}</version> - <scope>compile</scope> - <exclusions> - <exclusion> - <groupId>jboss</groupId> - <artifactId>javassist</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.apache.tapestry</groupId> - <artifactId>tapestry-upload</artifactId> - <version>${tapestryVersion}</version> - </dependency> - <dependency> - <groupId>com.orientimport</groupId> - <artifactId>t5-easy-fckeditor</artifactId> - <version>1.0.4</version> - </dependency> - <dependency> - <groupId>org.chenillekit</groupId> - <artifactId>chenillekit-tapestry</artifactId> - <version>1.2.0</version> - <exclusions> - <exclusion> - <groupId>jboss</groupId> - <artifactId>javassist</artifactId> - </exclusion> - </exclusions> - </dependency> - -  - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> - <version>1.5.10</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - <version>1.5.10</version> - <scope>runtime</scope> - </dependency> -  - <dependency> - <groupId>jfree</groupId> - <artifactId>jfreechart</artifactId> - <version>1.0.12</version> - </dependency> -  - <dependency> - <groupId>de.micromata.jak</groupId> - <artifactId>JavaAPIforKml</artifactId> - <version>2.2.0</version> - <exclusions> - <exclusion> - <groupId>com.sun.xml.bind</groupId> - <artifactId>jaxb-impl</artifactId> - </exclusion> - <exclusion> - <groupId>com.sun.xml.bind</groupId> - <artifactId>jaxb-xjc</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>com.sun.xml.bind</groupId> - <artifactId>jaxb-impl</artifactId> - <version>2.2</version> - </dependency> - <dependency> - <groupId>com.sun.xml.bind</groupId> - <artifactId>jaxb-xjc</artifactId> - <version>2.2</version> - </dependency> -  - <dependency> - <groupId>xerces</groupId> - <artifactId>xercesImpl</artifactId> - <version>2.8.1</version> - </dependency> -  -  -  -  -  -  -  -  -  -  -  - <dependency> - <groupId>net.sourceforge.javacsv</groupId> - <artifactId>javacsv</artifactId> - <version>2.0</version> - </dependency> -  - <dependency> - <groupId>com.h2database</groupId> - <artifactId>h2</artifactId> - <version>1.2.137</version> - </dependency> - <dependency> - <groupId>postgresql</groupId> - <artifactId>postgresql</artifactId> - <version>8.4-701.jdbc4</version> - </dependency> - <dependency> - <groupId>org.jvnet.hudson.winstone</groupId> - <artifactId>winstone</artifactId> - <version>0.9.10-hudson-16</version> - <scope>provided</scope> - </dependency> -  - <dependency> - <groupId>com.formos.tapestry</groupId> - <artifactId>tapestry-testify</artifactId> - <version>1.0.2</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.mockito</groupId> - <artifactId>mockito-core</artifactId> - <version>1.8.4</version> - <scope>test</scope> - </dependency> - </dependencies> - </dependencyManagement> + <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-email</artifactId> + <version>1.2</version> + </dependency> + <dependency> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-utils</artifactId> + <version>${nuitonUtilsVersion}</version> + <scope>compile</scope> + <exclusions> + <exclusion> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.nuiton.i18n</groupId> + <artifactId>nuiton-i18n</artifactId> + <version>${nuitonI18nVersion}</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.nuiton.web</groupId> + <artifactId>nuiton-tapestry-extra</artifactId> + <version>${nuitonWebVersion}</version> + </dependency> +  + <dependency> + <groupId>org.nuiton.topia</groupId> + <artifactId>topia-persistence</artifactId> + <version>${topiaVersion}</version> + </dependency> + <dependency> + <groupId>org.nuiton.topia</groupId> + <artifactId>topia-service-migration</artifactId> + <version>${topiaVersion}</version> + </dependency> + <dependency> + <groupId>org.apache.tapestry</groupId> + <artifactId>tapestry-core</artifactId> + <version>${tapestryVersion}</version> + <scope>compile</scope> + <exclusions> + <exclusion> + <groupId>jboss</groupId> + <artifactId>javassist</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.apache.tapestry</groupId> + <artifactId>tapestry-ioc</artifactId> + <version>${tapestryVersion}</version> + </dependency> + <dependency> + <groupId>org.apache.tapestry</groupId> + <artifactId>tapestry5-annotations</artifactId> + <version>${tapestryVersion}</version> + </dependency> + <dependency> + <groupId>org.apache.tapestry</groupId> + <artifactId>tapestry-upload</artifactId> + <version>${tapestryVersion}</version> + </dependency> + <dependency> + <groupId>com.orientimport</groupId> + <artifactId>t5-easy-fckeditor</artifactId> + <version>1.0.4</version> + </dependency> + <dependency> + <groupId>org.chenillekit</groupId> + <artifactId>chenillekit-tapestry</artifactId> + <version>1.2.0</version> + <exclusions> + <exclusion> + <groupId>jboss</groupId> + <artifactId>javassist</artifactId> + </exclusion> + </exclusions> + </dependency> +  +  + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + <version>1.5.10</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + <version>1.5.10</version> + <scope>runtime</scope> + </dependency> +  + <dependency> + <groupId>jfree</groupId> + <artifactId>jfreechart</artifactId> + <version>${jfreeVersion}</version> + </dependency> + <dependency> + <groupId>jfree</groupId> + <artifactId>jcommon</artifactId> + <version>${jfreeVersion}</version> + </dependency> -  -  -  +  + <dependency> + <groupId>de.micromata.jak</groupId> + <artifactId>JavaAPIforKml</artifactId> + <version>2.2.0</version> + <exclusions> + <exclusion> + <groupId>com.sun.xml.bind</groupId> + <artifactId>jaxb-impl</artifactId> + </exclusion> + <exclusion> + <groupId>com.sun.xml.bind</groupId> + <artifactId>jaxb-xjc</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>com.sun.xml.bind</groupId> + <artifactId>jaxb-impl</artifactId> + <version>2.2</version> + </dependency> + <dependency> + <groupId>com.sun.xml.bind</groupId> + <artifactId>jaxb-xjc</artifactId> + <version>2.2</version> + </dependency> +  + <dependency> + <groupId>xerces</groupId> + <artifactId>xercesImpl</artifactId> + <version>2.8.1</version> + </dependency> - <name>Wao</name> - <description>Application pour le suivi d'embarquements sur des bateaux de pêches dans le cadre - d'observations scientifiques.</description> - <inceptionYear>2009</inceptionYear> + <dependency> + <groupId>xml-apis</groupId> + <artifactId>xml-apis</artifactId> + <version>1.3.03</version> + </dependency> - <organization> - <name>Ifremer</name> - <url>http://www.ifremer.fr/</url> - </organization> +  +  +  +  +  +  +  +  +  +  +  + <dependency> + <groupId>net.sourceforge.javacsv</groupId> + <artifactId>javacsv</artifactId> + <version>2.0</version> + </dependency> - <licenses> - <license> - <name>Affero General Public License (AGPL)</name> - <url>${maven.license.file}</url> - <distribution>local</distribution> - </license> - </licenses> + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-core</artifactId> + <version>${hibernateVersion}</version> + </dependency> -  - <developers> - <developer> - <id>fdesbois</id> - <name>Florian Desbois</name> - <email>fdesbois at codelutin.com</email> - <organization>CodeLutin</organization> - <organizationUrl>http://www.codelutin.com</organizationUrl> - <timezone>+1</timezone> - <roles> - <role>Chef de Projet</role> - <role>Analyste</role> - <role>Développeur</role> - </roles> - </developer> - <developer> - <name>Tony Chemit</name> - <id>tchemit</id> - <email>chemit at codelutin.com</email> - <organization>CodeLutin</organization> - <organizationUrl>http://www.codelutin.com</organizationUrl> - <timezone>+2</timezone> - <roles> - <role>Développeur</role> - </roles> - </developer> - <developer> - <name>Brendan Le Ny</name> - <id>bleny</id> - <email>bleny at codelutin.com</email> - <organization>CodeLutin</organization> - <organizationUrl>http://www.codelutin.com</organizationUrl> - <timezone>+2</timezone> - <roles> - <role>Développeur</role> - </roles> - </developer> - </developers> - - <url>http://suiviobsmer.labs.libre-entreprise.org/suiviobsmer</url> +  + <dependency> + <groupId>com.h2database</groupId> + <artifactId>h2</artifactId> + <version>1.2.137</version> + </dependency> + <dependency> + <groupId>postgresql</groupId> + <artifactId>postgresql</artifactId> + <version>8.4-701.jdbc4</version> + </dependency> + <dependency> + <groupId>org.jvnet.hudson.winstone</groupId> + <artifactId>winstone</artifactId> + <version>0.9.10-hudson-16</version> + <scope>provided</scope> + </dependency> +  + <dependency> + <groupId>com.formos.tapestry</groupId> + <artifactId>tapestry-testify</artifactId> + <version>1.0.2</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.mockito</groupId> + <artifactId>mockito-core</artifactId> + <version>1.8.4</version> + <scope>test</scope> + </dependency> + </dependencies> + </dependencyManagement> - <issueManagement> - <system>gforge</system> - <url>https://${platform}/tracker?group_id=${labs.id}</url> - </issueManagement> - -  -  -  +  +  +  - <packaging>pom</packaging> + <name>Wao</name> + <description>Application pour le suivi d'embarquements sur des bateaux de + pêches dans le cadre + d'observations scientifiques. + </description> + <inceptionYear>2009</inceptionYear> - <properties> + <organization> + <name>Ifremer</name> + <url>http://www.ifremer.fr/</url> + </organization> - <projectId>suiviobsmer</projectId> - <license.licenseName>agpl_v3</license.licenseName> - <labs.id>154</labs.id> - -  - <nuitonI18nVersion>1.2.2</nuitonI18nVersion> - <nuitonUtilsVersion>1.4.2</nuitonUtilsVersion> - <nuitonWebVersion>0.1</nuitonWebVersion> - <topiaVersion>2.4.3</topiaVersion> - <eugeneVersion>2.2</eugeneVersion> - <tapestryVersion>5.1.0.5</tapestryVersion> + <licenses> + <license> + <name>Affero General Public License (AGPL)</name> + <url>${maven.license.file}</url> + <distribution>local</distribution> + </license> + </licenses> - </properties> +  + <developers> + <developer> + <id>fdesbois</id> + <name>Florian Desbois</name> + <email>fdesbois at codelutin.com</email> + <organization>CodeLutin</organization> + <organizationUrl>http://www.codelutin.com</organizationUrl> + <timezone>+1</timezone> + <roles> + <role>Chef de Projet</role> + <role>Analyste</role> + <role>Développeur</role> + </roles> + </developer> + <developer> + <name>Tony Chemit</name> + <id>tchemit</id> + <email>chemit at codelutin.com</email> + <organization>CodeLutin</organization> + <organizationUrl>http://www.codelutin.com</organizationUrl> + <timezone>+2</timezone> + <roles> + <role>developer</role> + </roles> + </developer> + <developer> + <name>Brendan Le Ny</name> + <id>bleny</id> + <email>bleny at codelutin.com</email> + <organization>CodeLutin</organization> + <organizationUrl>http://www.codelutin.com</organizationUrl> + <timezone>+2</timezone> + <roles> + <role>Développeur</role> + </roles> + </developer> + </developers> -  -  -  + <url>http://suiviobsmer.labs.libre-entreprise.org/suiviobsmer</url> - <scm> - <connection>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/trunk</developerConnection> - <url>http://labs.libre-entreprise.org/scm/viewvc.php/trunk/?root=suiviobsmer</url> - </scm> - - <build> - + <issueManagement> + <system>gforge</system> + <url>https://${platform}/tracker?group_id=${labs.id}</url> + </issueManagement> - <pluginManagement> - <plugins> +  +  +  -  - <plugin> - <artifactId>maven-site-plugin</artifactId> - <dependencies> - <dependency> - <groupId>org.nuiton.jrst</groupId> - <artifactId>doxia-module-jrst</artifactId> - <version>${jrstPluginVersion}</version> - </dependency> - </dependencies> - </plugin> + <packaging>pom</packaging> - <plugin> - <groupId>org.nuiton.eugene</groupId> - <artifactId>maven-eugene-plugin</artifactId> - <version>${eugeneVersion}</version> - <configuration> - <inputs>zargo</inputs> - <resolver>org.nuiton.util.FasterCachedResourceResolver</resolver> - </configuration> - <dependencies> - <dependency> - <groupId>org.nuiton.topia</groupId> - <artifactId>topia-persistence</artifactId> - <version>${topiaVersion}</version> - </dependency> - </dependencies> - </plugin> + <properties> - <plugin> - <groupId>org.nuiton.i18n</groupId> - <artifactId>maven-i18n-plugin</artifactId> - <version>${nuitonI18nVersion}</version> - </plugin> + <projectId>suiviobsmer</projectId> + <license.licenseName>agpl_v3</license.licenseName> + <labs.id>154</labs.id> - </plugins> - </pluginManagement> +  + <nuitonI18nVersion>1.2.2</nuitonI18nVersion> + <nuitonUtilsVersion>1.4.2</nuitonUtilsVersion> + <nuitonWebVersion>0.1</nuitonWebVersion> + <topiaVersion>2.4.3</topiaVersion> + <eugeneVersion>2.2</eugeneVersion> + <tapestryVersion>5.1.0.5</tapestryVersion> + <hibernateVersion>3.3.2.GA</hibernateVersion> - </build> + <jfreeVersion>1.0.12</jfreeVersion> -  - <reporting> - <excludeDefaults>true</excludeDefaults> - </reporting> + </properties> -  -  -  +  +  +  -  - <mailingLists> + <scm> + <connection> + 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/trunk + </developerConnection> + <url>http://labs.libre-entreprise.org/scm/viewvc.php/trunk/?root=suiviobsmer + </url> + </scm> - <mailingList> - <name>${projectId}-devel</name> - <subscribe>http://${labs.list.host}/mailman/listinfo/${projectId}-devel</subscribe> - <unsubscribe>http://${labs.list.host}/mailman/listinfo/${projectId}-devel</unsubscribe> - <post>${projectId}-devel(a)${labs.list.host}</post> - <archive>http://${labs.list.host}/pipermail/${projectId}-devel/</archive> - </mailingList> + <build> +  - </mailingLists> + <pluginManagement> + <plugins> -  +  + <plugin> + <artifactId>maven-site-plugin</artifactId> + <dependencies> + <dependency> + <groupId>org.nuiton.jrst</groupId> + <artifactId>doxia-module-jrst</artifactId> + <version>${jrstPluginVersion}</version> + </dependency> + </dependencies> + </plugin> -  + <plugin> + <groupId>org.nuiton.eugene</groupId> + <artifactId>maven-eugene-plugin</artifactId> + <version>${eugeneVersion}</version> + <configuration> + <inputs>zargo</inputs> + <resolver>org.nuiton.util.FasterCachedResourceResolver</resolver> + </configuration> + <dependencies> + <dependency> + <groupId>org.nuiton.topia</groupId> + <artifactId>topia-persistence</artifactId> + <version>${topiaVersion}</version> + </dependency> + </dependencies> + </plugin> -  -  -  -  -  -  -  -  -  -  -  -  + <plugin> + <groupId>org.nuiton.i18n</groupId> + <artifactId>maven-i18n-plugin</artifactId> + <version>${nuitonI18nVersion}</version> + </plugin> -  + </plugins> + </pluginManagement> -  -  -  -  -  -  -  -  -  -  -  -  + </build> -  +  + <reporting> + <excludeDefaults>true</excludeDefaults> + </reporting> -  +  +  +  -  +  + <mailingLists> -  + <mailingList> + <name>${projectId}-devel</name> + <subscribe>http://${labs.list.host}/mailman/listinfo/${projectId}-devel + </subscribe> + <unsubscribe>http://${labs.list.host}/mailman/listinfo/${projectId}-devel + </unsubscribe> + <post>${projectId}-devel(a)${labs.list.host}</post> + <archive>http://${labs.list.host}/pipermail/${projectId}-devel/</archive> + </mailingList> -  -  -  -  -  -  -  -  -  -  -  + </mailingLists> -  +  -  -  -  -  -  -  -  -  -  -  -  -  +  -  +  +  +  +  +  +  +  +  +  +  +  +  +  + +  +  +  +  +  +  +  +  +  +  +  +  + +  + +  + +  + +  + +  +  +  +  +  +  +  +  +  +  +  + +  + +  +  +  +  +  +  +  +  +  +  +  +  + +  + </project> Modified: trunk/wao-business/pom.xml =================================================================== --- trunk/wao-business/pom.xml 2010-11-26 14:35:58 UTC (rev 806) +++ trunk/wao-business/pom.xml 2010-11-26 15:53:18 UTC (rev 807) @@ -1,225 +1,257 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - <modelVersion>4.0.0</modelVersion> + <modelVersion>4.0.0</modelVersion> -  -  -  +  +  +  - <parent> - <groupId>fr.ifremer</groupId> - <artifactId>wao</artifactId> - <version>1.6-SNAPSHOT</version> - </parent> + <parent> + <groupId>fr.ifremer</groupId> + <artifactId>wao</artifactId> + <version>1.6-SNAPSHOT</version> + </parent> - <groupId>fr.ifremer.wao</groupId> - <artifactId>wao-business</artifactId> + <groupId>fr.ifremer.wao</groupId> + <artifactId>wao-business</artifactId> - <dependencies> - <dependency> - <groupId>commons-lang</groupId> - <artifactId>commons-lang</artifactId> - </dependency> - <dependency> - <groupId>commons-io</groupId> - <artifactId>commons-io</artifactId> - </dependency> - <dependency> - <groupId>org.apache.commons</groupId> - <artifactId>commons-email</artifactId> - </dependency> -  - <dependency> - <groupId>org.nuiton</groupId> - <artifactId>nuiton-utils</artifactId> - </dependency> -  - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - </dependency> - <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - </dependency> -  - <dependency> - <groupId>net.sourceforge.javacsv</groupId> - <artifactId>javacsv</artifactId> - </dependency> -  - <dependency> - <groupId>de.micromata.jak</groupId> - <artifactId>JavaAPIforKml</artifactId> - </dependency> - <dependency> - <groupId>com.sun.xml.bind</groupId> - <artifactId>jaxb-impl</artifactId> - </dependency> - <dependency> - <groupId>com.sun.xml.bind</groupId> - <artifactId>jaxb-xjc</artifactId> - </dependency> - <dependency> - <groupId>xerces</groupId> - <artifactId>xercesImpl</artifactId> - </dependency> -  -  -  -  -  -  -  -  -  - <dependency> - <groupId>org.nuiton.topia</groupId> - <artifactId>topia-persistence</artifactId> - </dependency> - <dependency> - <groupId>org.nuiton.topia</groupId> - <artifactId>topia-service-migration</artifactId> - </dependency> -  - <dependency> - <groupId>com.h2database</groupId> - <artifactId>h2</artifactId> - </dependency> - <dependency> - <groupId>postgresql</groupId> - <artifactId>postgresql</artifactId> - </dependency> -  - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - </dependency> - <dependency> - <groupId>org.mockito</groupId> - <artifactId>mockito-core</artifactId> - </dependency> - </dependencies> + <dependencies> + <dependency> + <groupId>commons-collections</groupId> + <artifactId>commons-collections</artifactId> + </dependency> + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </dependency> + <dependency> + <groupId>commons-lang</groupId> + <artifactId>commons-lang</artifactId> + </dependency> + <dependency> + <groupId>commons-io</groupId> + <artifactId>commons-io</artifactId> + </dependency> + <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-email</artifactId> + </dependency> + +  + <dependency> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-utils</artifactId> + </dependency> + <dependency> + <groupId>org.nuiton.i18n</groupId> + <artifactId>nuiton-i18n</artifactId> + </dependency> +  + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + </dependency> + <dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + </dependency> +  + <dependency> + <groupId>net.sourceforge.javacsv</groupId> + <artifactId>javacsv</artifactId> + </dependency> +  + <dependency> + <groupId>de.micromata.jak</groupId> + <artifactId>JavaAPIforKml</artifactId> + </dependency> + <dependency> + <groupId>com.sun.xml.bind</groupId> + <artifactId>jaxb-impl</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>com.sun.xml.bind</groupId> + <artifactId>jaxb-xjc</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>xerces</groupId> + <artifactId>xercesImpl</artifactId> + </dependency> + <dependency> + <groupId>xml-apis</groupId> + <artifactId>xml-apis</artifactId> + </dependency> +  +  +  +  +  +  +  +  +  + <dependency> + <groupId>org.nuiton.topia</groupId> + <artifactId>topia-persistence</artifactId> + </dependency> + <dependency> + <groupId>org.nuiton.topia</groupId> + <artifactId>topia-service-migration</artifactId> + </dependency> + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-core</artifactId> + </dependency> +  + <dependency> + <groupId>com.h2database</groupId> + <artifactId>h2</artifactId> + <scope>test</scope> + </dependency> +  +  +  +  +  + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + </dependency> + <dependency> + <groupId>org.mockito</groupId> + <artifactId>mockito-core</artifactId> + </dependency> + </dependencies> -  -  -  +  +  +  - <name>Wao :: Business</name> - <description>Métier de l'application Wao</description> + <name>Wao :: Business</name> + <description>Métier de l'application Wao</description> -  -  -  +  +  +  - <packaging>jar</packaging> + <packaging>jar</packaging> -  -  -  +  +  +  - <build> -  - <resources> - <resource> - <directory>src/main/filters</directory> - <filtering>true</filtering> - <includes> - <include>Wao.properties</include> - </includes> - </resource> - <resource> - <directory>src/main/resources</directory> - <filtering>false</filtering> - <includes> - <include>**/*</include> - </includes> - </resource> + <build> +  + <resources> + <resource> + <directory>src/main/filters</directory> + <filtering>true</filtering> + <includes> + <include>Wao.properties</include> + </includes> + </resource> + <resource> + <directory>src/main/resources</directory> + <filtering>false</filtering> + <includes> + <include>**/*</include> + </includes> + </resource> - </resources> - <plugins> - <plugin> - <groupId>org.nuiton.eugene</groupId> - <artifactId>maven-eugene-plugin</artifactId> - <executions> - <execution> - <id>generate-entities</id> - <phase>generate-sources</phase> -  - <configuration> -  - <fullPackagePath>fr.ifremer.wao</fullPackagePath> -  - <defaultPackage>fr.ifremer.wao</defaultPackage> - <templates> - org.nuiton.topia.generator.TopiaMetaTransformer, - org.nuiton.eugene.java.JavaBeanTransformer, - org.nuiton.topia.generator.ServiceTransformer, - org.nuiton.eugene.java.JavaInterfaceTransformer, - org.nuiton.topia.generator.BinderHelperTransformer, - org.nuiton.topia.generator.QueryHelperTransformer - </templates> - </configuration> - <goals> - <goal>smart-generate</goal> - </goals> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.nuiton.i18n</groupId> - <artifactId>maven-i18n-plugin</artifactId> - <executions> - <execution> - <configuration> - <entries> - <entry> - <basedir>${maven.gen.dir}/java</basedir> - </entry> - </entries> - </configuration> - <goals> - <goal>parserJava</goal> - <goal>gen</goal> - </goals> - </execution> - <execution> - <id>make-bundle</id> - <configuration> - <bundleOutputName>wao-business</bundleOutputName> - </configuration> - <goals> - <goal>bundle</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> + </resources> + <plugins> + <plugin> + <groupId>org.nuiton.eugene</groupId> + <artifactId>maven-eugene-plugin</artifactId> + <executions> + <execution> + <id>generate-entities</id> + <phase>generate-sources</phase> +  + <configuration> +  + <fullPackagePath>fr.ifremer.wao</fullPackagePath> +  + <defaultPackage>fr.ifremer.wao</defaultPackage> + <templates> + org.nuiton.topia.generator.TopiaMetaTransformer, + org.nuiton.eugene.java.JavaBeanTransformer, + org.nuiton.topia.generator.ServiceTransformer, + org.nuiton.eugene.java.JavaInterfaceTransformer, + org.nuiton.topia.generator.BinderHelperTransformer, + org.nuiton.topia.generator.QueryHelperTransformer + </templates> + </configuration> + <goals> + <goal>smart-generate</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.nuiton.i18n</groupId> + <artifactId>maven-i18n-plugin</artifactId> + <executions> + <execution> + <configuration> + <entries> + <entry> + <basedir>${maven.gen.dir}/java</basedir> + </entry> + </entries> + </configuration> + <goals> + <goal>parserJava</goal> + <goal>gen</goal> + </goals> + </execution> + <execution> + <id>make-bundle</id> + <configuration> + <bundleOutputName>wao-business</bundleOutputName> + </configuration> + <goals> + <goal>bundle</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> - <scm> - <url>http://labs.libre-entreprise.org/scm/viewvc.php/trunk/wao-business/?root=su…</url> - <connection>scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/trunk/wao-business</connection> - <developerConnection>scm:svn:svn+ssh://${username}@labs.libre-entreprise.org/svnroot/suiviobsmer/trunk/wao-business</developerConnection> - </scm> + <scm> + <url> + http://labs.libre-entreprise.org/scm/viewvc.php/trunk/wao-business/?root=su… + </url> + <connection> + scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/trunk/wao-business + </connection> + <developerConnection> + scm:svn:svn+ssh://${username}@labs.libre-entreprise.org/svnroot/suiviobsmer/trunk/wao-business + </developerConnection> + </scm> -  -  -  -  -  -  -  -  -  -  -  +  +  +  +  +  +  +  +  +  +  +  </project> Modified: trunk/wao-ui/pom.xml =================================================================== --- trunk/wao-ui/pom.xml 2010-11-26 14:35:58 UTC (rev 806) +++ trunk/wao-ui/pom.xml 2010-11-26 15:53:18 UTC (rev 807) @@ -1,235 +1,285 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - <modelVersion>4.0.0</modelVersion> + <modelVersion>4.0.0</modelVersion> -  -  -  +  +  +  - <parent> - <groupId>fr.ifremer</groupId> - <artifactId>wao</artifactId> - <version>1.6-SNAPSHOT</version> - </parent> + <parent> + <groupId>fr.ifremer</groupId> + <artifactId>wao</artifactId> + <version>1.6-SNAPSHOT</version> + </parent> - <groupId>fr.ifremer.wao</groupId> - <artifactId>wao-ui</artifactId> + <groupId>fr.ifremer.wao</groupId> + <artifactId>wao-ui</artifactId> - <dependencies> -  - <dependency> - <groupId>fr.ifremer.wao</groupId> - <artifactId>wao-business</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>commons-lang</groupId> - <artifactId>commons-lang</artifactId> - </dependency> -  - <dependency> - <groupId>org.nuiton</groupId> - <artifactId>nuiton-utils</artifactId> - </dependency> - <dependency> - <groupId>org.nuiton.web</groupId> - <artifactId>nuiton-tapestry-extra</artifactId> - </dependency> -  - <dependency> - <groupId>org.apache.tapestry</groupId> - <artifactId>tapestry-core</artifactId> - </dependency> - <dependency> - <groupId>org.apache.tapestry</groupId> - <artifactId>tapestry-upload</artifactId> - </dependency> - <dependency> - <groupId>org.chenillekit</groupId> - <artifactId>chenillekit-tapestry</artifactId> - </dependency> - <dependency> - <groupId>com.orientimport</groupId> - <artifactId>t5-easy-fckeditor</artifactId> - </dependency> -  - <dependency> - <groupId>jfree</groupId> - <artifactId>jfreechart</artifactId> - </dependency> -  - - <dependency> - <groupId>com.formos.tapestry</groupId> - <artifactId>tapestry-testify</artifactId> - </dependency> - <dependency> - <groupId>org.mockito</groupId> - <artifactId>mockito-core</artifactId> - </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>4.7</version> - </dependency> -  - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - </dependency> -  - <dependency> - <groupId>org.jvnet.hudson.winstone</groupId> - <artifactId>winstone</artifactId> - <scope>provided</scope> - </dependency> - </dependencies> + <dependencies> +  + <dependency> + <groupId>fr.ifremer.wao</groupId> + <artifactId>wao-business</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>commons-collections</groupId> + <artifactId>commons-collections</artifactId> + </dependency> + <dependency> + <groupId>commons-lang</groupId> + <artifactId>commons-lang</artifactId> + </dependency> +  + <dependency> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-utils</artifactId> + </dependency> + <dependency> + <groupId>org.nuiton.web</groupId> + <artifactId>nuiton-tapestry-extra</artifactId> + <scope>runtime</scope> + </dependency> +  + <dependency> + <groupId>org.apache.tapestry</groupId> + <artifactId>tapestry-core</artifactId> + </dependency> + <dependency> + <groupId>org.apache.tapestry</groupId> + <artifactId>tapestry-ioc</artifactId> + </dependency> + <dependency> + <groupId>org.apache.tapestry</groupId> + <artifactId>tapestry5-annotations</artifactId> + </dependency> + <dependency> + <groupId>org.apache.tapestry</groupId> + <artifactId>tapestry-upload</artifactId> + </dependency> + <dependency> + <groupId>org.chenillekit</groupId> + <artifactId>chenillekit-tapestry</artifactId> + </dependency> + <dependency> + <groupId>com.orientimport</groupId> + <artifactId>t5-easy-fckeditor</artifactId> + <scope>runtime</scope> + </dependency> +  + <dependency> + <groupId>jfree</groupId> + <artifactId>jfreechart</artifactId> + </dependency> + <dependency> + <groupId>jfree</groupId> + <artifactId>jcommon</artifactId> + </dependency> + <dependency> + <groupId>com.sun.xml.bind</groupId> + <artifactId>jaxb-impl</artifactId> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>com.sun.xml.bind</groupId> + <artifactId>jaxb-xjc</artifactId> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>org.nuiton.topia</groupId> + <artifactId>topia-persistence</artifactId> + </dependency> + <dependency> + <groupId>com.h2database</groupId> + <artifactId>h2</artifactId> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>postgresql</groupId> + <artifactId>postgresql</artifactId> + <scope>runtime</scope> + </dependency> +  +  + <dependency> + <groupId>com.formos.tapestry</groupId> + <artifactId>tapestry-testify</artifactId> + </dependency> + <dependency> + <groupId>org.mockito</groupId> + <artifactId>mockito-core</artifactId> + </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + </dependency> +  + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + </dependency> +  + <dependency> + <groupId>org.jvnet.hudson.winstone</groupId> + <artifactId>winstone</artifactId> + <scope>provided</scope> + </dependency> + </dependencies> -  -  -  - <name>Wao :: Web Interface</name> - <description>Interface utilisateur du Wao</description> +  +  +  -  -  -  + <name>Wao :: Web Interface</name> + <description>Interface utilisateur du Wao</description> - <packaging>war</packaging> +  +  +  -  -  -  - <build> -  -  + <packaging>war</packaging> -  +  +  +  + <build> +  +  + +  + <plugins> + + <plugin> + <groupId>org.nuiton.i18n</groupId> + <artifactId>maven-i18n-plugin</artifactId> + <executions> + <execution> + <goals> + <goal>tapestry-bundle</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> + <artifactId>maven-war-plugin</artifactId> + <configuration> + <archive> + <manifest> + <mainClass>org.nuiton.util.war.WinstoneLauncher</mainClass> + </manifest> + </archive> + <overlays> + <overlay> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-utils</artifactId> + <type>jar</type> + <includes> + <include>**/war/Winstone*</include> + </includes> + </overlay> + <overlay> + <groupId>org.jvnet.hudson.winstone</groupId> + <artifactId>winstone</artifactId> + <type>jar</type> + </overlay> + </overlays> + </configuration> + </plugin> + +  + + </plugins> + </build> + <profiles> + <profile> + <id>release-profile</id> + <activation> + <property> + <name>performRelease</name> + <value>true</value> + </property> + </activation> + <build> <plugins> - - <plugin> - <groupId>org.nuiton.i18n</groupId> - <artifactId>maven-i18n-plugin</artifactId> - <executions> - <execution> - <goals> - <goal>tapestry-bundle</goal> - </goals> - </execution> - </executions> - </plugin> - <plugin> - <artifactId>maven-war-plugin</artifactId> - <configuration> - <archive> - <manifest> - <mainClass>org.nuiton.util.war.WinstoneLauncher</mainClass> - </manifest> - </archive> - <overlays> - <overlay> - <groupId>org.nuiton</groupId> - <artifactId>nuiton-utils</artifactId> - <type>jar</type> - <includes> - <include>**/war/Winstone*</include> - </includes> - </overlay> - <overlay> - <groupId>org.jvnet.hudson.winstone</groupId> - <artifactId>winstone</artifactId> - <type>jar</type> - </overlay> - </overlays> - </configuration> - </plugin> - - - + <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <configuration> + <finalName>wao-${project.version}</finalName> + <descriptors> + <descriptor>src/main/assembly/bin.xml</descriptor> + </descriptors> + <attach>false</attach> + </configuration> + <executions> + <execution> + <phase>verify</phase> + <goals> + <goal>single</goal> + </goals> + </execution> + </executions> + </plugin> </plugins> - </build> - <profiles> - <profile> - <id>release-profile</id> - <activation> - <property> - <name>performRelease</name> - <value>true</value> - </property> - </activation> - <build> - <plugins> - <plugin> - <artifactId>maven-assembly-plugin</artifactId> - <configuration> - <finalName>wao-${project.version}</finalName> - <descriptors> - <descriptor>src/main/assembly/bin.xml</descriptor> - </descriptors> - <attach>false</attach> - </configuration> - <executions> - <execution> - <phase>verify</phase> - <goals> - <goal>single</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> - </profiles> - - <repositories> + </build> + </profile> + </profiles> -  - <repository> - <id>m2-release-repository.orientimport.kenai.com</id> - <name>Orient Import Oy Maven Release Repository</name> - <url>http://kenai.com/svn/t5-easy-fckeditor~maven-release-repository</url> - <layout>default</layout> - </repository> + <repositories> - <repository> - <id>tapestry</id> - <name>Tapestry Formos</name> - <url>http://tapestry.formos.com/maven-repository</url> - </repository> - - </repositories> - - <scm> - <url>http://labs.libre-entreprise.org/scm/viewvc.php/trunk/wao-ui/?root=suiviobs…</url> - <connection>scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/trunk/wao-ui</connection> - <developerConnection>scm:svn:svn+ssh://tchemit at labs.libre-entreprise.org/svnroot/suiviobsmer/trunk/wao-ui</developerConnection> - </scm> +  + <repository> + <id>m2-release-repository.orientimport.kenai.com</id> + <name>Orient Import Oy Maven Release Repository</name> + <url>http://kenai.com/svn/t5-easy-fckeditor~maven-release-repository</url> + <layout>default</layout> + </repository> + <repository> + <id>tapestry</id> + <name>Tapestry Formos</name> + <url>http://tapestry.formos.com/maven-repository</url> + </repository> + + </repositories> + + <scm> + <url> + http://labs.libre-entreprise.org/scm/viewvc.php/trunk/wao-ui/?root=suiviobs… + </url> + <connection> + scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/trunk/wao-ui + </connection> + <developerConnection> + scm:svn:svn+ssh://tchemit at labs.libre-entreprise.org/svnroot/suiviobsmer/trunk/wao-ui + </developerConnection> + </scm> + </project>

1 0

[Suiviobsmer-commits] r806 - trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/base
by bleny＠users.labs.libre-entreprise.org Nov. 26, 2010

Nov. 26, 2010

Author: bleny Date: 2010-11-26 14:35:58 +0000 (Fri, 26 Nov 2010) New Revision: 806 Log: bug fix Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/base/AbstractFilteredPage.java Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/base/AbstractFilteredPage.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/base/AbstractFilteredPage.java 2010-11-26 14:14:35 UTC (rev 805) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/base/AbstractFilteredPage.java 2010-11-26 14:35:58 UTC (rev 806) @@ -147,20 +147,24 @@ public void onSelectedFromAddSampleRowCode() { + if (sampleRowId != null) { - List<SampleRow> rows = getFilter().getSampleRows(); - if (rows == null) { - rows = new ArrayList<SampleRow>(); - getFilter().setSampleRows(rows); + List<SampleRow> rows = getFilter().getSampleRows(); + if (rows == null) { + rows = new ArrayList<SampleRow>(); + getFilter().setSampleRows(rows); + } + rows.add(getSampleRowSelectModel().findObject(sampleRowId)); + + edited = true; } - rows.add(getSampleRowSelectModel().findObject(sampleRowId)); - - edited = true; } public void onSelectedFromRemoveSampleRowCode() { - getFilter().getSampleRows().remove(getSampleRowSelectModel().findObject(sampleRowId)); - edited = true; + if (sampleRowId != null) { + getFilter().getSampleRows().remove(getSampleRowSelectModel().findObject(sampleRowId)); + edited = true; + } } /**

1 0

Nov. 26, 2010

Author: bleny Date: 2010-11-26 14:14:35 +0000 (Fri, 26 Nov 2010) New Revision: 805 Log: add property prefix in entities ; changelog Modified: trunk/changelog.txt trunk/wao-business/src/main/java/fr/ifremer/wao/WaoQueryBuilder.java trunk/wao-business/src/main/java/fr/ifremer/wao/bean/ContactStatus.java trunk/wao-business/src/main/java/fr/ifremer/wao/entity/BoatInfosImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/io/ContactInput.java trunk/wao-business/src/main/java/fr/ifremer/wao/service/ActivityCalendarImport.java trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceBoatImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceContactImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceNewsImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceReferentialImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSamplingImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSynthesisImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceUserImpl.java trunk/wao-business/src/main/resources/i18n/wao-business-fr_FR.properties trunk/wao-business/src/main/xmi/wao.properties trunk/wao-business/src/test/java/fr/ifremer/wao/AbstractServiceTest.java trunk/wao-business/src/test/java/fr/ifremer/wao/ErrorDB1_0Test.java trunk/wao-business/src/test/java/fr/ifremer/wao/entity/BoatImplTest.java trunk/wao-business/src/test/java/fr/ifremer/wao/entity/SampleRowImplTest.java trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceBoatImplTest.java trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceContactInternalTest.java trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceSamplingImplTest.java trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceSynthesisImplTest.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/base/AbstractFilteredPage.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/data/FiltersModel.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Administration.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/SampleRowForm.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/services/ContactModelFactory.java Modified: trunk/changelog.txt =================================================================== --- trunk/changelog.txt 2010-11-26 13:13:45 UTC (rev 804) +++ trunk/changelog.txt 2010-11-26 14:14:35 UTC (rev 805) @@ -3,6 +3,19 @@ Historique des versions +1.6 +--- + +Evolution ++++++++++ + +- [bleny] Evo #2562 : ajout de la synthèse globale +- [bleny] Evo #2561 : factorisation des filtres de la synthèse +- [bleny] Evo #2556 : ajout du critère qualité de la donnée +- [bleny] Evo #2563 : mise en valeur des lignes modifiées dans le plan d'échantillonage +- [bleny] Evo #2365 : Amélioration cartographie des contacts +- [bleny] Evo #2353 : Décomposition code métier DCF + 1.5.4 ----- Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/WaoQueryBuilder.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/WaoQueryBuilder.java 2010-11-26 13:13:45 UTC (rev 804) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/WaoQueryBuilder.java 2010-11-26 14:14:35 UTC (rev 805) @@ -570,7 +570,7 @@ filter.setPeriod(period); if (filter.isSortedByBoardingDate()) { - query.addOrder(contactProperty.$property(Contact.TIDE_BEGIN_DATE + " DESC")); + query.addOrder(contactProperty.$property(Contact.PROPERTY_TIDE_BEGIN_DATE + " DESC")); } // ORDER_BY Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/bean/ContactStatus.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/bean/ContactStatus.java 2010-11-26 13:13:45 UTC (rev 804) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/bean/ContactStatus.java 2010-11-26 14:14:35 UTC (rev 805) @@ -255,8 +255,8 @@ period.initDayOfMonthExtremities(); // Bind sampleMonth.sampleRow with contact sampleRow - query.addEquals(SampleMonth.SAMPLE_ROW, sampleRow). - addBetween(SampleMonth.PERIOD_DATE, period.getFromDate(), period.getThruDate()); + query.addEquals(SampleMonth.PROPERTY_SAMPLE_ROW, sampleRow). + addBetween(SampleMonth.PROPERTY_PERIOD_DATE, period.getFromDate(), period.getThruDate()); //add(SampleMonth.PERIOD_DATE, period); SampleMonth result = monthDAO.findByQuery(query); if (result == null) { Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/entity/BoatInfosImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/entity/BoatInfosImpl.java 2010-11-26 13:13:45 UTC (rev 804) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/entity/BoatInfosImpl.java 2010-11-26 14:14:35 UTC (rev 805) @@ -72,7 +72,7 @@ dao.createQueryDoneContactsFromDate(getBoat(), fromDate); String companyProperty = - TopiaQuery.getProperty(query.getMainAlias(), Contact.OBSERVER, WaoUser.COMPANY); + TopiaQuery.getProperty(query.getMainAlias(), Contact.PROPERTY_OBSERVER, WaoUser.PROPERTY_COMPANY); query.addEquals(companyProperty, getCompany()); Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/io/ContactInput.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/io/ContactInput.java 2010-11-26 13:13:45 UTC (rev 804) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/io/ContactInput.java 2010-11-26 14:14:35 UTC (rev 805) @@ -98,7 +98,7 @@ throw new ImportRefusedException( "Etat du contact invalide '" + state + "', " + "valeurs possibles : " + - ContactState.availableStates(), rowNumber, STATE); + ContactState.availableStates(), rowNumber, PROPERTY_STATE); } setContactState(contactState); } @@ -117,7 +117,7 @@ WaoUser user = userDAO.findByLogin(observerLogin); if (user == null) { throw new ImportRefusedException("Utilisateur inexistant avec " + - "l'identifiant : " + observerLogin, rowNumber, OBSERVER); + "l'identifiant : " + observerLogin, rowNumber, PROPERTY_OBSERVER); } setObserver(user); } @@ -145,7 +145,7 @@ "L'observateur avec pour login '" + observer.getLogin() + "' n'appartient pas à votre société !", rowNumber, - WaoUser.COMPANY); + WaoUser.PROPERTY_COMPANY); } } } @@ -179,12 +179,12 @@ } SampleRowDAO dao = WaoDAOHelper.getSampleRowDAO(transaction); SampleRow rowFound = dao.findByProperties( - SampleRow.CODE, sampleRowCode, - SampleRow.COMPANY, company); + SampleRow.PROPERTY_CODE, sampleRowCode, + SampleRow.PROPERTY_COMPANY, company); if(rowFound == null) { throw new ImportRefusedException("Ligne d'échantillon inexistante" + " ou incompatible avec la société pour le code : " + - sampleRowCode, rowNumber, SAMPLE_ROW); + sampleRowCode, rowNumber, PROPERTY_SAMPLE_ROW); } setSampleRow(rowFound); } @@ -203,7 +203,7 @@ if(boatFound == null) { throw new ImportRefusedException("Navire inexistant avec" + " l'immatriculation : " + boatImmatriculation, - rowNumber, BOAT); + rowNumber, PROPERTY_BOAT); } setBoat(boatFound); } Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ActivityCalendarImport.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/service/ActivityCalendarImport.java 2010-11-26 13:13:45 UTC (rev 804) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ActivityCalendarImport.java 2010-11-26 14:14:35 UTC (rev 805) @@ -197,8 +197,8 @@ if (calendar == null) { calendar = calendarDAO.findByProperties( - ActivityCalendar.BOAT, boat, - ActivityCalendar.YEAR, year); + ActivityCalendar.PROPERTY_BOAT, boat, + ActivityCalendar.PROPERTY_YEAR, year); // Create it if not exist in Database if (calendar == null) { @@ -207,9 +207,9 @@ int fiability = ImportHelper.readInt(reader, ACTIVITY_CALENDAR.INDQ_COD); calendar = calendarDAO.create( - ActivityCalendar.BOAT, key.boat(), - ActivityCalendar.YEAR, key.year(), - ActivityCalendar.FIABILITY, fiability); + ActivityCalendar.PROPERTY_BOAT, key.boat(), + ActivityCalendar.PROPERTY_YEAR, key.year(), + ActivityCalendar.PROPERTY_FIABILITY, fiability); calendar.setActivityMonth(new ArrayList<ActivityMonth>()); } @@ -231,8 +231,8 @@ if (month == null) { month = monthDAO.create( - ActivityMonth.ACTIVITY_CALENDAR, calendar, - ActivityMonth.MONTH, monthNum); + ActivityMonth.PROPERTY_ACTIVITY_CALENDAR, calendar, + ActivityMonth.PROPERTY_MONTH, monthNum); month.setActivityProfession(new ArrayList<ActivityProfession>()); @@ -268,8 +268,8 @@ if (profession == null) { profession = professionDAO.create( - ActivityProfession.ACTIVITY_MONTH, month, - ActivityProfession.PROFESSION_ORDER, professionOrder); + ActivityProfession.PROPERTY_ACTIVITY_MONTH, month, + ActivityProfession.PROPERTY_PROFESSION_ORDER, professionOrder); profession.setActivityZone(new ArrayList<ActivityZone>()); @@ -290,8 +290,8 @@ if (zone == null) { zone = zoneDAO.create( - ActivityZone.ZONE_CODE, zoneCode, - ActivityZone.ACTIVITY_PROFESSION, profession); + ActivityZone.PROPERTY_ZONE_CODE, zoneCode, + ActivityZone.PROPERTY_ACTIVITY_PROFESSION, profession); profession.addActivityZone(zone); } Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceBoatImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceBoatImpl.java 2010-11-26 13:13:45 UTC (rev 804) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceBoatImpl.java 2010-11-26 14:14:35 UTC (rev 805) @@ -131,14 +131,14 @@ TopiaQuery query = builder.applyBoatFilter(filter); - query.addLoad(Boat.ACTIVITY_CALENDAR); + query.addLoad(Boat.PROPERTY_ACTIVITY_CALENDAR); if (logger.isDebugEnabled()) { logger.debug("Query : " + query); } Map<Integer, Boat> results = dao.findAllMappedByQuery(query, - Boat.IMMATRICULATION, Integer.class); + Boat.PROPERTY_IMMATRICULATION, Integer.class); return results; } @@ -196,7 +196,7 @@ BoatInfosDAO boatInfosDAO = WaoDAOHelper.getBoatInfosDAO(transaction); BoatInfos boatInfos = boatInfosDAO.findByProperties( - BoatInfos.BOAT, boat, BoatInfos.COMPANY, company); + BoatInfos.PROPERTY_BOAT, boat, BoatInfos.PROPERTY_COMPANY, company); if (boatInfos == null) { boatInfos = new BoatInfosImpl(); boatInfos.setBoat(boat); @@ -229,7 +229,7 @@ // Last contact ContactDAO contactDAO = WaoDAOHelper.getContactDAO(transaction); TopiaQuery query = contactDAO.createQueryLastContactForBoat(boat, company). - addLoad(Contact.SAMPLE_ROW, Contact.OBSERVER); + addLoad(Contact.PROPERTY_SAMPLE_ROW, Contact.PROPERTY_OBSERVER); Contact contact = contactDAO.findByQuery(query); @@ -332,8 +332,8 @@ List<String> boatNames = dao.createQuery(). addDistinct(). - setSelect(Boat.NAME). - addWhere(Boat.NAME, Op.LIKE, input + "%"). + setSelect(Boat.PROPERTY_NAME). + addWhere(Boat.PROPERTY_NAME, Op.LIKE, input + "%"). execute(transaction); return boatNames; @@ -446,7 +446,7 @@ if (boat == null) { boat = boatDAO.create( - Boat.IMMATRICULATION, immatriculation); + Boat.PROPERTY_IMMATRICULATION, immatriculation); result[1]++; } boat.setName(boatName); @@ -464,7 +464,7 @@ if (district == null) { district = districtDAO.findByCode(districtCode); if (district == null) { - district = districtDAO.create(BoatDistrict.CODE, districtCode); + district = districtDAO.create(BoatDistrict.PROPERTY_CODE, districtCode); } availableDistricts.put(districtCode, district); } @@ -481,7 +481,7 @@ // If not exist yet, create it if (shipOwner == null) { shipOwner = shipOwnerDAO.create( - ShipOwner.CODE, shipOwnerCode); + ShipOwner.PROPERTY_CODE, shipOwnerCode); } availableShipOwners.put(shipOwnerCode, shipOwner); 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 2010-11-26 13:13:45 UTC (rev 804) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceContactImpl.java 2010-11-26 14:14:35 UTC (rev 805) @@ -141,8 +141,8 @@ // addLoad(contactProperty.observerProperty().company(), // contactProperty.sampleRowProperty().sampleMonth()); // TODO-fdesbois-2010-06-18 : manage aliases in addLoad - addLoad(TopiaQuery.getProperty(Contact.OBSERVER, WaoUser.COMPANY), - TopiaQuery.getProperty(Contact.SAMPLE_ROW, SampleRow.SAMPLE_MONTH) + addLoad(TopiaQuery.getProperty(Contact.PROPERTY_OBSERVER, WaoUser.PROPERTY_COMPANY), + TopiaQuery.getProperty(Contact.PROPERTY_SAMPLE_ROW, SampleRow.PROPERTY_SAMPLE_MONTH) // TopiaQuery.getProperty(Contact.SAMPLE_ROW, SampleRow.PROFESSION, Profession.DCF5CODE) ); @@ -282,8 +282,8 @@ } destination = dao.create( - Contact.BOAT, source.getBoat(), - Contact.SAMPLE_ROW, source.getSampleRow(), + Contact.PROPERTY_BOAT, source.getBoat(), + Contact.PROPERTY_SAMPLE_ROW, source.getSampleRow(), // FIXME-FD20100415 : don't use the topiaCreateDate as a business field TopiaEntity.TOPIA_CREATE_DATE, source.getTopiaCreateDate() ); @@ -300,8 +300,8 @@ //BinderProvider.getBinder(Contact.class).copy(source, destination); WaoBinderHelper.getSimpleTopiaBinder(Contact.class). copyExcluding(source, destination, - Contact.BOAT, - Contact.SAMPLE_ROW + Contact.PROPERTY_BOAT, + Contact.PROPERTY_SAMPLE_ROW ); // Update the change @@ -543,15 +543,15 @@ // Retrieve the existing contact String companyProperty = - TopiaQuery.getProperty(Contact.OBSERVER, - WaoUser.COMPANY); + TopiaQuery.getProperty(Contact.PROPERTY_OBSERVER, + WaoUser.PROPERTY_COMPANY); Contact contact = dao.findByProperties( TopiaEntity.TOPIA_CREATE_DATE, contactCsv.getTopiaCreateDate(), companyProperty, contactCsv.getCompany(), - Contact.BOAT, contactCsv.getBoat(), - Contact.SAMPLE_ROW, contactCsv.getSampleRow()); + Contact.PROPERTY_BOAT, contactCsv.getBoat(), + Contact.PROPERTY_SAMPLE_ROW, contactCsv.getSampleRow()); // Seems to have a problem with companyProperty ?!? using // DAOLegacy (criteria) @@ -559,7 +559,7 @@ // addEquals(TopiaEntity.TOPIA_CREATE_DATE, // contactCsv.getTopiaCreateDate()). // addEquals(companyProperty, contactCsv.getCompany()). -// addEquals(Contact.BOAT, contactCsv.getBoat()). +// addEquals(Contact.PROPERTY_BOAT, contactCsv.getBoat()). // addEquals(Contact.SAMPLE_ROW, // contactCsv.getSampleRow()); // Contact contact = dao.findByQuery(query); @@ -570,7 +570,7 @@ throw new ImportRefusedException("Le contact est" + " déjà validé dans l'application" + " et ne peut pas être importé", currRow, - Contact.VALIDATION_COMPANY); + Contact.PROPERTY_VALIDATION_COMPANY); } // Create elligibleBoat if needed before saving the contact @@ -592,7 +592,7 @@ dateFormat.format(contact.getTideBeginDate()) + " pour la ligne du plan " + contactCsv.getSampleRow().getCode(), currRow, - Contact.TIDE_BEGIN_DATE, eee); + Contact.PROPERTY_TIDE_BEGIN_DATE, eee); } result.incNbImported(); @@ -853,14 +853,14 @@ WaoDAOHelper.getElligibleBoatDAO(transaction); ElligibleBoat elligible = elligibleDAO.findByProperties( - ElligibleBoat.BOAT, contact.getBoat(), - ElligibleBoat.SAMPLE_ROW, contact.getSampleRow()); + ElligibleBoat.PROPERTY_BOAT, contact.getBoat(), + ElligibleBoat.PROPERTY_SAMPLE_ROW, contact.getSampleRow()); if (elligible == null) { // Create new elligible boat not active in a global way elligible = elligibleDAO.create( - ElligibleBoat.BOAT, boat, - ElligibleBoat.SAMPLE_ROW, row); + ElligibleBoat.PROPERTY_BOAT, boat, + ElligibleBoat.PROPERTY_SAMPLE_ROW, row); if (log.isTraceEnabled()) { log.trace("Create elligibleBoat for : " + boat.getImmatriculation() + " - " + Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceNewsImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceNewsImpl.java 2010-11-26 13:13:45 UTC (rev 804) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceNewsImpl.java 2010-11-26 14:14:35 UTC (rev 805) @@ -85,7 +85,7 @@ String newsAlias = "N"; String companyProperty = - TopiaQuery.getProperty(newsAlias, News.COMPANY); + TopiaQuery.getProperty(newsAlias, News.PROPERTY_COMPANY); String createDateProperty = TopiaQuery.getProperty(newsAlias, News.TOPIA_CREATE_DATE); Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceReferentialImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceReferentialImpl.java 2010-11-26 13:13:45 UTC (rev 804) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceReferentialImpl.java 2010-11-26 14:14:35 UTC (rev 805) @@ -42,7 +42,6 @@ import org.nuiton.topia.TopiaContext; import org.nuiton.topia.TopiaException; import org.nuiton.topia.framework.TopiaQuery; -import org.nuiton.topia.framework.TopiaQuery.Op; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -194,7 +193,7 @@ FishingZone zone = dao.findByDistrictCode(districtCode); if (zone == null) { - zone = dao.create(FishingZone.DISTRICT_CODE, districtCode); + zone = dao.create(FishingZone.PROPERTY_DISTRICT_CODE, districtCode); } zone.setFacadeName(facadeName); zone.setSectorName(sectorName); 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 2010-11-26 13:13:45 UTC (rev 804) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSamplingImpl.java 2010-11-26 14:14:35 UTC (rev 805) @@ -180,10 +180,10 @@ // DCF5 code to be considered equals. targetSpecies as to be null // if asked TopiaQuery query = dao.createQuery() - .addEquals(DCF5Code.FISHING_GEAR_DCF, foundGearCode) + .addEquals(DCF5Code.PROPERTY_FISHING_GEAR_DCF, foundGearCode) // next line may result in a "IS NULL", exactly what we want - .addEquals(DCF5Code.TARGET_SPECIES_DCF, foundSpeciesCode); + .addEquals(DCF5Code.PROPERTY_TARGET_SPECIES_DCF, foundSpeciesCode); DCF5Code foundCode = dao.findByQuery(query); @@ -493,10 +493,10 @@ SampleRowDAO dao = WaoDAOHelper.getSampleRowDAO(transaction); TopiaQuery query = dao.createQuery(). addDistinct(). - setSelect(SampleRow.PROGRAM_NAME); + setSelect(SampleRow.PROPERTY_PROGRAM_NAME); if (company != null) { - query.addEquals(SampleRow.COMPANY, company); + query.addEquals(SampleRow.PROPERTY_COMPANY, company); } List<String> programs = transaction.findByQuery(query); @@ -569,13 +569,13 @@ SampleRowDAO dao = WaoDAOHelper.getSampleRowDAO(transaction); TopiaQuery query = dao.createQuery(). - addEquals(SampleRow.CODE, sampleRowCode); + addEquals(SampleRow.PROPERTY_CODE, sampleRowCode); if (!user.isAdmin() && !user.isGuest()) { - query.addEquals(SampleRow.COMPANY, user.getCompany()); + query.addEquals(SampleRow.PROPERTY_COMPANY, user.getCompany()); } - query.addLoad(SampleRow.SAMPLE_ROW_LOG); + query.addLoad(SampleRow.PROPERTY_SAMPLE_ROW_LOG); SampleRow result = dao.findByQuery(query); if (result == null) { @@ -597,7 +597,7 @@ // Check if contacts exists linked with this sampleRow, no delete permitted in this case. ContactDAO contactDAO = WaoDAOHelper.getContactDAO(transaction); - if (contactDAO.existByProperties(Contact.SAMPLE_ROW, sampleRow)) { + if (contactDAO.existByProperties(Contact.PROPERTY_SAMPLE_ROW, sampleRow)) { throw new WaoBusinessException("Des contacts liés à cette ligne" + " existent, aucune suppression n'est possible."); } @@ -626,8 +626,8 @@ String maxCode = dao.createQuery(). - addWhere(SampleRow.CODE, Op.LIKE, year + "_%"). - executeToString(transaction, "MAX(" + SampleRow.CODE + ")"); + addWhere(SampleRow.PROPERTY_CODE, Op.LIKE, year + "_%"). + executeToString(transaction, "MAX(" + SampleRow.PROPERTY_CODE + ")"); if (log.isDebugEnabled()) { log.debug("Max code found : " + maxCode); @@ -922,7 +922,7 @@ result.addError(currRow, "[CODE = " + code + "] refusé : Zone de pêche non renseigné"); result.incNbRefused(); //nbRefused++; } else { - row = dao.create(SampleRow.CODE, code); + row = dao.create(SampleRow.PROPERTY_CODE, code); String companyName = ImportHelper.read(reader, SAMPLING.SOCIETE_NOM); @@ -1130,8 +1130,8 @@ if (month == null) { month = dao.create( - SampleMonth.SAMPLE_ROW, sampleRow, - SampleMonth.PERIOD_DATE, monthDate); + SampleMonth.PROPERTY_SAMPLE_ROW, sampleRow, + SampleMonth.PROPERTY_PERIOD_DATE, monthDate); sampleRow.addSampleMonth(month); } month.setExpectedTidesValue(monthValue); Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSynthesisImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSynthesisImpl.java 2010-11-26 13:13:45 UTC (rev 804) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSynthesisImpl.java 2010-11-26 14:14:35 UTC (rev 805) @@ -410,19 +410,19 @@ // Prepare properties for query String contactAlias = query.getMainAlias(); String sampleRowProperty = - TopiaQuery.getProperty(contactAlias, Contact.SAMPLE_ROW); + TopiaQuery.getProperty(contactAlias, Contact.PROPERTY_SAMPLE_ROW); String nbObservantsRealProperty = - TopiaQuery.getProperty(contactAlias, Contact.NB_OBSERVANTS); + TopiaQuery.getProperty(contactAlias, Contact.PROPERTY_NB_OBSERVANTS); String sampleRowEndProperty = - TopiaQuery.getProperty(sampleRowProperty, SampleRow.PERIOD_END); + TopiaQuery.getProperty(sampleRowProperty, SampleRow.PROPERTY_PERIOD_END); String companyProperty = - TopiaQuery.getProperty(sampleRowProperty, SampleRow.COMPANY); + TopiaQuery.getProperty(sampleRowProperty, SampleRow.PROPERTY_COMPANY); String nbObservantsExpectedProperty = - TopiaQuery.getProperty(sampleRowProperty, SampleRow.NB_OBSERVANTS); + TopiaQuery.getProperty(sampleRowProperty, SampleRow.PROPERTY_NB_OBSERVANTS); String companyNameProperty = - TopiaQuery.getProperty(companyProperty, Company.NAME); + TopiaQuery.getProperty(companyProperty, Company.PROPERTY_NAME); // Only for unfinished sampleRows query.addWhere(sampleRowEndProperty, Op.GE, context.getCurrentDate()); @@ -600,13 +600,13 @@ String contactAlias = query.getMainAlias(); String companyProperty = - TopiaQuery.getProperty(contactAlias, Contact.OBSERVER, WaoUser.COMPANY); + TopiaQuery.getProperty(contactAlias, Contact.PROPERTY_OBSERVER, WaoUser.PROPERTY_COMPANY); String companyNameProperty = - TopiaQuery.getProperty(companyProperty, Company.NAME); + TopiaQuery.getProperty(companyProperty, Company.PROPERTY_NAME); String tideBeginDateProperty = - TopiaQuery.getProperty(contactAlias, Contact.TIDE_BEGIN_DATE); + TopiaQuery.getProperty(contactAlias, Contact.PROPERTY_TIDE_BEGIN_DATE); String dataInputProperty = - TopiaQuery.getProperty(contactAlias, Contact.DATA_INPUT_DATE); + TopiaQuery.getProperty(contactAlias, Contact.PROPERTY_DATA_INPUT_DATE); Company company = filter.getCompany(); if (company != null) { @@ -970,7 +970,7 @@ protected GlobalSynthesisParameters executeGetGlobalSynthesisParameters(TopiaContext transaction) throws Exception { IndicatorDAO indicatorDAO = WaoDAOHelper.getIndicatorDAO(transaction); - List<Indicator> indicators = indicatorDAO.findAllWithOrder(Indicator.INDICATOR_ID); + List<Indicator> indicators = indicatorDAO.findAllWithOrder(Indicator.PROPERTY_INDICATOR_ID); Indicator globalIndicator = null; // will be found in the list Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceUserImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceUserImpl.java 2010-11-26 13:13:45 UTC (rev 804) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceUserImpl.java 2010-11-26 14:14:35 UTC (rev 805) @@ -95,8 +95,8 @@ String passwordEncoded = context.encodeString(password); WaoUser user = dao.findByProperties( - WaoUser.LOGIN, login, - WaoUser.PASSWORD, passwordEncoded); + WaoUser.PROPERTY_LOGIN, login, + WaoUser.PROPERTY_PASSWORD, passwordEncoded); if (user == null) { throw new WaoBusinessException(Type.BAD_CONNECTION, @@ -344,10 +344,10 @@ CompanyDAO dao = WaoDAOHelper.getCompanyDAO(transaction); - TopiaQuery query = dao.createQuery().addOrder(Company.NAME); + TopiaQuery query = dao.createQuery().addOrder(Company.PROPERTY_NAME); if (activeOnly) { - query.addEquals(Company.ACTIVE, activeOnly); + query.addEquals(Company.PROPERTY_ACTIVE, activeOnly); } results = dao.findAllByQuery(query); @@ -365,8 +365,8 @@ TopiaQuery query = dao.createQuery(). - addEquals(WaoUser.COMPANY, company). - addOrder(WaoUser.FIRST_NAME, WaoUser.LAST_NAME); + addEquals(WaoUser.PROPERTY_COMPANY, company). + addOrder(WaoUser.PROPERTY_FIRST_NAME, WaoUser.PROPERTY_LAST_NAME); return dao.findAllByQuery(query); } @@ -382,15 +382,15 @@ UserRole.getMatchCodes(UserRole.OBSERVER, UserRole.COORDINATOR); TopiaQuery query = dao.createQuery(). - addEquals(WaoUser.ROLE, (Object[])matchCodes). - addOrder(WaoUser.FIRST_NAME, WaoUser.LAST_NAME); + addEquals(WaoUser.PROPERTY_ROLE, (Object[])matchCodes). + addOrder(WaoUser.PROPERTY_FIRST_NAME, WaoUser.PROPERTY_LAST_NAME); if (company != null) { - query.addEquals(WaoUser.COMPANY, company); + query.addEquals(WaoUser.PROPERTY_COMPANY, company); } if (activeOnly) { - query.addEquals(WaoUser.ACTIVE, Boolean.TRUE); + query.addEquals(WaoUser.PROPERTY_ACTIVE, Boolean.TRUE); } return dao.findAllByQuery(query); @@ -429,17 +429,17 @@ } Company company = companyDAO.create( - Company.ACTIVE, false, Company.NAME, "ADMIN"); + Company.PROPERTY_ACTIVE, false, Company.PROPERTY_NAME, "ADMIN"); String password = context.encodeString("password"); WaoUser user = dao.create( - WaoUser.ROLE, UserRole.ADMIN.toInt(), - WaoUser.ACTIVE, true, - WaoUser.LOGIN, "admin", - WaoUser.PASSWORD, password, - WaoUser.FIRST_NAME, "Super", - WaoUser.LAST_NAME, "Admin"); + WaoUser.PROPERTY_ROLE, UserRole.ADMIN.toInt(), + WaoUser.PROPERTY_ACTIVE, true, + WaoUser.PROPERTY_LOGIN, "admin", + WaoUser.PROPERTY_PASSWORD, password, + WaoUser.PROPERTY_FIRST_NAME, "Super", + WaoUser.PROPERTY_LAST_NAME, "Admin"); user.setCompany(company); transaction.commitTransaction(); 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 2010-11-26 13:13:45 UTC (rev 804) +++ trunk/wao-business/src/main/resources/i18n/wao-business-fr_FR.properties 2010-11-26 14:14:35 UTC (rev 805) @@ -1,128 +1,128 @@ -fr.ifremer.wao.entity.FishingGearDCF.=Non sp\u00e9cifi\u00e9 -fr.ifremer.wao.entity.FishingGearDCF.DRB=Dragues remorqu\u00e9es par bateau -fr.ifremer.wao.entity.FishingGearDCF.DRH=Dragues \u00e0 main -fr.ifremer.wao.entity.FishingGearDCF.FAR=Pi\u00e8ges a\u00e9riens -fr.ifremer.wao.entity.FishingGearDCF.FCN=\u00c9perviers -fr.ifremer.wao.entity.FishingGearDCF.FG=Autres engins retombants (non-sp\u00e9cifi\u00e9s) -fr.ifremer.wao.entity.FishingGearDCF.FIX=Pi\u00e8ges (non-sp\u00e9cifi\u00e9s) -fr.ifremer.wao.entity.FishingGearDCF.FPN=Filets-pi\u00e8ges fixes non couverts +fr.ifremer.wao.entity.FishingGearDCF.=Non sp\u00E9cifi\u00E9 +fr.ifremer.wao.entity.FishingGearDCF.DRB=Dragues remorqu\u00E9es par bateau +fr.ifremer.wao.entity.FishingGearDCF.DRH=Dragues \u00E0 main +fr.ifremer.wao.entity.FishingGearDCF.FAR=Pi\u00E8ges a\u00E9riens +fr.ifremer.wao.entity.FishingGearDCF.FCN=\u00C9perviers +fr.ifremer.wao.entity.FishingGearDCF.FG=Autres engins retombants (non-sp\u00E9cifi\u00E9s) +fr.ifremer.wao.entity.FishingGearDCF.FIX=Pi\u00E8ges (non-sp\u00E9cifi\u00E9s) +fr.ifremer.wao.entity.FishingGearDCF.FPN=Filets-pi\u00E8ges fixes non couverts fr.ifremer.wao.entity.FishingGearDCF.FPO=Nasses (casiers) -fr.ifremer.wao.entity.FishingGearDCF.FSN=Filets \u00e0 l'\u00e9talage (diables) +fr.ifremer.wao.entity.FishingGearDCF.FSN=Filets \u00E0 l'\u00E9talage (diables) fr.ifremer.wao.entity.FishingGearDCF.FWR=Barrages, parcs, bordigues, etc. fr.ifremer.wao.entity.FishingGearDCF.FYK=Verveux -fr.ifremer.wao.entity.FishingGearDCF.GEN=Filets maillants et filets emm\u00e9lants (non sp\u00e9cifi\u00e9s) -fr.ifremer.wao.entity.FishingGearDCF.GES=Tamis \u00e0 civelles -fr.ifremer.wao.entity.FishingGearDCF.GN=Filets maillants (non sp\u00e9cifi\u00e9s) +fr.ifremer.wao.entity.FishingGearDCF.GEN=Filets maillants et filets emm\u00E9lants (non sp\u00E9cifi\u00E9s) +fr.ifremer.wao.entity.FishingGearDCF.GES=Tamis \u00E0 civelles +fr.ifremer.wao.entity.FishingGearDCF.GN=Filets maillants (non sp\u00E9cifi\u00E9s) fr.ifremer.wao.entity.FishingGearDCF.GNC=Filets maillants encerclants -fr.ifremer.wao.entity.FishingGearDCF.GND=Filets maillants d\u00e9rivants (filets d\u00e9rivants) +fr.ifremer.wao.entity.FishingGearDCF.GND=Filets maillants d\u00E9rivants (filets d\u00E9rivants) fr.ifremer.wao.entity.FishingGearDCF.GNF=Filets maillants fixes (sur perches) -fr.ifremer.wao.entity.FishingGearDCF.GNS=Filets maillants cal\u00e9s (ancr\u00e9s) -fr.ifremer.wao.entity.FishingGearDCF.GT=Tr\u00e9mailleurs -fr.ifremer.wao.entity.FishingGearDCF.GTN=Tr\u00e9mails et filets maillants combin\u00e9s -fr.ifremer.wao.entity.FishingGearDCF.GTR=Tr\u00e9mails +fr.ifremer.wao.entity.FishingGearDCF.GNS=Filets maillants cal\u00E9s (ancr\u00E9s) +fr.ifremer.wao.entity.FishingGearDCF.GT=Tr\u00E9mailleurs +fr.ifremer.wao.entity.FishingGearDCF.GTN=Tr\u00E9mails et filets maillants combin\u00E9s +fr.ifremer.wao.entity.FishingGearDCF.GTR=Tr\u00E9mails fr.ifremer.wao.entity.FishingGearDCF.HAR=Harpons -fr.ifremer.wao.entity.FishingGearDCF.HMD=Dragues m\u00e9canis\u00e9es +fr.ifremer.wao.entity.FishingGearDCF.HMD=Dragues m\u00E9canis\u00E9es fr.ifremer.wao.entity.FishingGearDCF.HMP=Pompes -fr.ifremer.wao.entity.FishingGearDCF.HMX=Engins de r\u00e9colte (non sp\u00e9cifi\u00e9s) +fr.ifremer.wao.entity.FishingGearDCF.HMX=Engins de r\u00E9colte (non sp\u00E9cifi\u00E9s) fr.ifremer.wao.entity.FishingGearDCF.LA=Filets tournants sans coulisse (filet lamparo) -fr.ifremer.wao.entity.FishingGearDCF.LHM=Lignes \u00e0 main et lignes avec cannes -fr.ifremer.wao.entity.FishingGearDCF.LHP=Lignes \u00e0 main et lignes \u00e0 cannes -fr.ifremer.wao.entity.FishingGearDCF.LL=Palangres (non sp\u00e9cifi\u00e9es) -fr.ifremer.wao.entity.FishingGearDCF.LLD=Palangres d\u00e9rivantes -fr.ifremer.wao.entity.FishingGearDCF.LLS=Palangres cal\u00e9es ou semi-flottantes -fr.ifremer.wao.entity.FishingGearDCF.LN=Filets soulev\u00e9s (non sp\u00e9cifi\u00e9s) -fr.ifremer.wao.entity.FishingGearDCF.LNB=Filets soulev\u00e9s man\u0153uvr\u00e9es du bateau -fr.ifremer.wao.entity.FishingGearDCF.LNP=Filets soulev\u00e9s portatifs -fr.ifremer.wao.entity.FishingGearDCF.LNS=Filets soulev\u00e9s fixes man\u0153uvr\u00e9es du rivage -fr.ifremer.wao.entity.FishingGearDCF.LTL=lignes de tra\u00eene -fr.ifremer.wao.entity.FishingGearDCF.LX=Hame\u00e7ons et lignes (non sp\u00e9cifi\u00e9s) +fr.ifremer.wao.entity.FishingGearDCF.LHM=Lignes \u00E0 main et lignes avec cannes +fr.ifremer.wao.entity.FishingGearDCF.LHP=Lignes \u00E0 main et lignes \u00E0 cannes +fr.ifremer.wao.entity.FishingGearDCF.LL=Palangres (non sp\u00E9cifi\u00E9es) +fr.ifremer.wao.entity.FishingGearDCF.LLD=Palangres d\u00E9rivantes +fr.ifremer.wao.entity.FishingGearDCF.LLS=Palangres cal\u00E9es ou semi-flottantes +fr.ifremer.wao.entity.FishingGearDCF.LN=Filets soulev\u00E9s (non sp\u00E9cifi\u00E9s) +fr.ifremer.wao.entity.FishingGearDCF.LNB=Filets soulev\u00E9s man\u0153uvr\u00E9es du bateau +fr.ifremer.wao.entity.FishingGearDCF.LNP=Filets soulev\u00E9s portatifs +fr.ifremer.wao.entity.FishingGearDCF.LNS=Filets soulev\u00E9s fixes man\u0153uvr\u00E9es du rivage +fr.ifremer.wao.entity.FishingGearDCF.LTL=lignes de tra\u00EEne +fr.ifremer.wao.entity.FishingGearDCF.LX=Hame\u00E7ons et lignes (non sp\u00E9cifi\u00E9s) fr.ifremer.wao.entity.FishingGearDCF.MIS=Divers -fr.ifremer.wao.entity.FishingGearDCF.NK=Engins inconnus ou non sp\u00e9cifi\u00e9s -fr.ifremer.wao.entity.FishingGearDCF.OT=Chaluts \u00e0 panneaux (non sp\u00e9cifi\u00e9) -fr.ifremer.wao.entity.FishingGearDCF.OTB=Chalut de fond \u00e0 panneaux -fr.ifremer.wao.entity.FishingGearDCF.OTM=Chaluts p\u00e9lagiques \u00e0 panneaux -fr.ifremer.wao.entity.FishingGearDCF.OTT=Chaluts jumeaux \u00e0 panneaux +fr.ifremer.wao.entity.FishingGearDCF.NK=Engins inconnus ou non sp\u00E9cifi\u00E9s +fr.ifremer.wao.entity.FishingGearDCF.OT=Chaluts \u00E0 panneaux (non sp\u00E9cifi\u00E9) +fr.ifremer.wao.entity.FishingGearDCF.OTB=Chalut de fond \u00E0 panneaux +fr.ifremer.wao.entity.FishingGearDCF.OTM=Chaluts p\u00E9lagiques \u00E0 panneaux +fr.ifremer.wao.entity.FishingGearDCF.OTT=Chaluts jumeaux \u00E0 panneaux fr.ifremer.wao.entity.FishingGearDCF.PS=Filets tournants avec coulisse (sennes coulissantes) -fr.ifremer.wao.entity.FishingGearDCF.PS1=Filets tournants, sennes coulissantes man\u0153uvr\u00e9es par un bateau -fr.ifremer.wao.entity.FishingGearDCF.PS2=Filets tournants, sennes coulissantes man\u0153uvr\u00e9es par deux bateaux -fr.ifremer.wao.entity.FishingGearDCF.PT=Chalut-b\u0153ufs (non sp\u00e9cifi\u00e9) +fr.ifremer.wao.entity.FishingGearDCF.PS1=Filets tournants, sennes coulissantes man\u0153uvr\u00E9es par un bateau +fr.ifremer.wao.entity.FishingGearDCF.PS2=Filets tournants, sennes coulissantes man\u0153uvr\u00E9es par deux bateaux +fr.ifremer.wao.entity.FishingGearDCF.PT=Chalut-b\u0153ufs (non sp\u00E9cifi\u00E9) fr.ifremer.wao.entity.FishingGearDCF.PTB=Chalut-b\u0153ufs de fond -fr.ifremer.wao.entity.FishingGearDCF.PTM=Chalut-b\u0153ufs p\u00e9lagiques -fr.ifremer.wao.entity.FishingGearDCF.RG=Engins de p\u00eache r\u00e9vr\u00e9ative +fr.ifremer.wao.entity.FishingGearDCF.PTM=Chalut-b\u0153ufs p\u00E9lagiques +fr.ifremer.wao.entity.FishingGearDCF.RG=Engins de p\u00EAche r\u00E9vr\u00E9ative fr.ifremer.wao.entity.FishingGearDCF.SB=Sennes de plages fr.ifremer.wao.entity.FishingGearDCF.SDN=Sennes danoises -fr.ifremer.wao.entity.FishingGearDCF.SPR=Sennes man\u0153uvr\u00e9es par deux bateaux -fr.ifremer.wao.entity.FishingGearDCF.SSC=Sennes \u00e9cossaises -fr.ifremer.wao.entity.FishingGearDCF.SV=Sennes hal\u00e9es \u00e0 bord -fr.ifremer.wao.entity.FishingGearDCF.SW=Sennes (non sp\u00e9cifi\u00e9es) -fr.ifremer.wao.entity.FishingGearDCF.TB=Chalut de fond (non sp\u00e9cifi\u00e9) -fr.ifremer.wao.entity.FishingGearDCF.TBB=Chaluts \u00e0 perche -fr.ifremer.wao.entity.FishingGearDCF.TBN=Chalut \u00e0 langoustines -fr.ifremer.wao.entity.FishingGearDCF.TBS=Chalut \u00e0 crevettes -fr.ifremer.wao.entity.FishingGearDCF.TM=Chalut p\u00e9lagique (non sp\u00e9cifi\u00e9) -fr.ifremer.wao.entity.FishingGearDCF.TMS=Chalut \u00e0 crevettes -fr.ifremer.wao.entity.FishingGearDCF.TX=Autre chalut (non sp\u00e9cifi\u00e9) -fr.ifremer.wao.entity.TargetSpeciesDCF.=Non sp\u00e9cifi\u00e9 +fr.ifremer.wao.entity.FishingGearDCF.SPR=Sennes man\u0153uvr\u00E9es par deux bateaux +fr.ifremer.wao.entity.FishingGearDCF.SSC=Sennes \u00E9cossaises +fr.ifremer.wao.entity.FishingGearDCF.SV=Sennes hal\u00E9es \u00E0 bord +fr.ifremer.wao.entity.FishingGearDCF.SW=Sennes (non sp\u00E9cifi\u00E9es) +fr.ifremer.wao.entity.FishingGearDCF.TB=Chalut de fond (non sp\u00E9cifi\u00E9) +fr.ifremer.wao.entity.FishingGearDCF.TBB=Chaluts \u00E0 perche +fr.ifremer.wao.entity.FishingGearDCF.TBN=Chalut \u00E0 langoustines +fr.ifremer.wao.entity.FishingGearDCF.TBS=Chalut \u00E0 crevettes +fr.ifremer.wao.entity.FishingGearDCF.TM=Chalut p\u00E9lagique (non sp\u00E9cifi\u00E9) +fr.ifremer.wao.entity.FishingGearDCF.TMS=Chalut \u00E0 crevettes +fr.ifremer.wao.entity.FishingGearDCF.TX=Autre chalut (non sp\u00E9cifi\u00E9) +fr.ifremer.wao.entity.TargetSpeciesDCF.=Non sp\u00E9cifi\u00E9 fr.ifremer.wao.entity.TargetSpeciesDCF.ALG=Algues -fr.ifremer.wao.entity.TargetSpeciesDCF.CAT=Esp\u00e8ces catadromes -fr.ifremer.wao.entity.TargetSpeciesDCF.CRU=Crustac\u00e9s +fr.ifremer.wao.entity.TargetSpeciesDCF.CAT=Esp\u00E8ces catadromes +fr.ifremer.wao.entity.TargetSpeciesDCF.CRU=Crustac\u00E9s fr.ifremer.wao.entity.TargetSpeciesDCF.CSJ=Coquilles Saint-Jacques -fr.ifremer.wao.entity.TargetSpeciesDCF.DEF=Esp\u00e8ces d\u00e9mersales -fr.ifremer.wao.entity.TargetSpeciesDCF.DWS=Esp\u00e8ces d'eaux profondes +fr.ifremer.wao.entity.TargetSpeciesDCF.DEF=Esp\u00E8ces d\u00E9mersales +fr.ifremer.wao.entity.TargetSpeciesDCF.DWS=Esp\u00E8ces d'eaux profondes fr.ifremer.wao.entity.TargetSpeciesDCF.FIN=Poisson plats -fr.ifremer.wao.entity.TargetSpeciesDCF.LPF=Grands p\u00e9lagiques +fr.ifremer.wao.entity.TargetSpeciesDCF.LPF=Grands p\u00E9lagiques fr.ifremer.wao.entity.TargetSpeciesDCF.MOL=Mollusques -fr.ifremer.wao.entity.TargetSpeciesDCF.SPF=Petits p\u00e9lagiques +fr.ifremer.wao.entity.TargetSpeciesDCF.SPF=Petits p\u00E9lagiques wao.business.bean.DataReliability.doubtful=douteuse -wao.business.bean.DataReliability.not_provided=non renseign\u00e9e +wao.business.bean.DataReliability.not_provided=non renseign\u00E9e wao.business.bean.DataReliability.not_reliable=non exploitable wao.business.bean.DataReliability.reliable=exploitable wao.business.bean.DataReliability.unknown=inconnue -wao.business.bean.GlobalIndicatorValue.bad=P\u00e9nalit\u00e9 de niveau 1 +wao.business.bean.GlobalIndicatorValue.bad=P\u00E9nalit\u00E9 de niveau 1 wao.business.bean.GlobalIndicatorValue.good=Bonus de niveau 1 wao.business.bean.GlobalIndicatorValue.neutral=Conforme au cahier des charges -wao.business.bean.GlobalIndicatorValue.very_bad=P\u00e9nalit\u00e9 de niveau 2 +wao.business.bean.GlobalIndicatorValue.very_bad=P\u00E9nalit\u00E9 de niveau 2 wao.business.bean.GlobalIndicatorValue.very_good=Bonus de niveau 2 -wao.business.bean.SynthesisId.allegro_reactivity=D\u00e9lais de transmission des donn\u00e9es -wao.business.bean.SynthesisId.compliance_boarding=Respect du nombre d'observateurs embarqu\u00e9s -wao.business.bean.SynthesisId.contact_state=\u00c9tats des contacts -wao.business.bean.SynthesisId.data_reliability=Qualit\u00e9 de la donn\u00e9e -wao.business.bean.SynthesisId.graph_boarding=Taux d'embarquement sur un m\u00eame navire conforme aux exigences -wao.business.bean.SynthesisId.graph_sampling=Taux de r\u00e9alisation du plan d'\u00e9chantillonage -wao.business.bean.SynthesisId.non_compliance_boarding=Non-respect du nombre d'observateurs embarqu\u00e9s -wao.error.boat.canCreateContact=Impossible de cr\u00e9er un nouveau contact pour la soci\u00e9t\u00e9 %1$s et le navire %2$s (%3$d) -wao.error.boat.getNbBoarding=Impossible de r\u00e9cup\u00e9rer le nombre d'embarquements r\u00e9els depuis le %1$s -wao.error.boatInfos.getNbBoardingForCompany=Impossible de r\u00e9cup\u00e9rer le nombre d'embarquements r\u00e9els depuis le %1$s pour la soci\u00e9t\u00e9 %2$s +wao.business.bean.SynthesisId.allegro_reactivity=D\u00E9lais de transmission des donn\u00E9es +wao.business.bean.SynthesisId.compliance_boarding=Respect du nombre d'observateurs embarqu\u00E9s +wao.business.bean.SynthesisId.contact_state=\u00C9tats des contacts +wao.business.bean.SynthesisId.data_reliability=Qualit\u00E9 de la donn\u00E9e +wao.business.bean.SynthesisId.graph_boarding=Taux d'embarquement sur un m\u00EAme navire conforme aux exigences +wao.business.bean.SynthesisId.graph_sampling=Taux de r\u00E9alisation du plan d'\u00E9chantillonage +wao.business.bean.SynthesisId.non_compliance_boarding=Non-respect du nombre d'observateurs embarqu\u00E9s +wao.error.boat.canCreateContact=Impossible de cr\u00E9er un nouveau contact pour la soci\u00E9t\u00E9 %1$s et le navire %2$s (%3$d) +wao.error.boat.getNbBoarding=Impossible de r\u00E9cup\u00E9rer le nombre d'embarquements r\u00E9els depuis le %1$s +wao.error.boatInfos.getNbBoardingForCompany=Impossible de r\u00E9cup\u00E9rer le nombre d'embarquements r\u00E9els depuis le %1$s pour la soci\u00E9t\u00E9 %2$s wao.error.context.close=Une erreur est survenue pendant la fermeture du contexte principale de ToPIA wao.error.context.encodeString= -wao.error.context.getRootContext=Une erreur est survenue pour la r\u00e9cup\u00e9ration du contexte principale de ToPIA +wao.error.context.getRootContext=Une erreur est survenue pour la r\u00E9cup\u00E9ration du contexte principale de ToPIA wao.error.context.parse=Une erreur est survenue pendant le chargement de la configuration du fichier %1$s wao.error.context.rollback=Une erreur est survenue pendant l'annulation de la transaction courante -wao.error.context.start=Une erreur est survenue pendant le d\u00e9marrage de l'application +wao.error.context.start=Une erreur est survenue pendant le d\u00E9marrage de l'application wao.error.context.stop=Une erreur est survenue pendant la fermeture de l'application -wao.error.sampleMonth.addRealTideTime=Impossible d'enregistrer le nombre de mar\u00e9es r\u00e9els pour le mois de %1$s [ligne \: %2$s] -wao.error.sampleRow.saveSampleRowLog=Impossible d'enregistrer le commentaire \u00e9crit par %1$s -wao.error.serviceBoat.createUpdateCompanyBoatInfos=Impossible de cr\u00e9er ou modifier les informations li\u00e9s au navire %1$d pour la soci\u00e9t\u00e9 %2$s -wao.error.serviceBoat.exportBoatCsv=Impossible d'exporter les navires s\u00e9lectionn\u00e9s +wao.error.sampleMonth.addRealTideTime=Impossible d'enregistrer le nombre de mar\u00E9es r\u00E9els pour le mois de %1$s [ligne \: %2$s] +wao.error.sampleRow.saveSampleRowLog=Impossible d'enregistrer le commentaire \u00E9crit par %1$s +wao.error.serviceBoat.createUpdateCompanyBoatInfos=Impossible de cr\u00E9er ou modifier les informations li\u00E9s au navire %1$d pour la soci\u00E9t\u00E9 %2$s +wao.error.serviceBoat.exportBoatCsv=Impossible d'exporter les navires s\u00E9lectionn\u00E9s wao.error.serviceBoat.getActivityCalendarLogAccessFile= wao.error.serviceBoat.getActivityCalendarLogFile= wao.error.serviceBoat.getBoat=Impossible de charger le navire -wao.error.serviceBoat.getBoatNamesStartWith=Impossible de r\u00e9cup\u00e9rer les navires avec un nom commencant par '%1$s' +wao.error.serviceBoat.getBoatNamesStartWith=Impossible de r\u00E9cup\u00E9rer les navires avec un nom commencant par '%1$s' wao.error.serviceBoat.getBoatsByFilter=Impossible de filtrer la liste des navires -wao.error.serviceBoat.getBoatsByImmatriculations=La cha\u00eene d'immatriculations est incorrect \! Chaque immatriculation doit poss\u00e9der 6 chiffres -wao.error.serviceBoat.getCompanyBoatInfos=Impossible de r\u00e9cup\u00e9rer les informations du navire immatricul\u00e9 %1$d pour la soci\u00e9t\u00e9 %2$s -wao.error.serviceBoat.getLastActivityCalendar=Impossible de charger le dernier calendrier d'activit\u00e9 du navire %1$s (%2$d) +wao.error.serviceBoat.getBoatsByImmatriculations=La cha\u00EEne d'immatriculations est incorrect \! Chaque immatriculation doit poss\u00E9der 6 chiffres +wao.error.serviceBoat.getCompanyBoatInfos=Impossible de r\u00E9cup\u00E9rer les informations du navire immatricul\u00E9 %1$d pour la soci\u00E9t\u00E9 %2$s +wao.error.serviceBoat.getLastActivityCalendar=Impossible de charger le dernier calendrier d'activit\u00E9 du navire %1$s (%2$d) wao.error.serviceBoat.getNbBoatsByFilter=Impossible de filtrer la liste des navires wao.error.serviceBoat.getShipOwnerNamesContains= -wao.error.serviceBoat.importActivityCalendarCsv=Probl\u00e8me d'import du fichier CSV des calendriers d'activit\u00e9 -wao.error.serviceBoat.importBoatCsv=Probl\u00e8me d'import du fichier CSV. V\u00e9rifiez l'en-t\u00eate du fichier \: [ NAVS_COD,CARN_NOM,CARN_LONGUEUR_HT,CARN_ANNEE,QUARTIER_IMMA,PER_COD,PER_NOM,PER_PRENOM,NAVS_ACTIVE ]. Voir documentation pour plus de d\u00e9tails. +wao.error.serviceBoat.importActivityCalendarCsv=Probl\u00E8me d'import du fichier CSV des calendriers d'activit\u00E9 +wao.error.serviceBoat.importBoatCsv=Probl\u00E8me d'import du fichier CSV. V\u00E9rifiez l'en-t\u00EAte du fichier \: [ NAVS_COD,CARN_NOM,CARN_LONGUEUR_HT,CARN_ANNEE,QUARTIER_IMMA,PER_COD,PER_NOM,PER_PRENOM,NAVS_ACTIVE ]. Voir documentation pour plus de d\u00E9tails. wao.error.serviceCartography.exportContactStatisticsKml= -wao.error.serviceCartography.importBoatDistrictKml=Impossible d'importer les coordonn\u00e9es des quartiers des navires. V\u00e9rifiez la documentation pour le bon format du fichier Kml. +wao.error.serviceCartography.importBoatDistrictKml=Impossible d'importer les coordonn\u00E9es des quartiers des navires. V\u00E9rifiez la documentation pour le bon format du fichier Kml. wao.error.serviceChart.getContactPieChartData= wao.error.serviceChart.getContactPieChartUrl= wao.error.serviceContact.exportContactCsv=Impossible d'exporter les contacts wao.error.serviceContact.getContacts=Impossible de filtrer la liste des contacts -wao.error.serviceContact.getNbContacts=Impossible de compter le nombre de contacts filtr\u00e9s +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.saveComment= @@ -130,54 +130,54 @@ wao.error.serviceContact.sendContactDoneEmail= wao.error.serviceContact.updateSampleMonthTidesValue= wao.error.serviceNews.getNewNews= -wao.error.serviceNews.getNews=Impossible de r\u00e9cup\u00e9rer l'ensemble des news +wao.error.serviceNews.getNews=Impossible de r\u00E9cup\u00E9rer l'ensemble des news wao.error.serviceNews.saveNews=Impossible d'enregistrer la news ayant pour titre '%1$s' wao.error.serviceReferential.getCodesDCF5Contains= wao.error.serviceReferential.getFacades=Impossible de charger la liste des facades -wao.error.serviceReferential.getFishingZones=Impossible de charger la liste des secteurs de p\u00eache -wao.error.serviceReferential.getProfessions=Impossible de charger la liste des m\u00e9tiers -wao.error.serviceReferential.getSectors=Impossible de charger la liste des zones de p\u00eache -wao.error.serviceReferential.importFishingZoneCsv=Probl\u00e8me d'import du fichier CSV. V\u00e9rifiez l'en-t\u00eate du fichier \: [ PECHE_DIVISION,PECHE_ZONE,PECHE_FACADE ]. Voir documentation pour plus de d\u00e9tails. +wao.error.serviceReferential.getFishingZones=Impossible de charger la liste des secteurs de p\u00EAche +wao.error.serviceReferential.getProfessions=Impossible de charger la liste des m\u00E9tiers +wao.error.serviceReferential.getSectors=Impossible de charger la liste des zones de p\u00EAche +wao.error.serviceReferential.importFishingZoneCsv=Probl\u00E8me d'import du fichier CSV. V\u00E9rifiez l'en-t\u00EAte du fichier \: [ PECHE_DIVISION,PECHE_ZONE,PECHE_FACADE ]. Voir documentation pour plus de d\u00E9tails. wao.error.serviceSampling.createSampleRowLog= -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.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.getDCFGears= wao.error.serviceSampling.getDCFSpecies= wao.error.serviceSampling.getNewProfession= wao.error.serviceSampling.getNewSampleMonth= wao.error.serviceSampling.getNewSampleRow= -wao.error.serviceSampling.getNewSampleRowCode=Impossible de r\u00e9cup\u00e9rer un nouveau code pour une ligne d'\u00e9chantillonnage +wao.error.serviceSampling.getNewSampleRowCode=Impossible de r\u00E9cup\u00E9rer un nouveau code pour une ligne d'\u00E9chantillonnage wao.error.serviceSampling.getNewSampleRowLog= wao.error.serviceSampling.getPrograms=Impossible de charger la liste des programmes -wao.error.serviceSampling.getSampleRow=Impossible de charger la ligne d'\u00e9chantillon ayant pour identifiant \: %1$s -wao.error.serviceSampling.getSampleRowByCode=Impossible de charger la ligne d'\u00e9chantillon ayant pour code %1$s -wao.error.serviceSampling.getSampleRowsByFilter=Impossible de r\u00e9cup\u00e9rer la liste des lignes du plan d'\u00e9chantillonnage -wao.error.serviceSampling.getSampleRowsOrderedByFishingZone=Impossible de r\u00e9cup\u00e9rer la liste des lignes du plan d'\u00e9chantillonnage -wao.error.serviceSampling.importSamplingPlanCsv=Erreur \u00e0 la ligne %1$d [CODE \= %2$s] +wao.error.serviceSampling.getSampleRow=Impossible de charger la ligne d'\u00E9chantillon ayant pour identifiant \: %1$s +wao.error.serviceSampling.getSampleRowByCode=Impossible de charger la ligne d'\u00E9chantillon ayant pour code %1$s +wao.error.serviceSampling.getSampleRowsByFilter=Impossible de r\u00E9cup\u00E9rer la liste des lignes du plan d'\u00E9chantillonnage +wao.error.serviceSampling.getSampleRowsOrderedByFishingZone=Impossible de r\u00E9cup\u00E9rer la liste des lignes du plan d'\u00E9chantillonnage +wao.error.serviceSampling.importSamplingPlanCsv=Erreur \u00E0 la ligne %1$d [CODE \= %2$s] wao.error.serviceSynthesis.getAllIndicatorLogs= -wao.error.serviceSynthesis.getBoardingBoats=Impossible de r\u00e9cup\u00e9rer les donn\u00e9es du graphique concernant les embarquements sur les navires +wao.error.serviceSynthesis.getBoardingBoats=Impossible de r\u00E9cup\u00E9rer les donn\u00E9es du graphique concernant les embarquements sur les navires wao.error.serviceSynthesis.getComplianceBoardingIndicator= -wao.error.serviceSynthesis.getContactDataInputDateReactivity=Impossible de r\u00e9cup\u00e9rer l'indicateur de r\u00e9activit\u00e9 sur les dates de saisies dans Allegro +wao.error.serviceSynthesis.getContactDataInputDateReactivity=Impossible de r\u00E9cup\u00E9rer l'indicateur de r\u00E9activit\u00E9 sur les dates de saisies dans Allegro wao.error.serviceSynthesis.getContactPieChartData= wao.error.serviceSynthesis.getContactPieChartDataByBoatDistrict= -wao.error.serviceSynthesis.getContactStateStatistics=Impossible de r\u00e9cup\u00e9rer les statistiques sur les \u00e9tats des contacts +wao.error.serviceSynthesis.getContactStateStatistics=Impossible de r\u00E9cup\u00E9rer les statistiques sur les \u00E9tats des contacts wao.error.serviceSynthesis.getDataReliability= -wao.error.serviceSynthesis.getDataSampling=Impossible de r\u00e9cup\u00e9rer les donn\u00e9es pour le graphique dynamique des efforts de mar\u00e9es -wao.error.serviceSynthesis.getGlobalSynthesisParameters=Impossible de r\u00e9cup\u00e9rer les donn\u00e9es concernant les indicateurs pour la synth\u00e8se globale +wao.error.serviceSynthesis.getDataSampling=Impossible de r\u00E9cup\u00E9rer les donn\u00E9es pour le graphique dynamique des efforts de mar\u00E9es +wao.error.serviceSynthesis.getGlobalSynthesisParameters=Impossible de r\u00E9cup\u00E9rer les donn\u00E9es concernant les indicateurs pour la synth\u00E8se globale wao.error.serviceSynthesis.getGlobalSynthesisResult= -wao.error.serviceSynthesis.getNonComplianceBoardingIndicator=Impossible de r\u00e9cup\u00e9rer l'indicateur de non respect du nombre d'observateurs embarqu\u00e9s -wao.error.serviceSynthesis.updateGlobalSynthesisParameters=Impossible de mettre \u00e0 jour les param\u00e8tres de la synth\u00e8se globale +wao.error.serviceSynthesis.getNonComplianceBoardingIndicator=Impossible de r\u00E9cup\u00E9rer l'indicateur de non respect du nombre d'observateurs embarqu\u00E9s +wao.error.serviceSynthesis.updateGlobalSynthesisParameters=Impossible de mettre \u00E0 jour les param\u00E8tres de la synth\u00E8se globale wao.error.serviceUser.connect=Une erreur est survenue lors de la demande de connexion -wao.error.serviceUser.createDefaultAdmin=Impossible de cr\u00e9er l'administrateur par d\u00e9faut -wao.error.serviceUser.createUpdateCompany=Impossible de cr\u00e9er ou de mettre \u00e0 jour la soci\u00e9t\u00e9 -wao.error.serviceUser.createUpdateUser=Impossible de cr\u00e9er ou de mettre \u00e0 jour l'utilisateur +wao.error.serviceUser.createDefaultAdmin=Impossible de cr\u00E9er l'administrateur par d\u00E9faut +wao.error.serviceUser.createUpdateCompany=Impossible de cr\u00E9er ou de mettre \u00E0 jour la soci\u00E9t\u00E9 +wao.error.serviceUser.createUpdateUser=Impossible de cr\u00E9er ou de mettre \u00E0 jour l'utilisateur wao.error.serviceUser.deleteUser=Impossible de supprimer l'utilisateur wao.error.serviceUser.existLogin= wao.error.serviceUser.forgetPassword=Impossible d'envoyer le mail d'oubli de mot de passe -wao.error.serviceUser.getCompanies=Impossible de r\u00e9cup\u00e9rer la liste des soci\u00e9t\u00e9s +wao.error.serviceUser.getCompanies=Impossible de r\u00E9cup\u00E9rer la liste des soci\u00E9t\u00E9s wao.error.serviceUser.getCompany= wao.error.serviceUser.getNewUser=Impossible d'instancier un nouvel utilisateur -wao.error.serviceUser.getObservers=Impossible de r\u00e9cup\u00e9rer la liste des observateurs +wao.error.serviceUser.getObservers=Impossible de r\u00E9cup\u00E9rer la liste des observateurs wao.error.serviceUser.getUserRolesByLogin= -wao.error.serviceUser.getUsersByCompany=Impossible de r\u00e9cup\u00e9rer la liste des utilisateurs de la soci\u00e9t\u00e9 %1$s +wao.error.serviceUser.getUsersByCompany=Impossible de r\u00E9cup\u00E9rer la liste des utilisateurs de la soci\u00E9t\u00E9 %1$s Modified: trunk/wao-business/src/main/xmi/wao.properties =================================================================== --- trunk/wao-business/src/main/xmi/wao.properties 2010-11-26 13:13:45 UTC (rev 804) +++ trunk/wao-business/src/main/xmi/wao.properties 2010-11-26 14:14:35 UTC (rev 805) @@ -2,6 +2,7 @@ model.tagvalue.java.lang.String=text model.tagvalue.exceptionClass=fr.ifremer.wao.WaoException model.tagvalue.notGenerateToString=true +model.tagvalue.constantPrefix=PROPERTY_ #model.tagvalue.useLegacyDAO=true Modified: trunk/wao-business/src/test/java/fr/ifremer/wao/AbstractServiceTest.java =================================================================== --- trunk/wao-business/src/test/java/fr/ifremer/wao/AbstractServiceTest.java 2010-11-26 13:13:45 UTC (rev 804) +++ trunk/wao-business/src/test/java/fr/ifremer/wao/AbstractServiceTest.java 2010-11-26 14:14:35 UTC (rev 805) @@ -137,11 +137,11 @@ try { WaoUserDAO userDAO = WaoDAOHelper.getWaoUserDAO(transaction); observer = userDAO.create( - WaoUser.COMPANY, findDefaultCompany(), - WaoUser.LOGIN, OBSERVER_DEFAULT_LOGIN, - WaoUser.FIRST_NAME, OBSERVER_DEFAULT_FIRST_NAME, - WaoUser.LAST_NAME, OBSERVER_DEFAULT_LAST_NAME, - WaoUser.ROLE, UserRole.OBSERVER.ordinal()); + WaoUser.PROPERTY_COMPANY, findDefaultCompany(), + WaoUser.PROPERTY_LOGIN, OBSERVER_DEFAULT_LOGIN, + WaoUser.PROPERTY_FIRST_NAME, OBSERVER_DEFAULT_FIRST_NAME, + WaoUser.PROPERTY_LAST_NAME, OBSERVER_DEFAULT_LAST_NAME, + WaoUser.PROPERTY_ROLE, UserRole.OBSERVER.ordinal()); if (log.isDebugEnabled()) { log.debug("Create default observer : " + observer); } @@ -176,11 +176,11 @@ try { WaoUserDAO userDAO = WaoDAOHelper.getWaoUserDAO(transaction); observer = userDAO.create( - WaoUser.COMPANY, company, - WaoUser.LOGIN, login, - WaoUser.FIRST_NAME, null, - WaoUser.LAST_NAME, null, - WaoUser.ROLE, role.ordinal()); + WaoUser.PROPERTY_COMPANY, company, + WaoUser.PROPERTY_LOGIN, login, + WaoUser.PROPERTY_FIRST_NAME, null, + WaoUser.PROPERTY_LAST_NAME, null, + WaoUser.PROPERTY_ROLE, role.ordinal()); if (log.isDebugEnabled()) { log.debug("Create observer : " + observer); @@ -467,7 +467,7 @@ if (row != null) { // Load properties for (String property : properties) { - if (property.equals(SampleRow.ELLIGIBLE_BOAT)) { + if (property.equals(SampleRow.PROPERTY_ELLIGIBLE_BOAT)) { row.sizeElligibleBoat(); } } @@ -545,11 +545,11 @@ TopiaContext transaction = manager.getContext().beginTransaction(); WaoUserDAO userDAO = WaoDAOHelper.getWaoUserDAO(transaction); - WaoUser user = userDAO.create(WaoUser.FIRST_NAME,"Jean", WaoUser.LAST_NAME, "Michmuche", - WaoUser.COMPANY, company1); + WaoUser user = userDAO.create(WaoUser.PROPERTY_FIRST_NAME,"Jean", WaoUser.PROPERTY_LAST_NAME, "Michmuche", + WaoUser.PROPERTY_COMPANY, company1); company1.addWaoUser(user); - WaoUser user2 = userDAO.create(WaoUser.FIRST_NAME,"Bill", WaoUser.LAST_NAME, "Murray", - WaoUser.COMPANY, company2); + WaoUser user2 = userDAO.create(WaoUser.PROPERTY_FIRST_NAME,"Bill", WaoUser.PROPERTY_LAST_NAME, "Murray", + WaoUser.PROPERTY_COMPANY, company2); company2.addWaoUser(user2); transaction.commitTransaction(); Modified: trunk/wao-business/src/test/java/fr/ifremer/wao/ErrorDB1_0Test.java =================================================================== --- trunk/wao-business/src/test/java/fr/ifremer/wao/ErrorDB1_0Test.java 2010-11-26 13:13:45 UTC (rev 804) +++ trunk/wao-business/src/test/java/fr/ifremer/wao/ErrorDB1_0Test.java 2010-11-26 14:14:35 UTC (rev 805) @@ -123,9 +123,9 @@ TopiaQuery query = dao.createQueryDoneContactsFromDate(null, null); String contact = query.getMainAlias(); - String tideBegin = contact + "." + Contact.TIDE_BEGIN_DATE; + String tideBegin = contact + "." + Contact.PROPERTY_TIDE_BEGIN_DATE; - String sampleRow = contact + "." + Contact.SAMPLE_ROW; + String sampleRow = contact + "." + Contact.PROPERTY_SAMPLE_ROW; query.addEquals(sampleRow, curr); query.addGroup(sampleRow); Modified: trunk/wao-business/src/test/java/fr/ifremer/wao/entity/BoatImplTest.java =================================================================== --- trunk/wao-business/src/test/java/fr/ifremer/wao/entity/BoatImplTest.java 2010-11-26 13:13:45 UTC (rev 804) +++ trunk/wao-business/src/test/java/fr/ifremer/wao/entity/BoatImplTest.java 2010-11-26 14:14:35 UTC (rev 805) @@ -109,9 +109,9 @@ TopiaContext transaction = manager.getContext().beginTransaction(); FishingZoneDAO zoneDAO = WaoDAOHelper.getFishingZoneDAO(transaction); - FishingZone zoneIId = zoneDAO.create(FishingZone.DISTRICT_CODE, "IId"); - FishingZone zoneIV = zoneDAO.create(FishingZone.DISTRICT_CODE, "IV"); - FishingZone zoneI = zoneDAO.create(FishingZone.DISTRICT_CODE, "I"); + FishingZone zoneIId = zoneDAO.create(FishingZone.PROPERTY_DISTRICT_CODE, "IId"); + FishingZone zoneIV = zoneDAO.create(FishingZone.PROPERTY_DISTRICT_CODE, "IV"); + FishingZone zoneI = zoneDAO.create(FishingZone.PROPERTY_DISTRICT_CODE, "I"); transaction.commitTransaction(); @@ -188,23 +188,23 @@ TopiaContext transaction = manager.getContext().beginTransaction(); CompanyDAO companyDAO = WaoDAOHelper.getCompanyDAO(transaction); - Company company = companyDAO.create(Company.NAME, "TARTANPION"); - Company company2 = companyDAO.create(Company.NAME, "BIS"); + Company company = companyDAO.create(Company.PROPERTY_NAME, "TARTANPION"); + Company company2 = companyDAO.create(Company.PROPERTY_NAME, "BIS"); WaoUserDAO userDAO = WaoDAOHelper.getWaoUserDAO(transaction); - WaoUser user = userDAO.create(WaoUser.FIRST_NAME,"Jean", WaoUser.LAST_NAME, "Michmuche", - WaoUser.COMPANY, company); + WaoUser user = userDAO.create(WaoUser.PROPERTY_FIRST_NAME,"Jean", WaoUser.PROPERTY_LAST_NAME, "Michmuche", + WaoUser.PROPERTY_COMPANY, company); company.addWaoUser(user); - WaoUser user2 = userDAO.create(WaoUser.FIRST_NAME,"Bill", WaoUser.LAST_NAME, "Murray", - WaoUser.COMPANY, company2); + WaoUser user2 = userDAO.create(WaoUser.PROPERTY_FIRST_NAME,"Bill", WaoUser.PROPERTY_LAST_NAME, "Murray", + WaoUser.PROPERTY_COMPANY, company2); company2.addWaoUser(user2); transaction.commitTransaction(); FishingZoneDAO zoneDAO = WaoDAOHelper.getFishingZoneDAO(transaction); - FishingZone zoneIId = zoneDAO.create(FishingZone.DISTRICT_CODE, "IId"); - FishingZone zoneIV = zoneDAO.create(FishingZone.DISTRICT_CODE, "IV"); - FishingZone zoneI = zoneDAO.create(FishingZone.DISTRICT_CODE, "I"); + FishingZone zoneIId = zoneDAO.create(FishingZone.PROPERTY_DISTRICT_CODE, "IId"); + FishingZone zoneIV = zoneDAO.create(FishingZone.PROPERTY_DISTRICT_CODE, "IV"); + FishingZone zoneI = zoneDAO.create(FishingZone.PROPERTY_DISTRICT_CODE, "I"); transaction.commitTransaction(); Modified: trunk/wao-business/src/test/java/fr/ifremer/wao/entity/SampleRowImplTest.java =================================================================== --- trunk/wao-business/src/test/java/fr/ifremer/wao/entity/SampleRowImplTest.java 2010-11-26 13:13:45 UTC (rev 804) +++ trunk/wao-business/src/test/java/fr/ifremer/wao/entity/SampleRowImplTest.java 2010-11-26 14:14:35 UTC (rev 805) @@ -87,7 +87,7 @@ SampleMonthDAO monthDAO = WaoDAOHelper.getSampleMonthDAO(transaction); - SampleMonth month = monthDAO.create(SampleMonth.SAMPLE_ROW, row); + SampleMonth month = monthDAO.create(SampleMonth.PROPERTY_SAMPLE_ROW, row); Calendar calendar = new GregorianCalendar(2009, 3, 1); month.setPeriodDate(calendar.getTime()); row.addSampleMonth(month); Modified: trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceBoatImplTest.java =================================================================== --- trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceBoatImplTest.java 2010-11-26 13:13:45 UTC (rev 804) +++ trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceBoatImplTest.java 2010-11-26 14:14:35 UTC (rev 805) @@ -229,7 +229,7 @@ CompanyDAO companyDAO = WaoDAOHelper.getCompanyDAO(transaction); manager.getContext().prepareTopiaId(Company.class, company); companyDAO.update(company); - companyDAO.create(Company.NAME, "BIS"); + companyDAO.create(Company.PROPERTY_NAME, "BIS"); transaction.commitTransaction(); ServiceSampling serviceSampling = manager.getServiceSampling(); @@ -378,22 +378,22 @@ BoatDAO boatDAO = WaoDAOHelper.getBoatDAO(transaction); Boat boat = boatDAO.create( - Boat.NAME, "TESTBOAT", - Boat.IMMATRICULATION, 174592); + Boat.PROPERTY_NAME, "TESTBOAT", + Boat.PROPERTY_IMMATRICULATION, 174592); ActivityCalendarDAO dao = WaoDAOHelper.getActivityCalendarDAO(transaction); ActivityCalendar calendar1 = dao.create( - ActivityCalendar.BOAT, boat, - ActivityCalendar.YEAR, 2008); + ActivityCalendar.PROPERTY_BOAT, boat, + ActivityCalendar.PROPERTY_YEAR, 2008); ActivityCalendar calendar2 = dao.create( - ActivityCalendar.BOAT, boat, - ActivityCalendar.YEAR, 2007); + ActivityCalendar.PROPERTY_BOAT, boat, + ActivityCalendar.PROPERTY_YEAR, 2007); ActivityCalendar calendar3 = dao.create( - ActivityCalendar.BOAT, boat, - ActivityCalendar.YEAR, 2009); + ActivityCalendar.PROPERTY_BOAT, boat, + ActivityCalendar.PROPERTY_YEAR, 2009); transaction.commitTransaction(); transaction.closeContext(); Modified: trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceContactInternalTest.java =================================================================== --- trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceContactInternalTest.java 2010-11-26 13:13:45 UTC (rev 804) +++ trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceContactInternalTest.java 2010-11-26 14:14:35 UTC (rev 805) @@ -140,15 +140,15 @@ if (needObserver) { CompanyDAO companyDAO = WaoDAOHelper.getCompanyDAO(transaction); - company = companyDAO.create(Company.NAME, "TARTANPION"); + company = companyDAO.create(Company.PROPERTY_NAME, "TARTANPION"); WaoUserDAO userDAO = WaoDAOHelper.getWaoUserDAO(transaction); observer = userDAO.create( - WaoUser.COMPANY, company, - WaoUser.LOGIN, "jmichmuche", - WaoUser.FIRST_NAME, "Jean", - WaoUser.LAST_NAME, "Michmuche", - WaoUser.ROLE, UserRole.OBSERVER.ordinal()); + WaoUser.PROPERTY_COMPANY, company, + WaoUser.PROPERTY_LOGIN, "jmichmuche", + WaoUser.PROPERTY_FIRST_NAME, "Jean", + WaoUser.PROPERTY_LAST_NAME, "Michmuche", + WaoUser.PROPERTY_ROLE, UserRole.OBSERVER.ordinal()); when(contact.getObserver()).thenReturn(observer); } @@ -156,18 +156,18 @@ SampleRowDAO rowDAO = WaoDAOHelper.getSampleRowDAO(transaction); log.info("SampleRow : 2010_0001"); - sampleRow = rowDAO.create(SampleRow.CODE, "2010_0001", - SampleRow.COMPANY, company); + sampleRow = rowDAO.create(SampleRow.PROPERTY_CODE, "2010_0001", + SampleRow.PROPERTY_COMPANY, company); SampleMonthDAO monthDAO = WaoDAOHelper.getSampleMonthDAO(transaction); log.info("SampleMonth : 03/2010 _ row 2010_0001"); Date monthDate = DateUtil.createDate(1, 3, 2010); - sampleMonth = monthDAO.create(SampleMonth.SAMPLE_ROW, sampleRow, - SampleMonth.PERIOD_DATE, monthDate); + sampleMonth = monthDAO.create(SampleMonth.PROPERTY_SAMPLE_ROW, sampleRow, + SampleMonth.PROPERTY_PERIOD_DATE, monthDate); monthDate = DateUtil.createDate(1, 4, 2010); - monthDAO.create(SampleMonth.SAMPLE_ROW, sampleRow, - SampleMonth.PERIOD_DATE, monthDate); + monthDAO.create(SampleMonth.PROPERTY_SAMPLE_ROW, sampleRow, + SampleMonth.PROPERTY_PERIOD_DATE, monthDate); Date contactDate = DateUtil.createDate(18, 3, 2010); when(contact.getTideBeginDate()).thenReturn(contactDate); @@ -175,7 +175,7 @@ if (needBoat) { BoatDAO boatDAO = WaoDAOHelper.getBoatDAO(transaction); - boat = boatDAO.create(Boat.IMMATRICULATION, 175846); + boat = boatDAO.create(Boat.PROPERTY_IMMATRICULATION, 175846); when(contact.getBoat()).thenReturn(boat); } @@ -425,7 +425,7 @@ SampleMonthDAO dao = WaoDAOHelper.getSampleMonthDAO(transaction); TopiaQuery query = dao.createQuery(); - query.addEquals(SampleMonth.PERIOD_DATE, DateUtil.createDate(1, 4, 2010)); + query.addEquals(SampleMonth.PROPERTY_PERIOD_DATE, DateUtil.createDate(1, 4, 2010)); SampleMonth month = dao.findByQuery(query); @@ -614,34 +614,34 @@ log.info("test 2 : Error on boat"); when(reader.get(BOAT.NAVS_COD.name())).thenReturn("2222"); - checkImportError(Contact.BOAT); + checkImportError(Contact.PROPERTY_BOAT); // Reinit boat when(reader.get(BOAT.NAVS_COD.name())). thenReturn(String.valueOf(boat.getImmatriculation())); log.info("test 3 : Error on company"); when(creator.getCompany()).thenReturn(null); - checkImportError(WaoUser.COMPANY); + checkImportError(WaoUser.PROPERTY_COMPANY); // Reinit creator company when(creator.getCompany()).thenReturn(company); log.info("test 4 : Error on observer"); when(reader.get(CONTACT.OBSERV_ID.name())).thenReturn("FAKE"); - checkImportError(Contact.OBSERVER); + checkImportError(Contact.PROPERTY_OBSERVER); // Reinit observer when(reader.get(CONTACT.OBSERV_ID.name())). thenReturn(observer.getLogin()); log.info("test 5 : Error on sampleRow"); when(reader.get(SAMPLING.PLAN_CODE.name())).thenReturn("FAKE"); - checkImportError(Contact.SAMPLE_ROW); + checkImportError(Contact.PROPERTY_SAMPLE_ROW); // Reinit sampleRow when(reader.get(SAMPLING.PLAN_CODE.name())). thenReturn(sampleRow.getCode()); log.info("test 6 : Error on state"); when(reader.get(CONTACT.CONT_ETAT.name())).thenReturn("FAKE"); - checkImportError(Contact.STATE); + checkImportError(Contact.PROPERTY_STATE); // Reinit state when(reader.get(CONTACT.CONT_ETAT.name())). thenReturn(ContactState.BOARDING_DONE.libelle()); Modified: trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceSamplingImplTest.java =================================================================== --- trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceSamplingImplTest.java 2010-11-26 13:13:45 UTC (rev 804) +++ trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceSamplingImplTest.java 2010-11-26 14:14:35 UTC (rev 805) @@ -169,7 +169,7 @@ assertEquals(3, result.getFishingZone().size()); assertEquals(3, result.getElligibleBoat().size()); - // TEST FOR DELETE ELLIGIBLE BOAT + // TEST FOR DELETE ELLIGIBLE PROPERTY_BOAT boats.remove(2); serviceSampling.createUpdateSampleRow(result, boats, new SampleRowLogImpl()); @@ -220,7 +220,7 @@ // Create an elligibleBoat active for company ElligibleBoat elligible = createElligibleBoat(row, boat, true); // Retrieve the sampleRow (updated with elligible) - row = findDefaultSampleRow(SampleRow.ELLIGIBLE_BOAT); + row = findDefaultSampleRow(SampleRow.PROPERTY_ELLIGIBLE_BOAT); /** EXEC METHOD **/ List<Boat> boats = new ArrayList<Boat>(); @@ -390,21 +390,21 @@ TopiaContext transaction = manager.getContext().beginTransaction(); FishingZoneDAO zoneDAO = WaoDAOHelper.getFishingZoneDAO(transaction); - FishingZone zoneIId = zoneDAO.create(FishingZone.DISTRICT_CODE, "IId"); - FishingZone zoneIV = zoneDAO.create(FishingZone.DISTRICT_CODE, "IV"); - FishingZone zoneI = zoneDAO.create(FishingZone.DISTRICT_CODE, "I"); + FishingZone zoneIId = zoneDAO.create(FishingZone.PROPERTY_DISTRICT_CODE, "IId"); + FishingZone zoneIV = zoneDAO.create(FishingZone.PROPERTY_DISTRICT_CODE, "IV"); + FishingZone zoneI = zoneDAO.create(FishingZone.PROPERTY_DISTRICT_CODE, "I"); CompanyDAO companyDAO = WaoDAOHelper.getCompanyDAO(transaction); - Company company = companyDAO.create(Company.NAME, "TARTANPION"); + Company company = companyDAO.create(Company.PROPERTY_NAME, "TARTANPION"); Calendar begin = new GregorianCalendar(2009,8,1); Calendar end = new GregorianCalendar(2010,11,31); SampleRowDAO sampleRowDAO = WaoDAOHelper.getSampleRowDAO(transaction); SampleRow row = sampleRowDAO.create( - SampleRow.CODE,"2010_178", - SampleRow.COMPANY,company, - SampleRow.PROGRAM_NAME, "DPMA-2009", - SampleRow.PERIOD_BEGIN, begin.getTime(), - SampleRow.PERIOD_END, end.getTime()); + SampleRow.PROPERTY_CODE,"2010_178", + SampleRow.PROPERTY_COMPANY,company, + SampleRow.PROPERTY_PROGRAM_NAME, "DPMA-2009", + SampleRow.PROPERTY_PERIOD_BEGIN, begin.getTime(), + SampleRow.PROPERTY_PERIOD_END, end.getTime()); transaction.commitTransaction(); @@ -457,10 +457,10 @@ ProfessionDAO dao = WaoDAOHelper.getProfessionDAO(transaction); Profession profession = dao.create( - Profession.LIBELLE, "Fileyage en barre", - Profession.MESH_SIZE, "< 80", - Profession.OTHER, "90mm", - Profession.SPECIES, "barre, lieu noir, saumon des plages"); + Profession.PROPERTY_LIBELLE, "Fileyage en barre", + Profession.PROPERTY_MESH_SIZE, "< 80", + Profession.PROPERTY_OTHER, "90mm", + Profession.PROPERTY_SPECIES, "barre, lieu noir, saumon des plages"); transaction.commitTransaction(); transaction.closeContext(); @@ -483,13 +483,13 @@ TopiaContext transaction = manager.getContext().beginTransaction(); FishingZoneDAO zoneDAO = WaoDAOHelper.getFishingZoneDAO(transaction); - FishingZone zoneIId = zoneDAO.create(FishingZone.DISTRICT_CODE, "IId"); - FishingZone zoneIV = zoneDAO.create(FishingZone.DISTRICT_CODE, "IV"); - FishingZone zoneI = zoneDAO.create(FishingZone.DISTRICT_CODE, "I"); + FishingZone zoneIId = zoneDAO.create(FishingZone.PROPERTY_DISTRICT_CODE, "IId"); + FishingZone zoneIV = zoneDAO.create(FishingZone.PROPERTY_DISTRICT_CODE, "IV"); + FishingZone zoneI = zoneDAO.create(FishingZone.PROPERTY_DISTRICT_CODE, "I"); CompanyDAO companyDAO = WaoDAOHelper.getCompanyDAO(transaction); - companyDAO.create(Company.NAME, "TARTANPION"); - companyDAO.create(Company.NAME, "BIS"); + companyDAO.create(Company.PROPERTY_NAME, "TARTANPION"); + companyDAO.create(Company.PROPERTY_NAME, "BIS"); transaction.commitTransaction(); @@ -555,13 +555,13 @@ TopiaContext transaction = manager.getContext().beginTransaction(); FishingZoneDAO zoneDAO = WaoDAOHelper.getFishingZoneDAO(transaction); - FishingZone zoneIId = zoneDAO.create(FishingZone.DISTRICT_CODE, "IId"); - FishingZone zoneIV = zoneDAO.create(FishingZone.DISTRICT_CODE, "IV"); - FishingZone zoneI = zoneDAO.create(FishingZone.DISTRICT_CODE, "I"); + FishingZone zoneIId = zoneDAO.create(FishingZone.PROPERTY_DISTRICT_CODE, "IId"); + FishingZone zoneIV = zoneDAO.create(FishingZone.PROPERTY_DISTRICT_CODE, "IV"); + FishingZone zoneI = zoneDAO.create(FishingZone.PROPERTY_DISTRICT_CODE, "I"); CompanyDAO companyDAO = WaoDAOHelper.getCompanyDAO(transaction); - companyDAO.create(Company.NAME, "TARTANPION"); - companyDAO.create(Company.NAME, "BIS"); + companyDAO.create(Company.PROPERTY_NAME, "TARTANPION"); + companyDAO.create(Company.PROPERTY_NAME, "BIS"); transaction.commitTransaction(); transaction.closeContext(); @@ -618,13 +618,13 @@ TopiaContext transaction = manager.getContext().beginTransaction(); FishingZoneDAO zoneDAO = WaoDAOHelper.getFishingZoneDAO(transaction); - zoneDAO.create(FishingZone.DISTRICT_CODE, "IId"); - zoneDAO.create(FishingZone.DISTRICT_CODE, "IV"); - zoneDAO.create(FishingZone.DISTRICT_CODE, "I"); + zoneDAO.create(FishingZone.PROPERTY_DISTRICT_CODE, "IId"); + zoneDAO.create(FishingZone.PROPERTY_DISTRICT_CODE, "IV"); + zoneDAO.create(FishingZone.PROPERTY_DISTRICT_CODE, "I"); CompanyDAO companyDAO = WaoDAOHelper.getCompanyDAO(transaction); - companyDAO.create(Company.NAME, "TARTANPION"); - companyDAO.create(Company.NAME, "BIS"); + companyDAO.create(Company.PROPERTY_NAME, "TARTANPION"); + companyDAO.create(Company.PROPERTY_NAME, "BIS"); transaction.commitTransaction(); transaction.closeContext(); @@ -645,13 +645,13 @@ TopiaContext transaction = manager.getContext().beginTransaction(); FishingZoneDAO zoneDAO = WaoDAOHelper.getFishingZoneDAO(transaction); - FishingZone zoneIId = zoneDAO.create(FishingZone.DISTRICT_CODE, "IId"); - FishingZone zoneIV = zoneDAO.create(FishingZone.DISTRICT_CODE, "IV"); - FishingZone zoneI = zoneDAO.create(FishingZone.DISTRICT_CODE, "I"); + FishingZone zoneIId = zoneDAO.create(FishingZone.PROPERTY_DISTRICT_CODE, "IId"); + FishingZone zoneIV = zoneDAO.create(FishingZone.PROPERTY_DISTRICT_CODE, "IV"); + FishingZone zoneI = zoneDAO.create(FishingZone.PROPERTY_DISTRICT_CODE, "I"); CompanyDAO companyDAO = WaoDAOHelper.getCompanyDAO(transaction); - companyDAO.create(Company.NAME, "TARTANPION"); - companyDAO.create(Company.NAME, "BIS"); + companyDAO.create(Company.PROPERTY_NAME, "TARTANPION"); + companyDAO.create(Company.PROPERTY_NAME, "BIS"); transaction.commitTransaction(); ServiceSampling serviceSampling = manager.getServiceSampling(); Modified: trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceSynthesisImplTest.java =================================================================== --- trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceSynthesisImplTest.java 2010-11-26 13:13:45 UTC (rev 804) +++ trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceSynthesisImplTest.java 2010-11-26 14:14:35 UTC (rev 805) @@ -123,15 +123,15 @@ TopiaContext transaction = manager.getContext().beginTransaction(); CompanyDAO companyDAO = WaoDAOHelper.getCompanyDAO(transaction); - Company company = companyDAO.create(Company.NAME, "TARTANPION"); - Company company2 = companyDAO.create(Company.NAME, "BIS"); + Company company = companyDAO.create(Company.PROPERTY_NAME, "TARTANPION"); + Company company2 = companyDAO.create(Company.PROPERTY_NAME, "BIS"); WaoUserDAO userDAO = WaoDAOHelper.getWaoUserDAO(transaction); - WaoUser user = userDAO.create(WaoUser.FIRST_NAME,"Jean", WaoUser.LAST_NAME, "Michmuche", - WaoUser.COMPANY, company); + WaoUser user = userDAO.create(WaoUser.PROPERTY_FIRST_NAME,"Jean", WaoUser.PROPERTY_LAST_NAME, "Michmuche", + WaoUser.PROPERTY_COMPANY, company); company.addWaoUser(user); - WaoUser user2 = userDAO.create(WaoUser.FIRST_NAME,"Bill", WaoUser.LAST_NAME, "Murray", - WaoUser.COMPANY, company2); + WaoUser user2 = userDAO.create(WaoUser.PROPERTY_FIRST_NAME,"Bill", WaoUser.PROPERTY_LAST_NAME, "Murray", + WaoUser.PROPERTY_COMPANY, company2); company2.addWaoUser(user2); transaction.commitTransaction(); @@ -213,15 +213,15 @@ TopiaContext transaction = manager.getContext().beginTransaction(); CompanyDAO companyDAO = WaoDAOHelper.getCompanyDAO(transaction); - Company company = companyDAO.create(Company.NAME, "TARTANPION"); - Company company2 = companyDAO.create(Company.NAME, "BIS"); + Company company = companyDAO.create(Company.PROPERTY_NAME, "TARTANPION"); + Company company2 = companyDAO.create(Company.PROPERTY_NAME, "BIS"); WaoUserDAO userDAO = WaoDAOHelper.getWaoUserDAO(transaction); - WaoUser user = userDAO.create(WaoUser.FIRST_NAME,"Jean", WaoUser.LAST_NAME, "Michmuche", - WaoUser.COMPANY, company); + WaoUser user = userDAO.create(WaoUser.PROPERTY_FIRST_NAME,"Jean", WaoUser.PROPERTY_LAST_NAME, "Michmuche", + WaoUser.PROPERTY_COMPANY, company); company.addWaoUser(user); - WaoUser user2 = userDAO.create(WaoUser.FIRST_NAME,"Bill", WaoUser.LAST_NAME, "Murray", - WaoUser.COMPANY, company2); + WaoUser user2 = userDAO.create(WaoUser.PROPERTY_FIRST_NAME,"Bill", WaoUser.PROPERTY_LAST_NAME, "Murray", + WaoUser.PROPERTY_COMPANY, company2); company2.addWaoUser(user2); transaction.commitTransaction(); @@ -495,15 +495,15 @@ TopiaContext transaction = manager.getContext().beginTransaction(); CompanyDAO companyDAO = WaoDAOHelper.getCompanyDAO(transaction); - Company company = companyDAO.create(Company.NAME, "TARTANPION"); - Company company2 = companyDAO.create(Company.NAME, "BIS"); + Company company = companyDAO.create(Company.PROPERTY_NAME, "TARTANPION"); + Company company2 = companyDAO.create(Company.PROPERTY_NAME, "BIS"); WaoUserDAO userDAO = WaoDAOHelper.getWaoUserDAO(transaction); - WaoUser user = userDAO.create(WaoUser.FIRST_NAME,"Jean", WaoUser.LAST_NAME, "Michmuche", - WaoUser.COMPANY, company); + WaoUser user = userDAO.create(WaoUser.PROPERTY_FIRST_NAME,"Jean", WaoUser.PROPERTY_LAST_NAME, "Michmuche", + WaoUser.PROPERTY_COMPANY, company); company.addWaoUser(user); - WaoUser user2 = userDAO.create(WaoUser.FIRST_NAME,"Bill", WaoUser.LAST_NAME, "Murray", - WaoUser.COMPANY, company2); + WaoUser user2 = userDAO.create(WaoUser.PROPERTY_FIRST_NAME,"Bill", WaoUser.PROPERTY_LAST_NAME, "Murray", + WaoUser.PROPERTY_COMPANY, company2); company2.addWaoUser(user2); transaction.commitTransaction(); Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/base/AbstractFilteredPage.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/base/AbstractFilteredPage.java 2010-11-26 13:13:45 UTC (rev 804) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/base/AbstractFilteredPage.java 2010-11-26 14:14:35 UTC (rev 805) @@ -305,7 +305,7 @@ getFilter().setSampleRows(rowsFiltered); sampleRowSelectModel = new GenericSelectModel<SampleRow>(sampleRows, SampleRow.class, - SampleRow.CODE, SampleRow.TOPIA_ID, propertyAccess); + SampleRow.PROPERTY_CODE, SampleRow.TOPIA_ID, propertyAccess); } return sampleRowSelectModel; } @@ -322,7 +322,7 @@ if (companySelectModel == null) { List<Company> companies = serviceUser.getCompanies(isAvailableDataForFiltersOnly()); companySelectModel = new GenericSelectModel<Company>(companies,Company.class, - Company.NAME, Company.TOPIA_ID, propertyAccess); + Company.PROPERTY_NAME, Company.TOPIA_ID, propertyAccess); } return companySelectModel; } Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/data/FiltersModel.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/data/FiltersModel.java 2010-11-26 13:13:45 UTC (rev 804) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/data/FiltersModel.java 2010-11-26 14:14:35 UTC (rev 805) @@ -122,7 +122,7 @@ companySelectModel = new GenericSelectModel<Company>( companies, Company.class, - Company.NAME, + Company.PROPERTY_NAME, Company.TOPIA_ID, propertyAccess ); @@ -230,7 +230,7 @@ sampleRowSelectModel = new GenericSelectModel<SampleRow>( sampleRows, SampleRow.class, - SampleRow.CODE, + SampleRow.PROPERTY_CODE, SampleRow.TOPIA_ID, propertyAccess ); Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Administration.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Administration.java 2010-11-26 13:13:45 UTC (rev 804) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Administration.java 2010-11-26 14:14:35 UTC (rev 805) @@ -304,7 +304,7 @@ public GenericSelectModel<Company> getCompaniesSelectModel() throws WaoException { if (companiesSelectModel == null) { companiesSelectModel = new GenericSelectModel<Company>(getCompanies(), - Company.class, Company.NAME, "id", propertyAccess); + Company.class, Company.PROPERTY_NAME, "id", propertyAccess); } return companiesSelectModel; } @@ -460,13 +460,13 @@ userModel = beanModelSource.createEditModel(WaoUser.class, messages); userModel.add("userRole", null); userModel.include( - WaoUser.FIRST_NAME, - WaoUser.LAST_NAME, - WaoUser.LOGIN, - WaoUser.PASSWORD, - WaoUser.PHONE_NUMBER, + WaoUser.PROPERTY_FIRST_NAME, + WaoUser.PROPERTY_LAST_NAME, + WaoUser.PROPERTY_LOGIN, + WaoUser.PROPERTY_PASSWORD, + WaoUser.PROPERTY_PHONE_NUMBER, "userRole", - WaoUser.ACTIVE + WaoUser.PROPERTY_ACTIVE ); } return userModel; Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/SampleRowForm.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/SampleRowForm.java 2010-11-26 13:13:45 UTC (rev 804) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/SampleRowForm.java 2010-11-26 14:14:35 UTC (rev 805) @@ -412,7 +412,7 @@ curr = serviceSampling.getNewSampleMonth(currMonth, getSampleRow()); curr.addPropertyChangeListener( - SampleMonth.EXPECTED_TIDES_VALUE, propertyChange); + SampleMonth.PROPERTY_EXPECTED_TIDES_VALUE, propertyChange); } sampleMonths.add(curr); } @@ -488,7 +488,7 @@ void onSelectedFromDeleteMonth(int index) throws WaoException { SampleMonth month = getSampleMonths().remove(index); month.removePropertyChangeListener( - SampleMonth.EXPECTED_TIDES_VALUE, propertyChange); + SampleMonth.PROPERTY_EXPECTED_TIDES_VALUE, propertyChange); edited = true; } @@ -531,7 +531,7 @@ sampleRow = serviceSampling.getSampleRow(sampleRowId); for (SampleMonth month : sampleRow.getSampleMonth()) { month.addPropertyChangeListener( - SampleMonth.EXPECTED_TIDES_VALUE, propertyChange); + SampleMonth.PROPERTY_EXPECTED_TIDES_VALUE, propertyChange); } } else { sampleRow = serviceSampling.getNewSampleRow(); Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/services/ContactModelFactory.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/services/ContactModelFactory.java 2010-11-26 13:13:45 UTC (rev 804) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/services/ContactModelFactory.java 2010-11-26 14:14:35 UTC (rev 805) @@ -57,8 +57,8 @@ contactModel.add("createdBy", null); // contactModel.add(Contact.SAMPLE_ROW, getSampleRowPropertyConduit()); // contactModel.add(Contact.BOAT, getBoatPropertyConduit()); - contactModel.add(Contact.SAMPLE_ROW, null); - contactModel.add(Contact.BOAT, null); + contactModel.add(Contact.PROPERTY_SAMPLE_ROW, null); + contactModel.add(Contact.PROPERTY_BOAT, null); contactModel.add("mammals", null); contactModel.add("validation", null); contactModel.add("actions", null); @@ -66,35 +66,35 @@ contactModel.include( "createdBy", TopiaEntity.TOPIA_CREATE_DATE, - Contact.SAMPLE_ROW, - Contact.BOAT, - Contact.STATE, - Contact.TIDE_BEGIN_DATE, - Contact.TIDE_END_DATE, - Contact.NB_OBSERVANTS, + Contact.PROPERTY_SAMPLE_ROW, + Contact.PROPERTY_BOAT, + Contact.PROPERTY_STATE, + Contact.PROPERTY_TIDE_BEGIN_DATE, + Contact.PROPERTY_TIDE_END_DATE, + Contact.PROPERTY_NB_OBSERVANTS, "mammals", - Contact.COMMENT, - Contact.DATA_INPUT_DATE, + Contact.PROPERTY_COMMENT, + Contact.PROPERTY_DATA_INPUT_DATE, "validation", "actions"); contactModel.get(TopiaEntity.TOPIA_CREATE_DATE).sortable(false); - contactModel.get(Contact.STATE).sortable(false); - contactModel.get(Contact.TIDE_BEGIN_DATE).sortable(false); - contactModel.get(Contact.TIDE_END_DATE).sortable(false); - contactModel.get(Contact.NB_OBSERVANTS).sortable(false); - contactModel.get(Contact.DATA_INPUT_DATE).sortable(false); - contactModel.get(Contact.COMMENT).sortable(false); + contactModel.get(Contact.PROPERTY_STATE).sortable(false); + contactModel.get(Contact.PROPERTY_TIDE_BEGIN_DATE).sortable(false); + contactModel.get(Contact.PROPERTY_TIDE_END_DATE).sortable(false); + contactModel.get(Contact.PROPERTY_NB_OBSERVANTS).sortable(false); + contactModel.get(Contact.PROPERTY_DATA_INPUT_DATE).sortable(false); + contactModel.get(Contact.PROPERTY_COMMENT).sortable(false); return contactModel; } public BeanModel<Contact> buildCoordinatorContactModel(BeanModelSource beanModelSource, ComponentResources resources) { BeanModel<Contact> contactModel = buildContactModel(beanModelSource, resources); - contactModel.add(RelativePosition.AFTER, "validation", Contact.COMMENT_COORDINATOR, getCommentCoordinatorPropertyConduit()); - contactModel.add(RelativePosition.AFTER, Contact.COMMENT_COORDINATOR, Contact.COMMENT_ADMIN, getCommentAdminPropertyConduit()); - contactModel.get(Contact.COMMENT_COORDINATOR).sortable(false); - contactModel.get(Contact.COMMENT_ADMIN).sortable(false); + contactModel.add(RelativePosition.AFTER, "validation", Contact.PROPERTY_COMMENT_COORDINATOR, getCommentCoordinatorPropertyConduit()); + contactModel.add(RelativePosition.AFTER, Contact.PROPERTY_COMMENT_COORDINATOR, Contact.PROPERTY_COMMENT_ADMIN, getCommentAdminPropertyConduit()); + contactModel.get(Contact.PROPERTY_COMMENT_COORDINATOR).sortable(false); + contactModel.get(Contact.PROPERTY_COMMENT_ADMIN).sortable(false); contactModel.add(RelativePosition.BEFORE, "actions", "dataReliability", getDataReliabilityPropertyConduit()); contactModel.get("dataReliability").sortable(false); return contactModel; @@ -104,19 +104,19 @@ BeanModel<Contact> contactModel = buildCoordinatorContactModel(beanModelSource, resources); contactModel.exclude("createdBy"); contactModel.add(RelativePosition.AFTER, TopiaEntity.TOPIA_CREATE_DATE, "observer", getUserPropertyConduit()); - contactModel.add(RelativePosition.AFTER, "observer", WaoUser.COMPANY, getCompanyPropertyConduit()); - contactModel.add(RelativePosition.AFTER, Contact.SAMPLE_ROW, "program", getProgramPropertyConduit()); + contactModel.add(RelativePosition.AFTER, "observer", WaoUser.PROPERTY_COMPANY, getCompanyPropertyConduit()); + contactModel.add(RelativePosition.AFTER, Contact.PROPERTY_SAMPLE_ROW, "program", getProgramPropertyConduit()); contactModel.add(RelativePosition.AFTER, "program", "professionCode", getProfessionCodePropertyConduit()); contactModel.add(RelativePosition.AFTER, "professionCode", "professionLibelle", getProfessionLibellePropertyConduit()); contactModel.add(RelativePosition.AFTER, "professionLibelle", "professionSpecies", getProfessionSpeciesPropertyConduit()); contactModel.add(RelativePosition.AFTER, "professionSpecies", "fishingZoneFacade", getFishingZoneFacadePropertyConduit()); contactModel.add(RelativePosition.AFTER, "fishingZoneFacade", "fishingZoneSector", getFishingZoneSectorPropertyConduit()); contactModel.add(RelativePosition.AFTER, "fishingZoneSector", "fishingZoneDivision", getFishingZoneDivisionPropertyConduit()); - contactModel.add(RelativePosition.AFTER, Contact.BOAT, "boatImmatriculation", getBoatImmatriculationPropertyConduit()); + contactModel.add(RelativePosition.AFTER, Contact.PROPERTY_BOAT, "boatImmatriculation", getBoatImmatriculationPropertyConduit()); contactModel.add(RelativePosition.AFTER, "boatImmatriculation", "boatDistrictCode", getBoatDistrictCodePropertyConduit()); contactModel.get("observer").sortable(false); - contactModel.get(WaoUser.COMPANY).sortable(false); + contactModel.get(WaoUser.PROPERTY_COMPANY).sortable(false); contactModel.get("program").sortable(false); contactModel.get("professionCode").sortable(false); contactModel.get("professionLibelle").sortable(false);

1 0

[Suiviobsmer-commits] r804 - in trunk: wao-business/src/main/java/fr/ifremer/wao/entity wao-business/src/main/resources/i18n wao-business/src/main/xmi wao-ui/src/main/java/fr/ifremer/wao/ui/base
by bleny＠users.labs.libre-entreprise.org Nov. 26, 2010

Nov. 26, 2010

Author: bleny Date: 2010-11-26 13:13:45 +0000 (Fri, 26 Nov 2010) New Revision: 804 Log: update sampling plan form to have description in field Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/entity/FishingGearDCFImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/entity/TargetSpeciesDCFImpl.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/base/AbstractFilteredPage.java Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/entity/FishingGearDCFImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/entity/FishingGearDCFImpl.java 2010-11-26 12:44:45 UTC (rev 803) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/entity/FishingGearDCFImpl.java 2010-11-26 13:13:45 UTC (rev 804) @@ -20,4 +20,9 @@ public String getDescription() { return _(FishingGearDCF.class.getName() + "." + getCode()); } + + @Override + public String getFullDescription() { + return String.format("%s (%s)", getCode(), getDescription()); + } } Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/entity/TargetSpeciesDCFImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/entity/TargetSpeciesDCFImpl.java 2010-11-26 12:44:45 UTC (rev 803) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/entity/TargetSpeciesDCFImpl.java 2010-11-26 13:13:45 UTC (rev 804) @@ -20,4 +20,9 @@ public String getDescription() { return _(TargetSpeciesDCF.class.getName() + "." + getCode()); } + + @Override + public String getFullDescription() { + return String.format("%s (%s)", getCode(), getDescription()); + } } 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 2010-11-26 12:44:45 UTC (rev 803) +++ trunk/wao-business/src/main/resources/i18n/wao-business-en_GB.properties 2010-11-26 13:13:45 UTC (rev 804) @@ -1,66 +1,66 @@ -DCF.gear.=Not specified -DCF.gear.DRB=Boat dredges -DCF.gear.DRH=Hand dredges -DCF.gear.FAR=Aerial traps -DCF.gear.FCN=Cast nets -DCF.gear.FG=Falling gear (not specified) -DCF.gear.FIX=Traps (not specified) -DCF.gear.FPN=Stationary uncovered pound nets -DCF.gear.FPO=Pots -DCF.gear.FSN=Stow nets -DCF.gear.FWR=Barriers, fences, weirs, etc. -DCF.gear.FYK=Fyke nets -DCF.gear.GEN=Gillnets and entangling nets (not specified) -DCF.gear.GN=Gillnets (not specified) -DCF.gear.GNC=Encircling gillnets -DCF.gear.GND=Driftnets -DCF.gear.GNF=Fixed gillnets -DCF.gear.GNS=Set gillnets (anchored) -DCF.gear.GTN=Combined gillnets-trammel nets -DCF.gear.GTR=Trammel nets -DCF.gear.HAR=Harpoons -DCF.gear.HMD=Mechanized dredges -DCF.gear.HMP=Pumps -DCF.gear.HMX=Harvesting machines (not specified) -DCF.gear.LA=Wihtout purse lines (lampara) -DCF.gear.LHM=Handlines and pole-lines (mechanized) -DCF.gear.LHP=Handlines and pole-lines (hand-operated) -DCF.gear.LL=Longlines (not specified) -DCF.gear.LLD=Drifting longlines -DCF.gear.LLS=Set longlines -DCF.gear.LN=Lift nets (not specified) -DCF.gear.LNB=Boat-operated lift nets -DCF.gear.LNP=Portable lift nets -DCF.gear.LNS=Shore-operated stationary lift nets -DCF.gear.LTL=Trolling lines -DCF.gear.LX=Hooks and lines (not specified) -DCF.gear.MIS=Miscellaneous -DCF.gear.NK=Gear not know or not specified -DCF.gear.OT=Otter trawls (not specified) -DCF.gear.OTB=Otter trawls -DCF.gear.OTM=Otter trawls -DCF.gear.OTT=Other twin trawls -DCF.gear.PS=With purse lines (purse seines) -DCF.gear.PS1=One boat operated purse seines -DCF.gear.PS2=Tow boats operated purse seines -DCF.gear.PT=Pair trawls (not specified) -DCF.gear.PTB=Pair trawls -DCF.gear.PTM=Pair trawls -DCF.gear.RG=Recreational fishing gear -DCF.gear.SB=Beach seines -DCF.gear.SDN=Danish seines -DCF.gear.SPR=Pair seines -DCF.gear.SSC=Scottish seines -DCF.gear.SV=Boat or vessel seines -DCF.gear.SW=Seine nets (not specified) -DCF.gear.TB=Bottom trawls (not specified) -DCF.gear.TBB=Beam trawls -DCF.gear.TBN=Nephrops trawls -DCF.gear.TBS=Shrimp trawls -DCF.gear.TM=Midwater trawls (not specified) -DCF.gear.TMS=Shrimp trawls -DCF.gear.TX=Other trawls (not specified) -DCF.species.=Not specified +fr.ifremer.wao.entity.FishingGearDCF.=Not specified +fr.ifremer.wao.entity.FishingGearDCF.DRB=Boat dredges +fr.ifremer.wao.entity.FishingGearDCF.DRH=Hand dredges +fr.ifremer.wao.entity.FishingGearDCF.FAR=Aerial traps +fr.ifremer.wao.entity.FishingGearDCF.FCN=Cast nets +fr.ifremer.wao.entity.FishingGearDCF.FG=Falling gear (not specified) +fr.ifremer.wao.entity.FishingGearDCF.FIX=Traps (not specified) +fr.ifremer.wao.entity.FishingGearDCF.FPN=Stationary uncovered pound nets +fr.ifremer.wao.entity.FishingGearDCF.FPO=Pots +fr.ifremer.wao.entity.FishingGearDCF.FSN=Stow nets +fr.ifremer.wao.entity.FishingGearDCF.FWR=Barriers, fences, weirs, etc. +fr.ifremer.wao.entity.FishingGearDCF.FYK=Fyke nets +fr.ifremer.wao.entity.FishingGearDCF.GEN=Gillnets and entangling nets (not specified) +fr.ifremer.wao.entity.FishingGearDCF.GN=Gillnets (not specified) +fr.ifremer.wao.entity.FishingGearDCF.GNC=Encircling gillnets +fr.ifremer.wao.entity.FishingGearDCF.GND=Driftnets +fr.ifremer.wao.entity.FishingGearDCF.GNF=Fixed gillnets +fr.ifremer.wao.entity.FishingGearDCF.GNS=Set gillnets (anchored) +fr.ifremer.wao.entity.FishingGearDCF.GTN=Combined gillnets-trammel nets +fr.ifremer.wao.entity.FishingGearDCF.GTR=Trammel nets +fr.ifremer.wao.entity.FishingGearDCF.HAR=Harpoons +fr.ifremer.wao.entity.FishingGearDCF.HMD=Mechanized dredges +fr.ifremer.wao.entity.FishingGearDCF.HMP=Pumps +fr.ifremer.wao.entity.FishingGearDCF.HMX=Harvesting machines (not specified) +fr.ifremer.wao.entity.FishingGearDCF.LA=Wihtout purse lines (lampara) +fr.ifremer.wao.entity.FishingGearDCF.LHM=Handlines and pole-lines (mechanized) +fr.ifremer.wao.entity.FishingGearDCF.LHP=Handlines and pole-lines (hand-operated) +fr.ifremer.wao.entity.FishingGearDCF.LL=Longlines (not specified) +fr.ifremer.wao.entity.FishingGearDCF.LLD=Drifting longlines +fr.ifremer.wao.entity.FishingGearDCF.LLS=Set longlines +fr.ifremer.wao.entity.FishingGearDCF.LN=Lift nets (not specified) +fr.ifremer.wao.entity.FishingGearDCF.LNB=Boat-operated lift nets +fr.ifremer.wao.entity.FishingGearDCF.LNP=Portable lift nets +fr.ifremer.wao.entity.FishingGearDCF.LNS=Shore-operated stationary lift nets +fr.ifremer.wao.entity.FishingGearDCF.LTL=Trolling lines +fr.ifremer.wao.entity.FishingGearDCF.LX=Hooks and lines (not specified) +fr.ifremer.wao.entity.FishingGearDCF.MIS=Miscellaneous +fr.ifremer.wao.entity.FishingGearDCF.NK=Gear not know or not specified +fr.ifremer.wao.entity.FishingGearDCF.OT=Otter trawls (not specified) +fr.ifremer.wao.entity.FishingGearDCF.OTB=Otter trawls +fr.ifremer.wao.entity.FishingGearDCF.OTM=Otter trawls +fr.ifremer.wao.entity.FishingGearDCF.OTT=Other twin trawls +fr.ifremer.wao.entity.FishingGearDCF.PS=With purse lines (purse seines) +fr.ifremer.wao.entity.FishingGearDCF.PS1=One boat operated purse seines +fr.ifremer.wao.entity.FishingGearDCF.PS2=Tow boats operated purse seines +fr.ifremer.wao.entity.FishingGearDCF.PT=Pair trawls (not specified) +fr.ifremer.wao.entity.FishingGearDCF.PTB=Pair trawls +fr.ifremer.wao.entity.FishingGearDCF.PTM=Pair trawls +fr.ifremer.wao.entity.FishingGearDCF.RG=Recreational fishing gear +fr.ifremer.wao.entity.FishingGearDCF.SB=Beach seines +fr.ifremer.wao.entity.FishingGearDCF.SDN=Danish seines +fr.ifremer.wao.entity.FishingGearDCF.SPR=Pair seines +fr.ifremer.wao.entity.FishingGearDCF.SSC=Scottish seines +fr.ifremer.wao.entity.FishingGearDCF.SV=Boat or vessel seines +fr.ifremer.wao.entity.FishingGearDCF.SW=Seine nets (not specified) +fr.ifremer.wao.entity.FishingGearDCF.TB=Bottom trawls (not specified) +fr.ifremer.wao.entity.FishingGearDCF.TBB=Beam trawls +fr.ifremer.wao.entity.FishingGearDCF.TBN=Nephrops trawls +fr.ifremer.wao.entity.FishingGearDCF.TBS=Shrimp trawls +fr.ifremer.wao.entity.FishingGearDCF.TM=Midwater trawls (not specified) +fr.ifremer.wao.entity.FishingGearDCF.TMS=Shrimp trawls +fr.ifremer.wao.entity.FishingGearDCF.TX=Other trawls (not specified) +fr.ifremer.wao.entity.TargetSpeciesDCF.=Not specified wao.business.bean.DataReliability.doubtful=doubtful wao.business.bean.DataReliability.not_provided=not provided wao.business.bean.DataReliability.not_reliable=not reliable 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 2010-11-26 12:44:45 UTC (rev 803) +++ trunk/wao-business/src/main/resources/i18n/wao-business-fr_FR.properties 2010-11-26 13:13:45 UTC (rev 804) @@ -1,128 +1,128 @@ -DCF.gear.=Non sp\u00E9cifi\u00E9 -DCF.gear.DRB=Dragues remorqu\u00E9es par bateau -DCF.gear.DRH=Dragues \u00E0 main -DCF.gear.FAR=Pi\u00E8ges a\u00E9riens -DCF.gear.FCN=\u00C9perviers -DCF.gear.FG=Autres engins retombants (non-sp\u00E9cifi\u00E9s) -DCF.gear.FIX=Pi\u00E8ges (non-sp\u00E9cifi\u00E9s) -DCF.gear.FPN=Filets-pi\u00E8ges fixes non couverts -DCF.gear.FPO=Nasses (casiers) -DCF.gear.FSN=Filets \u00E0 l'\u00E9talage (diables) -DCF.gear.FWR=Barrages, parcs, bordigues, etc. -DCF.gear.FYK=Verveux -DCF.gear.GEN=Filets maillants et filets emm\u00E9lants (non sp\u00E9cifi\u00E9s) -DCF.gear.GES=Tamis \u00E0 civelles -DCF.gear.GN=Filets maillants (non sp\u00E9cifi\u00E9s) -DCF.gear.GNC=Filets maillants encerclants -DCF.gear.GND=Filets maillants d\u00E9rivants (filets d\u00E9rivants) -DCF.gear.GNF=Filets maillants fixes (sur perches) -DCF.gear.GNS=Filets maillants cal\u00E9s (ancr\u00E9s) -DCF.gear.GT=Tr\u00E9mailleurs -DCF.gear.GTN=Tr\u00E9mails et filets maillants combin\u00E9s -DCF.gear.GTR=Tr\u00E9mails -DCF.gear.HAR=Harpons -DCF.gear.HMD=Dragues m\u00E9canis\u00E9es -DCF.gear.HMP=Pompes -DCF.gear.HMX=Engins de r\u00E9colte (non sp\u00E9cifi\u00E9s) -DCF.gear.LA=Filets tournants sans coulisse (filet lamparo) -DCF.gear.LHM=Lignes \u00E0 main et lignes avec cannes -DCF.gear.LHP=Lignes \u00E0 main et lignes \u00E0 cannes -DCF.gear.LL=Palangres (non sp\u00E9cifi\u00E9es) -DCF.gear.LLD=Palangres d\u00E9rivantes -DCF.gear.LLS=Palangres cal\u00E9es ou semi-flottantes -DCF.gear.LN=Filets soulev\u00E9s (non sp\u00E9cifi\u00E9s) -DCF.gear.LNB=Filets soulev\u00E9s man\u0153uvr\u00E9es du bateau -DCF.gear.LNP=Filets soulev\u00E9s portatifs -DCF.gear.LNS=Filets soulev\u00E9s fixes man\u0153uvr\u00E9es du rivage -DCF.gear.LTL=lignes de tra\u00EEne -DCF.gear.LX=Hame\u00E7ons et lignes (non sp\u00E9cifi\u00E9s) -DCF.gear.MIS=Divers -DCF.gear.NK=Engins inconnus ou non sp\u00E9cifi\u00E9s -DCF.gear.OT=Chaluts \u00E0 panneaux (non sp\u00E9cifi\u00E9) -DCF.gear.OTB=Chalut de fond \u00E0 panneaux -DCF.gear.OTM=Chaluts p\u00E9lagiques \u00E0 panneaux -DCF.gear.OTT=Chaluts jumeaux \u00E0 panneaux -DCF.gear.PS=Filets tournants avec coulisse (sennes coulissantes) -DCF.gear.PS1=Filets tournants, sennes coulissantes man\u0153uvr\u00E9es par un bateau -DCF.gear.PS2=Filets tournants, sennes coulissantes man\u0153uvr\u00E9es par deux bateaux -DCF.gear.PT=Chalut-b\u0153ufs (non sp\u00E9cifi\u00E9) -DCF.gear.PTB=Chalut-b\u0153ufs de fond -DCF.gear.PTM=Chalut-b\u0153ufs p\u00E9lagiques -DCF.gear.RG=Engins de p\u00EAche r\u00E9vr\u00E9ative -DCF.gear.SB=Sennes de plages -DCF.gear.SDN=Sennes danoises -DCF.gear.SPR=Sennes man\u0153uvr\u00E9es par deux bateaux -DCF.gear.SSC=Sennes \u00E9cossaises -DCF.gear.SV=Sennes hal\u00E9es \u00E0 bord -DCF.gear.SW=Sennes (non sp\u00E9cifi\u00E9es) -DCF.gear.TB=Chalut de fond (non sp\u00E9cifi\u00E9) -DCF.gear.TBB=Chaluts \u00E0 perche -DCF.gear.TBN=Chalut \u00E0 langoustines -DCF.gear.TBS=Chalut \u00E0 crevettes -DCF.gear.TM=Chalut p\u00E9lagique (non sp\u00E9cifi\u00E9) -DCF.gear.TMS=Chalut \u00E0 crevettes -DCF.gear.TX=Autre chalut (non sp\u00E9cifi\u00E9) -DCF.species.=Non sp\u00E9cifi\u00E9 -DCF.species.ALG=Algues -DCF.species.CAT=Esp\u00E8ces catadromes -DCF.species.CRU=Crustac\u00E9s -DCF.species.CSJ=Coquilles Saint-Jacques -DCF.species.DEF=Esp\u00E8ces d\u00E9mersales -DCF.species.DWS=Esp\u00E8ces d'eaux profondes -DCF.species.FIN=Poisson plats -DCF.species.LPF=Grands p\u00E9lagiques -DCF.species.MOL=Mollusques -DCF.species.SPF=Petits p\u00E9lagiques +fr.ifremer.wao.entity.FishingGearDCF.=Non sp\u00e9cifi\u00e9 +fr.ifremer.wao.entity.FishingGearDCF.DRB=Dragues remorqu\u00e9es par bateau +fr.ifremer.wao.entity.FishingGearDCF.DRH=Dragues \u00e0 main +fr.ifremer.wao.entity.FishingGearDCF.FAR=Pi\u00e8ges a\u00e9riens +fr.ifremer.wao.entity.FishingGearDCF.FCN=\u00c9perviers +fr.ifremer.wao.entity.FishingGearDCF.FG=Autres engins retombants (non-sp\u00e9cifi\u00e9s) +fr.ifremer.wao.entity.FishingGearDCF.FIX=Pi\u00e8ges (non-sp\u00e9cifi\u00e9s) +fr.ifremer.wao.entity.FishingGearDCF.FPN=Filets-pi\u00e8ges fixes non couverts +fr.ifremer.wao.entity.FishingGearDCF.FPO=Nasses (casiers) +fr.ifremer.wao.entity.FishingGearDCF.FSN=Filets \u00e0 l'\u00e9talage (diables) +fr.ifremer.wao.entity.FishingGearDCF.FWR=Barrages, parcs, bordigues, etc. +fr.ifremer.wao.entity.FishingGearDCF.FYK=Verveux +fr.ifremer.wao.entity.FishingGearDCF.GEN=Filets maillants et filets emm\u00e9lants (non sp\u00e9cifi\u00e9s) +fr.ifremer.wao.entity.FishingGearDCF.GES=Tamis \u00e0 civelles +fr.ifremer.wao.entity.FishingGearDCF.GN=Filets maillants (non sp\u00e9cifi\u00e9s) +fr.ifremer.wao.entity.FishingGearDCF.GNC=Filets maillants encerclants +fr.ifremer.wao.entity.FishingGearDCF.GND=Filets maillants d\u00e9rivants (filets d\u00e9rivants) +fr.ifremer.wao.entity.FishingGearDCF.GNF=Filets maillants fixes (sur perches) +fr.ifremer.wao.entity.FishingGearDCF.GNS=Filets maillants cal\u00e9s (ancr\u00e9s) +fr.ifremer.wao.entity.FishingGearDCF.GT=Tr\u00e9mailleurs +fr.ifremer.wao.entity.FishingGearDCF.GTN=Tr\u00e9mails et filets maillants combin\u00e9s +fr.ifremer.wao.entity.FishingGearDCF.GTR=Tr\u00e9mails +fr.ifremer.wao.entity.FishingGearDCF.HAR=Harpons +fr.ifremer.wao.entity.FishingGearDCF.HMD=Dragues m\u00e9canis\u00e9es +fr.ifremer.wao.entity.FishingGearDCF.HMP=Pompes +fr.ifremer.wao.entity.FishingGearDCF.HMX=Engins de r\u00e9colte (non sp\u00e9cifi\u00e9s) +fr.ifremer.wao.entity.FishingGearDCF.LA=Filets tournants sans coulisse (filet lamparo) +fr.ifremer.wao.entity.FishingGearDCF.LHM=Lignes \u00e0 main et lignes avec cannes +fr.ifremer.wao.entity.FishingGearDCF.LHP=Lignes \u00e0 main et lignes \u00e0 cannes +fr.ifremer.wao.entity.FishingGearDCF.LL=Palangres (non sp\u00e9cifi\u00e9es) +fr.ifremer.wao.entity.FishingGearDCF.LLD=Palangres d\u00e9rivantes +fr.ifremer.wao.entity.FishingGearDCF.LLS=Palangres cal\u00e9es ou semi-flottantes +fr.ifremer.wao.entity.FishingGearDCF.LN=Filets soulev\u00e9s (non sp\u00e9cifi\u00e9s) +fr.ifremer.wao.entity.FishingGearDCF.LNB=Filets soulev\u00e9s man\u0153uvr\u00e9es du bateau +fr.ifremer.wao.entity.FishingGearDCF.LNP=Filets soulev\u00e9s portatifs +fr.ifremer.wao.entity.FishingGearDCF.LNS=Filets soulev\u00e9s fixes man\u0153uvr\u00e9es du rivage +fr.ifremer.wao.entity.FishingGearDCF.LTL=lignes de tra\u00eene +fr.ifremer.wao.entity.FishingGearDCF.LX=Hame\u00e7ons et lignes (non sp\u00e9cifi\u00e9s) +fr.ifremer.wao.entity.FishingGearDCF.MIS=Divers +fr.ifremer.wao.entity.FishingGearDCF.NK=Engins inconnus ou non sp\u00e9cifi\u00e9s +fr.ifremer.wao.entity.FishingGearDCF.OT=Chaluts \u00e0 panneaux (non sp\u00e9cifi\u00e9) +fr.ifremer.wao.entity.FishingGearDCF.OTB=Chalut de fond \u00e0 panneaux +fr.ifremer.wao.entity.FishingGearDCF.OTM=Chaluts p\u00e9lagiques \u00e0 panneaux +fr.ifremer.wao.entity.FishingGearDCF.OTT=Chaluts jumeaux \u00e0 panneaux +fr.ifremer.wao.entity.FishingGearDCF.PS=Filets tournants avec coulisse (sennes coulissantes) +fr.ifremer.wao.entity.FishingGearDCF.PS1=Filets tournants, sennes coulissantes man\u0153uvr\u00e9es par un bateau +fr.ifremer.wao.entity.FishingGearDCF.PS2=Filets tournants, sennes coulissantes man\u0153uvr\u00e9es par deux bateaux +fr.ifremer.wao.entity.FishingGearDCF.PT=Chalut-b\u0153ufs (non sp\u00e9cifi\u00e9) +fr.ifremer.wao.entity.FishingGearDCF.PTB=Chalut-b\u0153ufs de fond +fr.ifremer.wao.entity.FishingGearDCF.PTM=Chalut-b\u0153ufs p\u00e9lagiques +fr.ifremer.wao.entity.FishingGearDCF.RG=Engins de p\u00eache r\u00e9vr\u00e9ative +fr.ifremer.wao.entity.FishingGearDCF.SB=Sennes de plages +fr.ifremer.wao.entity.FishingGearDCF.SDN=Sennes danoises +fr.ifremer.wao.entity.FishingGearDCF.SPR=Sennes man\u0153uvr\u00e9es par deux bateaux +fr.ifremer.wao.entity.FishingGearDCF.SSC=Sennes \u00e9cossaises +fr.ifremer.wao.entity.FishingGearDCF.SV=Sennes hal\u00e9es \u00e0 bord +fr.ifremer.wao.entity.FishingGearDCF.SW=Sennes (non sp\u00e9cifi\u00e9es) +fr.ifremer.wao.entity.FishingGearDCF.TB=Chalut de fond (non sp\u00e9cifi\u00e9) +fr.ifremer.wao.entity.FishingGearDCF.TBB=Chaluts \u00e0 perche +fr.ifremer.wao.entity.FishingGearDCF.TBN=Chalut \u00e0 langoustines +fr.ifremer.wao.entity.FishingGearDCF.TBS=Chalut \u00e0 crevettes +fr.ifremer.wao.entity.FishingGearDCF.TM=Chalut p\u00e9lagique (non sp\u00e9cifi\u00e9) +fr.ifremer.wao.entity.FishingGearDCF.TMS=Chalut \u00e0 crevettes +fr.ifremer.wao.entity.FishingGearDCF.TX=Autre chalut (non sp\u00e9cifi\u00e9) +fr.ifremer.wao.entity.TargetSpeciesDCF.=Non sp\u00e9cifi\u00e9 +fr.ifremer.wao.entity.TargetSpeciesDCF.ALG=Algues +fr.ifremer.wao.entity.TargetSpeciesDCF.CAT=Esp\u00e8ces catadromes +fr.ifremer.wao.entity.TargetSpeciesDCF.CRU=Crustac\u00e9s +fr.ifremer.wao.entity.TargetSpeciesDCF.CSJ=Coquilles Saint-Jacques +fr.ifremer.wao.entity.TargetSpeciesDCF.DEF=Esp\u00e8ces d\u00e9mersales +fr.ifremer.wao.entity.TargetSpeciesDCF.DWS=Esp\u00e8ces d'eaux profondes +fr.ifremer.wao.entity.TargetSpeciesDCF.FIN=Poisson plats +fr.ifremer.wao.entity.TargetSpeciesDCF.LPF=Grands p\u00e9lagiques +fr.ifremer.wao.entity.TargetSpeciesDCF.MOL=Mollusques +fr.ifremer.wao.entity.TargetSpeciesDCF.SPF=Petits p\u00e9lagiques wao.business.bean.DataReliability.doubtful=douteuse -wao.business.bean.DataReliability.not_provided=non renseign\u00E9e +wao.business.bean.DataReliability.not_provided=non renseign\u00e9e wao.business.bean.DataReliability.not_reliable=non exploitable wao.business.bean.DataReliability.reliable=exploitable wao.business.bean.DataReliability.unknown=inconnue -wao.business.bean.GlobalIndicatorValue.bad=P\u00E9nalit\u00E9 de niveau 1 +wao.business.bean.GlobalIndicatorValue.bad=P\u00e9nalit\u00e9 de niveau 1 wao.business.bean.GlobalIndicatorValue.good=Bonus de niveau 1 wao.business.bean.GlobalIndicatorValue.neutral=Conforme au cahier des charges -wao.business.bean.GlobalIndicatorValue.very_bad=P\u00E9nalit\u00E9 de niveau 2 +wao.business.bean.GlobalIndicatorValue.very_bad=P\u00e9nalit\u00e9 de niveau 2 wao.business.bean.GlobalIndicatorValue.very_good=Bonus de niveau 2 -wao.business.bean.SynthesisId.allegro_reactivity=D\u00E9lais de transmission des donn\u00E9es -wao.business.bean.SynthesisId.compliance_boarding=Respect du nombre d'observateurs embarqu\u00E9s -wao.business.bean.SynthesisId.contact_state=\u00C9tats des contacts -wao.business.bean.SynthesisId.data_reliability=Qualit\u00E9 de la donn\u00E9e -wao.business.bean.SynthesisId.graph_boarding=Taux d'embarquement sur un m\u00EAme navire conforme aux exigences -wao.business.bean.SynthesisId.graph_sampling=Taux de r\u00E9alisation du plan d'\u00E9chantillonage -wao.business.bean.SynthesisId.non_compliance_boarding=Non-respect du nombre d'observateurs embarqu\u00E9s -wao.error.boat.canCreateContact=Impossible de cr\u00E9er un nouveau contact pour la soci\u00E9t\u00E9 %1$s et le navire %2$s (%3$d) -wao.error.boat.getNbBoarding=Impossible de r\u00E9cup\u00E9rer le nombre d'embarquements r\u00E9els depuis le %1$s -wao.error.boatInfos.getNbBoardingForCompany=Impossible de r\u00E9cup\u00E9rer le nombre d'embarquements r\u00E9els depuis le %1$s pour la soci\u00E9t\u00E9 %2$s +wao.business.bean.SynthesisId.allegro_reactivity=D\u00e9lais de transmission des donn\u00e9es +wao.business.bean.SynthesisId.compliance_boarding=Respect du nombre d'observateurs embarqu\u00e9s +wao.business.bean.SynthesisId.contact_state=\u00c9tats des contacts +wao.business.bean.SynthesisId.data_reliability=Qualit\u00e9 de la donn\u00e9e +wao.business.bean.SynthesisId.graph_boarding=Taux d'embarquement sur un m\u00eame navire conforme aux exigences +wao.business.bean.SynthesisId.graph_sampling=Taux de r\u00e9alisation du plan d'\u00e9chantillonage +wao.business.bean.SynthesisId.non_compliance_boarding=Non-respect du nombre d'observateurs embarqu\u00e9s +wao.error.boat.canCreateContact=Impossible de cr\u00e9er un nouveau contact pour la soci\u00e9t\u00e9 %1$s et le navire %2$s (%3$d) +wao.error.boat.getNbBoarding=Impossible de r\u00e9cup\u00e9rer le nombre d'embarquements r\u00e9els depuis le %1$s +wao.error.boatInfos.getNbBoardingForCompany=Impossible de r\u00e9cup\u00e9rer le nombre d'embarquements r\u00e9els depuis le %1$s pour la soci\u00e9t\u00e9 %2$s wao.error.context.close=Une erreur est survenue pendant la fermeture du contexte principale de ToPIA wao.error.context.encodeString= -wao.error.context.getRootContext=Une erreur est survenue pour la r\u00E9cup\u00E9ration du contexte principale de ToPIA +wao.error.context.getRootContext=Une erreur est survenue pour la r\u00e9cup\u00e9ration du contexte principale de ToPIA wao.error.context.parse=Une erreur est survenue pendant le chargement de la configuration du fichier %1$s wao.error.context.rollback=Une erreur est survenue pendant l'annulation de la transaction courante -wao.error.context.start=Une erreur est survenue pendant le d\u00E9marrage de l'application +wao.error.context.start=Une erreur est survenue pendant le d\u00e9marrage de l'application wao.error.context.stop=Une erreur est survenue pendant la fermeture de l'application -wao.error.sampleMonth.addRealTideTime=Impossible d'enregistrer le nombre de mar\u00E9es r\u00E9els pour le mois de %1$s [ligne \: %2$s] -wao.error.sampleRow.saveSampleRowLog=Impossible d'enregistrer le commentaire \u00E9crit par %1$s -wao.error.serviceBoat.createUpdateCompanyBoatInfos=Impossible de cr\u00E9er ou modifier les informations li\u00E9s au navire %1$d pour la soci\u00E9t\u00E9 %2$s -wao.error.serviceBoat.exportBoatCsv=Impossible d'exporter les navires s\u00E9lectionn\u00E9s +wao.error.sampleMonth.addRealTideTime=Impossible d'enregistrer le nombre de mar\u00e9es r\u00e9els pour le mois de %1$s [ligne \: %2$s] +wao.error.sampleRow.saveSampleRowLog=Impossible d'enregistrer le commentaire \u00e9crit par %1$s +wao.error.serviceBoat.createUpdateCompanyBoatInfos=Impossible de cr\u00e9er ou modifier les informations li\u00e9s au navire %1$d pour la soci\u00e9t\u00e9 %2$s +wao.error.serviceBoat.exportBoatCsv=Impossible d'exporter les navires s\u00e9lectionn\u00e9s wao.error.serviceBoat.getActivityCalendarLogAccessFile= wao.error.serviceBoat.getActivityCalendarLogFile= wao.error.serviceBoat.getBoat=Impossible de charger le navire -wao.error.serviceBoat.getBoatNamesStartWith=Impossible de r\u00E9cup\u00E9rer les navires avec un nom commencant par '%1$s' +wao.error.serviceBoat.getBoatNamesStartWith=Impossible de r\u00e9cup\u00e9rer les navires avec un nom commencant par '%1$s' wao.error.serviceBoat.getBoatsByFilter=Impossible de filtrer la liste des navires -wao.error.serviceBoat.getBoatsByImmatriculations=La cha\u00EEne d'immatriculations est incorrect \! Chaque immatriculation doit poss\u00E9der 6 chiffres -wao.error.serviceBoat.getCompanyBoatInfos=Impossible de r\u00E9cup\u00E9rer les informations du navire immatricul\u00E9 %1$d pour la soci\u00E9t\u00E9 %2$s -wao.error.serviceBoat.getLastActivityCalendar=Impossible de charger le dernier calendrier d'activit\u00E9 du navire %1$s (%2$d) +wao.error.serviceBoat.getBoatsByImmatriculations=La cha\u00eene d'immatriculations est incorrect \! Chaque immatriculation doit poss\u00e9der 6 chiffres +wao.error.serviceBoat.getCompanyBoatInfos=Impossible de r\u00e9cup\u00e9rer les informations du navire immatricul\u00e9 %1$d pour la soci\u00e9t\u00e9 %2$s +wao.error.serviceBoat.getLastActivityCalendar=Impossible de charger le dernier calendrier d'activit\u00e9 du navire %1$s (%2$d) wao.error.serviceBoat.getNbBoatsByFilter=Impossible de filtrer la liste des navires wao.error.serviceBoat.getShipOwnerNamesContains= -wao.error.serviceBoat.importActivityCalendarCsv=Probl\u00E8me d'import du fichier CSV des calendriers d'activit\u00E9 -wao.error.serviceBoat.importBoatCsv=Probl\u00E8me d'import du fichier CSV. V\u00E9rifiez l'en-t\u00EAte du fichier \: [ NAVS_COD,CARN_NOM,CARN_LONGUEUR_HT,CARN_ANNEE,QUARTIER_IMMA,PER_COD,PER_NOM,PER_PRENOM,NAVS_ACTIVE ]. Voir documentation pour plus de d\u00E9tails. +wao.error.serviceBoat.importActivityCalendarCsv=Probl\u00e8me d'import du fichier CSV des calendriers d'activit\u00e9 +wao.error.serviceBoat.importBoatCsv=Probl\u00e8me d'import du fichier CSV. V\u00e9rifiez l'en-t\u00eate du fichier \: [ NAVS_COD,CARN_NOM,CARN_LONGUEUR_HT,CARN_ANNEE,QUARTIER_IMMA,PER_COD,PER_NOM,PER_PRENOM,NAVS_ACTIVE ]. Voir documentation pour plus de d\u00e9tails. wao.error.serviceCartography.exportContactStatisticsKml= -wao.error.serviceCartography.importBoatDistrictKml=Impossible d'importer les coordonn\u00E9es des quartiers des navires. V\u00E9rifiez la documentation pour le bon format du fichier Kml. +wao.error.serviceCartography.importBoatDistrictKml=Impossible d'importer les coordonn\u00e9es des quartiers des navires. V\u00e9rifiez la documentation pour le bon format du fichier Kml. wao.error.serviceChart.getContactPieChartData= wao.error.serviceChart.getContactPieChartUrl= wao.error.serviceContact.exportContactCsv=Impossible d'exporter les contacts wao.error.serviceContact.getContacts=Impossible de filtrer la liste des contacts -wao.error.serviceContact.getNbContacts=Impossible de compter le nombre de contacts filtr\u00E9s +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.saveComment= @@ -130,54 +130,54 @@ wao.error.serviceContact.sendContactDoneEmail= wao.error.serviceContact.updateSampleMonthTidesValue= wao.error.serviceNews.getNewNews= -wao.error.serviceNews.getNews=Impossible de r\u00E9cup\u00E9rer l'ensemble des news +wao.error.serviceNews.getNews=Impossible de r\u00e9cup\u00e9rer l'ensemble des news wao.error.serviceNews.saveNews=Impossible d'enregistrer la news ayant pour titre '%1$s' wao.error.serviceReferential.getCodesDCF5Contains= wao.error.serviceReferential.getFacades=Impossible de charger la liste des facades -wao.error.serviceReferential.getFishingZones=Impossible de charger la liste des secteurs de p\u00EAche -wao.error.serviceReferential.getProfessions=Impossible de charger la liste des m\u00E9tiers -wao.error.serviceReferential.getSectors=Impossible de charger la liste des zones de p\u00EAche -wao.error.serviceReferential.importFishingZoneCsv=Probl\u00E8me d'import du fichier CSV. V\u00E9rifiez l'en-t\u00EAte du fichier \: [ PECHE_DIVISION,PECHE_ZONE,PECHE_FACADE ]. Voir documentation pour plus de d\u00E9tails. +wao.error.serviceReferential.getFishingZones=Impossible de charger la liste des secteurs de p\u00eache +wao.error.serviceReferential.getProfessions=Impossible de charger la liste des m\u00e9tiers +wao.error.serviceReferential.getSectors=Impossible de charger la liste des zones de p\u00eache +wao.error.serviceReferential.importFishingZoneCsv=Probl\u00e8me d'import du fichier CSV. V\u00e9rifiez l'en-t\u00eate du fichier \: [ PECHE_DIVISION,PECHE_ZONE,PECHE_FACADE ]. Voir documentation pour plus de d\u00e9tails. wao.error.serviceSampling.createSampleRowLog= -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.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.getDCFGears= wao.error.serviceSampling.getDCFSpecies= wao.error.serviceSampling.getNewProfession= wao.error.serviceSampling.getNewSampleMonth= wao.error.serviceSampling.getNewSampleRow= -wao.error.serviceSampling.getNewSampleRowCode=Impossible de r\u00E9cup\u00E9rer un nouveau code pour une ligne d'\u00E9chantillonnage +wao.error.serviceSampling.getNewSampleRowCode=Impossible de r\u00e9cup\u00e9rer un nouveau code pour une ligne d'\u00e9chantillonnage wao.error.serviceSampling.getNewSampleRowLog= wao.error.serviceSampling.getPrograms=Impossible de charger la liste des programmes -wao.error.serviceSampling.getSampleRow=Impossible de charger la ligne d'\u00E9chantillon ayant pour identifiant \: %1$s -wao.error.serviceSampling.getSampleRowByCode=Impossible de charger la ligne d'\u00E9chantillon ayant pour code %1$s -wao.error.serviceSampling.getSampleRowsByFilter=Impossible de r\u00E9cup\u00E9rer la liste des lignes du plan d'\u00E9chantillonnage -wao.error.serviceSampling.getSampleRowsOrderedByFishingZone=Impossible de r\u00E9cup\u00E9rer la liste des lignes du plan d'\u00E9chantillonnage -wao.error.serviceSampling.importSamplingPlanCsv=Erreur \u00E0 la ligne %1$d [CODE \= %2$s] +wao.error.serviceSampling.getSampleRow=Impossible de charger la ligne d'\u00e9chantillon ayant pour identifiant \: %1$s +wao.error.serviceSampling.getSampleRowByCode=Impossible de charger la ligne d'\u00e9chantillon ayant pour code %1$s +wao.error.serviceSampling.getSampleRowsByFilter=Impossible de r\u00e9cup\u00e9rer la liste des lignes du plan d'\u00e9chantillonnage +wao.error.serviceSampling.getSampleRowsOrderedByFishingZone=Impossible de r\u00e9cup\u00e9rer la liste des lignes du plan d'\u00e9chantillonnage +wao.error.serviceSampling.importSamplingPlanCsv=Erreur \u00e0 la ligne %1$d [CODE \= %2$s] wao.error.serviceSynthesis.getAllIndicatorLogs= -wao.error.serviceSynthesis.getBoardingBoats=Impossible de r\u00E9cup\u00E9rer les donn\u00E9es du graphique concernant les embarquements sur les navires +wao.error.serviceSynthesis.getBoardingBoats=Impossible de r\u00e9cup\u00e9rer les donn\u00e9es du graphique concernant les embarquements sur les navires wao.error.serviceSynthesis.getComplianceBoardingIndicator= -wao.error.serviceSynthesis.getContactDataInputDateReactivity=Impossible de r\u00E9cup\u00E9rer l'indicateur de r\u00E9activit\u00E9 sur les dates de saisies dans Allegro +wao.error.serviceSynthesis.getContactDataInputDateReactivity=Impossible de r\u00e9cup\u00e9rer l'indicateur de r\u00e9activit\u00e9 sur les dates de saisies dans Allegro wao.error.serviceSynthesis.getContactPieChartData= wao.error.serviceSynthesis.getContactPieChartDataByBoatDistrict= -wao.error.serviceSynthesis.getContactStateStatistics=Impossible de r\u00E9cup\u00E9rer les statistiques sur les \u00E9tats des contacts +wao.error.serviceSynthesis.getContactStateStatistics=Impossible de r\u00e9cup\u00e9rer les statistiques sur les \u00e9tats des contacts wao.error.serviceSynthesis.getDataReliability= -wao.error.serviceSynthesis.getDataSampling=Impossible de r\u00E9cup\u00E9rer les donn\u00E9es pour le graphique dynamique des efforts de mar\u00E9es -wao.error.serviceSynthesis.getGlobalSynthesisParameters=Impossible de r\u00E9cup\u00E9rer les donn\u00E9es concernant les indicateurs pour la synth\u00E8se globale +wao.error.serviceSynthesis.getDataSampling=Impossible de r\u00e9cup\u00e9rer les donn\u00e9es pour le graphique dynamique des efforts de mar\u00e9es +wao.error.serviceSynthesis.getGlobalSynthesisParameters=Impossible de r\u00e9cup\u00e9rer les donn\u00e9es concernant les indicateurs pour la synth\u00e8se globale wao.error.serviceSynthesis.getGlobalSynthesisResult= -wao.error.serviceSynthesis.getNonComplianceBoardingIndicator=Impossible de r\u00E9cup\u00E9rer l'indicateur de non respect du nombre d'observateurs embarqu\u00E9s -wao.error.serviceSynthesis.updateGlobalSynthesisParameters=Impossible de mettre \u00E0 jour les param\u00E8tres de la synth\u00E8se globale +wao.error.serviceSynthesis.getNonComplianceBoardingIndicator=Impossible de r\u00e9cup\u00e9rer l'indicateur de non respect du nombre d'observateurs embarqu\u00e9s +wao.error.serviceSynthesis.updateGlobalSynthesisParameters=Impossible de mettre \u00e0 jour les param\u00e8tres de la synth\u00e8se globale wao.error.serviceUser.connect=Une erreur est survenue lors de la demande de connexion -wao.error.serviceUser.createDefaultAdmin=Impossible de cr\u00E9er l'administrateur par d\u00E9faut -wao.error.serviceUser.createUpdateCompany=Impossible de cr\u00E9er ou de mettre \u00E0 jour la soci\u00E9t\u00E9 -wao.error.serviceUser.createUpdateUser=Impossible de cr\u00E9er ou de mettre \u00E0 jour l'utilisateur +wao.error.serviceUser.createDefaultAdmin=Impossible de cr\u00e9er l'administrateur par d\u00e9faut +wao.error.serviceUser.createUpdateCompany=Impossible de cr\u00e9er ou de mettre \u00e0 jour la soci\u00e9t\u00e9 +wao.error.serviceUser.createUpdateUser=Impossible de cr\u00e9er ou de mettre \u00e0 jour l'utilisateur wao.error.serviceUser.deleteUser=Impossible de supprimer l'utilisateur wao.error.serviceUser.existLogin= wao.error.serviceUser.forgetPassword=Impossible d'envoyer le mail d'oubli de mot de passe -wao.error.serviceUser.getCompanies=Impossible de r\u00E9cup\u00E9rer la liste des soci\u00E9t\u00E9s +wao.error.serviceUser.getCompanies=Impossible de r\u00e9cup\u00e9rer la liste des soci\u00e9t\u00e9s wao.error.serviceUser.getCompany= wao.error.serviceUser.getNewUser=Impossible d'instancier un nouvel utilisateur -wao.error.serviceUser.getObservers=Impossible de r\u00E9cup\u00E9rer la liste des observateurs +wao.error.serviceUser.getObservers=Impossible de r\u00e9cup\u00e9rer la liste des observateurs wao.error.serviceUser.getUserRolesByLogin= -wao.error.serviceUser.getUsersByCompany=Impossible de r\u00E9cup\u00E9rer la liste des utilisateurs de la soci\u00E9t\u00E9 %1$s +wao.error.serviceUser.getUsersByCompany=Impossible de r\u00e9cup\u00e9rer la liste des utilisateurs de la soci\u00e9t\u00e9 %1$s Modified: trunk/wao-business/src/main/xmi/wao.zargo =================================================================== (Binary files differ) Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/base/AbstractFilteredPage.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/base/AbstractFilteredPage.java 2010-11-26 12:44:45 UTC (rev 803) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/base/AbstractFilteredPage.java 2010-11-26 13:13:45 UTC (rev 804) @@ -299,13 +299,6 @@ if (sampleRowSelectModel == null) { // WARN : no use of sampleRow filter - /* - SampleRow rowFiltered = getFilter().getSampleRow(); - getFilter().setSampleRow(null); - List<SampleRow> sampleRows = serviceSampling.getSampleRowsByFilter(getFilter()); - getFilter().setSampleRow(rowFiltered); - */ - List<SampleRow> rowsFiltered = getFilter().getSampleRows(); getFilter().setSampleRows(null); List<SampleRow> sampleRows = serviceSampling.getSampleRowsByFilter(getFilter()); @@ -386,7 +379,7 @@ getFilter().setFishingGearDCF(keptFishingGearDCF); dcfGearSelectModel = new GenericSelectModel<FishingGearDCF>(fishingGearDCFs, FishingGearDCF.class, - FishingGearDCF.CODE, FishingGearDCF.TOPIA_ID, propertyAccess); + "fullDescription", FishingGearDCF.TOPIA_ID, propertyAccess); } return dcfGearSelectModel; } @@ -406,7 +399,7 @@ getFilter().setTargetSpeciesDCF(keptTargetSpeciesDCF); dcfSpeciesSelectModel = new GenericSelectModel<TargetSpeciesDCF>(targetSpeciesDCFs, TargetSpeciesDCF.class, - TargetSpeciesDCF.CODE, TargetSpeciesDCF.TOPIA_ID, propertyAccess); + "fullDescription", TargetSpeciesDCF.TOPIA_ID, propertyAccess); } return dcfSpeciesSelectModel; }

1 0

[Suiviobsmer-commits] r803 - trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages
by bleny＠users.labs.libre-entreprise.org Nov. 26, 2010

Nov. 26, 2010

Author: bleny Date: 2010-11-26 12:44:45 +0000 (Fri, 26 Nov 2010) New Revision: 803 Log: fix sample row form to allow profession selection ; add DCF5 codes validation Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/SampleRowForm.java Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/SampleRowForm.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/SampleRowForm.java 2010-11-26 10:11:05 UTC (rev 802) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/SampleRowForm.java 2010-11-26 12:44:45 UTC (rev 803) @@ -27,16 +27,20 @@ import fr.ifremer.wao.WaoBusinessException; import fr.ifremer.wao.WaoException; import fr.ifremer.wao.bean.ConnectedUser; +import fr.ifremer.wao.bean.SamplingFilter; +import fr.ifremer.wao.bean.SamplingFilterImpl; import fr.ifremer.wao.bean.UserRole; import fr.ifremer.wao.entity.Boat; import fr.ifremer.wao.entity.Company; import fr.ifremer.wao.entity.DCF5Code; +import fr.ifremer.wao.entity.FishingGearDCF; import fr.ifremer.wao.entity.FishingZone; import fr.ifremer.wao.entity.Profession; import fr.ifremer.wao.entity.ProfessionImpl; import fr.ifremer.wao.entity.SampleMonth; import fr.ifremer.wao.entity.SampleRow; import fr.ifremer.wao.entity.SampleRowLog; +import fr.ifremer.wao.entity.TargetSpeciesDCF; import fr.ifremer.wao.service.ServiceBoat; import fr.ifremer.wao.service.ServiceReferential; import fr.ifremer.wao.service.ServiceSampling; @@ -74,6 +78,7 @@ import java.util.ArrayList; import java.util.Collection; import java.util.Date; +import java.util.LinkedList; import java.util.List; /** @@ -162,9 +167,9 @@ /** Select model which contains all professions **/ @Persist - private GenericSelectModel<Profession> professionSelectModel; + private GenericSelectModel<SampleRow> professionSelectModel; - /** The current selected professionId **/ + /** The current selected professionId, this is actually a sample row topia Id **/ @Property private String professionId; @@ -182,11 +187,11 @@ * @return a GenericSelectModel<Profession> * @throws WaoException */ - public GenericSelectModel<Profession> getProfessionSelectModel() throws WaoException { + public GenericSelectModel<SampleRow> getProfessionSelectModel() throws WaoException { if (professionSelectModel == null) { - List<Profession> professions = serviceReferential.getProfessions(); - professionSelectModel = new GenericSelectModel<Profession>(professions, Profession.class, - "code", "topiaId", propertyAccess); + List<SampleRow> professions = serviceSampling.getSampleRowsByFilter(new SamplingFilterImpl()); + professionSelectModel = new GenericSelectModel<SampleRow>(professions, SampleRow.class, + "professionDescription", SampleRow.TOPIA_ID, propertyAccess); } return professionSelectModel; } @@ -207,12 +212,15 @@ */ void onSelectedFromAddNewProfession() throws WaoException { Profession profession = new ProfessionImpl(); - if (!StringUtils.isEmpty(professionId)) { - Profession professionSelected = getProfessionSelectModel().findObject(professionId); + if ( ! StringUtils.isEmpty(professionId)) { + SampleRow professionSelected = getProfessionSelectModel().findObject(professionId); if (log.isDebugEnabled()) { - log.debug("Add new profession from : " + professionSelected); + log.debug("add new profession from : " + professionSelected); } - profession = serviceSampling.getNewProfession(professionSelected); + profession = serviceSampling.getNewProfession(professionSelected.getProfession()); + + getSampleRow().setDCF5Code(professionSelected.getDCF5Code()); + dcf5codes = null; } getSampleRow().setProfession(profession); edited = true; @@ -582,6 +590,35 @@ "Vous devez choisir un programme existant ou en créer un nouveau"); } + // validate DCF5 codes + getSampleRow().setDCF5Code(getDcf5codes(), ", "); + if (CollectionUtils.isEmpty(getSampleRow().getDCF5Code())) { + sampleRowForm.recordError("Vous devez associer au moins un code DCF5"); + } else { + // check that codes exist in the reference + SamplingFilter noFilter = new SamplingFilterImpl(); + List<String> existingFishingGearCodes = new LinkedList<String>(); + // filling existingFishingGearCodes + for (FishingGearDCF dcfGear : serviceSampling.getDCFGears(noFilter)) { + existingFishingGearCodes.add(dcfGear.getCode()); + } + List<String> existingTargetSpeciesCodes = new LinkedList<String>(); + for (TargetSpeciesDCF dcfSpecies : serviceSampling.getDCFSpecies(noFilter)) { + existingTargetSpeciesCodes.add(dcfSpecies.getCode()); + } + + + for (DCF5Code code : getSampleRow().getDCF5Code()) { + if ( ! existingFishingGearCodes.contains(code.getFishingGearCode())) { + sampleRowForm.recordError(code.getFishingGearCode() + " n'est pas un code d'engin valide"); + } + if (code.getTargetSpeciesCode() != null && + ! existingTargetSpeciesCodes.contains(code.getTargetSpeciesCode())) { + sampleRowForm.recordError(code.getTargetSpeciesCode() + " n'est pas un code d'espèces cibles valide"); + } + } + } + Date periodBegin = getSampleRow().getPeriodBegin(); Date periodEnd = getSampleRow().getPeriodEnd();

1 0

[Suiviobsmer-commits] r802 - in trunk: wao-business/src/main/java/fr/ifremer/wao/entity wao-business/src/main/java/fr/ifremer/wao/service wao-business/src/main/xmi wao-ui/src/main/java/fr/ifremer/wao/ui/base wao-ui/src/main/webapp
by bleny＠users.labs.libre-entreprise.org Nov. 26, 2010

Nov. 26, 2010

Author: bleny Date: 2010-11-26 10:11:05 +0000 (Fri, 26 Nov 2010) New Revision: 802 Log: update filters in sampling plan Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/entity/DCF5CodeImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/entity/FishingGearDCFImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/entity/TargetSpeciesDCFImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSamplingImpl.java trunk/wao-business/src/main/xmi/wao.zargo trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/base/AbstractFilteredPage.java trunk/wao-ui/src/main/webapp/SamplingPlan.tml Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/entity/DCF5CodeImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/entity/DCF5CodeImpl.java 2010-11-25 15:30:03 UTC (rev 801) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/entity/DCF5CodeImpl.java 2010-11-26 10:11:05 UTC (rev 802) @@ -40,12 +40,16 @@ @Override public String getFishingGearDescription() { - return _("DCF.gear." + getFishingGearDCF()); + return getFishingGearDCF().getDescription(); } @Override public String getTargetSpeciesDescription() { - return _("DCF.species." + getTargetSpeciesDCF()); + String description = null; + if (getTargetSpeciesDCF() != null) { + description = getTargetSpeciesDCF().getDescription(); + } + return description; } @Override Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/entity/FishingGearDCFImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/entity/FishingGearDCFImpl.java 2010-11-25 15:30:03 UTC (rev 801) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/entity/FishingGearDCFImpl.java 2010-11-26 10:11:05 UTC (rev 802) @@ -1,5 +1,7 @@ package fr.ifremer.wao.entity; +import static org.nuiton.i18n.I18n._; + /** * @author bleny */ @@ -14,4 +16,8 @@ setCode(code); } + @Override + public String getDescription() { + return _(FishingGearDCF.class.getName() + "." + getCode()); + } } Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/entity/TargetSpeciesDCFImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/entity/TargetSpeciesDCFImpl.java 2010-11-25 15:30:03 UTC (rev 801) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/entity/TargetSpeciesDCFImpl.java 2010-11-26 10:11:05 UTC (rev 802) @@ -1,5 +1,7 @@ package fr.ifremer.wao.entity; +import static org.nuiton.i18n.I18n._; + /** * @author bleny */ @@ -13,4 +15,9 @@ super(); setCode(code); } + + @Override + public String getDescription() { + return _(TargetSpeciesDCF.class.getName() + "." + getCode()); + } } 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 2010-11-25 15:30:03 UTC (rev 801) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSamplingImpl.java 2010-11-26 10:11:05 UTC (rev 802) @@ -103,7 +103,6 @@ import java.util.LinkedList; import java.util.List; import java.util.Map; -import java.util.Set; /** * ServiceSamplingImpl @@ -441,30 +440,6 @@ SampleRowDAO dao = WaoDAOHelper.getSampleRowDAO(transaction); -// // FishingZone properties -// String fishingZoneAlias = "Z"; -// String fishingZoneFacadeProperty = -// TopiaQuery.getProperty(fishingZoneAlias, FishingZone.FACADE_NAME); -// String fishingZoneSectorProperty = -// TopiaQuery.getProperty(fishingZoneAlias, FishingZone.SECTOR_NAME); -// String fishingZoneDistrictProperty = -// TopiaQuery.getProperty(fishingZoneAlias, FishingZone.DISTRICT_CODE); -// String fishingZoneSampleRowProperty = -// TopiaQuery.getProperty(fishingZoneAlias, FishingZone.SAMPLE_ROW); -// -// // SampleRow properties -// String sampleRowAlias = "S"; -// String sampleRowCodeProperty = -// TopiaQuery.getProperty(sampleRowAlias, SampleRow.CODE); -// -// // Query -// TopiaQuery query = dao.createQuery(sampleRowAlias).addDistinct(). -// addFrom(FishingZone.class, fishingZoneAlias). -// // TODO-fdesbois-2010-06-07 for ToPIA 2.4 : replace this statement by addInElements -// add(sampleRowAlias + " IN elements(" + fishingZoneSampleRowProperty + ")"); -// -// filter.prepareQueryForSampling(query, sampleRowAlias, fishingZoneAlias); - WaoQueryBuilder builder = context.newQueryBuilder(); WaoQueryHelper.SampleRowProperty sampleRowProperty = @@ -1165,12 +1140,61 @@ } @Override - protected Set<String> executeGetDCFGears(TopiaContext transaction, SamplingFilter filter) throws Exception { - throw new UnsupportedOperationException(); + protected List<FishingGearDCF> executeGetDCFGears(TopiaContext transaction, SamplingFilter filter) throws Exception { + + // return all distinct fishing gear DCF codes used in sample-rows filtered by filter + + WaoQueryBuilder builder = context.newQueryBuilder(); + + WaoQueryHelper.SampleRowProperty sampleRowProperty = + builder.initializeForSampleRow(true); + + WaoQueryHelper.FishingZoneProperty fishingZoneProperty = WaoQueryHelper.newFishingZoneProperty(); + WaoQueryHelper.DCF5CodeProperty dcf5CodeProperty = WaoQueryHelper.newDCF5CodeProperty(); + WaoQueryHelper.FishingGearDCFProperty fishingGearDCFProperty = WaoQueryHelper.newFishingGearDCFProperty(); + + TopiaQuery query = builder.applySamplingFilter(filter). + addDistinct(). + setSelect(fishingGearDCFProperty.$alias()). + addJoin(sampleRowProperty.fishingZone(), fishingZoneProperty.$alias(), false). + addJoin(sampleRowProperty.dCF5Code(), dcf5CodeProperty.$alias(), false). + addJoin(dcf5CodeProperty.fishingGearDCF(), fishingGearDCFProperty.$alias(), false). + addOrder(fishingGearDCFProperty.code()); + + if (log.isDebugEnabled()) { + log.debug("query to get distinct DCF fishing gears : " + query); + } + + List<FishingGearDCF> dcfGears = transaction.findByQuery(query); + return dcfGears; } @Override - protected Set<String> executeGetDCFSpecies(TopiaContext transaction, SamplingFilter filter) throws Exception { - throw new UnsupportedOperationException(); + protected List<TargetSpeciesDCF> executeGetDCFSpecies(TopiaContext transaction, SamplingFilter filter) throws Exception { + + // return all distinct target species DCF codes used in sample-rows filtered by filter + + WaoQueryBuilder builder = context.newQueryBuilder(); + + WaoQueryHelper.SampleRowProperty sampleRowProperty = builder.initializeForSampleRow(true); + + WaoQueryHelper.FishingZoneProperty fishingZoneProperty = WaoQueryHelper.newFishingZoneProperty(); + WaoQueryHelper.DCF5CodeProperty dcf5CodeProperty = WaoQueryHelper.newDCF5CodeProperty(); + WaoQueryHelper.TargetSpeciesDCFProperty targetSpeciesDCFProperty = WaoQueryHelper.newTargetSpeciesDCFProperty(); + + TopiaQuery query = builder.applySamplingFilter(filter). + addDistinct(). + setSelect(targetSpeciesDCFProperty.$alias()). + addJoin(sampleRowProperty.fishingZone(), fishingZoneProperty.$alias(), false). + addJoin(sampleRowProperty.dCF5Code(), dcf5CodeProperty.$alias(), false). + addJoin(dcf5CodeProperty.targetSpeciesDCF(), targetSpeciesDCFProperty.$alias(), false). + addOrder(targetSpeciesDCFProperty.code()); + + if (log.isDebugEnabled()) { + log.debug("query to get distinct DCF target species : " + query); + } + + List<TargetSpeciesDCF> dcfSpecies = transaction.findByQuery(query); + return dcfSpecies; } } Modified: trunk/wao-business/src/main/xmi/wao.zargo =================================================================== (Binary files differ) Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/base/AbstractFilteredPage.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/base/AbstractFilteredPage.java 2010-11-25 15:30:03 UTC (rev 801) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/base/AbstractFilteredPage.java 2010-11-26 10:11:05 UTC (rev 802) @@ -28,7 +28,9 @@ import fr.ifremer.wao.bean.ConnectedUser; import fr.ifremer.wao.bean.SamplingFilter; import fr.ifremer.wao.entity.Company; +import fr.ifremer.wao.entity.FishingGearDCF; import fr.ifremer.wao.entity.SampleRow; +import fr.ifremer.wao.entity.TargetSpeciesDCF; import fr.ifremer.wao.entity.WaoUser; import fr.ifremer.wao.service.ServiceBoat; import fr.ifremer.wao.service.ServiceReferential; @@ -50,8 +52,6 @@ import java.util.ArrayList; import java.util.List; -import static org.nuiton.i18n.I18n._; - /** * AbstractFilteredPage * @@ -312,7 +312,7 @@ getFilter().setSampleRows(rowsFiltered); sampleRowSelectModel = new GenericSelectModel<SampleRow>(sampleRows, SampleRow.class, - "code", "topiaId", propertyAccess); + SampleRow.CODE, SampleRow.TOPIA_ID, propertyAccess); } return sampleRowSelectModel; } @@ -329,7 +329,7 @@ if (companySelectModel == null) { List<Company> companies = serviceUser.getCompanies(isAvailableDataForFiltersOnly()); companySelectModel = new GenericSelectModel<Company>(companies,Company.class, - "name","topiaId",propertyAccess); + Company.NAME, Company.TOPIA_ID, propertyAccess); } return companySelectModel; } @@ -348,7 +348,7 @@ serviceUser.getObservers(getFilter().getCompany(), isAvailableDataForFiltersOnly()); observerSelectModel = new GenericSelectModel<WaoUser>(observers,WaoUser.class, - "fullName","topiaId",propertyAccess); + "fullName", "topiaId", propertyAccess); } return observerSelectModel; } @@ -371,30 +371,42 @@ return programSelectModel; } - private SelectModel dcfGearSelectModel; + @Property + @Persist + private String fishingGearDCFId; - public SelectModel getDcfGearSelectModel() throws WaoException { + private GenericSelectModel<FishingGearDCF> dcfGearSelectModel; + + public GenericSelectModel<FishingGearDCF> getDcfGearSelectModel() throws WaoException { if (dcfGearSelectModel == null) { - List<OptionModel> options = new ArrayList<OptionModel>(); - for (String dcfGear : serviceSampling.getDCFGears(getFilter())) { - options.add(new OptionModelImpl(dcfGear + " - " + - _("DCF.gear." + dcfGear), dcfGear)); - } - dcfGearSelectModel = new SelectModelImpl(null, options); + // don't filter with already defined DCFs + FishingGearDCF keptFishingGearDCF = getFilter().getFishingGearDCF(); + getFilter().setFishingGearDCF(null); + List<FishingGearDCF> fishingGearDCFs = serviceSampling.getDCFGears(getFilter()); + getFilter().setFishingGearDCF(keptFishingGearDCF); + + dcfGearSelectModel = new GenericSelectModel<FishingGearDCF>(fishingGearDCFs, FishingGearDCF.class, + FishingGearDCF.CODE, FishingGearDCF.TOPIA_ID, propertyAccess); } return dcfGearSelectModel; } - private SelectModel dcfSpeciesSelectModel; + @Property + @Persist + private String targetSpeciesDCFId; - public SelectModel getDcfSpeciesSelectModel() throws WaoException { + private GenericSelectModel<TargetSpeciesDCF> dcfSpeciesSelectModel; + + public GenericSelectModel<TargetSpeciesDCF> getDcfSpeciesSelectModel() throws WaoException { if (dcfSpeciesSelectModel == null) { - List<OptionModel> options = new ArrayList<OptionModel>(); - for (String dcfSpecies : serviceSampling.getDCFSpecies(getFilter())) { - options.add(new OptionModelImpl(dcfSpecies + " - " + - _("DCF.species." + dcfSpecies), dcfSpecies)); - } - dcfSpeciesSelectModel = new SelectModelImpl(null, options); + // don't filter with already defined DCFs + TargetSpeciesDCF keptTargetSpeciesDCF = getFilter().getTargetSpeciesDCF(); + getFilter().setTargetSpeciesDCF(null); + List<TargetSpeciesDCF> targetSpeciesDCFs = serviceSampling.getDCFSpecies(getFilter()); + getFilter().setTargetSpeciesDCF(keptTargetSpeciesDCF); + + dcfSpeciesSelectModel = new GenericSelectModel<TargetSpeciesDCF>(targetSpeciesDCFs, TargetSpeciesDCF.class, + TargetSpeciesDCF.CODE, TargetSpeciesDCF.TOPIA_ID, propertyAccess); } return dcfSpeciesSelectModel; } @@ -441,6 +453,15 @@ } getFilter().setObserver(observer); } + + if (fishingGearDCFId != null) { + FishingGearDCF fishingGearDCF = getDcfGearSelectModel().findObject(fishingGearDCFId); + getFilter().setFishingGearDCF(fishingGearDCF); + } + if (targetSpeciesDCFId != null) { + TargetSpeciesDCF targetSpeciesDCF = getDcfSpeciesSelectModel().findObject(targetSpeciesDCFId); + getFilter().setTargetSpeciesDCF(targetSpeciesDCF); + } } private boolean edited; Modified: trunk/wao-ui/src/main/webapp/SamplingPlan.tml =================================================================== --- trunk/wao-ui/src/main/webapp/SamplingPlan.tml 2010-11-25 15:30:03 UTC (rev 801) +++ trunk/wao-ui/src/main/webapp/SamplingPlan.tml 2010-11-26 10:11:05 UTC (rev 802) @@ -124,9 +124,9 @@ </div> <div> <t:label t:for="fishingGearDCF" /> : - <input t:type="select" t:id="fishingGearDCF" t:model="dcfGearSelectModel" value="filter.fishingGearDCF"/>  + <input t:type="select" t:id="fishingGearDCF" t:model="dcfGearSelectModel" value="fishingGearDCFId"/>  <t:label t:for="targetSpeciesDCF" /> : - <input t:type="select" t:id="targetSpeciesDCF" t:model="dcfSpeciesSelectModel" value="filter.targetSpeciesDCF"/>  + <input t:type="select" t:id="targetSpeciesDCF" t:model="dcfSpeciesSelectModel" value="targetSpeciesDCFId"/>  </div> <div class="t-beaneditor-row aright"> <input t:type="submit" class="ico search-32px" t:id="search" value="Search" title="Rechercher les lignes du plan correspondants aux filtres saisies" /> 

1 0

[Suiviobsmer-commits] r801 - in trunk: wao-business/src/main/java/fr/ifremer/wao wao-business/src/main/java/fr/ifremer/wao/entity wao-business/src/main/java/fr/ifremer/wao/io/csv wao-business/src/main/java/fr/ifremer/wao/service wao-business/src/main/xmi wao-business/src/test/java/fr/ifremer/wao wao-business/src/test/java/fr/ifremer/wao/entity wao-business/src/test/java/fr/ifremer/wao/service wao-ui/src/main/java/fr/ifremer/wao/ui/pages wao-ui/src/main/java/fr/ifremer/wao/ui/services wao-ui/src/main/webapp
by bleny＠users.labs.libre-entreprise.org Nov. 25, 2010

Nov. 25, 2010

Author: bleny Date: 2010-11-25 15:30:03 +0000 (Thu, 25 Nov 2010) New Revision: 801 Log: refactor DCF5 codes + migration + impact in code and tests Added: trunk/wao-business/src/main/java/fr/ifremer/wao/entity/DCF5CodeImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/entity/FishingGearDCFImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/entity/TargetSpeciesDCFImpl.java Removed: trunk/wao-business/src/main/java/fr/ifremer/wao/entity/DCFFiveCodeImpl.java Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/PostgresMigrationCallback.java trunk/wao-business/src/main/java/fr/ifremer/wao/WaoMigrationCallBack.java trunk/wao-business/src/main/java/fr/ifremer/wao/WaoQueryBuilder.java trunk/wao-business/src/main/java/fr/ifremer/wao/entity/ProfessionImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/entity/SampleRowImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/entity/SampleRowLogImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv/ImportHelper.java trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceContactImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSamplingImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSynthesisImpl.java trunk/wao-business/src/main/xmi/wao.properties trunk/wao-business/src/main/xmi/wao.zargo trunk/wao-business/src/test/java/fr/ifremer/wao/WaoMigrationCallBackTest.java trunk/wao-business/src/test/java/fr/ifremer/wao/entity/BoatImplTest.java trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceBoatImplTest.java trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceSamplingImplTest.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/SampleRowForm.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/SamplingPlan.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/services/ContactModelFactory.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/services/WaoManager.java trunk/wao-ui/src/main/webapp/SamplingPlan.tml Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/PostgresMigrationCallback.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/PostgresMigrationCallback.java 2010-11-24 16:18:47 UTC (rev 800) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/PostgresMigrationCallback.java 2010-11-25 15:30:03 UTC (rev 801) @@ -26,7 +26,6 @@ import fr.ifremer.wao.bean.ContactState; import fr.ifremer.wao.bean.SynthesisId; -import fr.ifremer.wao.entity.DCFFiveCode; import org.hibernate.SQLQuery; import org.nuiton.topia.TopiaException; import org.nuiton.topia.framework.TopiaContextImplementor; @@ -443,36 +442,101 @@ @Override protected void createTablesForDCF5Code_1_6(List<String> queries) { - // create table IndicatorLog with author FK - queries.add("CREATE TABLE DCFFiveCode (" + + // create table FishingGearDCF + queries.add("CREATE TABLE FishingGearDCF (" + "topiaId CHARACTER VARYING(255) PRIMARY KEY," + "topiaVersion BIGINT NOT NULL," + "topiaCreateDate TIMESTAMP WITHOUT TIME ZONE NOT NULL," + - "fishingGearDCF CHARACTER VARYING(10) NOT NULL," + - "targetSpeciesDCF CHARACTER VARYING(10)," + + "code CHARACTER VARYING(10) NOT NULL," + + "UNIQUE (code));"); + queries.add("CREATE TABLE TargetSpeciesDCF (" + + "topiaId CHARACTER VARYING(255) PRIMARY KEY," + + "topiaVersion BIGINT NOT NULL," + + "topiaCreateDate TIMESTAMP WITHOUT TIME ZONE NOT NULL," + + "code CHARACTER VARYING(10) NOT NULL," + + "UNIQUE (code));"); + + queries.add("CREATE TABLE DCF5Code (" + + "topiaId CHARACTER VARYING(255) PRIMARY KEY," + + "topiaVersion BIGINT NOT NULL," + + "topiaCreateDate TIMESTAMP WITHOUT TIME ZONE NOT NULL," + + "FishingGearDCF CHARACTER VARYING(255) NOT NULL," + + "TargetSpeciesDCF CHARACTER VARYING(255)," + + "CONSTRAINT FishingGearDCF_fkey FOREIGN KEY (FishingGearDCF) " + + "REFERENCES FishingGearDCF (topiaid) MATCH SIMPLE " + + "ON UPDATE NO ACTION ON DELETE NO ACTION," + + "CONSTRAINT TargetSpeciesDCF_fkey FOREIGN KEY (TargetSpeciesDCF) " + + "REFERENCES TargetSpeciesDCF (topiaid) MATCH SIMPLE " + + "ON UPDATE NO ACTION ON DELETE NO ACTION," + "UNIQUE (fishingGearDCF, targetSpeciesDCF));"); - // *..* relation need an intermediate table - queries.add("CREATE TABLE dcf5code_profession (" + - "dcf5code character varying(255) NOT NULL," + - "Profession character varying(255) NOT NULL," + - "CONSTRAINT profession_fkey FOREIGN KEY (profession) " + - "REFERENCES Profession (topiaid) MATCH SIMPLE " + + // *..* relation need an intermediate table between sampleRow and dcf5code + queries.add("CREATE TABLE DCF5Code_SampleRow (" + + "DCF5Code character varying(255) NOT NULL," + + "SampleRow character varying(255) NOT NULL," + + "CONSTRAINT DCF5Code_fkey FOREIGN KEY (DCF5Code) " + + "REFERENCES DCF5Code (topiaid) MATCH SIMPLE " + "ON UPDATE NO ACTION ON DELETE NO ACTION," + - "CONSTRAINT dcffivecode_fkey FOREIGN KEY (dcf5code) " + - "REFERENCES DCFFiveCode (topiaid) MATCH SIMPLE " + + "CONSTRAINT SampleRow_fkey FOREIGN KEY (SampleRow) " + + "REFERENCES SampleRow (topiaid) MATCH SIMPLE " + "ON UPDATE NO ACTION ON DELETE NO ACTION);"); } - /** get Data to migrate. key is the topiaId of the profession (to be - * used as a foreign key) and value is the value of the field to split) - */ + @Override + protected Map<String, String> insertFishingGearDCF_1_6(List<String> queries) { + String topiaIdPrefix = "fr.ifremer.wao.entities.FishingGearDCF#1289321129111#798260963"; + int topiaVersion = 0; + String topiaCreateDateValue = "DATE '2010-11-24'"; + + Map<String, String> result = new HashMap<String, String>(); + + for (String code : gearCodesBase) { + String topiaId = topiaIdPrefix + code; + String sql = String.format("INSERT INTO FishingGearDCF (topiaId, topiaVersion, topiaCreateDate, code) " + + "VALUES ('%s', %s, %s, '%s');", + topiaId, + topiaVersion, + topiaCreateDateValue, + code); + queries.add(sql); + + result.put(code, topiaId); + } + + return result; + } + + @Override + protected Map<String, String> insertTargetSpeciesDCF_1_6(List<String> queries) { + String topiaIdPrefix = "fr.ifremer.wao.entities.TargetSpeciesDCF#1289321129111#798260963"; + int topiaVersion = 0; + String topiaCreateDateValue = "DATE '2010-11-24'"; + + Map<String, String> result = new HashMap<String, String>(); + + for (String code : speciesCodesBase) { + String topiaId = topiaIdPrefix + code; + String sql = String.format("INSERT INTO TargetSpeciesDCF (topiaId, topiaVersion, topiaCreateDate, code) " + + "VALUES ('%s', %s, %s, '%s');", + topiaId, + topiaVersion, + topiaCreateDateValue, + code); + queries.add(sql); + + result.put(code, topiaId); + } + + return result; + } + protected Map<String, String> getCodeDCF5ForMigration_1_6(TopiaContextImplementor tx) throws TopiaException { final Map<String, String> result = new HashMap<String, String>(); SQLQuery query = tx.getHibernate(). - createSQLQuery("SELECT topiaid, codedcf5 FROM Profession;"); + createSQLQuery("SELECT sr.topiaId, codedcf5 " + + "FROM SampleRow sr join Profession p on sr.profession = p.topiaId;"); List<Object[]> results = query.list(); @@ -485,29 +549,28 @@ return result; } + @Override + protected void insertDCFFiveCode_1_6(String codeTopiaId, String gearTopiaId, String speciesTopiaId, List<String> queries) { - @Override - protected void insertDCFFiveCode_1_6(String codeTopiaId, DCFFiveCode code, List<String> queries) { int topiaVersion = 0; String topiaCreateDateValue = "DATE '2010-11-09'"; - String sql = String.format("INSERT INTO DCFFiveCode (topiaId, topiaVersion, topiaCreateDate, fishingGearDCF, targetSpeciesDCF) " + + String sql = String.format("INSERT INTO DCF5Code (topiaId, topiaVersion, topiaCreateDate, fishingGearDCF, targetSpeciesDCF) " + "VALUES ('%s', %s, %s, '%s', %s);", codeTopiaId, topiaVersion, topiaCreateDateValue, - code.getFishingGearDCF(), - code.getTargetSpeciesDCF() == null ? "NULL" : "'" + code.getTargetSpeciesDCF() + "'"); + gearTopiaId, + speciesTopiaId == null ? "NULL" : "'" + speciesTopiaId + "'"); queries.add(sql); + } @Override - protected void insertSplitCodes_1_6(String professionTopiaId, - String codeTopiaId, - List<String> queries) { - String sql = String.format("INSERT INTO dcf5code_profession (Profession, dcf5code) " + + protected void insertSplitCodes_1_6(String sampleRowTopiaId, String codeTopiaId, List<String> queries) { + String sql = String.format("INSERT INTO DCF5Code_SampleRow (SampleRow, DCF5Code) " + "VALUES ('%s', '%s');", - professionTopiaId, codeTopiaId); + sampleRowTopiaId, codeTopiaId); queries.add(sql); } Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/WaoMigrationCallBack.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/WaoMigrationCallBack.java 2010-11-24 16:18:47 UTC (rev 800) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/WaoMigrationCallBack.java 2010-11-25 15:30:03 UTC (rev 801) @@ -24,8 +24,6 @@ package fr.ifremer.wao; -import fr.ifremer.wao.entity.DCFFiveCode; -import fr.ifremer.wao.entity.DCFFiveCodeImpl; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.topia.TopiaException; @@ -35,6 +33,7 @@ import org.nuiton.util.VersionUtil; import java.util.ArrayList; +import java.util.Arrays; import java.util.HashSet; import java.util.List; import java.util.Map; @@ -90,11 +89,17 @@ protected abstract void createTablesForDCF5Code_1_6(List<String> queries); + protected abstract Map<String, String> insertFishingGearDCF_1_6(List<String> queries); + protected abstract Map<String, String> insertTargetSpeciesDCF_1_6(List<String> queries); + + /** get Data to migrate. key is the topiaId of the sample row (to be + * used as a foreign key) and value is the value of the field to split) + */ protected abstract Map<String, String> getCodeDCF5ForMigration_1_6(TopiaContextImplementor tx) throws TopiaException; - protected abstract void insertDCFFiveCode_1_6(String codeTopiaId, DCFFiveCode code, List<String> queries); + protected abstract void insertDCFFiveCode_1_6(String codeTopiaId, String gearTopiaId, String speciesTopiaId, List<String> queries); - protected abstract void insertSplitCodes_1_6(String professionTopiaId, String codeTopiaId, List<String> queries); + protected abstract void insertSplitCodes_1_6(String sampleRowTopiaId, String codeTopiaId, List<String> queries); protected abstract void removeCodeDCF5columnFromProfession_1_6(List<String> queries); @@ -238,6 +243,16 @@ executeSQL(tx, showSql, showProgression, strings); } + protected final String[] gearCodesBase = {"DRB", "DRH", "FAR", "FCN", "FG", + "FIX", "FPN", "FPO", "FSN", "FWR", "FYK", "GEN", "GES", "GN", "GNC", + "GND", "GNF", "GNS", "GT", "GTN", "GTR", "HAR", "HMD", "HMP", "HMX", + "LA", "LHM", "LHP", "LL", "LLD", "LLS", "LN", "LNB", "LNP", "LNS", + "LTL", "LX", "MIS", "NK", "OT", "OTB", "OTM", "OTT", "PS", "PS1", + "PS2", "PT", "PTB", "PTM", "RG", "SB", "SDN", "SPR", "SSC", "SV", + "SW", "TB", "TBB", "TBN", "TBS", "TM", "TMS", "TX"}; + protected final String[] speciesCodesBase = {"ALG", "CAT", "CRU", "CSJ", + "DEF", "DWS", "FIN", "LPF", "MOL", "SPF"}; + /** creates Indicator, IndicatorLevel, IndicatorLog tables and inserts * initial values. */ @@ -258,20 +273,32 @@ createTablesForDCF5Code_1_6(queries); + // map code to TopiaId + Map<String, String> gearCodes = insertFishingGearDCF_1_6(queries); + Map<String, String> speciesCodes = insertTargetSpeciesDCF_1_6(queries); + Map<String, String> codesDCF5ForMigration = getCodeDCF5ForMigration_1_6(tx); Set<String> insertedDCFFiveCode = new HashSet<String>(); for (Map.Entry<String, String> codeToMigrate : codesDCF5ForMigration.entrySet()) { // split the code String in multiple codes - List<DCFFiveCode> codes = splitCodeDCF5_1_6(codeToMigrate.getValue()); + List<String[]> codes = splitCodeDCF5_1_6(codeToMigrate.getValue()); // first, do the insert if needed - for (DCFFiveCode code : codes) { - String codeTopiaId = "fr.ifremer.wao.entities.DCFFiveCode#1289320029000#798260963" - + code.getFishingGearDCF() + code.getTargetSpeciesDCF(); + for (String[] code : codes) { + String codeTopiaId = "fr.ifremer.wao.entities.DCF5Code#1289320029000#798260963" + + code[0]; + if (code.length == 2) { + codeTopiaId += code[1]; + } if ( ! insertedDCFFiveCode.contains(codeTopiaId)) { - insertDCFFiveCode_1_6(codeTopiaId, code, queries); + String gearTopiaId = gearCodes.get(code[0]); + String speciesTopiaId = null; + if (code.length == 2) { + speciesTopiaId = speciesCodes.get(code[1]); + } + insertDCFFiveCode_1_6(codeTopiaId, gearTopiaId, speciesTopiaId, queries); insertedDCFFiveCode.add(codeTopiaId); } @@ -292,26 +319,41 @@ } /** given "XXX_YYY et ZZZ_", will split with " et " and with "_" to extract - * some DCFFiveCode entities + * some array like ["XXX", "YYY"], ["ZZZ"] */ - protected List<DCFFiveCode> splitCodeDCF5_1_6(String dcf5Code) { + protected List<String[]> splitCodeDCF5_1_6(String dcf5Code) { String codes[] = dcf5Code.split(" et "); - List<DCFFiveCode> result = new ArrayList<DCFFiveCode>(); + List<String[]> result = new ArrayList<String[]>(); for (String code : codes) { - String codeParts[] = code.split("_"); - DCFFiveCode dcfFiveCode = new DCFFiveCodeImpl(); - dcfFiveCode.setFishingGearDCF(codeParts[0]); - if (codeParts.length == 2 && ! codeParts[1].isEmpty()) { - dcfFiveCode.setTargetSpeciesDCF(codeParts[1]); + // code may be a bad legacy data, replace it to make valid code + String actualCode = code; + if (code.equals("GT?")) { + actualCode = "GT"; + } else if (code.equals("GN?")) { + actualCode = "GN"; + } else if (code.equals("DRBCJ")) { + actualCode = "DRB_CJ"; } + + String codeParts[] = actualCode.split("_"); + String[] dcfFiveCode; + if (codeParts.length == 1 || codeParts[1].isEmpty()) { + dcfFiveCode = new String[1]; + } else { + dcfFiveCode = new String[2]; + dcfFiveCode[1] = codeParts[1]; + } + dcfFiveCode[0] = codeParts[0]; result.add(dcfFiveCode); } if (log.isInfoEnabled()) { - log.info(String.format("line %s will be migrated to", - dcf5Code, result)); + log.info(String.format("line %s will be migrated to", dcf5Code)); + for (String[] code : result) { + log.info(Arrays.toString(code)); + } } return result; } Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/WaoQueryBuilder.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/WaoQueryBuilder.java 2010-11-24 16:18:47 UTC (rev 800) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/WaoQueryBuilder.java 2010-11-25 15:30:03 UTC (rev 801) @@ -334,12 +334,12 @@ } if (filter.getFishingGearDCF() != null) { - query.addEquals(WaoQueryHelper.newDCFFiveCodeProperty().fishingGearDCF(), + query.addEquals(WaoQueryHelper.newDCF5CodeProperty().fishingGearDCF(), filter.getFishingGearDCF()); } if (filter.getTargetSpeciesDCF() != null) { - query.addEquals(WaoQueryHelper.newDCFFiveCodeProperty().targetSpeciesDCF(), + query.addEquals(WaoQueryHelper.newDCF5CodeProperty().targetSpeciesDCF(), filter.getTargetSpeciesDCF()); } Copied: trunk/wao-business/src/main/java/fr/ifremer/wao/entity/DCF5CodeImpl.java (from rev 799, trunk/wao-business/src/main/java/fr/ifremer/wao/entity/DCFFiveCodeImpl.java) =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/entity/DCF5CodeImpl.java (rev 0) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/entity/DCF5CodeImpl.java 2010-11-25 15:30:03 UTC (rev 801) @@ -0,0 +1,59 @@ +/* + * #%L + * Wao :: Business + * %% + * Copyright (C) 2009 - 2010 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.entity; + +import static org.nuiton.i18n.I18n._; + +public class DCF5CodeImpl extends DCF5CodeAbstract { + + @Override + public String getFishingGearCode() { + return getFishingGearDCF().getCode(); + } + + @Override + public String getTargetSpeciesCode() { + String code = null; + if (getTargetSpeciesDCF() != null) { + code = getTargetSpeciesDCF().getCode(); + } + return code; + } + + @Override + public String getFishingGearDescription() { + return _("DCF.gear." + getFishingGearDCF()); + } + + @Override + public String getTargetSpeciesDescription() { + return _("DCF.species." + getTargetSpeciesDCF()); + } + + @Override + public String toString() { + String toString = getFishingGearCode(); + if (getTargetSpeciesDCF() != null) { + toString += "_" + getTargetSpeciesCode(); + } + return toString; + } +} Deleted: trunk/wao-business/src/main/java/fr/ifremer/wao/entity/DCFFiveCodeImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/entity/DCFFiveCodeImpl.java 2010-11-24 16:18:47 UTC (rev 800) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/entity/DCFFiveCodeImpl.java 2010-11-25 15:30:03 UTC (rev 801) @@ -1,46 +0,0 @@ -/* - * #%L - * Wao :: Business - * %% - * Copyright (C) 2009 - 2010 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.entity; - -import static org.nuiton.i18n.I18n._; - -public class DCFFiveCodeImpl extends DCFFiveCodeAbstract { - - - @Override - public String getFishingGearDCFDescription() { - return _("DCF.gear." + getFishingGearDCF()); - } - - @Override - public String getTargetSpeciesDCFDescription() { - return _("DCF.species." + getTargetSpeciesDCF()); - } - - @Override - public String toString() { - String toString = getFishingGearDCF(); - if (getTargetSpeciesDCF() != null) { - toString += "_" + getTargetSpeciesDCF(); - } - return toString; - } -} Added: trunk/wao-business/src/main/java/fr/ifremer/wao/entity/FishingGearDCFImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/entity/FishingGearDCFImpl.java (rev 0) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/entity/FishingGearDCFImpl.java 2010-11-25 15:30:03 UTC (rev 801) @@ -0,0 +1,17 @@ +package fr.ifremer.wao.entity; + +/** + * @author bleny + */ +public class FishingGearDCFImpl extends FishingGearDCFAbstract { + + public FishingGearDCFImpl() { + super(); + } + + public FishingGearDCFImpl(String code) { + super(); + setCode(code); + } + +} Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/entity/ProfessionImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/entity/ProfessionImpl.java 2010-11-24 16:18:47 UTC (rev 800) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/entity/ProfessionImpl.java 2010-11-25 15:30:03 UTC (rev 801) @@ -44,44 +44,4 @@ private static final Logger log = LoggerFactory.getLogger(ProfessionImpl.class); private static final long serialVersionUID = 1L; - - @Override - public String getCode() { - String code = StringUtils.join(getDcf5code(), ", "); - code += getCodeWithoutDCF5(); - return code; - } - - @Override - public String getCodeWithoutDCF5() { - String code = ""; - if (!StringUtils.isEmpty(getMeshSize())) { - code += " " + getMeshSize(); - } - if (!StringUtils.isEmpty(getSize())) { - code += " " + getSize(); - } - if (!StringUtils.isEmpty(getOther())) { - code += " " + getOther(); - } - return code; - } - - @Override - public void setDcf5code(String codes, String separatorRegex) { - String[] splitCodes = codes.split(separatorRegex); - List<DCFFiveCode> dcfFives = new ArrayList<DCFFiveCode>(splitCodes.length); - for (String code : splitCodes) { - String[] codeParts = code.split("_"); - DCFFiveCode dcfFive = new DCFFiveCodeImpl(); - - dcfFive.setFishingGearDCF(codeParts[0]); - if (codeParts.length == 2) { - dcfFive.setTargetSpeciesDCF(codeParts[1]); - } - - dcfFives.add(dcfFive); - } - setDcf5code(dcfFives); - } } Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/entity/SampleRowImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/entity/SampleRowImpl.java 2010-11-24 16:18:47 UTC (rev 800) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/entity/SampleRowImpl.java 2010-11-25 15:30:03 UTC (rev 801) @@ -25,9 +25,9 @@ package fr.ifremer.wao.entity; import fr.ifremer.wao.WaoUtils; -import fr.ifremer.wao.bean.DataReliability; import fr.ifremer.wao.service.ServiceSampling; import org.apache.commons.lang.BooleanUtils; +import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.time.DurationFormatUtils; import org.nuiton.util.DateUtil; import org.nuiton.util.PeriodDates; @@ -379,4 +379,46 @@ // } // } + + + @Override + public String getProfessionDescription() { + String code = StringUtils.join(getDCF5Code(), ", "); + code += getProfessionDescriptionWithoutDCF5(); + return code; + } + + @Override + public String getProfessionDescriptionWithoutDCF5() { + String code = ""; + if (!StringUtils.isEmpty(getProfession().getMeshSize())) { + code += " " + getProfession().getMeshSize(); + } + if (!StringUtils.isEmpty(getProfession().getSize())) { + code += " " + getProfession().getSize(); + } + if (!StringUtils.isEmpty(getProfession().getOther())) { + code += " " + getProfession().getOther(); + } + return code; + } + + @Override + public void setDCF5Code(String codes, String separatorRegex) { + String[] splitCodes = codes.split(separatorRegex); + List<DCF5Code> dcfFives = new ArrayList<DCF5Code>(splitCodes.length); + for (String code : splitCodes) { + String[] codeParts = code.split("_"); + DCF5Code dcfFive = new DCF5CodeImpl(); + + dcfFive.setFishingGearDCF(new FishingGearDCFImpl(codeParts[0])); + if (codeParts.length == 2) { + dcfFive.setTargetSpeciesDCF(new TargetSpeciesDCFImpl(codeParts[1])); + } + + dcfFives.add(dcfFive); + } + setDCF5Code(dcfFives); + } + } Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/entity/SampleRowLogImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/entity/SampleRowLogImpl.java 2010-11-24 16:18:47 UTC (rev 800) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/entity/SampleRowLogImpl.java 2010-11-25 15:30:03 UTC (rev 801) @@ -56,9 +56,11 @@ } @Override - public void addChangeProfession(Profession oldProfession, Profession newProfession) { - if (oldProfession == null) { - addChange("Le métier de la ligne est " + newProfession.getCode()); + public void addChangeProfession(SampleRow oldSampleRow, SampleRow newSampleRow) { + Profession newProfession = newSampleRow.getProfession(); + + if (oldSampleRow == null) { + addChange("Le métier de la ligne est " + newSampleRow.getProfessionDescription()); if (newProfession.getLibelle() != null) { addChange("Le libelle du métier est " + newProfession.getLibelle()); } @@ -68,9 +70,12 @@ return; } - if (!nvl(oldProfession.getCode()).equals(nvl(newProfession.getCode()))) { - addChange("Le métier de la ligne est passé de " + oldProfession.getCode() + " à " + newProfession.getCode()); + if (!nvl(oldSampleRow.getProfessionDescription()).equals(nvl(newSampleRow.getProfessionDescription()))) { + addChange("Le métier de la ligne est passé de " + oldSampleRow.getProfessionDescription() + + " à " + newSampleRow.getProfessionDescription()); } + + Profession oldProfession = oldSampleRow.getProfession(); if (newProfession.getLibelle() != null && !nvl(oldProfession.getLibelle()).equals(nvl(newProfession.getLibelle()))) { addChange("Le libellé du métier est passé de " + oldProfession.getLibelle() + " à " + newProfession.getLibelle()); } Added: trunk/wao-business/src/main/java/fr/ifremer/wao/entity/TargetSpeciesDCFImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/entity/TargetSpeciesDCFImpl.java (rev 0) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/entity/TargetSpeciesDCFImpl.java 2010-11-25 15:30:03 UTC (rev 801) @@ -0,0 +1,16 @@ +package fr.ifremer.wao.entity; + +/** + * @author bleny + */ +public class TargetSpeciesDCFImpl extends TargetSpeciesDCFAbstract { + + public TargetSpeciesDCFImpl() { + super(); + } + + public TargetSpeciesDCFImpl(String code) { + super(); + setCode(code); + } +} Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv/ImportHelper.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv/ImportHelper.java 2010-11-24 16:18:47 UTC (rev 800) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv/ImportHelper.java 2010-11-25 15:30:03 UTC (rev 801) @@ -28,8 +28,10 @@ import fr.ifremer.wao.WaoBusinessException; import fr.ifremer.wao.WaoContext; import fr.ifremer.wao.WaoException; -import fr.ifremer.wao.entity.DCFFiveCode; -import fr.ifremer.wao.entity.DCFFiveCodeImpl; +import fr.ifremer.wao.entity.DCF5Code; +import fr.ifremer.wao.entity.DCF5CodeImpl; +import fr.ifremer.wao.entity.FishingGearDCFImpl; +import fr.ifremer.wao.entity.TargetSpeciesDCFImpl; import fr.ifremer.wao.io.csv.WaoCsvHeader.ACTIVITY_CALENDAR; import fr.ifremer.wao.io.csv.WaoCsvHeader.CONTACT; import fr.ifremer.wao.io.csv.WaoCsvHeader.DatedHeader; @@ -132,17 +134,17 @@ return context.prepareSampleRowCode(code); } - public static Collection<DCFFiveCode> readDCF5Codes(CsvReader reader) throws IOException { - Collection<DCFFiveCode> result = new ArrayList<DCFFiveCode>(); + public static Collection<DCF5Code> readDCF5Codes(CsvReader reader) throws IOException { + Collection<DCF5Code> result = new ArrayList<DCF5Code>(); String codesString = read(reader, SAMPLING.METIER_CODE_DCF5); // codeString is something like "AAA_BBB CCC", let's break it String[] codes = codesString.split(" et "); for (String codeString : codes) { String[] codeParts = codeString.split("_"); - DCFFiveCode code = new DCFFiveCodeImpl(); - code.setFishingGearDCF(codeParts[0]); + DCF5Code code = new DCF5CodeImpl(); + code.setFishingGearDCF(new FishingGearDCFImpl(codeParts[0])); if (codeParts.length == 2) { - code.setTargetSpeciesDCF(codeParts[1]); + code.setTargetSpeciesDCF(new TargetSpeciesDCFImpl(codeParts[1])); } result.add(code); } 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 2010-11-24 16:18:47 UTC (rev 800) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceContactImpl.java 2010-11-25 15:30:03 UTC (rev 801) @@ -471,7 +471,7 @@ Profession profession = row.getProfession(); // export.record(SAMPLING.METIER_CODE_DCF5, profession.getCodeDCF5()); - export.record(SAMPLING.METIER_CODE_DCF5, StringUtil.join(profession.getDcf5code(), " et ", true)); + export.record(SAMPLING.METIER_CODE_DCF5, StringUtil.join(row.getDCF5Code(), " et ", true)); export.record(SAMPLING.METIER_MAILLAGE, profession.getMeshSize()); 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 2010-11-24 16:18:47 UTC (rev 800) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSamplingImpl.java 2010-11-25 15:30:03 UTC (rev 801) @@ -45,10 +45,11 @@ import fr.ifremer.wao.entity.CompanyDAO; import fr.ifremer.wao.entity.Contact; import fr.ifremer.wao.entity.ContactDAO; -import fr.ifremer.wao.entity.DCFFiveCode; -import fr.ifremer.wao.entity.DCFFiveCodeDAO; +import fr.ifremer.wao.entity.DCF5Code; +import fr.ifremer.wao.entity.DCF5CodeDAO; import fr.ifremer.wao.entity.ElligibleBoat; import fr.ifremer.wao.entity.ElligibleBoatDAO; +import fr.ifremer.wao.entity.FishingGearDCF; import fr.ifremer.wao.entity.FishingZone; import fr.ifremer.wao.entity.FishingZoneDAO; import fr.ifremer.wao.entity.Profession; @@ -63,6 +64,7 @@ import fr.ifremer.wao.entity.SampleRowLog; import fr.ifremer.wao.entity.SampleRowLogDAO; import fr.ifremer.wao.entity.SampleRowLogImpl; +import fr.ifremer.wao.entity.TargetSpeciesDCF; import fr.ifremer.wao.entity.WaoUser; import fr.ifremer.wao.io.ImportResults; import fr.ifremer.wao.io.ImportResultsImpl; @@ -98,7 +100,6 @@ import java.util.Date; import java.util.GregorianCalendar; import java.util.HashMap; -import java.util.HashSet; import java.util.LinkedList; import java.util.List; import java.util.Map; @@ -149,25 +150,43 @@ * The method, insert all new codes in database, the others are already * inserted so we reference them, so they will be used as foreign key. */ - protected Collection<DCFFiveCode> insertOrSelect(TopiaContext transaction, - Collection<DCFFiveCode> codes) throws TopiaException { - Collection<DCFFiveCode> result = new LinkedList<DCFFiveCode>(); + protected Collection<DCF5Code> insertOrSelect(TopiaContext transaction, + Collection<DCF5Code> codes) throws TopiaException, WaoBusinessException { + Collection<DCF5Code> result = new LinkedList<DCF5Code>(); - for (DCFFiveCode code : codes) { + for (DCF5Code code : codes) { + FishingGearDCF foundGearCode = WaoDAOHelper.getFishingGearDCFDAO(transaction). + findByCode(code.getFishingGearCode()); + if (foundGearCode == null) { + throw new WaoBusinessException(String.format( + "%s is not a valid fishing gear code", code.getFishingGearCode())); + } + + TargetSpeciesDCF foundSpeciesCode = null; + if (code.getTargetSpeciesCode() != null) { + foundSpeciesCode = WaoDAOHelper.getTargetSpeciesDCFDAO(transaction). + findByCode(code.getTargetSpeciesCode()); + + if (foundSpeciesCode == null) { + throw new WaoBusinessException(String.format( + "%s is not a valid target species code", code.getTargetSpeciesCode())); + } + } + // try do find code in stored entities - DCFFiveCodeDAO dao = WaoDAOHelper.getDCFFiveCodeDAO(transaction); + DCF5CodeDAO dao = WaoDAOHelper.getDCF5CodeDAO(transaction); // both fishingGear and targetSpecies code have to be equals for // DCF5 code to be considered equals. targetSpecies as to be null // if asked - Map<String, Object> properties = new HashMap<String, Object>(); - properties.put(DCFFiveCode.FISHING_GEAR_DCF, code.getFishingGearDCF()); + TopiaQuery query = dao.createQuery() + .addEquals(DCF5Code.FISHING_GEAR_DCF, foundGearCode) - // next line may result in a "IS NULL", exactly what we want - properties.put(DCFFiveCode.TARGET_SPECIES_DCF, code.getTargetSpeciesDCF()); + // next line may result in a "IS NULL", exactly what we want + .addEquals(DCF5Code.TARGET_SPECIES_DCF, foundSpeciesCode); - DCFFiveCode foundCode = dao.findByProperties(properties); + DCF5Code foundCode = dao.findByQuery(query); if (log.isDebugEnabled()) { log.debug("foundCode = " + foundCode); @@ -178,6 +197,10 @@ log.debug(code + " is not already in DB, inserting"); } + // re-use codes already in database + code.setFishingGearDCF(foundGearCode); + code.setTargetSpeciesDCF(foundSpeciesCode); + // not found, let's insert a new row in database for this code dao.create(code); // add this new row in the result @@ -262,16 +285,14 @@ rowLog.addChangePeriod(oldPeriod, newPeriod, pattern); // before saving profession - if (row.getProfession().getDcf5code() != null) { - row.getProfession().setDcf5code( - insertOrSelect(transaction, - row.getProfession().getDcf5code())); + if (row.getDCF5Code() != null) { + row.setDCF5Code(insertOrSelect(transaction, row.getDCF5Code())); } // Save Profession ProfessionDAO professionDAO = WaoDAOHelper.getProfessionDAO(transaction); context.prepareTopiaId(Profession.class, row.getProfession()); - rowLog.addChangeProfession(oldProfession, row.getProfession()); + rowLog.addChangeProfession(oldRow, row); professionDAO.update(row.getProfession()); // Save sampleMonth @@ -458,7 +479,7 @@ // builder.setFishingZoneProperty(fishingZoneProperty); // builder.applySamplingFilter(filter); - WaoQueryHelper.DCFFiveCodeProperty dcf5CodeProperty = WaoQueryHelper.newDCFFiveCodeProperty(); + WaoQueryHelper.DCF5CodeProperty dcf5CodeProperty = WaoQueryHelper.newDCF5CodeProperty(); // Add join for FishingZone TopiaQuery query = builder.applySamplingFilter(filter). @@ -468,7 +489,7 @@ fishingZoneProperty.sectorName(), fishingZoneProperty.districtCode()). addLeftJoin(sampleRowProperty.fishingZone(), fishingZoneProperty.$alias(), false). - addLeftJoin(sampleRowProperty.professionProperty().dcf5code(), dcf5CodeProperty.$alias(), false). + addLeftJoin(sampleRowProperty.dCF5Code(), dcf5CodeProperty.$alias(), false). // Order By facade, sector, districtCode, sampleRowCode addOrder(fishingZoneProperty.facadeName(), fishingZoneProperty.sectorName(), @@ -532,13 +553,13 @@ WaoQueryHelper.SampleRowProperty sampleRowProperty = builder.initializeForSampleRow(false); - WaoQueryHelper.DCFFiveCodeProperty dcf5CodeProperty = - WaoQueryHelper.newDCFFiveCodeProperty(); + WaoQueryHelper.DCF5CodeProperty dcf5CodeProperty = + WaoQueryHelper.newDCF5CodeProperty(); TopiaQuery query = builder.applySamplingFilter(filter). addDistinct(). setSelect(sampleRowProperty.$alias()). - addLeftJoin(sampleRowProperty.professionProperty().dcf5code(), + addLeftJoin(sampleRowProperty.dCF5Code(), dcf5CodeProperty.$alias(), false). addOrder(sampleRowProperty.code()); @@ -828,7 +849,7 @@ Profession profession = row.getProfession(); // export.record(SAMPLING.METIER_CODE_DCF5, profession.getCodeDCF5()); - export.record(SAMPLING.METIER_CODE_DCF5, StringUtil.join(profession.getDcf5code(), " et ", true)); + export.record(SAMPLING.METIER_CODE_DCF5, StringUtil.join(row.getDCF5Code(), " et ", true)); export.record(SAMPLING.METIER_MAILLAGE, profession.getMeshSize()); export.record(SAMPLING.METIER_TAILLE, profession.getSize()); @@ -914,8 +935,7 @@ errorArgs.set(0, currRow); errorArgs.set(1, code); - String districts = ImportHelper.read(reader, - FISHING_ZONE.PECHE_DIVISION); + String districts = ImportHelper.read(reader, FISHING_ZONE.PECHE_DIVISION); row = dao.findByCode(code); // Refuse existing SampleRow @@ -1009,9 +1029,6 @@ profession.setLibelle(libelle); profession.setSpecies(especes); - // profession.setCodeDCF5(codeDCF5); - profession.setDcf5code(insertOrSelect(transaction, ImportHelper.readDCF5Codes(reader))); - return profession; } @@ -1149,22 +1166,11 @@ @Override protected Set<String> executeGetDCFGears(TopiaContext transaction, SamplingFilter filter) throws Exception { - TopiaQuery query = WaoDAOHelper.getDCFFiveCodeDAO(transaction).createQuery(); - query.setSelect(DCFFiveCode.FISHING_GEAR_DCF); - query.addDistinct(); - List<String> dcfGears = transaction.findByQuery(query); - Set<String> result = new HashSet<String>(dcfGears); - return result; + throw new UnsupportedOperationException(); } @Override protected Set<String> executeGetDCFSpecies(TopiaContext transaction, SamplingFilter filter) throws Exception { - TopiaQuery query = WaoDAOHelper.getDCFFiveCodeDAO(transaction).createQuery(); - query.setSelect(DCFFiveCode.TARGET_SPECIES_DCF) - .addNotNull(DCFFiveCode.TARGET_SPECIES_DCF) - .addDistinct(); - List<String> dcfGears = transaction.findByQuery(query); - Set<String> result = new HashSet<String>(dcfGears); - return result; + throw new UnsupportedOperationException(); } } Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSynthesisImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSynthesisImpl.java 2010-11-24 16:18:47 UTC (rev 800) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSynthesisImpl.java 2010-11-25 15:30:03 UTC (rev 801) @@ -54,7 +54,6 @@ import fr.ifremer.wao.entity.Boat; import fr.ifremer.wao.entity.Company; import fr.ifremer.wao.entity.Contact; -import fr.ifremer.wao.entity.ContactDAO; import fr.ifremer.wao.entity.Indicator; import fr.ifremer.wao.entity.IndicatorDAO; import fr.ifremer.wao.entity.IndicatorLevel; @@ -393,9 +392,6 @@ // only if there is no unfinished sampleRow or no contact done Map<String, Double> results = new HashMap<String, Double>(); - ContactDAO dao = WaoDAOHelper.getContactDAO(transaction); - - WaoQueryBuilder builder = context.newQueryBuilder(); ContactProperty contactProperty = builder.initializeForContact(); TopiaQuery query = builder.applySamplingFilter(filter). @@ -602,10 +598,6 @@ Map<String, ContactAverageReactivity> results = new HashMap<String, ContactAverageReactivity>(); - ContactDAO dao = WaoDAOHelper.getContactDAO(transaction); - - //TopiaQuery query = dao.createQueryDoneContactsFromDate(null, period.getFromDate()); - String contactAlias = query.getMainAlias(); String companyProperty = TopiaQuery.getProperty(contactAlias, Contact.OBSERVER, WaoUser.COMPANY); Modified: trunk/wao-business/src/main/xmi/wao.properties =================================================================== --- trunk/wao-business/src/main/xmi/wao.properties 2010-11-24 16:18:47 UTC (rev 800) +++ trunk/wao-business/src/main/xmi/wao.properties 2010-11-25 15:30:03 UTC (rev 801) @@ -14,7 +14,9 @@ fr.ifremer.wao.entity.SampleRow.attribute.fishingZone.tagvalue.orderBy=facadeName,sectorName,districtCode fr.ifremer.wao.entity.SampleRow.attribute.company.tagvalue.lazy=false fr.ifremer.wao.entity.SampleRow.attribute.profession.tagvalue.lazy=false -fr.ifremer.wao.entity.Profession.attribute.dcf5code.tagvalue.lazy=false +fr.ifremer.wao.entity.SampleRow.attribute.dCF5Code.tagvalue.lazy=false +fr.ifremer.wao.entity.DCF5Code.attribute.fishingGearDCF.tagvalue.lazy=false +fr.ifremer.wao.entity.DCF5Code.attribute.targetSpeciesDCF.tagvalue.lazy=false #fr.ifremer.wao.entity.SampleRow.attribute.elligibleBoat.tagvalue.lazy=false fr.ifremer.wao.entity.SampleRow.attribute.elligibleBoat.tagvalue.orderBy=companyActive #fr.ifremer.wao.entity.SampleRow.attribute.sampleRowLog.tagvalue.lazy=false Modified: trunk/wao-business/src/main/xmi/wao.zargo =================================================================== (Binary files differ) Modified: trunk/wao-business/src/test/java/fr/ifremer/wao/WaoMigrationCallBackTest.java =================================================================== --- trunk/wao-business/src/test/java/fr/ifremer/wao/WaoMigrationCallBackTest.java 2010-11-24 16:18:47 UTC (rev 800) +++ trunk/wao-business/src/test/java/fr/ifremer/wao/WaoMigrationCallBackTest.java 2010-11-25 15:30:03 UTC (rev 801) @@ -20,17 +20,12 @@ */ package fr.ifremer.wao; -import fr.ifremer.wao.entity.DCFFiveCode; import org.junit.Test; import org.mockito.Mockito; -import org.nuiton.topia.TopiaException; -import org.nuiton.topia.framework.TopiaContextImplementor; import java.util.List; -import java.util.Map; import static junit.framework.Assert.assertEquals; -import static junit.framework.Assert.assertNull; public class WaoMigrationCallBackTest { @@ -44,23 +39,23 @@ Mockito.when(migration.splitCodeDCF5_1_6(code)).thenCallRealMethod(); // now, the split - List<DCFFiveCode> codes = migration.splitCodeDCF5_1_6(code); + List<String[]> codes = migration.splitCodeDCF5_1_6(code); // first code - assertEquals("AAA", codes.get(0).getFishingGearDCF()); - assertEquals("BBB", codes.get(0).getTargetSpeciesDCF()); + assertEquals("AAA", codes.get(0)[0]); + assertEquals("BBB", codes.get(0)[1]); // second code - assertEquals("CCC", codes.get(1).getFishingGearDCF()); - assertEquals("DDD", codes.get(1).getTargetSpeciesDCF()); + assertEquals("CCC", codes.get(1)[0]); + assertEquals("DDD", codes.get(1)[1]); // third code - assertEquals("EEE", codes.get(2).getFishingGearDCF()); - assertNull(codes.get(2).getTargetSpeciesDCF()); + assertEquals("EEE", codes.get(2)[0]); + assertEquals(1, codes.get(2).length); // last code - assertEquals("FFF", codes.get(3).getFishingGearDCF()); - assertNull(codes.get(3).getTargetSpeciesDCF()); + assertEquals("FFF", codes.get(3)[0]); + assertEquals(1, codes.get(2).length); } Modified: trunk/wao-business/src/test/java/fr/ifremer/wao/entity/BoatImplTest.java =================================================================== --- trunk/wao-business/src/test/java/fr/ifremer/wao/entity/BoatImplTest.java 2010-11-24 16:18:47 UTC (rev 800) +++ trunk/wao-business/src/test/java/fr/ifremer/wao/entity/BoatImplTest.java 2010-11-25 15:30:03 UTC (rev 801) @@ -122,7 +122,7 @@ SampleRowDAO rowDAO = WaoDAOHelper.getSampleRowDAO(transaction); SampleRow row = rowDAO.findByCode("2010_0001"); row.getCompany(); - row.getProfession().sizeDcf5code(); + row.getProfession(); row.sizeElligibleBoat(); row.sizeSampleMonth(); transaction.closeContext(); Modified: trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceBoatImplTest.java =================================================================== --- trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceBoatImplTest.java 2010-11-24 16:18:47 UTC (rev 800) +++ trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceBoatImplTest.java 2010-11-25 15:30:03 UTC (rev 801) @@ -239,11 +239,11 @@ // Get two SampleRows : 2009_3 & 2010_4 SampleRowDAO rowDAO = WaoDAOHelper.getSampleRowDAO(transaction); SampleRow row1 = rowDAO.findByCode("2009_0003"); - row1.getProfession().sizeDcf5code(); + row1.getProfession(); row1.sizeElligibleBoat(); row1.sizeSampleMonth(); SampleRow row2 = rowDAO.findByCode("2010_0004"); - row2.getProfession().sizeDcf5code(); + row2.getProfession(); row2.sizeElligibleBoat(); row2.sizeSampleMonth(); Modified: trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceSamplingImplTest.java =================================================================== --- trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceSamplingImplTest.java 2010-11-24 16:18:47 UTC (rev 800) +++ trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceSamplingImplTest.java 2010-11-25 15:30:03 UTC (rev 801) @@ -37,8 +37,12 @@ import fr.ifremer.wao.entity.Contact; import fr.ifremer.wao.entity.ContactDAO; import fr.ifremer.wao.entity.ContactImpl; +import fr.ifremer.wao.entity.DCF5Code; +import fr.ifremer.wao.entity.DCF5CodeImpl; import fr.ifremer.wao.entity.ElligibleBoat; import fr.ifremer.wao.entity.ElligibleBoatDAO; +import fr.ifremer.wao.entity.FishingGearDCFDAO; +import fr.ifremer.wao.entity.FishingGearDCFImpl; import fr.ifremer.wao.entity.FishingZone; import fr.ifremer.wao.entity.FishingZoneDAO; import fr.ifremer.wao.entity.Profession; @@ -49,6 +53,7 @@ import fr.ifremer.wao.entity.SampleRow; import fr.ifremer.wao.entity.SampleRowDAO; import fr.ifremer.wao.entity.SampleRowLogImpl; +import fr.ifremer.wao.entity.TargetSpeciesDCFImpl; import fr.ifremer.wao.entity.WaoUser; import fr.ifremer.wao.io.ImportResults; import org.junit.Assert; @@ -98,6 +103,14 @@ ServiceBoatImpl serviceBoat = (ServiceBoatImpl) manager.getServiceBoat(); serviceBoat.importBoatCsv(input); + // add DRB, DRH and ALG as existing codes + FishingGearDCFDAO fishingGearDCFDAO = WaoDAOHelper.getFishingGearDCFDAO(transaction); + fishingGearDCFDAO.create(new FishingGearDCFImpl("DRB")); + fishingGearDCFDAO.create(new FishingGearDCFImpl("DRH")); + WaoDAOHelper.getTargetSpeciesDCFDAO(transaction).create(new TargetSpeciesDCFImpl("ALG")); + + transaction.commitTransaction(); + transaction.closeContext(); // CREATE @@ -134,10 +147,22 @@ row.setFishingZone(zones); row.setFishingZonesInfos("port tres loin du champ"); + // for row, add DCF5 codes DRB_ALG, DRH + Collection<DCF5Code> dcf5codes = new ArrayList<DCF5Code>(); + DCF5Code dcf5 = new DCF5CodeImpl(); + dcf5.setFishingGearDCF(new FishingGearDCFImpl("DRB")); + dcf5.setTargetSpeciesDCF(new TargetSpeciesDCFImpl("ALG")); + dcf5codes.add(dcf5); + dcf5 = new DCF5CodeImpl(); + dcf5.setFishingGearDCF(new FishingGearDCFImpl("DRH")); + dcf5codes.add(dcf5); + row.setDCF5Code(dcf5codes); + /** EXEC CREATE **/ List<Boat> boats = serviceBoat.getBoatsByImmatriculations("174592 978419 273129"); serviceSampling.createUpdateSampleRow(row, boats, new SampleRowLogImpl()); assertNotNull(row.getTopiaId()); + assertNotNull(row.getProfession().getTopiaId()); SampleRow result = serviceSampling.getSampleRow(row.getTopiaId()); @@ -474,7 +499,7 @@ SampleRowDAO rowDAO = WaoDAOHelper.getSampleRowDAO(transaction); SampleRow row = rowDAO.findByCode("2010_0001"); row.getProfession(); - row.getProfession().sizeDcf5code(); + row.getProfession(); row.getCompany(); row.sizeSampleMonth(); row.sizeElligibleBoat(); Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/SampleRowForm.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/SampleRowForm.java 2010-11-24 16:18:47 UTC (rev 800) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/SampleRowForm.java 2010-11-25 15:30:03 UTC (rev 801) @@ -30,8 +30,7 @@ import fr.ifremer.wao.bean.UserRole; import fr.ifremer.wao.entity.Boat; import fr.ifremer.wao.entity.Company; -import fr.ifremer.wao.entity.DCFFiveCode; -import fr.ifremer.wao.entity.DCFFiveCodeImpl; +import fr.ifremer.wao.entity.DCF5Code; import fr.ifremer.wao.entity.FishingZone; import fr.ifremer.wao.entity.Profession; import fr.ifremer.wao.entity.ProfessionImpl; @@ -223,7 +222,7 @@ public String getDcf5codes() { if (dcf5codes == null) { - Collection<DCFFiveCode> codes = getSampleRow().getProfession().getDcf5code(); + Collection<DCF5Code> codes = getSampleRow().getDCF5Code(); if (CollectionUtils.isEmpty(codes)) { dcf5codes = ""; } else { @@ -634,8 +633,7 @@ "Un commentaire est obligatoire lors d'une modification de la ligne"); } - Profession profession = getSampleRow().getProfession(); - if (CollectionUtils.isEmpty(profession.getDcf5code())) { + if (CollectionUtils.isEmpty(getSampleRow().getDCF5Code())) { sampleRowForm.recordError( "Le métier doit obligatoirement avoir un Code DCF niveau 5"); } @@ -681,7 +679,7 @@ getSampleRow().setSampleMonth(getSampleMonths()); // save dcf5 codes - getSampleRow().getProfession().setDcf5code(getDcf5codes(), ", "); + getSampleRow().setDCF5Code(getDcf5codes(), ", "); serviceSampling.createUpdateSampleRow(sampleRow, boats, getSampleRowLog()); Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/SamplingPlan.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/SamplingPlan.java 2010-11-24 16:18:47 UTC (rev 800) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/SamplingPlan.java 2010-11-25 15:30:03 UTC (rev 801) @@ -30,7 +30,7 @@ import fr.ifremer.wao.bean.FacadeRow; import fr.ifremer.wao.bean.SamplingFilter; import fr.ifremer.wao.bean.SamplingFilterImpl; -import fr.ifremer.wao.entity.DCFFiveCode; +import fr.ifremer.wao.entity.DCF5Code; import fr.ifremer.wao.entity.FishingZone; import fr.ifremer.wao.entity.SampleMonth; import fr.ifremer.wao.entity.SampleRow; @@ -247,61 +247,6 @@ return this; } - @Property - private boolean refreshSampleRowCodeZone; - - @Property - private int sampleRowCodeIndex; - - @Persist - @Property - private SampleRow selectedSampleRow; - - @InjectComponent - private Zone sampleRowZone; - - public void onChangeFromSelectedSampleRow(String sampleRowCode) { - if (sampleRowCode == null) { - selectedSampleRow = null; - } else { - selectedSampleRow = getSampleRowSelectModel().findObject(sampleRowCode); - if (logger.isDebugEnabled()) { - logger.debug("selectedSampleRow " + selectedSampleRow.getCode()); - } - } - } - - public Object onActionFromAddSampleRowCode() { - - if (getFilter().getSampleRows() == null) { - getFilter().setSampleRows(new ArrayList<SampleRow>()); - } - getFilter().getSampleRows().add(selectedSampleRow); - - if (logger.isDebugEnabled()) { - logger.debug("added filter on code " + selectedSampleRow.getCode()); - } - - selectedSampleRow = null; - refreshSampleRowCodeZone = true; - return sampleRowZone; - } - - public Object onActionFromRemoveSampleRowCode(int sampleRowCodeIndex) { - - logger.debug("should remove " + sampleRowCodeIndex); - - SampleRow sampleRowToRemove = getFilter().getSampleRows().get(sampleRowCodeIndex); - - logger.debug("will remove " + sampleRowToRemove.getCode()); - - boolean result = getFilter().getSampleRows().remove(sampleRowToRemove); - logger.debug("removed " + result); - - refreshSampleRowCodeZone = true; - return sampleRowZone; - } - /**************************** MAIN ACTIONS ********************************/ @Persist @@ -343,7 +288,7 @@ /* variable used in template */ @Property - private DCFFiveCode dcf5code; + private DCF5Code dcf5code; /** * Current SampleRow from loop Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/services/ContactModelFactory.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/services/ContactModelFactory.java 2010-11-24 16:18:47 UTC (rev 800) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/services/ContactModelFactory.java 2010-11-25 15:30:03 UTC (rev 801) @@ -266,7 +266,7 @@ @Override public Object get(Object arg0) { Contact contact = (Contact)arg0; - return contact.getSampleRow().getProfession().getCode(); + return contact.getSampleRow().getProfessionDescription(); } @Override Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/services/WaoManager.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/services/WaoManager.java 2010-11-24 16:18:47 UTC (rev 800) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/services/WaoManager.java 2010-11-25 15:30:03 UTC (rev 801) @@ -182,7 +182,7 @@ DateFormat dateFormat = new SimpleDateFormat("MM/yyyy"); Profession profession = row.getProfession(); result.append("<strong>Métier : </strong>"). - append(profession.getCode()); + append(row.getProfessionDescription()); result.append(" - ").append(profession.getLibelle()); if (!StringUtils.isEmpty(profession.getSpecies())) { result.append("\n<strong>Espèces cibles : </strong>"). @@ -231,7 +231,7 @@ if (filter.getSampleRow() != null) { Profession profession = filter.getSampleRow().getProfession(); result.append(separator). - append("\nMétier ").append(profession.getCode()); + append("\nMétier ").append(filter.getSampleRow().getCode()); if (StringUtils.isNotEmpty(profession.getLibelle())) { result.append(" - ").append(profession.getLibelle()); } Modified: trunk/wao-ui/src/main/webapp/SamplingPlan.tml =================================================================== --- trunk/wao-ui/src/main/webapp/SamplingPlan.tml 2010-11-24 16:18:47 UTC (rev 800) +++ trunk/wao-ui/src/main/webapp/SamplingPlan.tml 2010-11-25 15:30:03 UTC (rev 801) @@ -30,19 +30,6 @@ <t:layout t:pageTitle="Plan d'Echantillonnage" t:contentId="so-sampling" xmlns:t="http://tapestry.apache.org/schema/tapestry_5_1_0.xsd" xmlns:p="tapestry:parameter"> <div class="${mainClass}"> -  -  -  -  -  -  -  -  -  -  -  -  -  <div class="clearfix mbottom10"> <div class="clearfix"> <h1 class="fleft">Plan d'échantillonnage</h1> @@ -89,17 +76,7 @@ </t:if> </t:if> </div> - </div> -  + </div> <div> Pour la pédiode du <t:output value="period.fromDate" format="dateFormat" /> au <t:output value="period.thruDate" format="dateFormat" />  <a t:type="actionlink" t:id="showFilters" t:zone="so-sampling-filters" class="display-form"><img src="${asset:context:img/search.png}" /> recherche avancée</a> @@ -144,24 +121,6 @@ ${row.code} </li> </ul> - <t:zone id="so-sampling-sampleRowZone" t:id="sampleRowZone" t:update="show"> -  - </t:zone> </div> <div> <t:label t:for="fishingGearDCF" /> : @@ -263,8 +222,8 @@ <td>${fishingZones}</td> <td>${row.fishingZonesInfos}</td> <td> - <t:loop source="row.profession.dcf5code" value="dcf5code"> - <span t:type="ck/Tooltip" t:value="${dcf5Code.fishingGearDCF} - ${dcf5Code.fishingGearDCFDescription} ; ${dcf5Code.targetSpeciesDCF} - ${dcf5Code.targetSpeciesDCFDescription}" t:effect="appear"> + <t:loop source="row.dcf5code" value="dcf5code"> + <span t:type="ck/Tooltip" t:value="${dcf5Code.fishingGearCode} - ${dcf5Code.fishingGearDescription} ; ${dcf5Code.targetSpeciesCode} - ${dcf5Code.targetSpeciesDescription}" t:effect="appear"> ${dcf5Code} </span> </t:loop> @@ -283,12 +242,12 @@ </span> </td> <td> - <t:loop source="row.profession.dcf5code" value="dcf5code"> - <span t:type="ck/Tooltip" t:value="${dcf5Code.fishingGearDCF} - ${dcf5Code.fishingGearDCFDescription} ; ${dcf5Code.targetSpeciesDCF} - ${dcf5Code.targetSpeciesDCFDescription}" t:effect="appear"> + <t:loop source="row.dcf5code" value="dcf5code"> + <span t:type="ck/Tooltip" t:value="${dcf5Code.fishingGearCode} - ${dcf5Code.fishingGearDescription} ; ${dcf5Code.targetSpeciesCode} - ${dcf5Code.targetSpeciesDescription}" t:effect="appear"> ${dcf5Code} </span> </t:loop> - ${row.profession.codeWithoutDCF5} + ${row.professionDescriptionWithoutDCF5} </td> <td class="bright"> <span t:type="ck/Tooltip" title="Infos" t:value="Espèces cibles : ${row.profession.species}" t:effect="appear">

1 0

[Suiviobsmer-commits] r800 - trunk/src/announcement
by bleny＠users.labs.libre-entreprise.org Nov. 24, 2010

Nov. 24, 2010

Author: bleny Date: 2010-11-24 16:18:47 +0000 (Wed, 24 Nov 2010) New Revision: 800 Log: 1.6 announcement mail Added: trunk/src/announcement/release-email-1.6.txt Added: trunk/src/announcement/release-email-1.6.txt =================================================================== --- trunk/src/announcement/release-email-1.6.txt (rev 0) +++ trunk/src/announcement/release-email-1.6.txt 2010-11-24 16:18:47 UTC (rev 800) @@ -0,0 +1,26 @@ + +La nouvelle version 1.6 de l'applicatif Wao est disponible ! Cette version +améliore les filtres de la synthèse, permet d'évaluer la qualité de la donnée, +améliore le plan d'échantillonage et ajoute les indicateurs. + +Nouveautés : + +- ajout de la synthèse globale [bleny-Evo #2562] +- factorisation des filtres de la synthèse [bleny-Evo #2561] +- ajout du critère qualité de la donnée [bleny-Evo #2556] +- mise en valeur des lignes modifiées dans le plan d'échantillonage [bleny-Evo #2563] +- Amélioration cartographie des contacts [bleny-Evo #2365] +- Décomposition code métier DCF [bleny-Evo #2353] + +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] r799 - in trunk: wao-business/src/main/java/fr/ifremer/wao/service wao-business/src/main/xmi wao-ui/src/main/java/fr/ifremer/wao/ui/pages wao-ui/src/main/webapp
by bleny＠users.labs.libre-entreprise.org Nov. 24, 2010

Nov. 24, 2010

Author: bleny Date: 2010-11-24 11:08:19 +0000 (Wed, 24 Nov 2010) New Revision: 799 Log: update second synthesis Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSynthesisImpl.java trunk/wao-business/src/main/xmi/wao.zargo trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Synthesis.java trunk/wao-ui/src/main/webapp/Synthesis.tml Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSynthesisImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSynthesisImpl.java 2010-11-23 14:59:18 UTC (rev 798) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSynthesisImpl.java 2010-11-24 11:08:19 UTC (rev 799) @@ -214,10 +214,8 @@ @Override protected BoardingResult executeGetBoardingBoats(TopiaContext transaction, SamplingFilter filter) throws Exception { Map<String, Integer> mapBoarding = new LinkedHashMap<String, Integer>(); - Map<String, Integer> mapInvalidBoarding = new LinkedHashMap<String, Integer>(); BoardingResult result = new BoardingResultImpl(); result.setBoardings(mapBoarding); - result.setInvalidBoarding(mapInvalidBoarding); // Initialize max boardings and its max key value final int MAX_BOARDINGS = 12; @@ -225,13 +223,10 @@ // Prepare map which contains for each entry the number of boardings // for the key and the number of boats for the value. - mapInvalidBoarding.put(String.valueOf(0), 0); for (int i = 1; i < MAX_BOARDINGS; i++) { mapBoarding.put(String.valueOf(i), 0); - mapInvalidBoarding.put(String.valueOf(i), 0); } mapBoarding.put(maxBoardingsKey, 0); - mapInvalidBoarding.put(maxBoardingsKey, 0); // The number of boardings is the number of finished contacts // Use fromDate to filter contacts finished from this date @@ -296,11 +291,12 @@ Date lastTideBeginDate = null; int currentBoardingCount = 1; - int currentInvalidBoardingCount = 0; int maxBoardingCount = -1; Boat maxBoardingBoat = null; + int invalidBoardingCount = 0; + // We will browse result line after line, at each line, we know what was // in the last line. By Comparing we know if it's the same boat. // If yes, check sample-row and date to count a possible invalid @@ -327,7 +323,7 @@ if (sampleRowCode.equals(lastSampleRowCode) && DateUtil.getDifferenceInMonths(lastTideBeginDate, tideBeginDate) <= 3) { - currentInvalidBoardingCount += 1; + invalidBoardingCount += 1; } } @@ -367,24 +363,12 @@ Integer oldValue = mapBoarding.get(key); mapBoarding.put(key, oldValue + 1); - // update mapInvalidBoarding - if (currentInvalidBoardingCount >= MAX_BOARDINGS) { - key = maxBoardingsKey; - } else { - key = String.valueOf(currentInvalidBoardingCount); - } - - oldValue = mapInvalidBoarding.get(key); - mapInvalidBoarding.put(key, oldValue + 1); - if (log.isDebugEnabled()) { - log.debug(lastBoatName + " made " + currentBoardingCount + " boardings and " - + currentInvalidBoardingCount + " invalid boardings"); + log.debug(lastBoatName + " made " + currentBoardingCount + " boardings"); } // re-initialize values for the new boat in the lines currentBoardingCount = 1; - currentInvalidBoardingCount = 0; } lastBoatName = boatName; @@ -394,6 +378,9 @@ result.setMaxBoardingValue(maxBoardingCount); result.setMaxBoardingBoat(maxBoardingBoat); + result.setBoardingsCount(nbBoardingsByBoat.size()); + result.setInvalidBoardingsCount(invalidBoardingCount); + result.setValidBoardingsCount(nbBoardingsByBoat.size() - invalidBoardingCount); return result; } @@ -905,16 +892,11 @@ /** return null if 0 boarding */ protected Double getIndicatorValueForBoarding(SamplingFilter filter) { BoardingResult boardingResult = getBoardingBoats(filter); - - int numberOfBoatsWithZeroInvalidBoarding = boardingResult.getInvalidBoarding().get(String.valueOf(0)); - int totalNumberOfBoarding = 0; - for (Integer numberOfBoarding : boardingResult.getBoardings().values()) { - totalNumberOfBoarding += numberOfBoarding; - } + int boardingsCount = boardingResult.getBoardingsCount(); Double rate = null; - if (totalNumberOfBoarding > 0) { - rate = ((double) numberOfBoatsWithZeroInvalidBoarding / - (double) totalNumberOfBoarding) * 100.0; + if (boardingsCount > 0) { + rate = ((double) boardingResult.getValidBoardingsCount() / + (double) boardingsCount) * 100.0; } return rate; } Modified: trunk/wao-business/src/main/xmi/wao.zargo =================================================================== (Binary files differ) Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Synthesis.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Synthesis.java 2010-11-23 14:59:18 UTC (rev 798) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Synthesis.java 2010-11-24 11:08:19 UTC (rev 799) @@ -352,12 +352,7 @@ Map<String, Map<?, Integer>> data = new LinkedHashMap<String, Map<?, Integer>>(); - // remove column with number of boats with 0 invalid boarding, we - // don't want it to be showed in the graph. - // getBoardingResult().getInvalidBoarding().remove(String.valueOf(0)); - // put invalid first to get red color - data.put("Nombre de navires ayant effectués x embarquements invalides", getBoardingResult().getInvalidBoarding()); data.put("Nombre de navires ayant effectués x embarquements", getBoardingResult().getBoardings()); String title = "Sollicitations des navires depuis le " + Modified: trunk/wao-ui/src/main/webapp/Synthesis.tml =================================================================== --- trunk/wao-ui/src/main/webapp/Synthesis.tml 2010-11-23 14:59:18 UTC (rev 798) +++ trunk/wao-ui/src/main/webapp/Synthesis.tml 2010-11-24 11:08:19 UTC (rev 799) @@ -189,6 +189,9 @@ Navire le plus sollicité avec ${boardingResult.maxBoardingValue} embarquements : <strong>${boardingResult.maxBoardingBoat.name} (${boardingResult.maxBoardingBoat.immatriculation})</strong> </p> + <p> + Au total, ${boardingResult.invalidBoardingsCount} embarquements invalides sur ${boardingResult.boardingsCount} embarquements. + </p> </t:if> <t:if test="user.indicatorsViewer">

1 0

[Suiviobsmer-commits] r798 - in trunk: src/site/rst wao-business/src/main/java/fr/ifremer/wao/bean wao-business/src/main/java/fr/ifremer/wao/entity wao-business/src/main/java/fr/ifremer/wao/io/csv wao-business/src/main/java/fr/ifremer/wao/service wao-business/src/test/java/fr/ifremer/wao wao-business/src/test/java/fr/ifremer/wao/service wao-ui/src/main/java/fr/ifremer/wao/ui/components wao-ui/src/main/java/fr/ifremer/wao/ui/pages wao-ui/src/main/webapp/css
by bleny＠users.labs.libre-entreprise.org Nov. 23, 2010

Nov. 23, 2010

Author: bleny Date: 2010-11-23 14:59:18 +0000 (Tue, 23 Nov 2010) New Revision: 798 Log: update file header + fix contacts CSV imports (data reliability was missing) Modified: trunk/src/site/rst/obsdeb.rst trunk/wao-business/src/main/java/fr/ifremer/wao/bean/DataReliability.java trunk/wao-business/src/main/java/fr/ifremer/wao/bean/GlobalIndicatorValue.java trunk/wao-business/src/main/java/fr/ifremer/wao/bean/GlobalSynthesisParametersImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/bean/GlobalSynthesisResultImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/entity/DCFFiveCodeImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/entity/IndicatorImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/entity/IndicatorLevelImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv/WaoCsvHeader.java trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceContactImpl.java trunk/wao-business/src/test/java/fr/ifremer/wao/WaoMigrationCallBackTest.java trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceContactInternalTest.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/components/IndicatorLevels.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/IndicatorsHistory.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Synthesis.java trunk/wao-ui/src/main/webapp/css/cartography.css trunk/wao-ui/src/main/webapp/css/synthesis-print.css Modified: trunk/src/site/rst/obsdeb.rst =================================================================== --- trunk/src/site/rst/obsdeb.rst 2010-11-22 14:45:55 UTC (rev 797) +++ trunk/src/site/rst/obsdeb.rst 2010-11-23 14:59:18 UTC (rev 798) @@ -1,3 +1,23 @@ +.. - +.. * #%L +.. * Wao +.. * %% +.. * Copyright (C) 2009 - 2010 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% +.. - ==================================== OBSDEB : Observation au débarquement ==================================== Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/bean/DataReliability.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/bean/DataReliability.java 2010-11-22 14:45:55 UTC (rev 797) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/bean/DataReliability.java 2010-11-23 14:59:18 UTC (rev 798) @@ -1,3 +1,23 @@ +/* + * #%L + * Wao :: Business + * %% + * Copyright (C) 2009 - 2010 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.bean; import static org.nuiton.i18n.I18n._; Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/bean/GlobalIndicatorValue.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/bean/GlobalIndicatorValue.java 2010-11-22 14:45:55 UTC (rev 797) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/bean/GlobalIndicatorValue.java 2010-11-23 14:59:18 UTC (rev 798) @@ -1,3 +1,23 @@ +/* + * #%L + * Wao :: Business + * %% + * Copyright (C) 2009 - 2010 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.bean; import static org.nuiton.i18n.I18n._; Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/bean/GlobalSynthesisParametersImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/bean/GlobalSynthesisParametersImpl.java 2010-11-22 14:45:55 UTC (rev 797) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/bean/GlobalSynthesisParametersImpl.java 2010-11-23 14:59:18 UTC (rev 798) @@ -1,3 +1,23 @@ +/* + * #%L + * Wao :: Business + * %% + * Copyright (C) 2009 - 2010 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.bean; import fr.ifremer.wao.entity.Indicator; Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/bean/GlobalSynthesisResultImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/bean/GlobalSynthesisResultImpl.java 2010-11-22 14:45:55 UTC (rev 797) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/bean/GlobalSynthesisResultImpl.java 2010-11-23 14:59:18 UTC (rev 798) @@ -1,3 +1,23 @@ +/* + * #%L + * Wao :: Business + * %% + * Copyright (C) 2009 - 2010 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.bean; import fr.ifremer.wao.entity.Indicator; Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/entity/DCFFiveCodeImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/entity/DCFFiveCodeImpl.java 2010-11-22 14:45:55 UTC (rev 797) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/entity/DCFFiveCodeImpl.java 2010-11-23 14:59:18 UTC (rev 798) @@ -1,3 +1,23 @@ +/* + * #%L + * Wao :: Business + * %% + * Copyright (C) 2009 - 2010 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.entity; import static org.nuiton.i18n.I18n._; Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/entity/IndicatorImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/entity/IndicatorImpl.java 2010-11-22 14:45:55 UTC (rev 797) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/entity/IndicatorImpl.java 2010-11-23 14:59:18 UTC (rev 798) @@ -1,3 +1,23 @@ +/* + * #%L + * Wao :: Business + * %% + * Copyright (C) 2009 - 2010 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.entity; import fr.ifremer.wao.bean.SynthesisId; Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/entity/IndicatorLevelImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/entity/IndicatorLevelImpl.java 2010-11-22 14:45:55 UTC (rev 797) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/entity/IndicatorLevelImpl.java 2010-11-23 14:59:18 UTC (rev 798) @@ -1,3 +1,23 @@ +/* + * #%L + * Wao :: Business + * %% + * Copyright (C) 2009 - 2010 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.entity; import org.slf4j.Logger; Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv/WaoCsvHeader.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv/WaoCsvHeader.java 2010-11-22 14:45:55 UTC (rev 797) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv/WaoCsvHeader.java 2010-11-23 14:59:18 UTC (rev 798) @@ -331,11 +331,9 @@ /** Contact company validation **/ CONT_SOCIETE_VALID(31), /** Contact program validation **/ - CONT_PROGRAM_VALID(32); -// /** Contact company comment **/ -// CONT_COMMENT_SOCIETE(33), -// /** Contact program comment **/ -// CONT_COMMENT_PROGRAM(34); + CONT_PROGRAM_VALID(32), + /** Data reliability **/ + CONT_DATA_RELIABILITY(33); private int contactHeader; @@ -364,8 +362,8 @@ } public static int getTotalHeaders() { - // CONT_PROGRAM_VALID is the last column - return CONT_PROGRAM_VALID.forContactCsv() + 1; + // CONT_DATA_RELIABILITY is the last column + return CONT_DATA_RELIABILITY.forContactCsv() + 1; } public static String formatValidation(Boolean validation) { 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 2010-11-22 14:45:55 UTC (rev 797) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceContactImpl.java 2010-11-23 14:59:18 UTC (rev 798) @@ -434,6 +434,8 @@ CONTACT.formatValidation(contact.getValidationCompany())); export.record(CONTACT.CONT_PROGRAM_VALID, CONTACT.formatValidation(contact.getValidationProgram())); + export.record(CONTACT.CONT_DATA_RELIABILITY, + String.valueOf(contact.getDataReliabilityOrdinal())); // Observer part WaoUser observer = contact.getObserver(); @@ -694,6 +696,9 @@ contactCode, createDateCsv); contact.setTopiaCreateDate(createDate); + + contact.setDataReliabilityOrdinal( + ImportHelper.readInt(reader, CONTACT.CONT_DATA_RELIABILITY)); } /** Modified: trunk/wao-business/src/test/java/fr/ifremer/wao/WaoMigrationCallBackTest.java =================================================================== --- trunk/wao-business/src/test/java/fr/ifremer/wao/WaoMigrationCallBackTest.java 2010-11-22 14:45:55 UTC (rev 797) +++ trunk/wao-business/src/test/java/fr/ifremer/wao/WaoMigrationCallBackTest.java 2010-11-23 14:59:18 UTC (rev 798) @@ -1,3 +1,23 @@ +/* + * #%L + * Wao :: Business + * %% + * Copyright (C) 2009 - 2010 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; import fr.ifremer.wao.entity.DCFFiveCode; Modified: trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceContactInternalTest.java =================================================================== --- trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceContactInternalTest.java 2010-11-22 14:45:55 UTC (rev 797) +++ trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceContactInternalTest.java 2010-11-23 14:59:18 UTC (rev 798) @@ -574,6 +574,8 @@ String comment = "Commentaire sur le contact\nAutre ligne"; when(reader.get(CONTACT.CONT_COMMENT.name())). thenReturn(comment); + when(reader.get(CONTACT.CONT_DATA_RELIABILITY.name())). + thenReturn("0"); when(creator.getCompany()).thenReturn(company); when(creator.isAdmin()).thenReturn(false); Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/components/IndicatorLevels.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/components/IndicatorLevels.java 2010-11-22 14:45:55 UTC (rev 797) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/components/IndicatorLevels.java 2010-11-23 14:59:18 UTC (rev 798) @@ -1,3 +1,23 @@ +/* + * #%L + * Wao :: Web Interface + * %% + * Copyright (C) 2009 - 2010 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.ui.components; import fr.ifremer.wao.entity.Indicator; Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/IndicatorsHistory.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/IndicatorsHistory.java 2010-11-22 14:45:55 UTC (rev 797) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/IndicatorsHistory.java 2010-11-23 14:59:18 UTC (rev 798) @@ -1,3 +1,23 @@ +/* + * #%L + * Wao :: Web Interface + * %% + * Copyright (C) 2009 - 2010 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.ui.pages; import fr.ifremer.wao.bean.UserRole; Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Synthesis.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Synthesis.java 2010-11-22 14:45:55 UTC (rev 797) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Synthesis.java 2010-11-23 14:59:18 UTC (rev 798) @@ -354,10 +354,11 @@ // remove column with number of boats with 0 invalid boarding, we // don't want it to be showed in the graph. - getBoardingResult().getInvalidBoarding().remove(String.valueOf(0)); + // getBoardingResult().getInvalidBoarding().remove(String.valueOf(0)); + // put invalid first to get red color + data.put("Nombre de navires ayant effectués x embarquements invalides", getBoardingResult().getInvalidBoarding()); data.put("Nombre de navires ayant effectués x embarquements", getBoardingResult().getBoardings()); - data.put("Nombre de navires ayant effectués x embarquements invalides", getBoardingResult().getInvalidBoarding()); String title = "Sollicitations des navires depuis le " + getDateFormat().format(getFilter().getPeriod().getFromDate()); Modified: trunk/wao-ui/src/main/webapp/css/cartography.css =================================================================== --- trunk/wao-ui/src/main/webapp/css/cartography.css 2010-11-22 14:45:55 UTC (rev 797) +++ trunk/wao-ui/src/main/webapp/css/cartography.css 2010-11-23 14:59:18 UTC (rev 798) @@ -8,12 +8,12 @@ * 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% @@ -86,4 +86,4 @@ #so-footer a:hover { color: white !important; -} \ No newline at end of file +} Modified: trunk/wao-ui/src/main/webapp/css/synthesis-print.css =================================================================== --- trunk/wao-ui/src/main/webapp/css/synthesis-print.css 2010-11-22 14:45:55 UTC (rev 797) +++ trunk/wao-ui/src/main/webapp/css/synthesis-print.css 2010-11-23 14:59:18 UTC (rev 798) @@ -1,3 +1,23 @@ +/* + * #%L + * Wao :: Web Interface + * %% + * Copyright (C) 2009 - 2010 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% + */ * {

1 0