Author: tchemit Date: 2012-03-27 22:35:57 +0200 (Tue, 27 Mar 2012) New Revision: 419 Url: http://forge.codelutin.com/repositories/revision/echobase/419 Log: Validation des imports + fix r?\195?\169sultats import Added: trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureResults-ConfigureResults-modeAcousticBySpeciesAndAgeCategory-validation.xml trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureResults-ConfigureResults-modeAcousticBySpeciesAndSizeCategory-validation.xml Modified: trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureAccousticData-validation.xml trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureCommonData-ConfigureCommonData-modeAll-validation.xml trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureResults-ConfigureResults-modeAcousticByEchotype-validation.xml trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureResults-ConfigureResults-modeAcousticByEchotypeAndSpeciesCategory-validation.xml trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureResults-ConfigureResults-modeMap-validation.xml trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureResults-ConfigureResults-modeRegion-validation.xml trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureResults-ConfigureResults-modeVoyage-validation.xml trunk/echobase-ui/src/main/resources/i18n/echobase-ui_fr_FR.properties trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureResults.jsp Modified: trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureAccousticData-validation.xml =================================================================== --- trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureAccousticData-validation.xml 2012-03-27 20:09:43 UTC (rev 418) +++ trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureAccousticData-validation.xml 2012-03-27 20:35:57 UTC (rev 419) @@ -51,19 +51,22 @@ <field name="model.transceiverAcquisitionAbsorptionDescription"> <field-validator type="nrequiredstring"> - <message key="echobase.error.import.transceiverAcquisitionAbsorptionDescription.required"/> + <message + key="echobase.error.import.transceiverAcquisitionAbsorptionDescription.required"/> </field-validator> </field> <field name="model.acquisitionSoftwareVersionER60"> <field-validator type="nrequiredstring"> - <message key="echobase.error.import.acquisitionSoftwareVersionER60.required"/> + <message + key="echobase.error.import.acquisitionSoftwareVersionER60.required"/> </field-validator> </field> <field name="model.acquisitionSoftwareVersionME70"> <field-validator type="nrequiredstring"> - <message key="echobase.error.import.acquisitionSoftwareVersionME70.required"/> + <message + key="echobase.error.import.acquisitionSoftwareVersionME70.required"/> </field-validator> </field> Modified: trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureCommonData-ConfigureCommonData-modeAll-validation.xml =================================================================== --- trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureCommonData-ConfigureCommonData-modeAll-validation.xml 2012-03-27 20:09:43 UTC (rev 418) +++ trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureCommonData-ConfigureCommonData-modeAll-validation.xml 2012-03-27 20:35:57 UTC (rev 419) @@ -63,7 +63,8 @@ <field name="model.transectGeospatialVerticalPositive"> <field-validator type="nrequiredstring"> - <message key="echobase.error.import.transectGeospatialVerticalPositive.required"/> + <message + key="echobase.error.import.transectGeospatialVerticalPositive.required"/> </field-validator> </field> Modified: trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureResults-ConfigureResults-modeAcousticByEchotype-validation.xml =================================================================== --- trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureResults-ConfigureResults-modeAcousticByEchotype-validation.xml 2012-03-27 20:09:43 UTC (rev 418) +++ trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureResults-ConfigureResults-modeAcousticByEchotype-validation.xml 2012-03-27 20:35:57 UTC (rev 419) @@ -31,7 +31,7 @@ </field-validator> </field> - <field name="resultLabel"> + <field name="model.resultLabel"> <field-validator type="nrequiredstring"> <message key="echobase.error.import.resultLabel.required"/> </field-validator> Modified: trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureResults-ConfigureResults-modeAcousticByEchotypeAndSpeciesCategory-validation.xml =================================================================== --- trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureResults-ConfigureResults-modeAcousticByEchotypeAndSpeciesCategory-validation.xml 2012-03-27 20:09:43 UTC (rev 418) +++ trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureResults-ConfigureResults-modeAcousticByEchotypeAndSpeciesCategory-validation.xml 2012-03-27 20:35:57 UTC (rev 419) @@ -31,7 +31,7 @@ </field-validator> </field> - <field name="resultLabel"> + <field name="model.resultLabel"> <field-validator type="nrequiredstring"> <message key="echobase.error.import.resultLabel.required"/> </field-validator> @@ -39,8 +39,11 @@ <field name="acousticByEchotypeAndSpeciesCategoryFile"> <field-validator type="nfieldexpression"> - <param name="expression">model.acousticByEchotypeAndSpeciesCategoryFile.file!=null</param> - <message key="echobase.error.import.acousticByEchotypeAndSpeciesCategoryFile.required"/> + <param name="expression"> + model.acousticByEchotypeAndSpeciesCategoryFile.file!=null + </param> + <message + key="echobase.error.import.acousticByEchotypeAndSpeciesCategoryFile.required"/> </field-validator> </field> Added: trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureResults-ConfigureResults-modeAcousticBySpeciesAndAgeCategory-validation.xml =================================================================== --- trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureResults-ConfigureResults-modeAcousticBySpeciesAndAgeCategory-validation.xml (rev 0) +++ trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureResults-ConfigureResults-modeAcousticBySpeciesAndAgeCategory-validation.xml 2012-03-27 20:35:57 UTC (rev 419) @@ -0,0 +1,50 @@ +<!-- + #%L + EchoBase :: UI + + $Id$ + $HeadURL$ + %% + 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% + --> +<!DOCTYPE validators PUBLIC "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://www.opensymphony.com/xwork/xwork-validator-1.0.3.dtd"> +<validators> + + <field name="model.voyageId"> + <field-validator type="nrequiredstring"> + <message key="echobase.error.import.voyage.required"/> + </field-validator> + </field> + + <field name="model.resultLabel"> + <field-validator type="nrequiredstring"> + <message key="echobase.error.import.resultLabel.required"/> + </field-validator> + </field> + + <field name="acousticBySpeciesAndAgeCategoryFile"> + <field-validator type="nfieldexpression"> + <param name="expression"> + model.acousticBySpeciesAndAgeCategoryFile.file!=null + </param> + <message + key="echobase.error.import.acousticBySpeciesAndAgeCategoryFile.required"/> + </field-validator> + </field> + +</validators> \ No newline at end of file Property changes on: trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureResults-ConfigureResults-modeAcousticBySpeciesAndAgeCategory-validation.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureResults-ConfigureResults-modeAcousticBySpeciesAndSizeCategory-validation.xml =================================================================== --- trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureResults-ConfigureResults-modeAcousticBySpeciesAndSizeCategory-validation.xml (rev 0) +++ trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureResults-ConfigureResults-modeAcousticBySpeciesAndSizeCategory-validation.xml 2012-03-27 20:35:57 UTC (rev 419) @@ -0,0 +1,50 @@ +<!-- + #%L + EchoBase :: UI + + $Id$ + $HeadURL$ + %% + 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% + --> +<!DOCTYPE validators PUBLIC "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://www.opensymphony.com/xwork/xwork-validator-1.0.3.dtd"> +<validators> + + <field name="model.voyageId"> + <field-validator type="nrequiredstring"> + <message key="echobase.error.import.voyage.required"/> + </field-validator> + </field> + + <field name="model.resultLabel"> + <field-validator type="nrequiredstring"> + <message key="echobase.error.import.resultLabel.required"/> + </field-validator> + </field> + + <field name="acousticBySpeciesAndSizeCategoryFile"> + <field-validator type="nfieldexpression"> + <param name="expression"> + model.acousticBySpeciesAndSizeCategoryFile.file!=null + </param> + <message + key="echobase.error.import.acousticBySpeciesAndSizeCategoryFile.required"/> + </field-validator> + </field> + +</validators> \ No newline at end of file Property changes on: trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureResults-ConfigureResults-modeAcousticBySpeciesAndSizeCategory-validation.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureResults-ConfigureResults-modeMap-validation.xml =================================================================== --- trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureResults-ConfigureResults-modeMap-validation.xml 2012-03-27 20:09:43 UTC (rev 418) +++ trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureResults-ConfigureResults-modeMap-validation.xml 2012-03-27 20:35:57 UTC (rev 419) @@ -31,7 +31,7 @@ </field-validator> </field> - <field name="resultLabel"> + <field name="model.resultLabel"> <field-validator type="nrequiredstring"> <message key="echobase.error.import.resultLabel.required"/> </field-validator> Modified: trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureResults-ConfigureResults-modeRegion-validation.xml =================================================================== --- trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureResults-ConfigureResults-modeRegion-validation.xml 2012-03-27 20:09:43 UTC (rev 418) +++ trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureResults-ConfigureResults-modeRegion-validation.xml 2012-03-27 20:35:57 UTC (rev 419) @@ -31,7 +31,7 @@ </field-validator> </field> - <field name="resultLabel"> + <field name="model.resultLabel"> <field-validator type="nrequiredstring"> <message key="echobase.error.import.resultLabel.required"/> </field-validator> Modified: trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureResults-ConfigureResults-modeVoyage-validation.xml =================================================================== --- trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureResults-ConfigureResults-modeVoyage-validation.xml 2012-03-27 20:09:43 UTC (rev 418) +++ trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureResults-ConfigureResults-modeVoyage-validation.xml 2012-03-27 20:35:57 UTC (rev 419) @@ -34,7 +34,8 @@ <field name="lengthAgeKeyFile"> <field-validator type="nfieldexpression"> <param name="expression">model.lengthAgeKeyFile.file!=null || - model.lengthWeightKeyFile.file!=null || model.echotypeFile.file!=null </param> + model.lengthWeightKeyFile.file!=null || model.echotypeFile.file!=null + </param> <message key="echobase.error.import.resultImportFile.required"/> </field-validator> </field> Modified: trunk/echobase-ui/src/main/resources/i18n/echobase-ui_fr_FR.properties =================================================================== --- trunk/echobase-ui/src/main/resources/i18n/echobase-ui_fr_FR.properties 2012-03-27 20:09:43 UTC (rev 418) +++ trunk/echobase-ui/src/main/resources/i18n/echobase-ui_fr_FR.properties 2012-03-27 20:35:57 UTC (rev 419) @@ -85,6 +85,8 @@ echobase.error.export.sqlQuery.wrongformat=La requêtes n'est pas valide echobase.error.import.acousticByEchotypeAndSpeciesCategoryFile.required=La sélection d'un fichier d'import est obligatoire echobase.error.import.acousticByEchotypeFile.required=La sélection d'un fichier d'import est obligatoire +echobase.error.import.acousticBySpeciesAndAgeCategoryFile.required=La sélection d'un fichier d'import est obligatoire +echobase.error.import.acousticBySpeciesAndSizeCategoryFile.required=La sélection d'un fichier d'import est obligatoire echobase.error.import.acousticDensityUnit.required=acousticDensityUnit non renseigné echobase.error.import.acquisitionSoftwareVersionER60.required=acquisitionSoftwareVersionER60 non renseigné echobase.error.import.acquisitionSoftwareVersionME70.required=acquisitionSoftwareVersionME70 non renseigné @@ -100,7 +102,7 @@ echobase.error.import.lengthWeightKeyFile.required=La sélection d'un fichier lengthWeightKey est obligatoire echobase.error.import.loggedDataDatatype.required=loggedDataDatatype non renseigné echobase.error.import.loggedDataFormat.required=loggedDataFormat non renseigné -echobase.error.import.mapResultFile.required=La sélection d'un fichier de résultat de Carte est obligatoire +echobase.error.import.mapResultFile.required=La sélection d'un fichier de résultats de Carte est obligatoire echobase.error.import.mapsFile.required=La sélection d'un fichier Carte est obligatoire echobase.error.import.mission.required=La sélection d'une mission est obligatoire echobase.error.import.missionAbstract.required=Le résumé de la mission est obligatoire @@ -113,9 +115,9 @@ echobase.error.import.processingDescription.required=processingDescription non renseigné echobase.error.import.processingTemplate.required=processingTemplate non renseigné echobase.error.import.regionAssociationFile.required=La sélection d'un fichier d'association de Région est obligatoire -echobase.error.import.regionResultFile.required=La sélection d'un fichier de résultat de Région est obligatoire +echobase.error.import.regionResultFile.required=La sélection d'un fichier de résultats de Région est obligatoire echobase.error.import.regionsFile.required=La sélection d'un fichier Region est obligatoire -echobase.error.import.resultImportFile.required=Veuillez donner au moins un fichier à importer +echobase.error.import.resultImportFile.required=Veuillez sélectionner au moins un fichier à importer echobase.error.import.resultLabel.required=Le champs ResultLabel est obligatoire echobase.error.import.soundSpeedCalculationsER60.required=soundSpeedCalculationsER60 non renseigné echobase.error.import.soundSpeedCalculationsME70.required=soundSpeedCalculationsME70 non renseigné 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-27 20:09:43 UTC (rev 418) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureResults.jsp 2012-03-27 20:35:57 UTC (rev 419) @@ -87,7 +87,7 @@ <s:text name="echobase.legend.importData.configure"/> </legend> - <s:hidden key="model.importMode" value="ACOUSTIC" label=''/> + <s:hidden key="model.importMode" value="ACOUSTIC_BY_ECHOTYPE" label=''/> <s:select key="model.voyageId" required="true" label='%{getText("echobase.common.voyage")}' @@ -113,7 +113,8 @@ <s:text name="echobase.legend.importData.configure"/> </legend> - <s:hidden key="model.importMode" value="ACOUSTIC" label=''/> + <s:hidden key="model.importMode" + value="ACOUSTIC_BY_ECHOTYPE_AND_SPECIES_CATEGORY" label=''/> <s:select key="model.voyageId" required="true" label='%{getText("echobase.common.voyage")}' @@ -139,7 +140,8 @@ <s:text name="echobase.legend.importData.configure"/> </legend> - <s:hidden key="model.importMode" value="ACOUSTIC" label=''/> + <s:hidden key="model.importMode" + value="ACOUSTIC_BY_SPECIES_AND_SIZE_CATEGORY" label=''/> <s:select key="model.voyageId" required="true" label='%{getText("echobase.common.voyage")}' @@ -165,7 +167,8 @@ <s:text name="echobase.legend.importData.configure"/> </legend> - <s:hidden key="model.importMode" value="ACOUSTIC" label=''/> + <s:hidden key="model.importMode" + value="ACOUSTIC_BY_SPECIES_AND_AGE_CATEGORY" label=''/> <s:select key="model.voyageId" required="true" label='%{getText("echobase.common.voyage")}'