Author: tchemit Date: 2012-04-06 21:51:27 +0200 (Fri, 06 Apr 2012) New Revision: 507 Url: http://forge.codelutin.com/repositories/revision/echobase/507 Log: refs #1087 (mieux indiquer lorsque les fichiers ne sont pas tous obligatoires, rendre optionnel sur import p?\195?\170che les fichiers) Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/CatchesImportConfiguration.java trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureCatchesImport-validation.xml trunk/echobase-ui/src/main/resources/i18n/echobase-ui_en_GB.properties trunk/echobase-ui/src/main/resources/i18n/echobase-ui_fr_FR.properties trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureCatchesImport.jsp trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureResultsImport.jsp Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/CatchesImportConfiguration.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/CatchesImportConfiguration.java 2012-04-06 19:42:53 UTC (rev 506) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/CatchesImportConfiguration.java 2012-04-06 19:51:27 UTC (rev 507) @@ -80,6 +80,12 @@ return biometrySampleFile; } + public boolean isOneImportFile() { + return totalSampleFile.hasFile() || + subSampleFile.hasFile() || + biometrySampleFile.hasFile(); + } + @Override public InputFile[] getInputFiles() { return new InputFile[]{totalSampleFile, subSampleFile, biometrySampleFile}; Modified: trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureCatchesImport-validation.xml =================================================================== --- trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureCatchesImport-validation.xml 2012-04-06 19:42:53 UTC (rev 506) +++ trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureCatchesImport-validation.xml 2012-04-06 19:51:27 UTC (rev 507) @@ -33,23 +33,9 @@ <field name="totalSampleFile"> <field-validator type="nfieldexpression"> - <param name="expression">model.totalSampleFile.file!=null</param> - <message key="echobase.error.import.totalSampleFile.required"/> + <param name="expression">model.oneImportFile</param> + <message key="echobase.error.import.oneImportFile.required"/> </field-validator> </field> - <field name="subSampleFile"> - <field-validator type="nfieldexpression"> - <param name="expression">model.subSampleFile.file!=null</param> - <message key="echobase.error.import.subSampleFile.required"/> - </field-validator> - </field> - - <field name="biometrySampleFile"> - <field-validator type="nfieldexpression"> - <param name="expression">model.biometrySampleFile.file!=null</param> - <message key="echobase.error.import.biometrySampleFile.required"/> - </field-validator> - </field> - </validators> \ No newline at end of file Modified: trunk/echobase-ui/src/main/resources/i18n/echobase-ui_en_GB.properties =================================================================== --- trunk/echobase-ui/src/main/resources/i18n/echobase-ui_en_GB.properties 2012-04-06 19:42:53 UTC (rev 506) +++ trunk/echobase-ui/src/main/resources/i18n/echobase-ui_en_GB.properties 2012-04-06 19:51:27 UTC (rev 507) @@ -23,6 +23,7 @@ echobase.error.export.sqlQuery.forbidden.insert.word=Export query contains a forbidden word 'INSERT' echobase.error.export.sqlQuery.forbidden.update.word=Export query contains a forbidden word 'UPDATE' echobase.error.import.esduByEchotypeAndSpeciesFile.required=Import file is mandatory +echobase.error.import.oneImportFile.required=At least one import file is mandatory echobase.error.import.esduByEchotypeFile.required=Import file is mandatory echobase.error.import.resultLabel.required=ResultLabel is required echobase.error.invalid.sql=Invalid request \: %s 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-04-06 19:42:53 UTC (rev 506) +++ trunk/echobase-ui/src/main/resources/i18n/echobase-ui_fr_FR.properties 2012-04-06 19:51:27 UTC (rev 507) @@ -25,6 +25,8 @@ echobase.action.newLibreOfficeQuery=Nouvelle requète Libre office echobase.action.newQuery=Nouvelle requète echobase.action.reloadSqlQuery=Recharger +echobase.information.one.file.required=Veuillez renseigner l'un des fichiers à importer + echobase.action.reset=Annuler echobase.action.return=Retour echobase.action.save=Sauvegarder @@ -96,6 +98,7 @@ echobase.error.import.digitThreshold.required=digitThreshold non renseigné echobase.error.import.echosounderSoundSpeed.required=echosounderSoundSpeed non renseigné echobase.error.import.echotypeFile.required=La sélection d'un fichier Echotype est obligatoire +echobase.error.import.oneImportFile.required=La sélection d'un fichier d'import est obligatoire echobase.error.import.esduByEchotypeAndSpeciesCategoryFile.required=La sélection d'un fichier d'import est obligatoire echobase.error.import.esduByEchotypeFile.required=La sélection d'un fichier d'import est obligatoire echobase.error.import.esduBySpeciesAndAgeCategoryFile.required=La sélection d'un fichier d'import est obligatoire Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureCatchesImport.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureCatchesImport.jsp 2012-04-06 19:42:53 UTC (rev 506) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureCatchesImport.jsp 2012-04-06 19:51:27 UTC (rev 507) @@ -49,13 +49,16 @@ label='%{getText("echobase.common.voyage")}' list="voyages" headerKey="" headerValue=""/> - <s:file key="totalSampleFile" required="true" + <s:label key="echobase.information.one.file.required" required="true" + value=''/> + + <s:file key="totalSampleFile" label='%{getText("echobase.common.totalSampleFile")}'/> - <s:file key="subSampleFile" required="true" + <s:file key="subSampleFile" label='%{getText("echobase.common.subSampleFile")}'/> - <s:file key="biometrySampleFile" required="true" + <s:file key="biometrySampleFile" label='%{getText("echobase.common.biometrySampleFile")}'/> <s:textarea key="model.importNotes" cols="80" rows="5" Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureResultsImport.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureResultsImport.jsp 2012-04-06 19:42:53 UTC (rev 506) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureResultsImport.jsp 2012-04-06 19:51:27 UTC (rev 507) @@ -75,13 +75,16 @@ label='%{getText("echobase.common.voyage")}' list="voyages" headerKey="" headerValue=""/> - <s:file key="lengthAgeKeyFile" required="true" + <s:label key="echobase.information.one.file.required" required="true" + value=''/> + + <s:file key="lengthAgeKeyFile" label='%{getText("echobase.common.lengthAgeKeyFile")}'/> - <s:file key="lengthWeightKeyFile" required="true" + <s:file key="lengthWeightKeyFile" label='%{getText("echobase.common.lengthWeightKeyFile")}'/> - <s:file key="echotypeFile" required="true" + <s:file key="echotypeFile" label='%{getText("echobase.common.echotypeFile")}'/> <s:textarea key="model.importNotes" cols="80" rows="5" @@ -112,16 +115,19 @@ <s:textfield key="model.resultLabel" size="40" required="true" label='%{getText("echobase.common.resultLabel")}'/> - <s:file key="esduByEchotypeFile" required="true" + <s:label key="echobase.information.one.file.required" required="true" + value=''/> + + <s:file key="esduByEchotypeFile" label='%{getText("echobase.common.esduByEchotypeFile")}'/> - <s:file key="esduByEchotypeAndSpeciesCategoryFile" required="true" + <s:file key="esduByEchotypeAndSpeciesCategoryFile" label='%{getText("echobase.common.esduByEchotypeAndSpeciesCategoryFile")}'/> - <s:file key="esduBySpeciesAndSizeCategoryFile" required="true" + <s:file key="esduBySpeciesAndSizeCategoryFile" label='%{getText("echobase.common.esduBySpeciesAndSizeCategoryFile")}'/> - <s:file key="esduBySpeciesAndAgeCategoryFile" required="true" + <s:file key="esduBySpeciesAndAgeCategoryFile" label='%{getText("echobase.common.esduBySpeciesAndAgeCategoryFile")}'/> <s:textarea key="model.importNotes" cols="80" rows="5"