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

r715 - in trunk: . echobase-domain echobase-services echobase-tools echobase-ui
by tchemit＠users.forge.codelutin.com Sept. 25, 2012

Sept. 25, 2012

Author: tchemit Date: 2012-09-25 12:48:41 +0200 (Tue, 25 Sep 2012) New Revision: 715 Url: http://forge.codelutin.com/repositories/revision/echobase/715 Log: [maven-release-plugin] prepare for next development iteration Modified: trunk/echobase-domain/pom.xml trunk/echobase-services/pom.xml trunk/echobase-tools/pom.xml trunk/echobase-ui/pom.xml trunk/pom.xml Modified: trunk/echobase-domain/pom.xml =================================================================== --- trunk/echobase-domain/pom.xml 2012-09-25 10:48:33 UTC (rev 714) +++ trunk/echobase-domain/pom.xml 2012-09-25 10:48:41 UTC (rev 715) @@ -9,7 +9,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>1.3</version> + <version>1.4-SNAPSHOT</version> </parent> <groupId>fr.ifremer.echobase</groupId> Modified: trunk/echobase-services/pom.xml =================================================================== --- trunk/echobase-services/pom.xml 2012-09-25 10:48:33 UTC (rev 714) +++ trunk/echobase-services/pom.xml 2012-09-25 10:48:41 UTC (rev 715) @@ -6,7 +6,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>1.3</version> + <version>1.4-SNAPSHOT</version> </parent> <groupId>fr.ifremer.echobase</groupId> Modified: trunk/echobase-tools/pom.xml =================================================================== --- trunk/echobase-tools/pom.xml 2012-09-25 10:48:33 UTC (rev 714) +++ trunk/echobase-tools/pom.xml 2012-09-25 10:48:41 UTC (rev 715) @@ -11,7 +11,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>1.3</version> + <version>1.4-SNAPSHOT</version> </parent> <groupId>fr.ifremer.echobase</groupId> Modified: trunk/echobase-ui/pom.xml =================================================================== --- trunk/echobase-ui/pom.xml 2012-09-25 10:48:33 UTC (rev 714) +++ trunk/echobase-ui/pom.xml 2012-09-25 10:48:41 UTC (rev 715) @@ -7,7 +7,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>1.3</version> + <version>1.4-SNAPSHOT</version> </parent> <groupId>fr.ifremer.echobase</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-09-25 10:48:33 UTC (rev 714) +++ trunk/pom.xml 2012-09-25 10:48:41 UTC (rev 715) @@ -11,7 +11,7 @@ <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>1.3</version> + <version>1.4-SNAPSHOT</version> <modules> <module>echobase-domain</module> @@ -78,12 +78,12 @@ </developers> <scm> - <url>http://svn.forge.codelutin.com/svn/echobase/tags/echobase-1.3</url> + <url>http://svn.forge.codelutin.com/svn/echobase/trunk</url> <connection> - scm:svn:http://svn.forge.codelutin.com/svn/echobase/tags/echobase-1.3 + scm:svn:http://svn.forge.codelutin.com/svn/echobase/trunk </connection> <developerConnection> - scm:svn:http://svn.forge.codelutin.com/svn/echobase/tags/echobase-1.3 + scm:svn:http://svn.forge.codelutin.com/svn/echobase/trunk </developerConnection> </scm>

1 0

r714 - tags
by tchemit＠users.forge.codelutin.com Sept. 25, 2012

Sept. 25, 2012

Author: tchemit Date: 2012-09-25 12:48:33 +0200 (Tue, 25 Sep 2012) New Revision: 714 Url: http://forge.codelutin.com/repositories/revision/echobase/714 Log: [maven-release-plugin] copy for tag echobase-1.3 Added: tags/echobase-1.3/

1 0

r713 - in trunk: . echobase-domain echobase-services echobase-tools echobase-ui
by tchemit＠users.forge.codelutin.com Sept. 25, 2012

Sept. 25, 2012

Author: tchemit Date: 2012-09-25 12:48:25 +0200 (Tue, 25 Sep 2012) New Revision: 713 Url: http://forge.codelutin.com/repositories/revision/echobase/713 Log: [maven-release-plugin] prepare release echobase-1.3 Modified: trunk/echobase-domain/pom.xml trunk/echobase-services/pom.xml trunk/echobase-tools/pom.xml trunk/echobase-ui/pom.xml trunk/pom.xml Modified: trunk/echobase-domain/pom.xml =================================================================== --- trunk/echobase-domain/pom.xml 2012-09-25 10:43:49 UTC (rev 712) +++ trunk/echobase-domain/pom.xml 2012-09-25 10:48:25 UTC (rev 713) @@ -9,7 +9,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>1.3-SNAPSHOT</version> + <version>1.3</version> </parent> <groupId>fr.ifremer.echobase</groupId> Modified: trunk/echobase-services/pom.xml =================================================================== --- trunk/echobase-services/pom.xml 2012-09-25 10:43:49 UTC (rev 712) +++ trunk/echobase-services/pom.xml 2012-09-25 10:48:25 UTC (rev 713) @@ -6,7 +6,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>1.3-SNAPSHOT</version> + <version>1.3</version> </parent> <groupId>fr.ifremer.echobase</groupId> Modified: trunk/echobase-tools/pom.xml =================================================================== --- trunk/echobase-tools/pom.xml 2012-09-25 10:43:49 UTC (rev 712) +++ trunk/echobase-tools/pom.xml 2012-09-25 10:48:25 UTC (rev 713) @@ -11,7 +11,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>1.3-SNAPSHOT</version> + <version>1.3</version> </parent> <groupId>fr.ifremer.echobase</groupId> Modified: trunk/echobase-ui/pom.xml =================================================================== --- trunk/echobase-ui/pom.xml 2012-09-25 10:43:49 UTC (rev 712) +++ trunk/echobase-ui/pom.xml 2012-09-25 10:48:25 UTC (rev 713) @@ -7,7 +7,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>1.3-SNAPSHOT</version> + <version>1.3</version> </parent> <groupId>fr.ifremer.echobase</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-09-25 10:43:49 UTC (rev 712) +++ trunk/pom.xml 2012-09-25 10:48:25 UTC (rev 713) @@ -11,7 +11,7 @@ <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>1.3-SNAPSHOT</version> + <version>1.3</version> <modules> <module>echobase-domain</module> @@ -78,12 +78,12 @@ </developers> <scm> - <url>http://svn.forge.codelutin.com/svn/echobase/trunk</url> + <url>http://svn.forge.codelutin.com/svn/echobase/tags/echobase-1.3</url> <connection> - scm:svn:http://svn.forge.codelutin.com/svn/echobase/trunk + scm:svn:http://svn.forge.codelutin.com/svn/echobase/tags/echobase-1.3 </connection> <developerConnection> - scm:svn:http://svn.forge.codelutin.com/svn/echobase/trunk + scm:svn:http://svn.forge.codelutin.com/svn/echobase/tags/echobase-1.3 </developerConnection> </scm>

1 0

r712 - trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/interceptors
by tchemit＠users.forge.codelutin.com Sept. 25, 2012

Sept. 25, 2012

Author: tchemit Date: 2012-09-25 12:43:49 +0200 (Tue, 25 Sep 2012) New Revision: 712 Url: http://forge.codelutin.com/repositories/revision/echobase/712 Log: add add missing headers Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/interceptors/CheckWorkingDbSelected.java Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/interceptors/CheckWorkingDbSelected.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/interceptors/CheckWorkingDbSelected.java 2012-09-25 10:15:57 UTC (rev 711) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/interceptors/CheckWorkingDbSelected.java 2012-09-25 10:43:49 UTC (rev 712) @@ -1,5 +1,28 @@ package fr.ifremer.echobase.ui.interceptors; +/* + * #%L + * EchoBase :: UI + * $Id$ + * $HeadURL:$ + * %% + * Copyright (C) 2011 - 2012 Ifremer, Codelutin + * %% + * 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% + */ + import com.opensymphony.xwork2.ActionInvocation; import fr.ifremer.echobase.ui.EchoBaseSession; import fr.ifremer.echobase.ui.actions.EchoBaseActionSupport;

1 0

r711 - in trunk: echobase-domain/src/main/java/fr/ifremer/echobase/entities echobase-domain/src/main/resources/i18n echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/workingDb echobase-ui/src/main/webapp/WEB-INF/jsp/workingDb
by tchemit＠users.forge.codelutin.com Sept. 25, 2012

Sept. 25, 2012

Author: tchemit Date: 2012-09-25 12:15:57 +0200 (Tue, 25 Sep 2012) New Revision: 711 Url: http://forge.codelutin.com/repositories/revision/echobase/711 Log: change dashboard column names Modified: trunk/echobase-domain/src/main/java/fr/ifremer/echobase/entities/ImportType.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-ui/src/main/java/fr/ifremer/echobase/ui/actions/workingDb/DashBoard.java trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/workingDb/dashboard.jsp Modified: trunk/echobase-domain/src/main/java/fr/ifremer/echobase/entities/ImportType.java =================================================================== --- trunk/echobase-domain/src/main/java/fr/ifremer/echobase/entities/ImportType.java 2012-09-24 21:33:32 UTC (rev 710) +++ trunk/echobase-domain/src/main/java/fr/ifremer/echobase/entities/ImportType.java 2012-09-25 10:15:57 UTC (rev 711) @@ -36,34 +36,44 @@ public enum ImportType implements I18nAble { /** Import a voyage with all his data. */ - VOYAGE(n_("echobase.common.importType.voyage")), + VOYAGE(n_("echobase.common.importType.voyage"), + n_("echobase.common.importType.voyage.short")), /** Import Voyage / Transit / Transect. */ - COMMON_ALL(n_("echobase.common.importType.commonDataAll")), + COMMON_ALL(n_("echobase.common.importType.commonDataAll"), + n_("echobase.common.importType.commonDataAll.short")), /** Import all common data from Transect to Operation. */ - COMMON_TRANSECT(n_("echobase.common.importType.commonDataTransect")), + COMMON_TRANSECT(n_("echobase.common.importType.commonDataTransect"), + n_("echobase.common.importType.commonDataTransect.short")), /** Import operations common data. */ - OPERATION(n_("echobase.common.importType.operation")), + OPERATION(n_("echobase.common.importType.operation"), + n_("echobase.common.importType.operation.short")), /** Import catches data (unsorted, total, but no individual ones). */ - CATCHES(n_("echobase.common.importType.catches")), + CATCHES(n_("echobase.common.importType.catches"), + n_("echobase.common.importType.catches.short")), /** Import accoustic data (Cells ESDU and Elementary). */ - ACOUSTIC(n_("echobase.common.importType.acoustic")), + ACOUSTIC(n_("echobase.common.importType.acoustic"), + n_("echobase.common.importType.acoustic.short")), /** Import results at voyage level. */ - RESULT_VOYAGE(n_("echobase.common.importType.resultsVoyage")), + RESULT_VOYAGE(n_("echobase.common.importType.resultsVoyage"), + n_("echobase.common.importType.resultsVoyage.short")), /** Import esdu results by echotype. */ - RESULT_ESDU(n_("echobase.common.importType.resultsEsdu")), + RESULT_ESDU(n_("echobase.common.importType.resultsEsdu"), + n_("echobase.common.importType.resultsEsdu.short")), /** Import cells Region. */ - RESULT_REGION(n_("echobase.common.importType.resultsRegion")), + RESULT_REGION(n_("echobase.common.importType.resultsRegion"), + n_("echobase.common.importType.resultsRegion.short")), /** Import cells Map. */ - RESULT_MAP(n_("echobase.common.importType.resultsMap")); + RESULT_MAP(n_("echobase.common.importType.resultsMap"), + n_("echobase.common.importType.resultsMap.short")); /** * All common import types. @@ -87,8 +97,11 @@ private final String i18nKey; - ImportType(String i18nKey) { + private final String shortI18nKey; + + ImportType(String i18nKey, String shortI18nKey) { this.i18nKey = i18nKey; + this.shortI18nKey = shortI18nKey; } @Override @@ -96,6 +109,10 @@ return i18nKey; } + public String getShortI18nKey() { + return shortI18nKey; + } + public static ImportType[] getCommonImportType() { return COMMON_IMPORT_TYPES; } 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 2012-09-24 21:33:32 UTC (rev 710) +++ trunk/echobase-domain/src/main/resources/i18n/echobase-domain_en_GB.properties 2012-09-25 10:15:57 UTC (rev 711) @@ -1,15 +1,25 @@ echobase.common.driverType.h2=H2 Database echobase.common.driverType.postgres=Postgresql Database echobase.common.importType.acoustic=Acoustic data import +echobase.common.importType.acoustic.short=Acoustic echobase.common.importType.catches=Fishing data import +echobase.common.importType.catches.short=Fishing echobase.common.importType.commonDataAll=Voyage / Transit / Transects import +echobase.common.importType.commonDataAll.short=V/T/T echobase.common.importType.commonDataTransect=Transects import +echobase.common.importType.commonDataTransect.short=Transect echobase.common.importType.operation=Operations data import +echobase.common.importType.operation.short=Operation echobase.common.importType.resultsEsdu=Import the “ESDU” cells results +echobase.common.importType.resultsEsdu.short=R ESDU echobase.common.importType.resultsMap=Import the “map” cells results +echobase.common.importType.resultsMap.short=Map echobase.common.importType.resultsRegion=Import the “region” cells results +echobase.common.importType.resultsRegion.short=Region echobase.common.importType.resultsVoyage=Import the voyage-related results +echobase.common.importType.resultsVoyage.short=R Voyage echobase.common.importType.voyage=Voyage import +echobase.common.importType.voyage.short=Voyage echobase.config.csv.separator.description=Csv separator character echobase.config.data.directory.description=Path to application data echobase.config.documentationUrl.description=Where to find EchoBase online documentation 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 2012-09-24 21:33:32 UTC (rev 710) +++ trunk/echobase-domain/src/main/resources/i18n/echobase-domain_fr_FR.properties 2012-09-25 10:15:57 UTC (rev 711) @@ -1,15 +1,25 @@ echobase.common.driverType.h2=Base H2 echobase.common.driverType.postgres=Base Postgresql echobase.common.importType.acoustic=Import des données acoustiques +echobase.common.importType.acoustic.short=Acoustique echobase.common.importType.catches=Import des données de pêche +echobase.common.importType.catches.short=Pêche echobase.common.importType.commonDataAll=Import Voyage / Transit / Transects +echobase.common.importType.commonDataAll.short=V/T/T echobase.common.importType.commonDataTransect=Import Transects +echobase.common.importType.commonDataTransect.short=Transects echobase.common.importType.operation=Import des opérations +echobase.common.importType.operation.short=Opérations echobase.common.importType.resultsEsdu=Import des résultats des cellules de type "ESDU" +echobase.common.importType.resultsEsdu.short=R ESDU echobase.common.importType.resultsMap=Import des cellules de type Carte +echobase.common.importType.resultsMap.short=Carte echobase.common.importType.resultsRegion=Import des cellules de type Région +echobase.common.importType.resultsRegion.short=Région echobase.common.importType.resultsVoyage=Import des résultats du voyage +echobase.common.importType.resultsVoyage.short=R Voyage echobase.common.importType.voyage=Import Campagne +echobase.common.importType.voyage.short=Campagne echobase.config.csv.separator.description=Caractère séparateur pour les fichiers csv echobase.config.data.directory.description=Répertoire des données de l'application echobase.config.documentationUrl.description=Où trouver la documentation en ligne d'EchoBase Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/workingDb/DashBoard.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/workingDb/DashBoard.java 2012-09-24 21:33:32 UTC (rev 710) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/workingDb/DashBoard.java 2012-09-25 10:15:57 UTC (rev 711) @@ -23,10 +23,12 @@ * #L% */ +import com.google.common.collect.Lists; import fr.ifremer.echobase.entities.ImportType; import fr.ifremer.echobase.ui.actions.EchoBaseActionSupport; -import java.util.Map; +import java.io.Serializable; +import java.util.List; /** * DashBoard of existing voyages. @@ -38,16 +40,53 @@ private static final long serialVersionUID = 1L; - protected Map<String, String> importTypes; + protected List<ImportTypeEntry> importTypes; - public Map<String, String> getImportTypes() { + public List<ImportTypeEntry> getImportTypes() { return importTypes; } @Override public String execute() throws Exception { - importTypes = decorateEnums(ImportType.values()); + importTypes = Lists.newLinkedList(); + for (ImportType importType : ImportType.values()) { + ImportTypeEntry entry = new ImportTypeEntry( + importType.name(), + _(importType.getShortI18nKey()), + _(importType.getI18nKey()) + ); + importTypes.add(entry); + } return SUCCESS; } + + public static class ImportTypeEntry implements Serializable { + + private static final long serialVersionUID = 1L; + + protected String name; + + protected String label; + + protected String title; + + public ImportTypeEntry(String name, String label, String title) { + this.name = name; + this.label = label; + this.title = title; + } + + public String getName() { + return name; + } + + public String getLabel() { + return label; + } + + public String getTitle() { + return title; + } + } } \ No newline at end of file Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/workingDb/dashboard.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/workingDb/dashboard.jsp 2012-09-24 21:33:32 UTC (rev 710) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/workingDb/dashboard.jsp 2012-09-25 10:15:57 UTC (rev 711) @@ -101,6 +101,10 @@ return result; } + function formatVoyageName(cellvalue, options, rowObject) { + return rowObject['id_lbl']; + } + jQuery(document).ready(function () { // display voyage infos @@ -118,12 +122,9 @@ }); $.addEvenAndOddClasses('voyages'); }); - - </script> <title><s:text name="echobase.title.dashboard"/></title> - <s:url id="loadUrl" action="getDashboardImportLogs" namespace="/workingDb" escapeAmp="false"/> <sjg:grid id="voyages" dataType="json" href="%{loadUrl}" gridModel="datas" @@ -137,12 +138,13 @@ onCompleteTopics="voyages-clearSelect,voyages-CompleteTopics"> <sjg:gridColumn name="id" title="id" hidden="true"/> - <sjg:gridColumn name="id_lbl" sortable="true" + <sjg:gridColumn name="name" sortable="true" formatter="formatVoyageName" title="%{getText('echobase.common.voyage')}"/> - <s:iterator value="%{importTypes.entrySet()}" var="entry"> - <sjg:gridColumn name="importType.%{#entry.key}" sortable="true" - title="%{#entry.value}" formatter="formatImportLogs"/> + <s:iterator value="%{importTypes}" var="entry"> + <sjg:gridColumn name="importType.%{#entry.name}" sortable="false" + title="%{#entry.label}" tooltip="%{#entry.title}" + formatter="formatImportLogs"/> </s:iterator> </sjg:grid> <br/> @@ -214,7 +216,7 @@ <s:label key='echobase.common.importText' value=''/> <div class="floatLeft"> - <pre id='importLogText' style="font-weight: bold;"></pre> + <pre id='importLogText' style="font-weight: bold;"></pre> </div> <br/>

1 0

r710 - trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/dbeditor
by tchemit＠users.forge.codelutin.com Sept. 24, 2012

Sept. 24, 2012

Author: tchemit Date: 2012-09-24 23:33:32 +0200 (Mon, 24 Sep 2012) New Revision: 710 Url: http://forge.codelutin.com/repositories/revision/echobase/710 Log: fixes #1523: Lorsqu'une date n'existe pas, dbEditor utilise la date du jour Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/dbeditor/dbeditor.jsp Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/dbeditor/dbeditor.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/dbeditor/dbeditor.jsp 2012-09-24 21:09:01 UTC (rev 709) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/dbeditor/dbeditor.jsp 2012-09-24 21:33:32 UTC (rev 710) @@ -136,8 +136,13 @@ break; case 'Date': - // Update date - updateDate(value, editor); + if (!!value) { + // Update date (only if exists) + updateDate(value, editor); + } + // always set value to simple text editor otherwise it + // won't work anylonger after a blank previous value :( + editor.val(value); break; case 'FK': @@ -260,8 +265,6 @@ onCompleteTopics="datas-clearSelect,datas-CompleteTopics" navigatorSearchOptions="{multipleGroup:false,multipleSearch:true,sopt:['eq','ne','cn','nc','bw','bn','ew','en','lt','le','gt','ge','nu','nn']}"> - <%--navigatorSearchOptions="{multipleGroup:false,showQuery:true,multipleSearch:true,sopt:['eq','ne','cn','nc','bw','bn','ew','en','lt','le','gt','ge','nu','nn','in','ni']}"--%> - <sjg:gridColumn name="id" title="id" hidden="true" editable="true"/> <s:iterator value="columnMetas" var="meta" status="status"> @@ -329,8 +332,6 @@ <s:hidden key="entityType" label=''/> - <%--<s:hidden id="topiaId" name='topiaId' label=''/>--%> - <s:textfield id="topiaId" name='topiaId' readonly="true" label='%{getText("echobase.common.id")}' size="250"/>

1 0

r709 - in trunk: echobase-ui/src/main/webapp/WEB-INF/jsp/exportDb src/site/rst
by tchemit＠users.forge.codelutin.com Sept. 24, 2012

Sept. 24, 2012

Author: tchemit Date: 2012-09-24 23:09:01 +0200 (Mon, 24 Sep 2012) New Revision: 709 Url: http://forge.codelutin.com/repositories/revision/echobase/709 Log: fix exportDb + remove no more used doc Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/exportDb/configure.jsp trunk/src/site/rst/exportDb.rst trunk/src/site/rst/importDb.rst Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/exportDb/configure.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/exportDb/configure.jsp 2012-09-24 21:08:44 UTC (rev 708) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/exportDb/configure.jsp 2012-09-24 21:09:01 UTC (rev 709) @@ -31,7 +31,7 @@ jQuery(document).ready(function () { function reload(value) { - if (this.value = "REFERENTIAL_AND_DATA") { + if (value == "REFERENTIAL_AND_DATA") { $('#extraInfos').show(); } else { $('#extraInfos').hide(); Modified: trunk/src/site/rst/exportDb.rst =================================================================== --- trunk/src/site/rst/exportDb.rst 2012-09-24 21:08:44 UTC (rev 708) +++ trunk/src/site/rst/exportDb.rst 2012-09-24 21:09:01 UTC (rev 709) @@ -62,19 +62,6 @@ Une fois l'export réalisé, le fichier sera téléchargeable. - -Export data ------------ - -Dans ce mode on exporte uniquement les données sélectionnées de la base de -travail. - -Il vous suffit de renseigner le nom du fichier d'export (l'extension -*.echobase*) sera automatiquement rajoutée, de sélectionner les données -à exporter puis de cliquer sur *Exporter*. - -Une fois l'export réalisé, le fichier sera téléchargeable. - Export All ---------- Modified: trunk/src/site/rst/importDb.rst =================================================================== --- trunk/src/site/rst/importDb.rst 2012-09-24 21:08:44 UTC (rev 708) +++ trunk/src/site/rst/importDb.rst 2012-09-24 21:09:01 UTC (rev 709) @@ -37,13 +37,6 @@ Il suffit de renseigner le fichier *.echobase* à importer et de lancer l'import. -Import Data ------------ - -Ce mode permet d'importer uniquement des données thématiques. - -Il suffit de renseigner le fichier *.echobase* à importer et de lancer l'import. - Import Free -----------

1 0

r708 - trunk/src/doc/reunions
by tchemit＠users.forge.codelutin.com Sept. 24, 2012

Sept. 24, 2012

Author: tchemit Date: 2012-09-24 23:08:44 +0200 (Mon, 24 Sep 2012) New Revision: 708 Url: http://forge.codelutin.com/repositories/revision/echobase/708 Log: add cr renunion Added: trunk/src/doc/reunions/reunion-2012-09-24.txt Added: trunk/src/doc/reunions/reunion-2012-09-24.txt =================================================================== --- trunk/src/doc/reunions/reunion-2012-09-24.txt (rev 0) +++ trunk/src/doc/reunions/reunion-2012-09-24.txt 2012-09-24 21:08:44 UTC (rev 708) @@ -0,0 +1,40 @@ +======== +Echobase +======== + +Jeudi 20 septembre 2012 (Ifremer) + +Présents : Mathieu et Tony + +But +=== + +- Lissage des données +- Validation dela version 1.3 + +Echotype +======== + +- Les echotypes ne contiennent qu'une seule espèce. +- Les echotypes sont rattachés à plusieurs voyages alors que cela n'est plus possible. + +A faire +======= + +- Mathieu + - documentation + tests sur lissage des données +- Tony + - corriger les echotypes + - supprimer les modes (import/export) de données seules + - corriger le problème des dates (dans dbeditor) + - corriger le problème sur exporter les requetes (tout est en readonly) + - supprimer le mot import (dans les colonnes du tableau de bord) + - modifier le mode d'insertion de requete libre-office + - valider la version embarquée sans jdk mais only jvm + - faire doc d'installation + +Prochaine réunion +================= + +- Lundi 11 octbore 2012 à 10h00 + Property changes on: trunk/src/doc/reunions/reunion-2012-09-24.txt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native

1 0

r707 - trunk/echobase-tools/src/test/echobase-2012-04-12/csv/new
by tchemit＠users.forge.codelutin.com Sept. 24, 2012

Sept. 24, 2012

Author: tchemit Date: 2012-09-24 23:00:52 +0200 (Mon, 24 Sep 2012) New Revision: 707 Url: http://forge.codelutin.com/repositories/revision/echobase/707 Log: fixes #1524: Echotype mal renseign?\195?\169 dans les donn?\195?\169es l?\195?\169gendaires Modified: trunk/echobase-tools/src/test/echobase-2012-04-12/csv/new/Echotype.csv.gz Modified: trunk/echobase-tools/src/test/echobase-2012-04-12/csv/new/Echotype.csv.gz =================================================================== (Binary files differ)

1 0

r706 - in trunk: echobase-services/src/main/java/fr/ifremer/echobase/services/exportdb echobase-services/src/main/java/fr/ifremer/echobase/services/importdb echobase-services/src/main/java/fr/ifremer/echobase/services/importdb/strategy echobase-services/src/main/resources/i18n echobase-services/src/test/java/fr/ifremer/echobase/services/exportdb echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importDb echobase-ui/src/main/resources/i18n echobase-ui/src/main/webapp/WEB-INF/jsp/exp
by tchemit＠users.forge.codelutin.com Sept. 24, 2012

Sept. 24, 2012

Author: tchemit Date: 2012-09-24 22:40:29 +0200 (Mon, 24 Sep 2012) New Revision: 706 Url: http://forge.codelutin.com/repositories/revision/echobase/706 Log: remove data only import/export Removed: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdb/strategy/DataImportDbStrategy.java Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/exportdb/ExportDbMode.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdb/ImportDbMode.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdb/ImportDbService.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdb/strategy/FreeImportDbStrategy.java trunk/echobase-services/src/main/resources/i18n/echobase-services_en_GB.properties trunk/echobase-services/src/main/resources/i18n/echobase-services_fr_FR.properties trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/exportdb/ExportDbServiceTest.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importDb/Import.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/exportDb/configure.jsp trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importDb/configure.jsp Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/exportdb/ExportDbMode.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/exportdb/ExportDbMode.java 2012-09-24 20:09:52 UTC (rev 705) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/exportdb/ExportDbMode.java 2012-09-24 20:40:29 UTC (rev 706) @@ -38,9 +38,6 @@ /** Export only referential. */ REFERENTIAL(n_("echobase.common.exportDbMode.referential"), true, false), - /** Export only selected data. */ - DATA(n_("echobase.common.exportDbMode.data"), false, true), - /** Export selected data + referential. */ REFERENTIAL_AND_DATA(n_("echobase.common.exportDbMode.referentialAndData"), true, true), Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdb/ImportDbMode.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdb/ImportDbMode.java 2012-09-24 20:09:52 UTC (rev 705) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdb/ImportDbMode.java 2012-09-24 20:40:29 UTC (rev 706) @@ -24,7 +24,6 @@ */ import fr.ifremer.echobase.I18nAble; -import fr.ifremer.echobase.entities.ImportType; import static org.nuiton.i18n.I18n.n_; @@ -39,9 +38,6 @@ /** Import only referential. */ REFERENTIAL(n_("echobase.common.importDbMode.referential")), - /** Import only data. */ - DATA(n_("echobase.common.importDbMode.data")), - /** Import what you want. */ FREE(n_("echobase.common.importDbMode.free")); Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdb/ImportDbService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdb/ImportDbService.java 2012-09-24 20:09:52 UTC (rev 705) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdb/ImportDbService.java 2012-09-24 20:40:29 UTC (rev 706) @@ -28,7 +28,6 @@ import fr.ifremer.echobase.services.EchoBaseServiceSupport; import fr.ifremer.echobase.services.importdata.ImportException; import fr.ifremer.echobase.services.importdb.strategy.AbstractImportDbStrategy; -import fr.ifremer.echobase.services.importdb.strategy.DataImportDbStrategy; import fr.ifremer.echobase.services.importdb.strategy.FreeImportDbStrategy; import fr.ifremer.echobase.services.importdb.strategy.ReferentialImportDbStrategy; import org.nuiton.topia.TopiaException; @@ -54,9 +53,6 @@ case REFERENTIAL: strategy = getService(ReferentialImportDbStrategy.class); break; - case DATA: - strategy = getService(DataImportDbStrategy.class); - break; case FREE: strategy = getService(FreeImportDbStrategy.class); break; Deleted: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdb/strategy/DataImportDbStrategy.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdb/strategy/DataImportDbStrategy.java 2012-09-24 20:09:52 UTC (rev 705) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdb/strategy/DataImportDbStrategy.java 2012-09-24 20:40:29 UTC (rev 706) @@ -1,127 +0,0 @@ -package fr.ifremer.echobase.services.importdb.strategy; - -/* - * #%L - * EchoBase :: Services - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2011 - 2012 Ifremer, Codelutin - * %% - * 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% - */ - -import com.google.common.collect.Lists; -import fr.ifremer.echobase.entities.EchoBaseEntityEnum; -import fr.ifremer.echobase.entities.EchoBaseUser; -import fr.ifremer.echobase.entities.EntityModificationLog; -import fr.ifremer.echobase.entities.ImportLog; -import fr.ifremer.echobase.entities.ImportType; -import fr.ifremer.echobase.entities.data.Voyage; -import fr.ifremer.echobase.persistence.EchoBaseDbMeta; -import fr.ifremer.echobase.services.DecoratorService; -import fr.ifremer.echobase.services.importdata.ImportException; -import org.nuiton.topia.TopiaException; -import org.nuiton.topia.persistence.TopiaDAO; -import org.nuiton.topia.persistence.metadata.AssociationMeta; -import org.nuiton.topia.persistence.metadata.TableMeta; -import org.nuiton.util.decorator.Decorator; - -import java.io.File; -import java.util.List; -import java.util.Map; -import java.util.zip.ZipEntry; - -/** - * Data only import db strategy. - * - * @author tchemit <chemit(a)codelutin.com> - * @since 1.2 - */ -public class DataImportDbStrategy extends AbstractImportDbStrategy { - - @Override - protected void validateTableEntries(EchoBaseDbMeta dbMeta, - Map<TableMeta<EchoBaseEntityEnum>, ZipEntry> tables) throws ImportException { - - // check that contains only referential entries - List<EchoBaseEntityEnum> badTableTypes = Lists.newArrayList(); - List<TableMeta<EchoBaseEntityEnum>> dataTables = dbMeta.getReferenceTables(); - for (TableMeta<EchoBaseEntityEnum> tableMetas : tables.keySet()) { - if (dataTables.contains(tableMetas)) { - badTableTypes.add(tableMetas.getSource()); - } - } - - if (!badTableTypes.isEmpty()) { - throw new ImportException( - "In data import, can not accept " + - "referential type, but found some referential files: " + badTableTypes); - } - } - - @Override - protected void validateAssociationEntries(EchoBaseDbMeta dbMeta, - Map<AssociationMeta<EchoBaseEntityEnum>, ZipEntry> associations) throws ImportException { - List<EchoBaseEntityEnum> badAssociationTypes = Lists.newArrayList(); - List<AssociationMeta<EchoBaseEntityEnum>> associationTables = dbMeta.getReferenceAssociations(); - for (AssociationMeta<EchoBaseEntityEnum> tableMetas : associations.keySet()) { - if (associationTables.contains(tableMetas)) { - badAssociationTypes.add(tableMetas.getSource()); - } - } - if (!badAssociationTypes.isEmpty()) { - throw new ImportException( - "In data import, can not accept " + - "referential type, but found some referential associations files: " + - badAssociationTypes); - } - } - - @Override - protected void createImportLogEntry(TopiaDAO<ImportLog> dao, - EchoBaseUser user, - File file, - Iterable<Voyage> importedVoyages) throws TopiaException { - - Decorator<Voyage> decorator = getService(DecoratorService.class).getDecorator(getLocale(), Voyage.class, null); - for (Voyage importedVoyage : importedVoyages) { - - // create a importLog entry - ImportLog importLog = dao.create( - ImportLog.PROPERTY_VOYAGE_ID, importedVoyage.getTopiaId(), - ImportLog.PROPERTY_IMPORT_TYPE, ImportType.VOYAGE, - ImportLog.PROPERTY_IMPORT_USER, user.getEmail(), - ImportLog.PROPERTY_IMPORT_DATE, newDate(), - ImportLog.PROPERTY_IMPORT_TEXT, "import voyage " + decorator.toString(importedVoyage) + " from file " + file.getName() - ); - importLog.addImportId(importedVoyage.getTopiaId()); - } - } - - @Override - protected void createLogBookEntry(TopiaDAO<EntityModificationLog> dao, - EchoBaseUser user, - File file, - Iterable<Voyage> importedVoyages) throws TopiaException { - dao.create( - EntityModificationLog.PROPERTY_ENTITY_TYPE, "Import data only db", - EntityModificationLog.PROPERTY_ENTITY_ID, "Data only EchoBase db", - EntityModificationLog.PROPERTY_MODIFICATION_USER, user.getEmail(), - EntityModificationLog.PROPERTY_MODIFICATION_DATE, newDate(), - EntityModificationLog.PROPERTY_MODIFICATION_TEXT, "import db from file " + file.getName() - ); - } -} Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdb/strategy/FreeImportDbStrategy.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdb/strategy/FreeImportDbStrategy.java 2012-09-24 20:09:52 UTC (rev 705) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdb/strategy/FreeImportDbStrategy.java 2012-09-24 20:40:29 UTC (rev 706) @@ -79,7 +79,7 @@ ImportLog.PROPERTY_IMPORT_TYPE, ImportType.VOYAGE, ImportLog.PROPERTY_IMPORT_USER, user.getEmail(), ImportLog.PROPERTY_IMPORT_DATE, date, - ImportLog.PROPERTY_IMPORT_TEXT, "import voyage " + decorator.toString(importedVoyage) + " from file " + file.getName() + ImportLog.PROPERTY_IMPORT_TEXT, "Import voyage " + decorator.toString(importedVoyage) + " from file " + file.getName() ); importLog.addImportId(importedVoyage.getTopiaId()); } @@ -92,8 +92,8 @@ Iterable<Voyage> importedVoyages) throws TopiaException { dao.create( - EntityModificationLog.PROPERTY_ENTITY_TYPE, "Import free db", - EntityModificationLog.PROPERTY_ENTITY_ID, "Free EchoBase db", + EntityModificationLog.PROPERTY_ENTITY_TYPE, "Import db", + EntityModificationLog.PROPERTY_ENTITY_ID, "EchoBase (referential + data) db", EntityModificationLog.PROPERTY_MODIFICATION_USER, user.getEmail(), EntityModificationLog.PROPERTY_MODIFICATION_DATE, newDate(), EntityModificationLog.PROPERTY_MODIFICATION_TEXT, "import db from file " + file.getName() Modified: trunk/echobase-services/src/main/resources/i18n/echobase-services_en_GB.properties =================================================================== --- trunk/echobase-services/src/main/resources/i18n/echobase-services_en_GB.properties 2012-09-24 20:09:52 UTC (rev 705) +++ trunk/echobase-services/src/main/resources/i18n/echobase-services_en_GB.properties 2012-09-24 20:40:29 UTC (rev 706) @@ -12,12 +12,10 @@ echobase.common.esduBySpeciesAndAgeCategoryFile=Results per ESDU / species / age file echobase.common.esduBySpeciesAndSizeCategoryFile=Results per ESDU / species / size file echobase.common.exportDbMode.all=Export complete database -echobase.common.exportDbMode.data=Export only data echobase.common.exportDbMode.referential=Export only referential echobase.common.exportDbMode.referentialAndData=Export referential and some data echobase.common.gearMetadataFile=Gear metadata file echobase.common.importDbFile=Import file (.echobase) -echobase.common.importDbMode.data=Data import echobase.common.importDbMode.free=Free import echobase.common.importDbMode.referential=Referential import echobase.common.lengthAgeKeyFile=Size-age equations file Modified: trunk/echobase-services/src/main/resources/i18n/echobase-services_fr_FR.properties =================================================================== --- trunk/echobase-services/src/main/resources/i18n/echobase-services_fr_FR.properties 2012-09-24 20:09:52 UTC (rev 705) +++ trunk/echobase-services/src/main/resources/i18n/echobase-services_fr_FR.properties 2012-09-24 20:40:29 UTC (rev 706) @@ -12,12 +12,10 @@ echobase.common.esduBySpeciesAndAgeCategoryFile=Fichier de résultats par ESDU / espèce / âge echobase.common.esduBySpeciesAndSizeCategoryFile=Fichier de résultats par ESDU / espèce / taille echobase.common.exportDbMode.all=Exporter toute la base -echobase.common.exportDbMode.data=Exporter uniquement des données echobase.common.exportDbMode.referential=Exporter uniquement le référentiel echobase.common.exportDbMode.referentialAndData=Exporter le référentiel et des données echobase.common.gearMetadataFile=Fichier de méta-données d'engin echobase.common.importDbFile=Fichier d'import (.echobase) -echobase.common.importDbMode.data=Import Données echobase.common.importDbMode.free=Import libre echobase.common.importDbMode.referential=Import Référentiel echobase.common.lengthAgeKeyFile=Fichier des relations taille-âge Modified: trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/exportdb/ExportDbServiceTest.java =================================================================== --- trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/exportdb/ExportDbServiceTest.java 2012-09-24 20:09:52 UTC (rev 705) +++ trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/exportdb/ExportDbServiceTest.java 2012-09-24 20:40:29 UTC (rev 706) @@ -226,37 +226,6 @@ } @Test - public void exportData() throws IOException, TopiaException { - - ExportDbService service = getService(ExportDbService.class); - - ExportDbConfiguration conf = new ExportDbConfiguration(); - - conf.setVoyageIds(new String[]{getVoyageId()}); - - File workingDirectory = new File(getTestDir(), "work-dir"); - FileUtil.createDirectoryIfNecessary(workingDirectory); - conf.setWorkingDirectory(workingDirectory); - conf.setFileName("echobase-data"); - conf.setComputeSteps(true); - conf.setExportDbMode(ExportDbMode.DATA); - service.doExport(conf); - File exportFile = conf.getExportFile(); - Assert.assertNotNull(exportFile); - Assert.assertTrue(exportFile.exists()); - - // check all tables (referential + data) where exported - ZipFile zipFile = new ZipFile(exportFile); - - Map<TableMeta<EchoBaseEntityEnum>, ZipEntry> tables = - TopiaCsvImports.discoverEntries( - "echobase/", getDbMeta().getAllTables(), - zipFile, Lists.<String>newArrayList()); - - checkAllTablesExported(zipFile, tables); - } - - @Test public void exportReferentialAndData() throws IOException { ExportDbService service = getService(ExportDbService.class); Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importDb/Import.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importDb/Import.java 2012-09-24 20:09:52 UTC (rev 705) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importDb/Import.java 2012-09-24 20:40:29 UTC (rev 706) @@ -68,11 +68,6 @@ model.getActionTime()); break; - case DATA: - message = _("echobase.importDb.dataResult", - model.getActionTime()); - - break; case FREE: message = _("echobase.importDb.freeResult", model.getActionTime()); 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 2012-09-24 20:09:52 UTC (rev 705) +++ trunk/echobase-ui/src/main/resources/i18n/echobase-ui_en_GB.properties 2012-09-24 20:40:29 UTC (rev 706) @@ -221,7 +221,6 @@ echobase.error.workingDbConfiguration.url.already.exists=A configuration with same url already exists echobase.error.workingDbConfiguration.url.required=Mandatory jdbc url echobase.header.request.result=SQL query result -echobase.importDb.dataResult=Data db import was sucessful in %s. echobase.importDb.freeResult=Free db import was succesful in %s. echobase.importDb.referentialResult=Referential db import was succesul in %s. echobase.info.click.to.select=You can select value with a simple click then copy it (Ctrl-C) 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 2012-09-24 20:09:52 UTC (rev 705) +++ trunk/echobase-ui/src/main/resources/i18n/echobase-ui_fr_FR.properties 2012-09-24 20:40:29 UTC (rev 706) @@ -221,7 +221,6 @@ echobase.error.workingDbConfiguration.url.already.exists=Une configuration existe déjà avec cette url echobase.error.workingDbConfiguration.url.required=Url jdbc obligatoire echobase.header.request.result=Résultat de la requête SQL -echobase.importDb.dataResult=L'import de type données s'est déroulé avec succès en %s. echobase.importDb.freeResult=L'import de type libre s'est déroulé avec succès en %s. echobase.importDb.referentialResult=L'import de type référentiel s'est déroulé avec succès en %s. echobase.info.click.to.select=Vous pouvez sélectionner la valeur en un simple click puis la copier (Ctrl-C) Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/exportDb/configure.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/exportDb/configure.jsp 2012-09-24 20:09:52 UTC (rev 705) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/exportDb/configure.jsp 2012-09-24 20:40:29 UTC (rev 706) @@ -31,8 +31,11 @@ jQuery(document).ready(function () { function reload(value) { - $('#extraInfos').hide(); - $('[class~="' + value + '"]').show(); + if (this.value = "REFERENTIAL_AND_DATA") { + $('#extraInfos').show(); + } else { + $('#extraInfos').hide(); + } } // to change form when mode is changed @@ -52,17 +55,15 @@ </legend> <div class="cleanBoth help"> - <s:a href="%{getDocumentation('exportDb.html', null)}" - target="doc"> + <s:a href="%{getDocumentation('exportDb.html', null)}" target="doc"> <s:text name="echobase.action.show.exportDb.documentation"/> </s:a> </div> <br/> <s:radio id='mode' key='model.exportDbMode' list="modes" - cssClass="cleanBoth" - label='%{getText("echobase.common.exportDbMode")}' - required="true" template="myradiomap"/> + cssClass="cleanBoth" required="true" template="myradiomap" + label='%{getText("echobase.common.exportDbMode")}'/> <div class="cleanBoth"></div> <br/> @@ -72,7 +73,7 @@ <div class="cleanBoth"></div> <br/> - <div id='extraInfos' class="DATA REFERENTIAL_AND_DATA"> + <div id='extraInfos'> <s:checkboxlist list="voyages" key="model.voyageIds" id='voyages' template="mycheckboxlist" label="%{getText('echobase.label.voyageToSelect')}"/> Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importDb/configure.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importDb/configure.jsp 2012-09-24 20:09:52 UTC (rev 705) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importDb/configure.jsp 2012-09-24 20:40:29 UTC (rev 706) @@ -26,11 +26,6 @@ <title><s:text name="echobase.title.importDb"/></title> -<script type="text/javascript"> - -</script> - - <s:form namespace="/importDb" method="POST" enctype="multipart/form-data"> <fieldset> <legend> @@ -43,9 +38,9 @@ </s:a> </div> <br/> - <s:radio id='mode' key='model.importDbMode' list="modes" cssClass="cleanBoth" - label='%{getText("echobase.common.importDbMode")}' - required="true" template="myradiomap"/> + <s:radio id='mode' key='model.importDbMode' list="modes" + cssClass="cleanBoth" required="true" template="myradiomap" + label='%{getText("echobase.common.importDbMode")}'/> <div class="cleanBoth"></div> <br/> <s:file name="input" required="true" key="echobase.common.importDbFile"/>

1 0