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 2e685cbf6014e18e8f5e3ab68f6169c104980afe Author: Julien Ruchaud <julien.ruchaud@debux.org> Date: Mon Jun 13 13:48:49 2016 +0200 Plug action but they are not implemented --- .../ui/actions/importData/ImportMooringMode.java | 4 +-- .../main/resources/config/struts-importData.xml | 2 +- .../resources/i18n/echobase-ui_en_GB.properties | 1 + .../resources/i18n/echobase-ui_fr_FR.properties | 1 + .../WEB-INF/jsp/importData/selectImportType.jsp | 40 +++++++--------------- 5 files changed, 18 insertions(+), 30 deletions(-) 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 7b6d496..3bbf379 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 @@ -37,10 +37,10 @@ public enum ImportMooringMode implements I18nAble { Mooring(n("echobase.common.importType.mooring")), /** Import accoustic data (Cells ESDU and Elementary). */ - Acoustic(ImportType.ACOUSTIC.getI18nKey()), + MooringAcoustic(ImportType.ACOUSTIC.getI18nKey()), /** Import results. */ - Results(n("echobase.common.importType.results")); + MooringResults(n("echobase.common.importType.results")); private final String i18nKey; diff --git a/echobase-ui/src/main/resources/config/struts-importData.xml b/echobase-ui/src/main/resources/config/struts-importData.xml index 8527adb..ea02e23 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${voyageMode}</param> + <param name="actionName">configure${voyageMode}${mooringMode}</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 7746c55..7c1cf2e 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 @@ -9,6 +9,7 @@ echobase.action.create=Create echobase.action.createEmbeddedApplication=Create a portable database echobase.action.createMission=Create mission echobase.action.createNewMission=Create a new mission +echobase.action.createNewMooring=Create a new mooring echobase.action.createPostgresDb=Create database echobase.action.createSqlQuery=Save echobase.action.createWorkingDbConfiguration=Save 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 6613d2c..4842e20 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 @@ -9,6 +9,7 @@ echobase.action.create=Créer echobase.action.createEmbeddedApplication=Créer l'application echobase.action.createMission=Créer la mission echobase.action.createNewMission=Créer une nouvelle mission +echobase.action.createNewMooring=Créer une nouvelle bouée echobase.action.createPostgresDb=Créer la base echobase.action.createSqlQuery=Enregistrer echobase.action.createWorkingDbConfiguration=Enregistrer 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 cbb64ee..98b924c 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 @@ -23,33 +23,11 @@ <title><s:text name="echobase.title.importData.selectImportType"/></title> -<script type="text/javascript"> - - function updateMode(newValue) { - // change the action target - $('#selectImportType_configure').attr( - 'name', - 'action:configure' + newValue + '-input'); - } - - jQuery(document).ready(function () { - - $('[name="voyageMode"]').change(function (event) { - updateMode(this.value); - }); - 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.selectImportTypeVoyage"/> @@ -61,8 +39,12 @@ <s:submit action="selectImportType" key='echobase.action.configureImport' align="right"/> </fieldset> - - <fieldset> + +</s:form> + +<s:form namespace="/importData" method="GET"> + + <fieldset> <legend> <s:text name="echobase.legend.importData.configuration.selectImportTypeMooring"/> </legend> @@ -70,8 +52,12 @@ label='%{getText("echobase.common.importDataMode")}' requiredLabel="true" template="myradiomap"/> + <s:submit action="createMooring" key='echobase.action.createNewMooring' + method="input" align="right"/> + <s:submit action="selectImportType" key='echobase.action.configureImport' align="right"/> </fieldset> </s:form> + -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.