branch feature/8180 created (now 00cbfce)
This is an automated email from the git hooks/post-receive script. New change to branch feature/8180 in repository echobase. See https://gitlab.nuiton.org/codelutin/echobase.git at 00cbfce Add new import mode for mooring This branch includes the following new commits: new 00cbfce Add new import mode for mooring The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 00cbfce49df0c79a306e0587a50d9100ae414fcf Author: Julien Ruchaud <julien.ruchaud@debux.org> Date: Mon Jun 13 12:00:56 2016 +0200 Add new import mode for mooring -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
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 00cbfce49df0c79a306e0587a50d9100ae414fcf Author: Julien Ruchaud <julien.ruchaud@debux.org> Date: Mon Jun 13 12:00:56 2016 +0200 Add new import mode for mooring --- .../{ImportMode.java => ImportMooringMode.java} | 20 ++++------- .../{ImportMode.java => ImportVoyageMode.java} | 6 ++-- .../ui/actions/importData/SelectImportType.java | 40 ++++++++++++++++------ .../main/resources/config/struts-importData.xml | 2 +- .../resources/i18n/echobase-ui_en_GB.properties | 3 ++ .../resources/i18n/echobase-ui_fr_FR.properties | 3 ++ .../WEB-INF/jsp/importData/selectImportType.jsp | 34 +++++++++++++----- 7 files changed, 72 insertions(+), 36 deletions(-) diff --git a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ImportMode.java b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ImportMooringMode.java similarity index 71% copy from echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ImportMode.java copy to echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ImportMooringMode.java index 2b7c76f..7b6d496 100644 --- a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ImportMode.java +++ b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ImportMooringMode.java @@ -26,21 +26,15 @@ import fr.ifremer.echobase.entities.ImportType; import static org.nuiton.i18n.I18n.n; /** - * To define the mode of import data (says files to be imported). + * To define the mode of import data for mooring (says files to be imported). * - * @author Tony Chemit - chemit@codelutin.com - * @since 0.2 + * @author Julien Ruchaud - ruchaud@codelutin.com + * @since 0.3 */ -public enum ImportMode implements I18nAble { +public enum ImportMooringMode implements I18nAble { - /** Import Voyage / Transit / Transect. */ - Common(n("echobase.common.importType.common")), - - /** Import operations common data. */ - Operation(ImportType.OPERATION.getI18nKey()), - - /** Import catches data (unsorted, total, but no individual ones). */ - Catches(ImportType.CATCHES.getI18nKey()), + /** Import Mooring. */ + Mooring(n("echobase.common.importType.mooring")), /** Import accoustic data (Cells ESDU and Elementary). */ Acoustic(ImportType.ACOUSTIC.getI18nKey()), @@ -50,7 +44,7 @@ public enum ImportMode implements I18nAble { private final String i18nKey; - ImportMode(String i18nKey) { + ImportMooringMode(String i18nKey) { this.i18nKey = i18nKey; } diff --git a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ImportMode.java b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ImportVoyageMode.java similarity index 90% rename from echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ImportMode.java rename to echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ImportVoyageMode.java index 2b7c76f..6812c5a 100644 --- a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ImportMode.java +++ b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ImportVoyageMode.java @@ -26,12 +26,12 @@ import fr.ifremer.echobase.entities.ImportType; import static org.nuiton.i18n.I18n.n; /** - * To define the mode of import data (says files to be imported). + * To define the mode of import data for voyage (says files to be imported). * * @author Tony Chemit - chemit@codelutin.com * @since 0.2 */ -public enum ImportMode implements I18nAble { +public enum ImportVoyageMode implements I18nAble { /** Import Voyage / Transit / Transect. */ Common(n("echobase.common.importType.common")), @@ -50,7 +50,7 @@ public enum ImportMode implements I18nAble { private final String i18nKey; - ImportMode(String i18nKey) { + ImportVoyageMode(String i18nKey) { this.i18nKey = i18nKey; } 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 49b81fe..4e94e0e 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 @@ -36,29 +36,47 @@ public class SelectImportType extends EchoBaseActionSupport { private static final long serialVersionUID = 1L; - protected ImportMode mode; + protected ImportVoyageMode voyageMode; + protected ImportMooringMode mooringMode; - public void setMode(ImportMode mode) { - this.mode = mode; + public ImportVoyageMode getVoyageMode() { + return voyageMode; } - public ImportMode getMode() { - return mode; + public void setVoyageMode(ImportVoyageMode voyageMode) { + this.voyageMode = voyageMode; + } + + public ImportMooringMode getMooringMode() { + return mooringMode; + } + + public void setMooringMode(ImportMooringMode mooringMode) { + this.mooringMode = mooringMode; } /** Universe of possible import modes. */ - protected Map<String, String> modes; + protected Map<String, String> voyageModes; + protected Map<String, String> mooringModes; - public Map<String, String> getModes() { - return modes; + public Map<String, String> getVoyageModes() { + return voyageModes; + } + + public Map<String, String> getMooringModes() { + return mooringModes; } @Override public String input() throws Exception { - modes = decoratorService.decorateEnums(ImportMode.values()); + voyageModes = decoratorService.decorateEnums(ImportVoyageMode.values()); + mooringModes = decoratorService.decorateEnums(ImportMooringMode.values()); - if (mode == null) { - mode = ImportMode.Common; + if (voyageMode == null) { + voyageMode = ImportVoyageMode.Common; + } + if (mooringMode == null) { + mooringMode = ImportMooringMode.Mooring; } return INPUT; } diff --git a/echobase-ui/src/main/resources/config/struts-importData.xml b/echobase-ui/src/main/resources/config/struts-importData.xml index 67c1dc5..8527adb 100644 --- a/echobase-ui/src/main/resources/config/struts-importData.xml +++ b/echobase-ui/src/main/resources/config/struts-importData.xml @@ -34,7 +34,7 @@ <result name="input">/WEB-INF/jsp/importData/selectImportType.jsp</result> <result type="redirectAction"> <param name="namespace">/importData</param> - <param name="actionName">configure${mode}</param> + <param name="actionName">configure${voyageMode}</param> <param name="method">input</param> </result> </action> 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 a993625..07cce69 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 @@ -106,6 +106,7 @@ echobase.common.importType=Import type 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.operation= echobase.common.importType.results=Results import echobase.common.importUser=Import user @@ -343,6 +344,8 @@ echobase.legend.exportCoser.resume=Resume of Coser export echobase.legend.exportDb.configuration.files=Export configuration echobase.legend.exportDb.resume=Resume of database export echobase.legend.importData.configuration.selectImportType=Type of import selection +echobase.legend.importData.configuration.selectImportTypeMooring=Type of import selection for mooring +echobase.legend.importData.configuration.selectImportTypeVoyage=Type of import selection for voyage echobase.legend.importData.configure=Import configuration echobase.legend.importData.createMission=Mission caracteristics echobase.legend.importData.result.resume=Results of data import 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 06a8fd6..7d9e6a3 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 @@ -106,6 +106,7 @@ echobase.common.importType=Type d'import 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.operation= echobase.common.importType.results=Import des résultats echobase.common.importUser=Utilisateur @@ -346,6 +347,8 @@ echobase.legend.exportCoser.resume=Résumé de l'export Coser echobase.legend.exportDb.configuration.files=Configuration de l'export echobase.legend.exportDb.resume=Résumé de l'export de base echobase.legend.importData.configuration.selectImportType=Sélection du type d'import +echobase.legend.importData.configuration.selectImportTypeMooring=Sélection du type d'import pour les bouées +echobase.legend.importData.configuration.selectImportTypeVoyage=Sélection du type d'import pour les voyages echobase.legend.importData.configure=Configurer l'import echobase.legend.importData.createMission=Caractéristiques de la mission echobase.legend.importData.result.resume=Résultats de l'import de données diff --git a/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/selectImportType.jsp b/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/selectImportType.jsp index d3c5371..cbb64ee 100644 --- a/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/selectImportType.jsp +++ b/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/selectImportType.jsp @@ -34,26 +34,44 @@ jQuery(document).ready(function () { - $('[name="mode"]').change(function (event) { + $('[name="voyageMode"]').change(function (event) { updateMode(this.value); }); - updateMode($('[name="mode"][checked="checked"]').val()); + updateMode($('[name="voyageMode"][checked="checked"]').val()); + + $('[name="mooringMode"]').change(function (event) { + updateMode(this.value); + }); + updateMode($('[name="mooringMode"][checked="checked"]').val()); }); </script> <s:form namespace="/importData" method="GET"> - <s:submit action="createMission" key='echobase.action.createNewMission' - method="input"/> + <s:submit action="createMission" key='echobase.action.createNewMission' + method="input"/> <fieldset> <legend> - <s:text name="echobase.legend.importData.configuration.selectImportType"/> + <s:text name="echobase.legend.importData.configuration.selectImportTypeVoyage"/> </legend> - <s:radio key='mode' list="modes" cssClass="cleanBoth" + <s:radio key='voyageMode' list="voyageModes" cssClass="cleanBoth" label='%{getText("echobase.common.importDataMode")}' requiredLabel="true" template="myradiomap"/> + + <s:submit action="selectImportType" key='echobase.action.configureImport' + align="right"/> + </fieldset> + + <fieldset> + <legend> + <s:text name="echobase.legend.importData.configuration.selectImportTypeMooring"/> + </legend> + <s:radio key='mooringMode' list="mooringModes" cssClass="cleanBoth" + label='%{getText("echobase.common.importDataMode")}' + requiredLabel="true" template="myradiomap"/> + + <s:submit action="selectImportType" key='echobase.action.configureImport' + align="right"/> </fieldset> - <s:submit action="selectImportType" key='echobase.action.configureImport' - align="right"/> </s:form> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm