This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository echobase. See http://git.codelutin.com/echobase.git commit 1751642b7204687aa4b151a28508d6a71e54461c Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Jan 12 20:23:35 2016 +0100 Amélioration de la validation du formulaire d'import common --- .../actions/importData/ConfigureCommonImport.java | 84 +++++++++++++++++++--- ...onImport-configureCommon-modeAll-validation.xml | 28 ++++---- ...ort-configureCommon-modeTransect-validation.xml | 14 ++-- ...port-configureCommon-modeTransit-validation.xml | 8 +-- ...mport-configureCommon-modeVoyage-validation.xml | 14 ++-- .../jsp/importData/configureCommonImport.jsp | 67 ++++++++--------- 6 files changed, 141 insertions(+), 74 deletions(-) diff --git a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureCommonImport.java b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureCommonImport.java index e71fb82..a96e7d7 100644 --- a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureCommonImport.java +++ b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureCommonImport.java @@ -26,6 +26,8 @@ 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.services.service.importdata.CommonImportConfiguration; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import java.io.File; import java.util.Map; @@ -40,6 +42,9 @@ public class ConfigureCommonImport extends AbstractConfigureImport<CommonImportC private static final long serialVersionUID = 1L; + /** Logger. */ + private static final Log log = LogFactory.getLog(ConfigureCommonImport.class); + /** Universe of existing missions. */ protected Map<String, String> missions; @@ -114,39 +119,100 @@ public class ConfigureCommonImport extends AbstractConfigureImport<CommonImportC return importTypes; } - public void setVoyageFile(File file) { + // mode Voyage + + public CommonImportConfiguration getModelVoyage() { + return getModel(); + } + + public void setModelVoyageVoyageFile(File file) { + getModel().getVoyageFile().setFile(file); + } + + public void setModelVoyageVoyageFileContentType(String contentType) { + getModel().getVoyageFile().setContentType(contentType); + } + + public void setModelVoyageVoyageFileFileName(String fileName) { + getModel().getVoyageFile().setFileName(fileName); + } + + // mode transit + + public CommonImportConfiguration getModelTransit() { + return getModel(); + } + + public void setModelTransitTransitFile(File file) { + getModel().getTransitFile().setFile(file); + } + + public void setModelTransitTransitFileContentType(String contentType) { + getModel().getTransitFile().setContentType(contentType); + } + + public void setModelTransitFileFileName(String fileName) { + getModel().getTransitFile().setFileName(fileName); + } + + // mode transect + + + public CommonImportConfiguration getModelTransect() { + return getModel(); + } + + public void setModelTransectTransectFile(File file) { + getModel().getTransectFile().setFile(file); + } + + public void setModelTransectTransectFileContentType(String contentType) { + getModel().getTransectFile().setContentType(contentType); + } + + public void setModelTransectTransectFileFileName(String fileName) { + getModel().getTransectFile().setFileName(fileName); + } + + // mode All + + public CommonImportConfiguration getModelAll() { + return getModel(); + } + + public void setModelAllVoyageFile(File file) { getModel().getVoyageFile().setFile(file); } - public void setVoyageFileContentType(String contentType) { + public void setModelAllVoyageFileContentType(String contentType) { getModel().getVoyageFile().setContentType(contentType); } - public void setVoyageFileFileName(String fileName) { + public void setModelAllVoyageFileFileName(String fileName) { getModel().getVoyageFile().setFileName(fileName); } - public void setTransitFile(File file) { + public void setModelAllTransitFile(File file) { getModel().getTransitFile().setFile(file); } - public void setTransitFileContentType(String contentType) { + public void setModelAllTransitFileContentType(String contentType) { getModel().getTransitFile().setContentType(contentType); } - public void setTransitFileFileName(String fileName) { + public void setModelAllTransitFileFileName(String fileName) { getModel().getTransitFile().setFileName(fileName); } - public void setTransectFile(File file) { + public void setModelAllTransectFile(File file) { getModel().getTransectFile().setFile(file); } - public void setTransectFileContentType(String contentType) { + public void setModelAllTransectFileContentType(String contentType) { getModel().getTransectFile().setContentType(contentType); } - public void setTransectFileFileName(String fileName) { + public void setModelAllTransectFileFileName(String fileName) { getModel().getTransectFile().setFileName(fileName); } diff --git a/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureCommonImport-configureCommon-modeAll-validation.xml b/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureCommonImport-configureCommon-modeAll-validation.xml index b387175..b9d3cc1 100644 --- a/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureCommonImport-configureCommon-modeAll-validation.xml +++ b/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureCommonImport-configureCommon-modeAll-validation.xml @@ -20,72 +20,72 @@ "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> <validators> - <field name="model.missionId"> + <field name="modelAll.missionId"> <field-validator type="nrequiredstring"> <message key="echobase.error.import.mission.required"/> </field-validator> </field> - <field name="model.areaOfOperationId"> + <field name="modelAll.areaOfOperationId"> <field-validator type="nrequiredstring"> <message key="echobase.error.import.areaOfOperation.required"/> </field-validator> </field> - <field name="model.voyageDescription"> + <field name="modelAll.voyageDescription"> <field-validator type="nrequiredstring"> <message key="echobase.error.import.voyageDescription.required"/> </field-validator> </field> - <field name="model.transitRelatedActivity"> + <field name="modelAll.transitRelatedActivity"> <field-validator type="nrequiredstring"> <message key="echobase.error.import.transitRelatedActivity.required"/> </field-validator> </field> - <field name="model.transectLicence"> + <field name="modelAll.transectLicence"> <field-validator type="nrequiredstring"> <message key="echobase.error.import.transectLicence.required"/> </field-validator> </field> - <field name="model.transectGeospatialVerticalPositive"> + <field name="modelAll.transectGeospatialVerticalPositive"> <field-validator type="nrequiredstring"> <message key="echobase.error.import.transectGeospatialVerticalPositive.required"/> </field-validator> </field> - <field name="model.transectBinUnitsPingAxis"> + <field name="modelAll.transectBinUnitsPingAxis"> <field-validator type="nrequiredstring"> <message key="echobase.error.import.transectBinUnitsPingAxis.required"/> </field-validator> </field> - <field name="model.datum"> + <field name="modelAll.datum"> <field-validator type="nrequiredstring"> <message key="echobase.error.import.datum.required"/> </field-validator> </field> - <field name="voyageFile"> + <field name="modelAllVoyageFile"> <field-validator type="nfieldexpression"> - <param name="expression">model.voyageFile.file!=null</param> + <param name="expression">modelAll.voyageFile.file != null</param> <message key="echobase.error.import.voyageFile.required"/> </field-validator> </field> - <field name="transitFile"> + <field name="modelAllTransitFile"> <field-validator type="nfieldexpression"> - <param name="expression">model.transitFile.file!=null</param> + <param name="expression">modelAll.transitFile.file != null</param> <message key="echobase.error.import.transitFile.required"/> </field-validator> </field> - <field name="transectFile"> + <field name="modelAllTransectFile"> <field-validator type="nfieldexpression"> - <param name="expression">model.transectFile.file!=null</param> + <param name="expression">modelAll.transectFile.file != null</param> <message key="echobase.error.import.transectFile.required"/> </field-validator> </field> diff --git a/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureCommonImport-configureCommon-modeTransect-validation.xml b/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureCommonImport-configureCommon-modeTransect-validation.xml index b34052a..0e7e89b 100644 --- a/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureCommonImport-configureCommon-modeTransect-validation.xml +++ b/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureCommonImport-configureCommon-modeTransect-validation.xml @@ -20,40 +20,40 @@ "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> <validators> - <field name="model.voyageId"> + <field name="modelTransect.voyageId"> <field-validator type="nrequiredstring"> <message key="echobase.error.import.voyage.required"/> </field-validator> </field> - <field name="model.transectLicence"> + <field name="modelTransect.transectLicence"> <field-validator type="nrequiredstring"> <message key="echobase.error.import.transectLicence.required"/> </field-validator> </field> - <field name="model.transectGeospatialVerticalPositive"> + <field name="modelTransect.transectGeospatialVerticalPositive"> <field-validator type="nrequiredstring"> <message key="echobase.error.import.transectGeospatialVerticalPositive.required"/> </field-validator> </field> - <field name="model.transectBinUnitsPingAxis"> + <field name="modelTransect.transectBinUnitsPingAxis"> <field-validator type="nrequiredstring"> <message key="echobase.error.import.transectBinUnitsPingAxis.required"/> </field-validator> </field> - <field name="model.datum"> + <field name="modelTransect.datum"> <field-validator type="nrequiredstring"> <message key="echobase.error.import.datum.required"/> </field-validator> </field> - <field name="transectFile"> + <field name="modelTransectTransectFile"> <field-validator type="nfieldexpression"> - <param name="expression">model.transectFile.file!=null</param> + <param name="expression">modelTransect.transectFile.file != null</param> <message key="echobase.error.import.transectFile.required"/> </field-validator> </field> diff --git a/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureCommonImport-configureCommon-modeTransit-validation.xml b/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureCommonImport-configureCommon-modeTransit-validation.xml index 1abdbcd..d765d89 100644 --- a/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureCommonImport-configureCommon-modeTransit-validation.xml +++ b/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureCommonImport-configureCommon-modeTransit-validation.xml @@ -20,21 +20,21 @@ "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> <validators> - <field name="model.voyageId"> + <field name="modelTransit.voyageId"> <field-validator type="nrequiredstring"> <message key="echobase.error.import.voyage.required"/> </field-validator> </field> - <field name="model.transitRelatedActivity"> + <field name="modelTransit.transitRelatedActivity"> <field-validator type="nrequiredstring"> <message key="echobase.error.import.transitRelatedActivity.required"/> </field-validator> </field> - <field name="transitFile"> + <field name="modelTransitTransitFile"> <field-validator type="nfieldexpression"> - <param name="expression">model.transitFile.file!=null</param> + <param name="expression">modelTransit.transitFile.file != null</param> <message key="echobase.error.import.transitFile.required"/> </field-validator> </field> diff --git a/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureCommonImport-configureCommon-modeVoyage-validation.xml b/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureCommonImport-configureCommon-modeVoyage-validation.xml index 82e890d..826d615 100644 --- a/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureCommonImport-configureCommon-modeVoyage-validation.xml +++ b/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureCommonImport-configureCommon-modeVoyage-validation.xml @@ -17,36 +17,36 @@ #L% --> <!DOCTYPE validators PUBLIC "-//Apache Struts//XWork Validator 1.0.3//EN" - "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> <validators> - <field name="model.missionId"> + <field name="modelVoyage.missionId"> <field-validator type="nrequiredstring"> <message key="echobase.error.import.mission.required"/> </field-validator> </field> - <field name="model.areaOfOperationId"> + <field name="modelVoyage.areaOfOperationId"> <field-validator type="nrequiredstring"> <message key="echobase.error.import.areaOfOperation.required"/> </field-validator> </field> - <field name="model.voyageDescription"> + <field name="modelVoyage.voyageDescription"> <field-validator type="nrequiredstring"> <message key="echobase.error.import.voyageDescription.required"/> </field-validator> </field> - <field name="model.datum"> + <field name="modelVoyage.datum"> <field-validator type="nrequiredstring"> <message key="echobase.error.import.datum.required"/> </field-validator> </field> - <field name="voyageFile"> + <field name="modelVoyageVoyageFile"> <field-validator type="nfieldexpression"> - <param name="expression">model.voyageFile.file!=null</param> + <param name="expression">modelVoyage.voyageFile.file != null</param> <message key="echobase.error.import.voyageFile.required"/> </field-validator> </field> diff --git a/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureCommonImport.jsp b/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureCommonImport.jsp index 77fcdfd..647fae7 100644 --- a/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureCommonImport.jsp +++ b/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureCommonImport.jsp @@ -38,6 +38,7 @@ var incomingVal = $('[name="model.importType"][checked="checked"]').val(); $('#' + incomingVal).show(); + $.addCheckFileSize(<s:property value="uploadFileMaxLength"/>); }); </script> @@ -64,46 +65,46 @@ </div> <br/> - <s:select key="model.missionId" requiredLabel="true" + <s:select key="modelAll.missionId" requiredLabel="true" label='%{getText("echobase.common.mission")}' list="missions" headerKey="" headerValue=""/> <br/> - <s:hidden key="model.importType" value="COMMON_ALL" label=''/> + <s:hidden key="modelAll.importType" value="COMMON_ALL" label=''/> - <s:select key="model.areaOfOperationId" requiredLabel="true" + <s:select key="modelAll.areaOfOperationId" requiredLabel="true" label='%{getText("echobase.common.areaOfOperation")}' list="areaOfOperations" headerKey="" headerValue=""/> - <s:textfield key="model.voyageDescription" size="80" requiredLabel="true" + <s:textfield key="modelAll.voyageDescription" size="80" requiredLabel="true" label='%{getText("echobase.common.voyageDescription")}'/> - <s:textfield key="model.datum" size="80" requiredLabel="true" + <s:textfield key="modelAll.datum" size="80" requiredLabel="true" label='%{getText("echobase.common.datum")}'/> - <s:textfield key="model.transitRelatedActivity" size="80" requiredLabel="true" + <s:textfield key="modelAll.transitRelatedActivity" size="80" requiredLabel="true" label='%{getText("echobase.common.transitRelatedActivity")}'/> - <s:textfield key="model.transectLicence" size="80" requiredLabel="true" + <s:textfield key="modelAll.transectLicence" size="80" requiredLabel="true" label='%{getText("echobase.common.transectLicence")}'/> - <s:textfield key="model.transectGeospatialVerticalPositive" size="80" + <s:textfield key="modelAll.transectGeospatialVerticalPositive" size="80" requiredLabel="true" label='%{getText("echobase.common.transectGeospatialVerticalPositive")}'/> - <s:textfield key="model.transectBinUnitsPingAxis" size="80" requiredLabel="true" + <s:textfield key="modelAll.transectBinUnitsPingAxis" size="80" requiredLabel="true" label='%{getText("echobase.common.transectBinUnitsPingAxis")}'/> - <s:file key="voyageFile" requiredLabel="true" + <s:file key="modelAllVoyageFile" requiredLabel="true" label='%{getText("echobase.common.voyageFile")}'/> - <s:file key="transitFile" requiredLabel="true" + <s:file key="modelAllTransitFile" requiredLabel="true" label='%{getText("echobase.common.transitFile")}'/> - <s:file key="transectFile" requiredLabel="true" + <s:file key="modelAllTransectFile" requiredLabel="true" label='%{getText("echobase.common.transectFile")}'/> - <s:textarea key="model.importNotes" cols="80" rows="5" + <s:textarea key="modelAll.importNotes" cols="80" rows="5" label='%{getText("echobase.common.importNotes")}'/> </fieldset> @@ -130,27 +131,27 @@ </div> <br/> - <s:select key="model.missionId" requiredLabel="true" + <s:select key="modelVoyage.missionId" requiredLabel="true" label='%{getText("echobase.common.mission")}' list="missions" headerKey="" headerValue=""/> <br/> - <s:hidden key="model.importType" value="COMMON_VOYAGE" label=''/> + <s:hidden key="modelVoyage.importType" value="COMMON_VOYAGE" label=''/> - <s:select key="model.areaOfOperationId" requiredLabel="true" + <s:select key="modelVoyage.areaOfOperationId" requiredLabel="true" label='%{getText("echobase.common.areaOfOperation")}' list="areaOfOperations" headerKey="" headerValue=""/> - <s:textfield key="model.voyageDescription" size="80" requiredLabel="true" + <s:textfield key="modelVoyage.voyageDescription" size="80" requiredLabel="true" label='%{getText("echobase.common.voyageDescription")}'/> - <s:textfield key="model.datum" size="80" requiredLabel="true" + <s:textfield key="modelVoyage.datum" size="80" requiredLabel="true" label='%{getText("echobase.common.datum")}'/> - <s:file key="voyageFile" requiredLabel="true" + <s:file key="modelVoyageVoyageFile" requiredLabel="true" label='%{getText("echobase.common.voyageFile")}'/> - <s:textarea key="model.importNotes" cols="80" rows="5" + <s:textarea key="modelVoyage.importNotes" cols="80" rows="5" label='%{getText("echobase.common.importNotes")}'/> </fieldset> @@ -177,19 +178,19 @@ </div> <br/> - <s:hidden key="model.importType" value="COMMON_TRANSIT" label=''/> + <s:hidden key="modelTransit.importType" value="COMMON_TRANSIT" label=''/> - <s:select key="model.voyageId" requiredLabel="true" + <s:select key="modelTransit.voyageId" requiredLabel="true" label='%{getText("echobase.common.voyage")}' list="voyages" headerKey="" headerValue=""/> - <s:textfield key="model.transitRelatedActivity" size="80" requiredLabel="true" + <s:textfield key="modelTransit.transitRelatedActivity" size="80" requiredLabel="true" label='%{getText("echobase.common.transitRelatedActivity")}'/> - <s:file key="transitFile" requiredLabel="true" + <s:file key="modelTransitTransitFile" requiredLabel="true" label='%{getText("echobase.common.transitFile")}'/> - <s:textarea key="model.importNotes" cols="80" rows="5" + <s:textarea key="modelTransit.importNotes" cols="80" rows="5" label='%{getText("echobase.common.importNotes")}'/> </fieldset> @@ -209,7 +210,7 @@ <s:text name="echobase.legend.importData.configure"/> </legend> - <s:hidden key="model.importType" value="COMMON_TRANSECT" label=''/> + <s:hidden key="modelTransect.importType" value="COMMON_TRANSECT" label=''/> <div class="cleanBoth help"> <s:a href="%{getDocumentation('importData.html', null)}" target="doc"> @@ -218,27 +219,27 @@ </div> <br/> - <s:select key="model.voyageId" requiredLabel="true" + <s:select key="modelTransect.voyageId" requiredLabel="true" label='%{getText("echobase.common.voyage")}' list="voyages" headerKey="" headerValue=""/> - <s:textfield key="model.datum" size="80" requiredLabel="true" + <s:textfield key="modelTransect.datum" size="80" requiredLabel="true" label='%{getText("echobase.common.datum")}'/> - <s:textfield key="model.transectLicence" size="80" requiredLabel="true" + <s:textfield key="modelTransect.transectLicence" size="80" requiredLabel="true" label='%{getText("echobase.common.transectLicence")}'/> - <s:textfield key="model.transectGeospatialVerticalPositive" size="80" + <s:textfield key="modelTransect.transectGeospatialVerticalPositive" size="80" requiredLabel="true" label='%{getText("echobase.common.transectGeospatialVerticalPositive")}'/> - <s:textfield key="model.transectBinUnitsPingAxis" size="80" requiredLabel="true" + <s:textfield key="modelTransect.transectBinUnitsPingAxis" size="80" requiredLabel="true" label='%{getText("echobase.common.transectBinUnitsPingAxis")}'/> - <s:file key="transectFile" requiredLabel="true" + <s:file key="modelTransectTransectFile" requiredLabel="true" label='%{getText("echobase.common.transectFile")}'/> - <s:textarea key="model.importNotes" cols="80" rows="5" + <s:textarea key="modelTransect.importNotes" cols="80" rows="5" label='%{getText("echobase.common.importNotes")}'/> </fieldset> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.