This is an automated email from the git hooks/post-receive script. New commit to branch feature/8180 in repository echobase. See https://gitlab.nuiton.org/codelutin/echobase.git commit c6e295cbbceb19987cf66b2a92ffa0e2bc448295 Author: Julien Ruchaud <julien.ruchaud@debux.org> Date: Wed Jun 22 11:12:19 2016 +0200 Finish mooring import forms --- ...ort.java => ConfigureMooringCommonsImport.java} | 8 ++--- .../ui/actions/importData/ImportMooringMode.java | 2 +- .../importData/LaunchMooringAcousticImport.java | 2 +- ...Import.java => LaunchMooringCommonsImport.java} | 16 ++++----- .../ui/actions/importData/SelectImportType.java | 2 +- .../resources/i18n/echobase-ui_en_GB.properties | 1 + .../resources/i18n/echobase-ui_fr_FR.properties | 1 + ...mport.jsp => configureMooringCommonsImport.jsp} | 4 +-- .../importData/progressMooringCommonsImport.jsp | 40 ++++++++++++++++++++++ .../jsp/importData/resultMooringCommonsImport.jsp | 28 +++++++++++++++ 10 files changed, 85 insertions(+), 19 deletions(-) diff --git a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureMooringImport.java b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureMooringCommonsImport.java similarity index 87% rename from echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureMooringImport.java rename to echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureMooringCommonsImport.java index b2d91e1..303a951 100644 --- a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureMooringImport.java +++ b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureMooringCommonsImport.java @@ -30,12 +30,12 @@ import java.io.File; * @author Julien Ruchaud - ruchaud@codelutin.com * @since 0.4 */ -public class ConfigureMooringImport extends AbstractConfigureImport<MooringCommonsImportConfiguration> { +public class ConfigureMooringCommonsImport extends AbstractConfigureImport<MooringCommonsImportConfiguration> { private static final long serialVersionUID = 1L; - public ConfigureMooringImport() { + public ConfigureMooringCommonsImport() { super(MooringCommonsImportConfiguration.class); } @@ -44,10 +44,6 @@ public class ConfigureMooringImport extends AbstractConfigureImport<MooringCommo return new MooringCommonsImportConfiguration(getLocale()); } - @Override - protected void prepareInputAction(MooringCommonsImportConfiguration model) { - } - public void setMooringFile(File file) { getModel().getMooringFile().setFile(file); } diff --git a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ImportMooringMode.java b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ImportMooringMode.java index 8ff5506..e31e13b 100644 --- a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ImportMooringMode.java +++ b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ImportMooringMode.java @@ -34,7 +34,7 @@ import static org.nuiton.i18n.I18n.n; public enum ImportMooringMode implements I18nAble { /** Import mooring **/ - Mooring(n("echobase.common.importType.mooring")), + MooringCommons(n("echobase.common.importType.mooring")), /** Import accoustic data (Cells ESDU and Elementary). */ MooringAcoustic(ImportType.ACOUSTIC.getI18nKey()), diff --git a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/LaunchMooringAcousticImport.java b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/LaunchMooringAcousticImport.java index 32382f6..25317c8 100644 --- a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/LaunchMooringAcousticImport.java +++ b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/LaunchMooringAcousticImport.java @@ -30,7 +30,7 @@ import fr.ifremer.echobase.services.service.importdata.configurations.MooringAco * Launch a accoustic data import for mooring. * * @author Julien Ruchaud - ruchaud@codelutin.com - * @since 0.5 + * @since 4.0 */ public class LaunchMooringAcousticImport extends AbstractLaunchImport<MooringAcousticsImportConfiguration, ImportDataService> { diff --git a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/LaunchMooringAcousticImport.java b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/LaunchMooringCommonsImport.java similarity index 67% copy from echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/LaunchMooringAcousticImport.java copy to echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/LaunchMooringCommonsImport.java index 32382f6..52b22da 100644 --- a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/LaunchMooringAcousticImport.java +++ b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/LaunchMooringCommonsImport.java @@ -24,24 +24,24 @@ import fr.ifremer.echobase.entities.EchoBaseUser; import fr.ifremer.echobase.services.service.importdata.ImportDataResult; import fr.ifremer.echobase.services.service.importdata.ImportDataService; import fr.ifremer.echobase.services.service.importdata.ImportException; -import fr.ifremer.echobase.services.service.importdata.configurations.MooringAcousticsImportConfiguration; +import fr.ifremer.echobase.services.service.importdata.configurations.MooringCommonsImportConfiguration; /** - * Launch a accoustic data import for mooring. + * Launch a commons data import for mooring. * * @author Julien Ruchaud - ruchaud@codelutin.com - * @since 0.5 + * @since 4.0 */ -public class LaunchMooringAcousticImport extends AbstractLaunchImport<MooringAcousticsImportConfiguration, ImportDataService> { +public class LaunchMooringCommonsImport extends AbstractLaunchImport<MooringCommonsImportConfiguration, ImportDataService> { private static final long serialVersionUID = 1L; - public LaunchMooringAcousticImport() { - super(MooringAcousticsImportConfiguration.class, ImportDataService.class); + public LaunchMooringCommonsImport() { + super(MooringCommonsImportConfiguration.class, ImportDataService.class); } @Override - protected ImportDataResult<MooringAcousticsImportConfiguration> doImport(ImportDataService service, MooringAcousticsImportConfiguration model, EchoBaseUser user) throws ImportException { - return service.doImportMooringAcoustics(model, user); + protected ImportDataResult<MooringCommonsImportConfiguration> doImport(ImportDataService service, MooringCommonsImportConfiguration model, EchoBaseUser user) throws ImportException { + return service.doImportMooringCommons(model, user); } } diff --git a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/SelectImportType.java b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/SelectImportType.java index 4e94e0e..060fa10 100644 --- a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/SelectImportType.java +++ b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/SelectImportType.java @@ -76,7 +76,7 @@ public class SelectImportType extends EchoBaseActionSupport { voyageMode = ImportVoyageMode.Common; } if (mooringMode == null) { - mooringMode = ImportMooringMode.Mooring; + mooringMode = ImportMooringMode.MooringCommons; } return INPUT; } diff --git a/echobase-ui/src/main/resources/i18n/echobase-ui_en_GB.properties b/echobase-ui/src/main/resources/i18n/echobase-ui_en_GB.properties index 209c3e8..c81e67d 100644 --- a/echobase-ui/src/main/resources/i18n/echobase-ui_en_GB.properties +++ b/echobase-ui/src/main/resources/i18n/echobase-ui_en_GB.properties @@ -115,6 +115,7 @@ echobase.common.importType.acoustic= echobase.common.importType.catches= echobase.common.importType.common=Voyage / Transit / Transect data import echobase.common.importType.mooring=Mooring import +echobase.common.importType.mooringCommons= echobase.common.importType.operation= echobase.common.importType.results=Results import echobase.common.importUser=Import user diff --git a/echobase-ui/src/main/resources/i18n/echobase-ui_fr_FR.properties b/echobase-ui/src/main/resources/i18n/echobase-ui_fr_FR.properties index 9a22b88..cfde050 100644 --- a/echobase-ui/src/main/resources/i18n/echobase-ui_fr_FR.properties +++ b/echobase-ui/src/main/resources/i18n/echobase-ui_fr_FR.properties @@ -115,6 +115,7 @@ echobase.common.importType.acoustic= echobase.common.importType.catches= echobase.common.importType.common=Import des données de Voyage / Transit / Transect echobase.common.importType.mooring=Import des bouées +echobase.common.importType.mooringCommons= echobase.common.importType.operation= echobase.common.importType.results=Import des résultats echobase.common.importUser=Utilisateur diff --git a/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureMooringImport.jsp b/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureMooringCommonsImport.jsp similarity index 92% rename from echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureMooringImport.jsp rename to echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureMooringCommonsImport.jsp index 63e6e4e..cd8758c 100644 --- a/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureMooringImport.jsp +++ b/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureMooringCommonsImport.jsp @@ -49,12 +49,12 @@ </div> <br/> - <s:file key="moviesFile" requiredLabel="true" + <s:file key="mooringFile" requiredLabel="true" label='%{getText("echobase.common.mooringFile")}'/> </fieldset> <br/> - <s:submit action="configureMooring-execute" key='echobase.action.import'/> + <s:submit action="configureMooringCommons-execute" key='echobase.action.import'/> </s:form> diff --git a/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/progressMooringCommonsImport.jsp b/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/progressMooringCommonsImport.jsp new file mode 100644 index 0000000..6296f88 --- /dev/null +++ b/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/progressMooringCommonsImport.jsp @@ -0,0 +1,40 @@ +<%-- + #%L + EchoBase :: UI + %% + 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% + --%> +<%@page contentType="text/html" pageEncoding="UTF-8" %> +<%@ taglib prefix="s" uri="/struts-tags" %> +<%@ taglib prefix="sj" uri="/struts-jquery-tags" %> + +<meta http-equiv="refresh" + content='1;url=<s:url action="importMooringCommons" namespace="/importData"/>'/> + +<title> + <s:text name="echobase.common.importType.mooringCommons"/> + <s:text name="echobase.common.inProgress"/> +</title> + +<%-- TODO letellier 20111104 : Add warn icon --%> +<p><s:text name="echobase.message.warnImportInProgress"/></p> + +<br/> + +<div> + <sj:progressbar value="%{model.progress}"/> +</div> diff --git a/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/resultMooringCommonsImport.jsp b/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/resultMooringCommonsImport.jsp new file mode 100644 index 0000000..d77c0c1 --- /dev/null +++ b/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/resultMooringCommonsImport.jsp @@ -0,0 +1,28 @@ +<%-- + #%L + EchoBase :: UI + %% + Copyright (C) 2011 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% + --%> +<%@page contentType="text/html" pageEncoding="UTF-8" %> +<%@ taglib prefix="s" uri="/struts-tags" %> + +<title> + <s:text name="echobase.common.importType.mooringCommons"/> +</title> + +<%@ include file="importDataActionResult.jsp" %> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.