- Echobase-commits - mailman.cloud.codelutin.com

r1030 - in trunk: echobase-domain/src/main/java/fr/ifremer/echobase/config echobase-domain/src/main/resources/i18n echobase-services/src/main/java/fr/ifremer/echobase/services/service/spatial echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/spatial echobase-ui/src/main/resources/config echobase-ui/src/main/webapp/WEB-INF/jsp/spatial src/site/rst
by sbavencoff＠users.forge.codelutin.com 16 Jun '14

16 Jun '14

Author: sbavencoff Date: 2014-06-16 09:54:40 +0200 (Mon, 16 Jun 2014) New Revision: 1030 Url: http://forge.codelutin.com/projects/echobase/repository/revisions/1030 Log: refs #4194 : Visualisation des donn?\195?\169es spatiales Modified: trunk/echobase-domain/src/main/java/fr/ifremer/echobase/config/EchoBaseConfiguration.java trunk/echobase-domain/src/main/java/fr/ifremer/echobase/config/EchoBaseConfigurationOption.java trunk/echobase-domain/src/main/resources/i18n/echobase-domain_en_GB.properties trunk/echobase-domain/src/main/resources/i18n/echobase-domain_fr_FR.properties trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/spatial/SpatialService.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/spatial/ShowMap.java trunk/echobase-ui/src/main/resources/config/struts-spatial.xml trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/spatial/show.jsp trunk/src/site/rst/install.rst.vm Modified: trunk/echobase-domain/src/main/java/fr/ifremer/echobase/config/EchoBaseConfiguration.java =================================================================== --- trunk/echobase-domain/src/main/java/fr/ifremer/echobase/config/EchoBaseConfiguration.java 2014-06-05 10:41:01 UTC (rev 1029) +++ trunk/echobase-domain/src/main/java/fr/ifremer/echobase/config/EchoBaseConfiguration.java 2014-06-16 07:54:40 UTC (rev 1030) @@ -259,6 +259,37 @@ return result; } + public File getQgisTemplate() { + File file = applicationConfig.getOptionAsFile( + EchoBaseConfigurationOption.QGIS_TEMPLATE.key); + Preconditions.checkNotNull(file); + return file; + } + + public File getLizmapTemplate() { + File file = applicationConfig.getOptionAsFile( + EchoBaseConfigurationOption.LIZMAP_TEMPLATE.key); + Preconditions.checkNotNull(file); + return file; + } + + public File getLizmapTarget() { + File file = applicationConfig.getOptionAsFile( + EchoBaseConfigurationOption.LIZMAP_TARGET.key); + Preconditions.checkNotNull(file); + return file; + } + + public String getLizmapUrl(){ + String url = applicationConfig.getOption(EchoBaseConfigurationOption.LIZMAP_URL.key); + return url; + } + + public String getLizmapRepository(){ + String repository = applicationConfig.getOption(EchoBaseConfigurationOption.LIZMAP_REPOSITORY.key); + return repository; + } + /** * Creates a directory given the configuration given key. * Modified: trunk/echobase-domain/src/main/java/fr/ifremer/echobase/config/EchoBaseConfigurationOption.java =================================================================== --- trunk/echobase-domain/src/main/java/fr/ifremer/echobase/config/EchoBaseConfigurationOption.java 2014-06-05 10:41:01 UTC (rev 1029) +++ trunk/echobase-domain/src/main/java/fr/ifremer/echobase/config/EchoBaseConfigurationOption.java 2014-06-16 07:54:40 UTC (rev 1030) @@ -90,7 +90,27 @@ DOCUMENTATION_URL("echobase.documentationUrl", n("echobase.config.documentationUrl.description"), "http://doc.codelutin.com/echobase", - URL.class); + URL.class), + QGIS_TEMPLATE("echobase.qgis.template.file", + n("echobase.config.qgis.template.file.description"), + "${echobase.data.directory}/lizmap/templates/{{voyageName}}.qgs", + File.class), + LIZMAP_TEMPLATE("echobase.lizmap.template.file", + n("echobase.config.lizmap.template.file.description"), + "${echobase.data.directory}/lizmap/templates/{{voyageName}}.qgs.cfg", + File.class), + LIZMAP_TARGET("echobase.lizmap.target.file", + n("echobase.config.lizmap.target.file.description"), + "${echobase.data.directory}/lizmap/qgis", + File.class), + LIZMAP_URL("echobase.lizmap.url", + n("echobase.config.lizmap.url.description"), + "http://localhost/lizmap-web-client-2.9.4/lizmap/www/index.php/view/map/", + String.class), + LIZMAP_REPOSITORY("echobase.lizmap.repository", + n("echobase.config.lizmap.url.description"), + "echobase", + String.class); /** Configuration key. */ protected final String key; Modified: trunk/echobase-domain/src/main/resources/i18n/echobase-domain_en_GB.properties =================================================================== --- trunk/echobase-domain/src/main/resources/i18n/echobase-domain_en_GB.properties 2014-06-05 10:41:01 UTC (rev 1029) +++ trunk/echobase-domain/src/main/resources/i18n/echobase-domain_en_GB.properties 2014-06-16 07:54:40 UTC (rev 1030) @@ -35,8 +35,12 @@ echobase.config.h2Version.description=H2 jdbc driver version echobase.config.internal.db.directory.description=Directory of the internal database echobase.config.lib.directory.description=Directory where to put internal libraries (jdbc drivers, embedded war) +echobase.config.lizmap.target.file.description=Repository directory of Qgis and LizMap files +echobase.config.lizmap.template.file.description=Lizmap configuration file template +echobase.config.lizmap.url.description=Lizmap URL echobase.config.log.config.file.description=Log configuration file echobase.config.postgresqlVersion.description=Postgresql driver version +echobase.config.qgis.template.file.description=Qgis file template echobase.config.version.description=Application version echobase.config.war.location.description=Location of the war used to create embedded applications echobase.configuration.description=EchoBase configuration Modified: trunk/echobase-domain/src/main/resources/i18n/echobase-domain_fr_FR.properties =================================================================== --- trunk/echobase-domain/src/main/resources/i18n/echobase-domain_fr_FR.properties 2014-06-05 10:41:01 UTC (rev 1029) +++ trunk/echobase-domain/src/main/resources/i18n/echobase-domain_fr_FR.properties 2014-06-16 07:54:40 UTC (rev 1030) @@ -35,8 +35,12 @@ echobase.config.h2Version.description=Version du pilote jdbc H2 echobase.config.internal.db.directory.description=Répertoire de la base interne echobase.config.lib.directory.description=Chemin où sont stockés les libraires internes (drivers + application embarquée) +echobase.config.lizmap.target.file.description=Le répertoire de dépôt des fichiers Qgis et lizmap +echobase.config.lizmap.template.file.description=Le modièle du fichier de configuration de Lizmap +echobase.config.lizmap.url.description=L'URL de Lizmap echobase.config.log.config.file.description=Fichier de configuration des logs echobase.config.postgresqlVersion.description=Version du pilote jdbc Postgresql +echobase.config.qgis.template.file.description=Le modèle du fichier Qgis echobase.config.version.description=Version de l'application echobase.config.war.location.description=Chemin d'accèss au war embarqué à utiliser pour créer des applications embarquées echobase.configuration.description=Configuration d'EchoBase Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/spatial/SpatialService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/spatial/SpatialService.java 2014-06-05 10:41:01 UTC (rev 1029) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/spatial/SpatialService.java 2014-06-16 07:54:40 UTC (rev 1030) @@ -21,15 +21,26 @@ * #L% */ +import com.google.common.base.Preconditions; import fr.ifremer.echobase.EchoBaseTechnicalException; +import fr.ifremer.echobase.entities.data.Voyage; import fr.ifremer.echobase.io.EchoBaseIOUtil; +import fr.ifremer.echobase.persistence.JdbcConfiguration; import fr.ifremer.echobase.services.EchoBaseServiceSupport; import fr.ifremer.echobase.services.service.UserDbPersistenceService; +import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.util.TimeLog; import javax.inject.Inject; +import java.io.BufferedWriter; +import java.io.File; +import java.io.FileNotFoundException; +import java.io.IOException; +import java.nio.charset.StandardCharsets; +import java.nio.file.Files; +import java.util.Scanner; /** * Spatial service. @@ -48,6 +59,10 @@ public static final String POSTGIS_VIEW_SQL = "/postgis-view.sql"; + public static final String[] TEMPLATE_MARKUP = {"{{dbname}}", "{{host}}", "{{port}}", "{{userName}}", "{{password}}", "{{voyageName}}", "{{voyageId}}" }; + + public static final String START_JDBC_URL = "jdbc:postgresql://"; + @Inject private UserDbPersistenceService persistenceService; @@ -139,4 +154,109 @@ } } } + + public String generateMap(JdbcConfiguration conf, String voyageId) { + Preconditions.checkState(StringUtils.isNotBlank(voyageId)); + Voyage voyage = persistenceService.getVoyage(voyageId); + return generateMap(conf, voyage); + } + + public String generateMap (JdbcConfiguration conf, Voyage voyage) { + Preconditions.checkNotNull(conf); + Preconditions.checkNotNull(voyage); + + String[] templateValues = getTemplateValues(conf, voyage); + + File qgisFile = generateMapFile(getConfiguration().getQgisTemplate(), templateValues); + + generateMapFile(getConfiguration().getLizmapTemplate(), templateValues); + + String name = qgisFile.getName(); + name = name.substring(0, name.lastIndexOf(".")); + + return name; + + } + + protected File generateMapFile(File template, String[] templateValues) { + + File lizmapTarget = getConfiguration().getLizmapTarget(); + + if (!lizmapTarget.isDirectory()) { + throw new EchoBaseTechnicalException("Map target (" + lizmapTarget.getAbsolutePath() + ") is not directory"); + } + + String name = template.getName(); + name = StringUtils.replaceEach(name, TEMPLATE_MARKUP, templateValues); + + File target = new File(lizmapTarget, name); + + if (!target.isFile()) { + + Scanner scanner = null; + BufferedWriter writer = null; + try { + scanner = new Scanner(template, StandardCharsets.UTF_8.name()); + + writer = Files.newBufferedWriter(target.toPath(), StandardCharsets.UTF_8); + + String line; + + while(scanner.hasNextLine() ) { + line = scanner.nextLine(); + line = StringUtils.replaceEach(line, TEMPLATE_MARKUP, templateValues); + writer.write(line); + writer.newLine(); + } + } catch (FileNotFoundException e) { + throw new EchoBaseTechnicalException(e); + } catch (IOException e) { + throw new EchoBaseTechnicalException(e); + } finally { + scanner.close(); + if (writer != null) { + try { + writer.close(); + } catch (IOException e) { + throw new EchoBaseTechnicalException(e); + } + } + } + } + + return target; + + } + + protected String[] getTemplateValues(JdbcConfiguration conf, Voyage voyage) { + + String[] templateValues = new String[TEMPLATE_MARKUP.length]; + + String url = conf.getUrl(); + if (!url.startsWith(START_JDBC_URL)) { + throw new EchoBaseTechnicalException("JDBC URL '" + url + "' is no reference to a Postrges database"); + } + + int hostIndex = START_JDBC_URL.length() - 1; + int portIndex = url.indexOf(':', hostIndex); + int dbnameIndex = url.indexOf("/", portIndex); + + // dbname + templateValues[0] = url.substring(dbnameIndex + 1); + // host + templateValues[1] = url.substring(hostIndex + 1, portIndex); + // port + templateValues[2] = url.substring(portIndex + 1, dbnameIndex); + // userName + templateValues[3] = conf.getLogin(); + // password + templateValues[4] = conf.getPassword(); + // voyage name + templateValues[5] = voyage.getName(); + // voyage id + templateValues[6] = voyage.getTopiaId(); + + return templateValues; + } + } Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/spatial/ShowMap.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/spatial/ShowMap.java 2014-06-05 10:41:01 UTC (rev 1029) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/spatial/ShowMap.java 2014-06-16 07:54:40 UTC (rev 1030) @@ -21,10 +21,17 @@ * #L% */ +import fr.ifremer.echobase.EchoBaseTechnicalException; +import fr.ifremer.echobase.persistence.JdbcConfiguration; +import fr.ifremer.echobase.services.service.spatial.SpatialService; import fr.ifremer.echobase.ui.actions.EchoBaseActionSupport; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.apache.http.client.utils.URIBuilder; +import javax.inject.Inject; +import java.net.URISyntaxException; + /** * To display only the spatial data map. * <p/> @@ -40,17 +47,53 @@ /** Logger. */ private static final Log log = LogFactory.getLog(ShowMap.class); - protected final ShowSpatialModel model = new ShowSpatialModel(); + @Inject + protected transient SpatialService spatialService; - public ShowSpatialModel getModel() { - return model; + protected String voyageId; + + protected String lizmpaProject; + + public String getVoyageId() { + return voyageId; } + public void setVoyageId(String voyageId) { + this.voyageId = voyageId; + } + + public String getLizmapUrl() { + String url = null; + try { + URIBuilder uriBuilder = new URIBuilder(getServiceContext().getConfiguration().getLizmapUrl()); + uriBuilder.addParameter("repository", getServiceContext().getConfiguration().getLizmapRepository()); + uriBuilder.addParameter("project", lizmpaProject); + url = uriBuilder.build().toString(); + + } catch (URISyntaxException e) { + throw new EchoBaseTechnicalException(e); + } + return url; + } + + public String getLizmapRepository() { + return getServiceContext().getConfiguration().getLizmapRepository(); + } + + public String getLizmapProject() { + return lizmpaProject; + } + + @Override public String execute() throws Exception { + JdbcConfiguration dbConf = getEchoBaseSession().getWorkingDbConfiguration(); + + lizmpaProject = spatialService.generateMap(dbConf, voyageId); + if (log.isInfoEnabled()) { - log.info("Loading spatial view for voyage: " + model.getVoyageId()); + log.info("Loading spatial view for voyage: " + voyageId); } return SUCCESS; } Modified: trunk/echobase-ui/src/main/resources/config/struts-spatial.xml =================================================================== --- trunk/echobase-ui/src/main/resources/config/struts-spatial.xml 2014-06-05 10:41:01 UTC (rev 1029) +++ trunk/echobase-ui/src/main/resources/config/struts-spatial.xml 2014-06-16 07:54:40 UTC (rev 1030) @@ -36,7 +36,9 @@ <action name="showMap" class="fr.ifremer.echobase.ui.actions.spatial.ShowMap"> <interceptor-ref name="prepareParamsStackLogguedWithDb"/> - <result>/WEB-INF/jsp/spatial/showMap.jsp</result> + <result type="redirect"> + <param name="location">%{lizmapUrl}</param> + </result> </action>  Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/spatial/show.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/spatial/show.jsp 2014-06-05 10:41:01 UTC (rev 1029) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/spatial/show.jsp 2014-06-16 07:54:40 UTC (rev 1030) @@ -30,51 +30,6 @@ <s:if test="model.withSpatial"> - <script type="text/javascript"> - - jQuery(document).ready(function () { - - var voyageComboBox = $('[name="model.voyageId"]'); - - var loadvoyageData = function(voyageId) { - - var spatialView = $('#spatialViewContainer'); - var spatialViewContent = $('#spatialViewContent'); - if (voyageId!='') { - - // load spatial view - spatialViewContent.html('<s:text name="echobase.spatialView.loading"/>'); - spatialView.show(); - console.info('Load spatial view '+voyageId); - - - jQuery.get( - '<s:url action="showMap" namespace="/spatial"/>', - { - "model.voyageId": voyageComboBox.val() - }, - function (result) { - - // inject result - spatialViewContent.html(result); - }); - } else { - - // hide spatial view - spatialView.hide(); - spatialViewContent.html(""); - } - }; - - voyageComboBox.change(function () { - loadvoyageData(this.value); - }); - - loadvoyageData('<s:property value="model.voyageId"/>'); - - }); - </script> - <s:form namespace="/spatial" method="POST" enctype="multipart/form-data"> <div class="toolbar"> @@ -97,25 +52,27 @@ </div> <br/> - <s:select key="model.voyageId" requiredLabel="true" - label='%{getText("echobase.common.voyage")}' - list="voyages" headerKey="" headerValue=""/> + <div class="label"> + <s:property value="getText('echobase.common.voyage')"/> : + </div> + <ul> + <s:iterator value="voyages"> + <li> + <s:url action="showMap" id="showMapUrl"> + <s:param name="voyageId" value="%{key}"/> + </s:url> + <s:a href="%{showMapUrl}" target="_blank"> + <s:property value="%{value}"/> + </s:a> + </li> + </s:iterator> + </ul> + <s:hidden key="model.withSpatial" label=' '/> </fieldset> - - <div id="spatialViewContainer"> - <fieldset> - <legend> - <s:text name="echobase.legend.showData.result"/> - </legend> - - <div id="spatialViewContent"></div> - </fieldset> - </div> - </s:form> </s:if> <s:else> Modified: trunk/src/site/rst/install.rst.vm =================================================================== --- trunk/src/site/rst/install.rst.vm 2014-06-05 10:41:01 UTC (rev 1029) +++ trunk/src/site/rst/install.rst.vm 2014-06-16 07:54:40 UTC (rev 1030) @@ -138,8 +138,18 @@ | | |-- echobase-embedded-2.3-SNAPSHOT.war | | |-- h2-1.3.173.jar | | `-- postgresql-9.1-901-1.jdbc4.jar - | `-- logs - | `-- echobase.log + | |-- logs + | | `-- echobase.log + | `-- lizmap + | |-- data + | | |-- France&Spain.shp + | | |-- pelgas09.shp + | | `-- ... + | |-- qgis + | `-- templates + | |-- {{voyageName}}.qgs + | |-- {{voyageName}}.qgs.cfg + | `-- ... |-- echobase.war `-- war `-- echobase-full-${project.version}-SNAPSHOT.war @@ -220,3 +230,72 @@ .. _créer une base travail: ./db.html#creation-d-une-base-postgresql .. _détail des options disponibles: ./application-config-report.html + +Visualisation des données spatiales +----------------------------------- + + +Qgis map server +~~~~~~~~~~~~~~~ + +Suivez `le guide de Qgis map server <http://hub.qgis.org/projects/quantum-gis/wiki/QGIS_Server_Tutorial#Webserve…>`_. + +Lizmap +~~~~~~ + +Suivez `le guide de lizmap <http://docs.3liz.com/fr/lizmap-web-client/installation/linux.html>`_. + + +Configuration pour Echobase +~~~~~~~~~~~~~~~~~~~~~~~~~~~ + + 1. Répetoires + + * **/var/local/echobase/data/lizmap/templates** contient deux fichiers de modèles : + + * **{{voyageName}}.qgs** est le fichier de project Qgis + * **{{voyageName}}.qgs.cfg** est généré par le plugin lizmap de Qgis. + + Dans ses fichiers, les références à la base de données et au voyage sont remplacer par des balises suivantes : + + * *{{dbName}}* : le nom de la base de données, + * *{{host}}* : l'adresse du serveur de base, + * *{{port}}* : le port d'écoute de la base, + * *{{userName}}* : le identitfiant de connexion, + * *{{password}}* : le mot de passe, + * *{{voyageName}}* : le label du voyage, + * *{{voyageId}}* : l'identifiant du voyage. + + * **/var/local/echobase/data/lizmap/data** contient les fichiers de données utiles aux fichiers Qgis + + * **/var/local/echobase/data/lizmap/Qgis** répertoire de dépôt des fichiers de modèles une fois adaptés à une base de donnée et à un voyage. + + + Ces répetoires et fichiers sont définis par les propriétées : + + * echobase.qgis.template.file : le modèle du fichier Qgis + * echobase.lizmap.template.file : le modièle du fichier de configuration de Lizmap + * echobase.lizmap.target.file : le répertoire de dépôt des fichiers Qgis et lizmap + + 2. Configuration de lizmap + + Il faut indiquer à lizmap le repertoir où trouver les fichiers Qgis et de configuration. + + Allez sur la page d'administration de Lizmap + + :: + + http://localhost/lizmap-web-client-2.9.4/lizmap/www/admin.php + login / password : admin / admin + + Dans lizmap Configuration cliquez sur *Create a repository* + + * *id* : l'identifiant du dépôt, doit etre identique à la propriété **echobase.lizmap.repository** (par défaut "echobase") + * *Label* : Le label utilisé par lizmap + * *path* : le répertoire de dépôt des fichiers Qgis et lizmap (par défaut **/var/local/echobase/data/lizmap/Qgis/**) doit finir par un "/" + + Cliquez sur *save* + + Dans la partie *View repositories*, cochez *anonymous* + + Cliquez sur *save*

1 0

Jenkins build is back to normal : echobase-nightly » EchoBase :: UI #34
by admin+ci-codelutin.com＠codelutin.com 05 Jun '14

05 Jun '14

See <http://ci.codelutin.com/jenkins/job/echobase-nightly/fr.ifremer.echobase$ec…>

1 0

Jenkins build is back to normal : echobase-nightly » EchoBase :: Domain #34
by admin+ci-codelutin.com＠codelutin.com 05 Jun '14

05 Jun '14

See <http://ci.codelutin.com/jenkins/job/echobase-nightly/fr.ifremer.echobase$ec…>

1 0

Jenkins build is back to normal : echobase-nightly » EchoBase :: Services #34
by admin+ci-codelutin.com＠codelutin.com 05 Jun '14

05 Jun '14

See <http://ci.codelutin.com/jenkins/job/echobase-nightly/fr.ifremer.echobase$ec…>

1 0

Jenkins build is back to normal : echobase-nightly » EchoBase #34
by admin+ci-codelutin.com＠codelutin.com 05 Jun '14

05 Jun '14

See <http://ci.codelutin.com/jenkins/job/echobase-nightly/fr.ifremer$echobase/34…>

1 0

r1029 - in trunk/echobase-ui/src/main: java/fr/ifremer/echobase/ui/actions/exportCoser resources/i18n webapp/WEB-INF/jsp/exportCoser
by tchemit＠users.forge.codelutin.com 05 Jun '14

05 Jun '14

Author: tchemit Date: 2014-06-05 12:41:01 +0200 (Thu, 05 Jun 2014) New Revision: 1029 Url: http://forge.codelutin.com/projects/echobase/repository/revisions/1029 Log: fixes #5186 Export Coser : mettre un message si le site des indicateurs n'est pas accessible Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportCoser/Configure.java trunk/echobase-ui/src/main/resources/i18n/echobase-ui_en_GB.properties trunk/echobase-ui/src/main/resources/i18n/echobase-ui_fr_FR.properties trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/exportCoser/configure.jsp Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportCoser/Configure.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportCoser/Configure.java 2014-06-05 08:22:14 UTC (rev 1028) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportCoser/Configure.java 2014-06-05 10:41:01 UTC (rev 1029) @@ -22,6 +22,7 @@ */ import com.google.common.collect.Maps; +import fr.ifremer.echobase.EchoBaseTechnicalException; import fr.ifremer.echobase.entities.references.DataMetadata; import fr.ifremer.echobase.entities.references.Mission; import fr.ifremer.echobase.persistence.JdbcConfiguration; @@ -84,6 +85,11 @@ */ protected Map<String, String> zones; + /** + * If coser services are not reachable. + */ + protected boolean coserUnreachable; + public Configure() { super(ExportCoserConfiguration.class); } @@ -108,6 +114,10 @@ return communityIndicators; } + public boolean isCoserUnreachable() { + return coserUnreachable; + } + @Override protected ExportCoserConfiguration createModel() { ExportCoserConfiguration result = new ExportCoserConfiguration(); @@ -150,7 +160,16 @@ missions = userDbPersistenceService.loadSortAndDecorate(Mission.class); // Get facades from Coser - facades = coserApiService.getFacades(); + try { + facades = coserApiService.getFacades(); + } catch (EchoBaseTechnicalException e) { + // could not get + if (log.isErrorEnabled()) { + log.error(e); + } + coserUnreachable = true; + return; + } // Get Zones from Coser if (StringUtils.isNotEmpty(getModel().getFacade())) { Modified: trunk/echobase-ui/src/main/resources/i18n/echobase-ui_en_GB.properties =================================================================== --- trunk/echobase-ui/src/main/resources/i18n/echobase-ui_en_GB.properties 2014-06-05 08:22:14 UTC (rev 1028) +++ trunk/echobase-ui/src/main/resources/i18n/echobase-ui_en_GB.properties 2014-06-05 10:41:01 UTC (rev 1029) @@ -425,4 +425,5 @@ echobase.tooltip.disconnectWorkingDb=Change working database echobase.tooltip.logout=Logout echobase.tooltip.selectWorkingDb=Select a working database +echobase.warning.coser.not.reachable=Coser instance <strong>%s</strong> is not available, please contact his administrator. echobase.warning.no.importLog.selected=No selected import Modified: trunk/echobase-ui/src/main/resources/i18n/echobase-ui_fr_FR.properties =================================================================== --- trunk/echobase-ui/src/main/resources/i18n/echobase-ui_fr_FR.properties 2014-06-05 08:22:14 UTC (rev 1028) +++ trunk/echobase-ui/src/main/resources/i18n/echobase-ui_fr_FR.properties 2014-06-05 10:41:01 UTC (rev 1029) @@ -426,4 +426,5 @@ echobase.tooltip.disconnectWorkingDb=Changer de base de travail echobase.tooltip.logout=Se déconnecter echobase.tooltip.selectWorkingDb=Sélectionner une base de travail +echobase.warning.coser.not.reachable=L'instance de Coser <strong>%s</strong> n'est pas disponible, veuillez contacter l'administrateur de ce projet. echobase.warning.no.importLog.selected=Aucun import sélectionné Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/exportCoser/configure.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/exportCoser/configure.jsp 2014-06-05 08:22:14 UTC (rev 1028) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/exportCoser/configure.jsp 2014-06-05 10:41:01 UTC (rev 1029) @@ -72,50 +72,59 @@ }); </script> -<s:form namespace="/exportCoser" method="POST"> - <fieldset> - <legend> - <s:text name="echobase.legend.exportCoser.configuration.files"/> - </legend> - <div class="cleanBoth help"> - <s:a href="%{getDocumentation(exportCoser, null)}" target="doc"> - <s:text name="echobase.action.show.exportCoser.documentation"/> - </s:a> - </div> - <br/> +<s:if test="coserUnreachable"> - <s:select id='missionField' key="model.missionId" requiredLabel="true" - label='%{getText("echobase.common.mission")}' - list="missions" headerKey="" headerValue=""/> + <s:text name="echobase.warning.coser.not.reachable"> + <s:param value="serviceContext.coserApiURL"/> + </s:text> - <div class="cleanBoth"></div> - <br/> +</s:if> +<s:else> + <s:form namespace="/exportCoser" method="POST"> + <fieldset> + <legend> + <s:text name="echobase.legend.exportCoser.configuration.files"/> + </legend> - <s:select id='facadeSelectBox' key="model.facade" requiredLabel="true" - label='%{getText("echobase.common.facade")}' - list="facades" headerKey="" headerValue=""/> + <div class="cleanBoth help"> + <s:a href="%{getDocumentation(exportCoser, null)}" target="doc"> + <s:text name="echobase.action.show.exportCoser.documentation"/> + </s:a> + </div> + <br/> - <div class="cleanBoth"></div> - <br/> + <s:select id='missionField' key="model.missionId" requiredLabel="true" + label='%{getText("echobase.common.mission")}' + list="missions" headerKey="" headerValue=""/> - <s:select id='zoneSelectBox' key="model.zone" requiredLabel="true" - label='%{getText("echobase.common.zone")}' - list="zones" headerKey="" headerValue=""/> + <div class="cleanBoth"></div> + <br/> - <div class="cleanBoth"></div> - <br/> - <s:checkbox name="model.publishable" label='%{getText("echobase.common.publishable")}'/> - <s:checkbox name="model.extractMap" label='%{getText("echobase.common.extractMaps")}'/> - <s:checkbox name="model.extractRawData" label='%{getText("echobase.common.extractRawData")}'/> - <div class="cleanBoth"></div> - <br/> - <s:textfield name="model.userName" label='%{getText("echobase.common.userName")}'/> - <div class="cleanBoth"></div> - <s:textarea name="model.comment" label='%{getText("echobase.common.comment")}' cols="80" rows="5"/> - <div class="cleanBoth"></div> - <s:checkbox id='extractPopulationIndicator' name="model.extractPopulationIndicator" label='%{getText("echobase.common.extractPopulationIndicator")}'/> - <div class="cleanBoth"></div> + <s:select id='facadeSelectBox' key="model.facade" requiredLabel="true" + label='%{getText("echobase.common.facade")}' + list="facades" headerKey="" headerValue=""/> + + <div class="cleanBoth"></div> + <br/> + + <s:select id='zoneSelectBox' key="model.zone" requiredLabel="true" + label='%{getText("echobase.common.zone")}' + list="zones" headerKey="" headerValue=""/> + + <div class="cleanBoth"></div> + <br/> + <s:checkbox name="model.publishable" label='%{getText("echobase.common.publishable")}'/> + <s:checkbox name="model.extractMap" label='%{getText("echobase.common.extractMaps")}'/> + <s:checkbox name="model.extractRawData" label='%{getText("echobase.common.extractRawData")}'/> + <div class="cleanBoth"></div> + <br/> + <s:textfield name="model.userName" label='%{getText("echobase.common.userName")}'/> + <div class="cleanBoth"></div> + <s:textarea name="model.comment" label='%{getText("echobase.common.comment")}' cols="80" rows="5"/> + <div class="cleanBoth"></div> + <s:checkbox id='extractPopulationIndicator' name="model.extractPopulationIndicator" label='%{getText("echobase.common.extractPopulationIndicator")}'/> + <div class="cleanBoth"></div> <span class="populationIndicator"> <s:select id='populationIndicator' key="model.populationIndicator" label='%{getText("echobase.common.populationIndicator")}' @@ -135,8 +144,8 @@ <br/> </span> - <s:checkbox id='extractCommunityIndicator' name="model.extractCommunityIndicator" label='%{getText("echobase.common.extractCommunityIndicator")}'/> - <div class="cleanBoth"></div> + <s:checkbox id='extractCommunityIndicator' name="model.extractCommunityIndicator" label='%{getText("echobase.common.extractCommunityIndicator")}'/> + <div class="cleanBoth"></div> <span class="communityIndicator"> <s:select id='communityIndicator' key="model.communityIndicator" label='%{getText("echobase.common.communityIndicator")}' @@ -156,7 +165,9 @@ <br/> </span> - </fieldset> - <br/> - <s:submit action="configure" value='%{getText("echobase.action.export")}'/> -</s:form> + </fieldset> + <br/> + <s:submit action="configure" value='%{getText("echobase.action.export")}'/> + </s:form> +</s:else> +

1 0

r1028 - trunk
by tchemit＠users.forge.codelutin.com 05 Jun '14

05 Jun '14

Author: tchemit Date: 2014-06-05 10:22:14 +0200 (Thu, 05 Jun 2014) New Revision: 1028 Url: http://forge.codelutin.com/projects/echobase/repository/revisions/1028 Log: fixes #5181: Utilisation coser 1.5-rc-1 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-06-04 12:40:47 UTC (rev 1027) +++ trunk/pom.xml 2014-06-05 08:22:14 UTC (rev 1028) @@ -185,7 +185,7 @@ <dependency> <groupId>fr.ifremer.coser</groupId> <artifactId>coser-business</artifactId> - <version>1.5-SNAPSHOT</version> + <version>1.5-rc-1</version> </dependency>

1 0

r1027 - trunk/echobase-domain/src/main/java/fr/ifremer/echobase/csv
by tchemit＠users.forge.codelutin.com 04 Jun '14

04 Jun '14

Author: tchemit Date: 2014-06-04 14:40:47 +0200 (Wed, 04 Jun 2014) New Revision: 1027 Url: http://forge.codelutin.com/projects/echobase/repository/revisions/1027 Log: fixes #5182: Export coser, mauvais nom d'esp?\195?\168ce Modified: trunk/echobase-domain/src/main/java/fr/ifremer/echobase/csv/EchoBaseCsvUtil.java Modified: trunk/echobase-domain/src/main/java/fr/ifremer/echobase/csv/EchoBaseCsvUtil.java =================================================================== --- trunk/echobase-domain/src/main/java/fr/ifremer/echobase/csv/EchoBaseCsvUtil.java 2014-06-04 09:57:42 UTC (rev 1026) +++ trunk/echobase-domain/src/main/java/fr/ifremer/echobase/csv/EchoBaseCsvUtil.java 2014-06-04 12:40:47 UTC (rev 1027) @@ -53,7 +53,7 @@ public static final ValueFormatter<Species> SPECIES_TO_COSER_CODE = new ValueFormatter<Species>() { @Override public String format(Species value) { - return value.getBaracoudaCode().replaceAll("_", ""); + return value.getBaracoudaCode().replaceAll("-", ""); } };

1 0

r1026 - in trunk: echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportCoser echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportCoser echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/exportCoser echobase-ui/src/main/resources/i18n echobase-ui/src/main/webapp/WEB-INF/jsp/exportCoser
by tchemit＠users.forge.codelutin.com 04 Jun '14

04 Jun '14

Author: tchemit Date: 2014-06-04 11:57:42 +0200 (Wed, 04 Jun 2014) New Revision: 1026 Url: http://forge.codelutin.com/projects/echobase/repository/revisions/1026 Log: fixes #5180: Am?\195?\169ioration de l'export Coser Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportCoser/ExportCoserConfiguration.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportCoser/ExportCoserService.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportCoser/Configure.java trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/exportCoser/Configure-validation.xml trunk/echobase-ui/src/main/resources/i18n/echobase-ui_en_GB.properties trunk/echobase-ui/src/main/resources/i18n/echobase-ui_fr_FR.properties trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/exportCoser/configure.jsp Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportCoser/ExportCoserConfiguration.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportCoser/ExportCoserConfiguration.java 2014-06-04 09:57:19 UTC (rev 1025) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportCoser/ExportCoserConfiguration.java 2014-06-04 09:57:42 UTC (rev 1026) @@ -75,17 +75,43 @@ * Ids of population indicators to extract. */ private Set<String> populationIndicator; + /** + * Is the project is publishable by Coser? + */ + private boolean publishable; + + /** * Should we produce raw data? */ - private boolean publishRawData; + private boolean extractRawData; /** + * Should we produce maps? + */ + private boolean extractMap; + + /** + * Should we produce community indicators? + */ + private boolean extractCommunityIndicator; + + /** + * Should we produce population indicators? + */ + private boolean extractPopulationIndicator; + + /** * Name of user performing the action. */ private String userName; /** + * Comment. + */ + private String comment; + + /** * Database configuration. */ private JdbcConfiguration dbConfiguration; @@ -153,12 +179,12 @@ this.userName = userName; } - public boolean isPublishRawData() { - return publishRawData; + public boolean isPublishable() { + return publishable; } - public void setPublishRawData(boolean publishRawData) { - this.publishRawData = publishRawData; + public void setPublishable(boolean publishable) { + this.publishable = publishable; } public Set<String> getCommunityIndicator() { @@ -177,6 +203,46 @@ this.populationIndicator = populationIndicator; } + public boolean isExtractRawData() { + return extractRawData; + } + + public void setExtractRawData(boolean extractRawData) { + this.extractRawData = extractRawData; + } + + public boolean isExtractMap() { + return extractMap; + } + + public void setExtractMap(boolean extractMap) { + this.extractMap = extractMap; + } + + public boolean isExtractCommunityIndicator() { + return extractCommunityIndicator; + } + + public void setExtractCommunityIndicator(boolean extractCommunityIndicator) { + this.extractCommunityIndicator = extractCommunityIndicator; + } + + public boolean isExtractPopulationIndicator() { + return extractPopulationIndicator; + } + + public void setExtractPopulationIndicator(boolean extractPopulationIndicator) { + this.extractPopulationIndicator = extractPopulationIndicator; + } + + public String getComment() { + return comment; + } + + public void setComment(String comment) { + this.comment = comment; + } + @Override public void destroy() throws IOException { if (workingDirectory != null) { Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportCoser/ExportCoserService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportCoser/ExportCoserService.java 2014-06-04 09:57:19 UTC (rev 1025) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportCoser/ExportCoserService.java 2014-06-04 09:57:42 UTC (rev 1026) @@ -83,46 +83,85 @@ Preconditions.checkNotNull(model.getPopulationIndicator()); Preconditions.checkNotNull(model.getCommunityIndicator()); - model.setNbSteps(4 + - 4 + // raw data - model.getPopulationIndicator().size() + 1 + - model.getCommunityIndicator().size() + 1); + int nbSteps = 3; + boolean extractMaps = model.isExtractMap(); + if (extractMaps) { + nbSteps += 2; + } + + boolean extractRawData = model.isExtractRawData(); + if (extractRawData) { + nbSteps += 4; + } + + boolean extractPopulationIndicators = model.isExtractPopulationIndicator(); + if (extractPopulationIndicators) { + nbSteps += model.getPopulationIndicator().size() + 1; + } + + boolean extractCommunityIndicators = model.isExtractCommunityIndicator(); + if (extractCommunityIndicators) { + nbSteps += model.getCommunityIndicator().size() + 1; + } + + model.setNbSteps(nbSteps); + Mission mission = persistenceService.getMission(model.getMissionId()); Preconditions.checkNotNull(mission); File tempDirectory = model.getWorkingDirectory(); - // 1 - invoke EchoR - File echRMapsDir = generateMaps(mission, - tempDirectory, - model.getDbConfiguration()); - model.incrementsProgress(); - - // 2 - create echobase project + // 1 - create echobase project EchoBaseProject project = createProject(tempDirectory, model, mission.getName()); model.incrementsProgress(); - // 3 - Extract source files - extractRawData(project, mission, model); + // Extract maps (invoking EchoR) + if (extractMaps) { - // 4 - Extract population indicators - extractPopulationIndicators(model, project, mission); + File echRMapsDir = generateMaps(mission, + tempDirectory, + model.getDbConfiguration()); - // 5 - Extract community indicators - extractCommunityIndicators(model, project, mission); + model.incrementsProgress(); - // 6 - Export species file + copyMaps(project, echRMapsDir); + model.incrementsProgress(); + + } + + // Extract source files + if (extractRawData) { + + extractRawData(project, mission, model); + + } + + // Extract population indicators + if (extractPopulationIndicators) { + + extractPopulationIndicators(model, project, mission); + + } + + // Extract community indicators + if (extractCommunityIndicators) { + + extractCommunityIndicators(model, project, mission); + + } + + // 2 - Export species file extractSpeciesFile(project); model.incrementsProgress(); - // 7 - create archive + // 3 - create archive File zipFile = generateArchive( project, - tempDirectory, - echRMapsDir); + tempDirectory + ); model.setExportFile(zipFile); model.incrementsProgress(); @@ -152,10 +191,10 @@ project.setFacadeName(model.getFacade()); project.setZoneName(model.getZone()); project.setSurveyName(missionName); - project.setAuthor("EchoBase user: " + model.getUserName()); + project.setAuthor(model.getUserName()); project.setCreationDate(serviceContext.newDate()); - project.setComment("Created by Echobase application (db: " + getUserDbUrl() + ")"); - project.setPubliableResult(true); + project.setComment(model.getComment()); + project.setPubliableResult(model.isPublishable()); project.save(); @@ -166,10 +205,8 @@ } protected File generateArchive(EchoBaseProject project, - File tempDirectory, - File echRMapsDir) throws IOException { + File tempDirectory) throws IOException { - copyMaps(project, echRMapsDir); String fileName = project.getZoneName() + "-" + project.getName() + ".zip"; File zipFile = new File(tempDirectory, fileName); Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportCoser/Configure.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportCoser/Configure.java 2014-06-04 09:57:19 UTC (rev 1025) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportCoser/Configure.java 2014-06-04 09:57:42 UTC (rev 1026) @@ -111,11 +111,17 @@ @Override protected ExportCoserConfiguration createModel() { ExportCoserConfiguration result = new ExportCoserConfiguration(); + result.setExtractCommunityIndicator(true); + result.setExtractPopulationIndicator(true); + result.setExtractMap(true); + result.setExtractRawData(true); + result.setPublishable(true); EchoBaseSession userSession = getEchoBaseSession(); JdbcConfiguration workingDbConfiguration = userSession.getWorkingDbConfiguration(); result.setDbConfiguration(workingDbConfiguration); result.setUserName(userSession.getUser().getEmail()); + result.setComment("Created by Echobase application (db: " + workingDbConfiguration.getUrl() + ")"); return result; } Modified: trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/exportCoser/Configure-validation.xml =================================================================== --- trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/exportCoser/Configure-validation.xml 2014-06-04 09:57:19 UTC (rev 1025) +++ trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/exportCoser/Configure-validation.xml 2014-06-04 09:57:42 UTC (rev 1026) @@ -38,16 +38,28 @@ </field-validator> </field> + <field name="model.userName"> + <field-validator type="requiredstring"> + <message key="echobase.error.exportCoser.userName.required"/> + </field-validator> + </field> + + <field name="model.comment"> + <field-validator type="requiredstring"> + <message key="echobase.error.exportCoser.comment.required"/> + </field-validator> + </field> + <field name="model.populationIndicator"> <field-validator type="fieldexpression"> - <param name="expression">!(model.populationIndicator == null || model.populationIndicator.empty)</param> + <param name="expression">!model.extractPopulationIndicator || !(model.populationIndicator == null || model.populationIndicator.empty)</param> <message key="echobase.error.exportCoser.populationIndicator.required"/> </field-validator> </field> <field name="model.communityIndicator"> <field-validator type="fieldexpression"> - <param name="expression">!(model.communityIndicator == null || model.communityIndicator.empty)</param> + <param name="expression">!model.extractCommunityIndicator || !(model.communityIndicator == null || model.communityIndicator.empty)</param> <message key="echobase.error.exportCoser.communityIndicator.required"/> </field-validator> </field> Modified: trunk/echobase-ui/src/main/resources/i18n/echobase-ui_en_GB.properties =================================================================== --- trunk/echobase-ui/src/main/resources/i18n/echobase-ui_en_GB.properties 2014-06-04 09:57:19 UTC (rev 1025) +++ trunk/echobase-ui/src/main/resources/i18n/echobase-ui_en_GB.properties 2014-06-04 09:57:42 UTC (rev 1026) @@ -65,6 +65,7 @@ echobase.common.cellRegionAssociationFile= echobase.common.cellRegionResultFile= echobase.common.cellRegionsFile= +echobase.common.comment=Comment echobase.common.communityIndicator=Community indicators echobase.common.dataCentre=Data center echobase.common.dataCentreEmail=Data center email @@ -83,6 +84,10 @@ echobase.common.esduBySpeciesAndAgeCategoryFile= echobase.common.esduBySpeciesAndSizeCategoryFile= echobase.common.exportDbMode=Mode +echobase.common.extractCommunityIndicator=Extract community indicators +echobase.common.extractMaps=Extract maps +echobase.common.extractPopulationIndicator=Extract population indicators +echobase.common.extractRawData=Extract raw data echobase.common.facade=Facade (Coser) echobase.common.gearMetadataFile= echobase.common.id=ID @@ -137,6 +142,7 @@ echobase.common.processingDescription=Data processing description echobase.common.processingTemplate=Data processing template echobase.common.project=Project +echobase.common.publishable=Make the project publishable via Coser echobase.common.resultLabel=Results label echobase.common.selectall=Select All echobase.common.selectnone=Unselect All @@ -157,6 +163,7 @@ echobase.common.transitFile= echobase.common.transitRelatedActivity=Transit related activities echobase.common.user=User +echobase.common.userName=User name echobase.common.vessel=Vessel echobase.common.voyage=Cruise echobase.common.voyageDescription=Description @@ -174,10 +181,12 @@ echobase.error.export.sqlQuery.forbidden.insert.word=La requète contient le mot 'INSERT', ce qui est interdit echobase.error.export.sqlQuery.forbidden.update.word=La requète contient le mot 'UPDATE', ce qui est interdit echobase.error.export.sqlQuery.requiredstring=La requète de l'export est obligatoire +echobase.error.exportCoser.comment.required=Comment is required echobase.error.exportCoser.communityIndicator.required=You must select at least one community indicator echobase.error.exportCoser.facade.required=No facade selected echobase.error.exportCoser.mission.required=No mission selected echobase.error.exportCoser.populationIndicator.required=You must select at least one population indicator +echobase.error.exportCoser.userName.required=User name is required echobase.error.exportCoser.zone.required=No zone selected echobase.error.import.acousticDensityUnit.required=acousticDensityUnit non renseigné echobase.error.import.acquisitionSoftwareVersionER60.required=acquisitionSoftwareVersionER60 non renseigné Modified: trunk/echobase-ui/src/main/resources/i18n/echobase-ui_fr_FR.properties =================================================================== --- trunk/echobase-ui/src/main/resources/i18n/echobase-ui_fr_FR.properties 2014-06-04 09:57:19 UTC (rev 1025) +++ trunk/echobase-ui/src/main/resources/i18n/echobase-ui_fr_FR.properties 2014-06-04 09:57:42 UTC (rev 1026) @@ -65,6 +65,7 @@ echobase.common.cellRegionAssociationFile= echobase.common.cellRegionResultFile= echobase.common.cellRegionsFile= +echobase.common.comment=Commentaire echobase.common.communityIndicator=indicateurs de communauté echobase.common.dataCentre=Centre de données echobase.common.dataCentreEmail=Courriel du centre de données @@ -83,6 +84,10 @@ echobase.common.esduBySpeciesAndAgeCategoryFile= echobase.common.esduBySpeciesAndSizeCategoryFile= echobase.common.exportDbMode=Mode +echobase.common.extractCommunityIndicator=Extraire les indicateurs de communauté +echobase.common.extractMaps=Extraire les cartes +echobase.common.extractPopulationIndicator=Extraire les indicateurs de population +echobase.common.extractRawData=Extraire les sources echobase.common.facade=Facade (Coser) echobase.common.gearMetadataFile= echobase.common.id=Identifiant @@ -137,6 +142,7 @@ echobase.common.processingDescription=Description de la méthode de pré-traitement des données echobase.common.processingTemplate=Intitulé de la méthode de pré-traitement des données echobase.common.project=Projet +echobase.common.publishable=Rendre le projet publiable via Coser echobase.common.resultLabel=Intitulé des résultats echobase.common.selectall=Tout sélectionner echobase.common.selectnone=Tout désélectionner @@ -157,6 +163,7 @@ echobase.common.transitFile= echobase.common.transitRelatedActivity=Travaux réalisés pendant le transit echobase.common.user=Utilisateur +echobase.common.userName=Nom de l'utilisateur echobase.common.vessel=Navire echobase.common.voyage=Campagne echobase.common.voyageDescription=Description @@ -174,10 +181,12 @@ echobase.error.export.sqlQuery.forbidden.insert.word=La requète contient le mot 'INSERT', ce qui est interdit echobase.error.export.sqlQuery.forbidden.update.word=La requète contient le mot 'UPDATE', ce qui est interdit echobase.error.export.sqlQuery.requiredstring=La requète de l'export est obligatoire +echobase.error.exportCoser.comment.required=Commentaire non renseigné echobase.error.exportCoser.communityIndicator.required=Il faut sélectionner au moins un indicateur de communauté echobase.error.exportCoser.facade.required=La sélection d'une facade est obligatoire echobase.error.exportCoser.mission.required=La sélection d'une série est obligatoire echobase.error.exportCoser.populationIndicator.required=Il faut sélectionner au moins un indicateur de population +echobase.error.exportCoser.userName.required=Nom d'utilisateur non renseigné echobase.error.exportCoser.zone.required=La sélection d'une zone est obligatoire echobase.error.import.acousticDensityUnit.required=acousticDensityUnit non renseigné echobase.error.import.acquisitionSoftwareVersionER60.required=acquisitionSoftwareVersionER60 non renseigné Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/exportCoser/configure.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/exportCoser/configure.jsp 2014-06-04 09:57:19 UTC (rev 1025) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/exportCoser/configure.jsp 2014-06-04 09:57:42 UTC (rev 1026) @@ -40,6 +40,18 @@ $(select).change(); } + function changeExtractIndicator(checkbox, select) { + + if ($(checkbox).is(":checked")) { + $('#' + select).attr('disabled', false); + $('.' + select).show(); + } + else { + $('#' + select).attr('disabled', 'disabled'); + $('.' + select).hide(); + } + } + $(document).ready(function () { $.autoSelectZones( @@ -49,6 +61,15 @@ '<s:property value="model.facade"/>', '<s:property value="model.zone"/>' ); + + var communityChangefunction = function () { changeExtractIndicator('#extractCommunityIndicator', 'communityIndicator'); }; + $('#extractCommunityIndicator').change(communityChangefunction); + communityChangefunction(); + + var populationChangefunction = function () { changeExtractIndicator('#extractPopulationIndicator', 'populationIndicator'); }; + $('#extractPopulationIndicator').change(populationChangefunction); + populationChangefunction(); + }); </script> <s:form namespace="/exportCoser" method="POST"> @@ -84,6 +105,18 @@ <div class="cleanBoth"></div> <br/> + <s:checkbox name="model.publishable" label='%{getText("echobase.common.publishable")}'/> + <s:checkbox name="model.extractMap" label='%{getText("echobase.common.extractMaps")}'/> + <s:checkbox name="model.extractRawData" label='%{getText("echobase.common.extractRawData")}'/> + <div class="cleanBoth"></div> + <br/> + <s:textfield name="model.userName" label='%{getText("echobase.common.userName")}'/> + <div class="cleanBoth"></div> + <s:textarea name="model.comment" label='%{getText("echobase.common.comment")}' cols="80" rows="5"/> + <div class="cleanBoth"></div> + <s:checkbox id='extractPopulationIndicator' name="model.extractPopulationIndicator" label='%{getText("echobase.common.extractPopulationIndicator")}'/> + <div class="cleanBoth"></div> + <span class="populationIndicator"> <s:select id='populationIndicator' key="model.populationIndicator" label='%{getText("echobase.common.populationIndicator")}' list="communityIndicators" multiple="true" size="10" @@ -98,10 +131,13 @@ onClick="coserUnSelectAll($('#populationIndicator'))" title="<s:text name="echobase.common.selectnone" />"/> </span> - <div class="cleanBoth"></div> <br/> + </span> + <s:checkbox id='extractCommunityIndicator' name="model.extractCommunityIndicator" label='%{getText("echobase.common.extractCommunityIndicator")}'/> + <div class="cleanBoth"></div> + <span class="communityIndicator"> <s:select id='communityIndicator' key="model.communityIndicator" label='%{getText("echobase.common.communityIndicator")}' list="communityIndicators" multiple="true" size="10" @@ -116,9 +152,10 @@ onClick="coserUnSelectAll($('#communityIndicator'))" title="<s:text name="echobase.common.selectnone" />"/> </span> - <div class="cleanBoth"></div> <br/> + </span> + </fieldset> <br/> <s:submit action="configure" value='%{getText("echobase.action.export")}'/>

1 0

r1025 - trunk
by tchemit＠users.forge.codelutin.com 04 Jun '14

04 Jun '14

Author: tchemit Date: 2014-06-04 11:57:19 +0200 (Wed, 04 Jun 2014) New Revision: 1025 Url: http://forge.codelutin.com/projects/echobase/repository/revisions/1025 Log: fix pom urls + updates to mavenpom 5.0.8 and others libs Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-04-22 21:04:45 UTC (rev 1024) +++ trunk/pom.xml 2014-06-04 09:57:19 UTC (rev 1025) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>5.0.6</version> + <version>5.0.8</version> </parent> <groupId>fr.ifremer</groupId> @@ -84,7 +84,7 @@ </developers> <scm> - <url>https://svn.codelutin.com/repositories/browse/echobase/trunk</url> + <url>https://svn.codelutin.com/projects/echobase/repository/show/trunk</url> <connection> scm:svn:https://svn.codelutin.com/echobase/trunk </connection> @@ -140,7 +140,7 @@ <topiaVersion>3.0-beta-3</topiaVersion> <nuitonUtilsVersion>3.0-rc-2</nuitonUtilsVersion> - <nuitonI18nVersion>3.0</nuitonI18nVersion> + <nuitonI18nVersion>3.1</nuitonI18nVersion> <nuitonWebVersion>1.16</nuitonWebVersion> <struts2Version>2.3.16</struts2Version> <struts2Version>2.3.15.3</struts2Version> @@ -148,7 +148,7 @@ <jqueryPluginVersion>3.6.1</jqueryPluginVersion> <h2Version>1.3.175</h2Version> <postgresqlVersion>9.3-1101-jdbc41</postgresqlVersion> - <slf4jVersion>1.7.6</slf4jVersion> + <slf4jVersion>1.7.7</slf4jVersion> <licensePluginVersion>1.6</licensePluginVersion> <googleSearchEnabled>true</googleSearchEnabled> @@ -185,7 +185,7 @@ <dependency> <groupId>fr.ifremer.coser</groupId> <artifactId>coser-business</artifactId> - <version>1.5-alpha-3</version> + <version>1.5-SNAPSHOT</version> </dependency>  @@ -534,7 +534,7 @@ <plugin> <groupId>org.nuiton</groupId> <artifactId>nuiton-maven-report-plugin</artifactId> - <version>3.0-rc-1</version> + <version>3.0</version> <reportSets> <reportSet> <reports>

1 0