Author: tchemit Date: 2012-03-01 23:45:19 +0100 (Thu, 01 Mar 2012) New Revision: 333 Url: http://forge.codelutin.com/repositories/revision/echobase/333 Log: - ne plus configurer le navire pour les imports de donn?\195?\169es - am?\195?\169liration des actions (utilisation de l'attribut key au lieu de label) Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureCatchesData.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureCommonData.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureOperation.java trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureAccousticData.jsp trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureCatchesData.jsp trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureCommonData.jsp trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureOperation.jsp trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureResults.jsp trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/createMission.jsp trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/selectImportType.jsp trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/user/Delete.jsp Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureCatchesData.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureCatchesData.java 2012-03-01 22:41:46 UTC (rev 332) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureCatchesData.java 2012-03-01 22:45:19 UTC (rev 333) @@ -24,7 +24,6 @@ package fr.ifremer.echobase.ui.actions.importData; import fr.ifremer.echobase.entities.data.Voyage; -import fr.ifremer.echobase.entities.references.Vessel; import fr.ifremer.echobase.services.EchoBaseServiceSupport; import fr.ifremer.echobase.services.configurations.CatchesDataImportConfiguration; @@ -44,9 +43,6 @@ /** Universe of existing voyages. */ protected Map<String, String> voyages; - /** Universe of existing vessels. */ - protected Map<String, String> vessels; - public ConfigureCatchesData() { super(CatchesDataImportConfiguration.class); } @@ -65,7 +61,6 @@ newService(EchoBaseServiceSupport.class); voyages = loadSortAndDecorate(service, Voyage.class); - vessels = loadSortAndDecorate(service, Vessel.class); return INPUT; } @@ -74,10 +69,6 @@ return voyages; } - public Map<String, String> getVessels() { - return vessels; - } - public void setTotalSampleFile(File file) { getModel().getTotalSampleFile().setFile(file); } Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureCommonData.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureCommonData.java 2012-03-01 22:41:46 UTC (rev 332) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureCommonData.java 2012-03-01 22:45:19 UTC (rev 333) @@ -27,7 +27,6 @@ import fr.ifremer.echobase.entities.data.Voyage; import fr.ifremer.echobase.entities.references.AreaOfOperation; import fr.ifremer.echobase.entities.references.Mission; -import fr.ifremer.echobase.entities.references.Vessel; import fr.ifremer.echobase.services.EchoBaseServiceSupport; import fr.ifremer.echobase.services.configurations.CommonDataImportConfiguration; import fr.ifremer.echobase.services.configurations.CommonDataImportMode; @@ -54,9 +53,6 @@ /** Universe of existing area of operations. */ protected Map<String, String> areaOfOperations; - /** Universe of existing vessels. */ - protected Map<String, String> vessels; - /** Universe of possible import modes. */ protected Map<String, String> importModes; @@ -80,7 +76,6 @@ missions = loadSortAndDecorate(service, Mission.class); voyages = loadSortAndDecorate(service, Voyage.class); areaOfOperations = loadSortAndDecorate(service, AreaOfOperation.class); - vessels = loadSortAndDecorate(service, Vessel.class); importModes = decorateEnums(CommonDataImportMode.values()); if (getModel().getImportMode() == null) { @@ -115,10 +110,6 @@ return areaOfOperations; } - public Map<String, String> getVessels() { - return vessels; - } - public Map<String, String> getImportModes() { return importModes; } Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureOperation.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureOperation.java 2012-03-01 22:41:46 UTC (rev 332) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureOperation.java 2012-03-01 22:45:19 UTC (rev 333) @@ -24,7 +24,6 @@ package fr.ifremer.echobase.ui.actions.importData; import fr.ifremer.echobase.entities.data.Voyage; -import fr.ifremer.echobase.entities.references.Vessel; import fr.ifremer.echobase.services.EchoBaseServiceSupport; import fr.ifremer.echobase.services.configurations.OperationImportConfiguration; @@ -44,9 +43,6 @@ /** Universe of existing voyages. */ protected Map<String, String> voyages; - /** Universe of existing vessels. */ - protected Map<String, String> vessels; - public ConfigureOperation() { super(OperationImportConfiguration.class); } @@ -65,7 +61,6 @@ newService(EchoBaseServiceSupport.class); voyages = loadSortAndDecorate(service, Voyage.class); - vessels = loadSortAndDecorate(service, Vessel.class); return INPUT; } @@ -73,10 +68,6 @@ return voyages; } - public Map<String, String> getVessels() { - return vessels; - } - public void setOperationFile(File file) { getModel().getOperationFile().setFile(file); } Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureAccousticData.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureAccousticData.jsp 2012-03-01 22:41:46 UTC (rev 332) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureAccousticData.jsp 2012-03-01 22:45:19 UTC (rev 333) @@ -122,8 +122,7 @@ </fieldset> <br/> - <s:submit action="configureAccousticData" - value='%{getText("echobase.action.import")}'/> + <s:submit action="configureAccousticData" key='echobase.action.import'/> </s:form> Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureCatchesData.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureCatchesData.jsp 2012-03-01 22:41:46 UTC (rev 332) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureCatchesData.jsp 2012-03-01 22:45:19 UTC (rev 333) @@ -34,13 +34,7 @@ <script type="text/javascript"> jQuery(document).ready(function () { - $.autoSelectVoyageAndVessel( - $('[name="model.voyageId"]'), - $('[name="model.vesselId"]'), - '<s:url action="getVesselsForVoyage" namespace="/importData"/>', - '<s:property value="model.voyageId"/>', - '<s:property value="model.vesselId"/>' - ); + }); </script> @@ -55,9 +49,6 @@ label='%{getText("echobase.common.voyage")}' list="voyages" headerKey="" headerValue=""/> - <sj:select key="model.vesselId" required="true" - label='%{getText("echobase.common.vessel")}'/> - <s:file key="totalSampleFile" required="true" label='%{getText("echobase.common.totalSampleFile")}'/> @@ -69,8 +60,7 @@ </fieldset> <br/> - <s:submit action="configureCatchesData" - value='%{getText("echobase.action.import")}'/> + <s:submit action="configureCatchesData" key='echobase.action.import'/> </s:form> \ No newline at end of file Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureCommonData.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureCommonData.jsp 2012-03-01 22:41:46 UTC (rev 332) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureCommonData.jsp 2012-03-01 22:45:19 UTC (rev 333) @@ -35,7 +35,7 @@ $('[name="model.importMode"]').change(function (event) { $('[class~="importMode"]').hide(); $('#' + this.value).show(); - $('#' + this.value+' .errorMessage').hide(); + $('#' + this.value + ' .errorMessage').hide(); }); var incomingVal = $('[name="model.importMode"][checked="checked"]').val(); @@ -44,7 +44,8 @@ }); </script> -<s:radio id='mode' key='model.importMode' list="importModes" cssClass="cleanBoth" +<s:radio id='mode' key='model.importMode' list="importModes" + cssClass="cleanBoth" label='%{getText("echobase.common.importMode")}' required="true" template="myradiomap"/> @@ -71,10 +72,6 @@ label='%{getText("echobase.common.areaOfOperation")}' list="areaOfOperations" headerKey="" headerValue=""/> - <s:select key="model.vesselId" required="true" - label='%{getText("echobase.common.vessel")}' - list="vessels" headerKey="" headerValue=""/> - <s:textfield key="model.voyageDescription" size="40" required="true" label='%{getText("echobase.common.voyageDescription")}'/> @@ -110,8 +107,7 @@ <s:text name="echobase.information.create.mission"/> </s:a> <br/> - <s:submit action="ConfigureCommonData-modeAll" - value='%{getText("echobase.action.import")}'/> + <s:submit action="ConfigureCommonData-modeAll" key='echobase.action.import'/> </s:form> @@ -131,10 +127,6 @@ label='%{getText("echobase.common.voyage")}' list="voyages" headerKey="" headerValue=""/> - <s:select key="model.vesselId" required="true" - label='%{getText("echobase.common.vessel")}' - list="vessels" headerKey="" headerValue=""/> - <s:textfield key="model.datum" size="40" required="true" label='%{getText("echobase.common.datum")}'/> @@ -155,7 +147,7 @@ <br/> <s:submit action="ConfigureCommonData-modeTransect" - value='%{getText("echobase.action.import")}'/> + key='echobase.action.import'/> </s:form> \ No newline at end of file Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureOperation.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureOperation.jsp 2012-03-01 22:41:46 UTC (rev 332) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureOperation.jsp 2012-03-01 22:45:19 UTC (rev 333) @@ -31,19 +31,6 @@ Configuration <s:text name="echobase.common.importDataMode.operation"/> </title> -<script type="text/javascript"> - - jQuery(document).ready(function () { - $.autoSelectVoyageAndVessel( - $('[name="model.voyageId"]'), - $('[name="model.vesselId"]'), - '<s:url action="getVesselsForVoyage" namespace="/importData"/>', - '<s:property value="model.voyageId"/>', - '<s:property value="model.vesselId"/>' - ); - }); -</script> - <s:form namespace="/importData" method="POST" enctype="multipart/form-data"> <fieldset> @@ -56,9 +43,6 @@ label='%{getText("echobase.common.voyage")}' list="voyages" headerKey="" headerValue=""/> - <sj:select key="model.vesselId" required="true" - label='%{getText("echobase.common.vessel")}'/> - <s:file key="operationFile" required="true" label='%{getText("echobase.common.operationFile")}'/> @@ -71,8 +55,6 @@ </fieldset> <br/> - <s:submit action="configureOperation" - value='%{getText("echobase.action.import")}'/> + <s:submit action="configureOperation" key='echobase.action.import'/> - </s:form> \ No newline at end of file Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureResults.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureResults.jsp 2012-03-01 22:41:46 UTC (rev 332) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureResults.jsp 2012-03-01 22:45:19 UTC (rev 333) @@ -37,7 +37,7 @@ $('[name="model.importMode"]').change(function (event) { $('[class~="importMode"]').hide(); $('#' + this.value).show(); - $('#' + this.value+' .errorMessage').hide(); + $('#' + this.value + ' .errorMessage').hide(); }); var incomingVal = $('[name="model.importMode"][checked="checked"]').val(); @@ -50,11 +50,11 @@ '<s:property value="model.voyageId"/>', '<s:property value="model.vesselId"/>' ); - }); </script> -<s:radio id='mode' key='model.importMode' list="importModes" cssClass="cleanBoth" +<s:radio id='mode' key='model.importMode' list="importModes" + cssClass="cleanBoth" label='%{getText("echobase.common.importMode")}' required="true" template="myradiomap"/> @@ -84,8 +84,7 @@ </fieldset> <br/> - <s:submit action="ConfigureResults-modeVoyage" - value='%{getText("echobase.action.import")}'/> + <s:submit action="ConfigureResults-modeVoyage" key='echobase.action.import'/> </s:form> @@ -112,8 +111,7 @@ </fieldset> <br/> - <s:submit action="ConfigureResults-modeRegion" - value='%{getText("echobase.action.import")}'/> + <s:submit action="ConfigureResults-modeRegion" key='echobase.action.import'/> </s:form> @@ -144,6 +142,6 @@ <br/> <s:submit action="ConfigureResults-modeAcoustic" - value='%{getText("echobase.action.import")}'/> + key='echobase.action.import'/> </s:form> \ No newline at end of file Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/createMission.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/createMission.jsp 2012-03-01 22:41:46 UTC (rev 332) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/createMission.jsp 2012-03-01 22:45:19 UTC (rev 333) @@ -89,7 +89,6 @@ <br/> - <s:submit action="createMission" - value='%{getText("echobase.action.createMission")}'/> + <s:submit action="createMission" key='echobase.action.createMission'/> </s:form> \ No newline at end of file Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/selectImportType.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/selectImportType.jsp 2012-03-01 22:41:46 UTC (rev 332) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/selectImportType.jsp 2012-03-01 22:45:19 UTC (rev 333) @@ -39,8 +39,7 @@ $('[name="mode"]').change(function (event) { updateMode(this.value); }); - var val = $('[name="mode"][checked="checked"]').val(); - updateMode(val); + updateMode($('[name="mode"][checked="checked"]').val()); }); </script> @@ -57,8 +56,7 @@ </fieldset> <br/> - <s:submit action="selectImportType" - value='%{getText("echobase.action.import")}'/> + <s:submit action="selectImportType" key='echobase.action.configureImport'/> </s:form> \ No newline at end of file Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/user/Delete.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/user/Delete.jsp 2012-03-01 22:41:46 UTC (rev 332) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/user/Delete.jsp 2012-03-01 22:45:19 UTC (rev 333) @@ -32,7 +32,7 @@ <legend> <s:text name="echobase.common.user"/> </legend> - <s:hidden name="user.topiaId" label=""/> + <s:hidden key="user.topiaId" label=""/> <s:textfield key="user.email" label="%{getText('echobase.common.email')}" size="40" disabled="true"/> <s:checkbox value="%{user.admin}" key="echobase.common.admin"