[Echobase-commits] r284 - in trunk: echobase-tools/src/test/resources/csv/new echobase-ui/src/main/java/fr/ifremer/echobase/ui echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData echobase-ui/src/main/resources/config echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData echobase-ui/src/main/resources/i18n echobase-ui/src/main/webapp/WEB-INF/includes echobase-ui/src/main/webapp/WEB-INF/jsp echobase-ui/src/main/webapp/WEB-INF/jsp/dbeditor echobase-ui/src/main/webapp/WEB-INF/

Author: tchemit Date: 2012-01-15 22:33:13 +0100 (Sun, 15 Jan 2012) New Revision: 284 Url: http://forge.codelutin.com/repositories/revision/echobase/284 Log: add import data configuration + clean jsp and i18n (to send it to Aurelie) Added: 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/ConfigureAccousticRegionData-validation.xml trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureCatchesData-validation.xml trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureCatchesIndividualData-validation.xml trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureCatchesReference-validation.xml trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureCommonDataComplete-validation.xml trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureCommonDataFromTransect-validation.xml trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/progressAccousticData.jsp trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/progressAccousticRegionData.jsp trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/progressCatchesData.jsp trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/progressCatchesIndividualData.jsp trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/progressCatchesReference.jsp trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/progressCommonDataComplete.jsp trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/progressCommonDataFromTransect.jsp Removed: trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureFiles-validation.xml trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureFiles.jsp trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureMission.jsp trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/progress.jsp trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/result.jsp Modified: trunk/echobase-tools/src/test/resources/csv/new/input-TSParameters.csv trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/EchoBaseApplicationListener.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureCommonDataCompleteImport.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureCommonDataFromTransectImport.java trunk/echobase-ui/src/main/resources/config/struts-importData.xml trunk/echobase-ui/src/main/resources/i18n/echobase-ui_fr_FR.properties trunk/echobase-ui/src/main/webapp/WEB-INF/includes/header.jsp trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/connectToDbInformations.jsp trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/dbeditor/dbeditor.jsp trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/exportQuery/exportQuery.jsp trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/exportQuery/exportQueryResult.jsp trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/home.jsp trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureAccousticData.jsp trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureAccousticRegionData.jsp trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureCatchesData.jsp trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureCatchesIndividualData.jsp trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureCatchesReference.jsp trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureCommonDataComplete.jsp trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureCommonDataFromTransect.jsp trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/selectImportType.jsp trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/modificationLogs.jsp trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/user/Create.jsp trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/user/Delete.jsp trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/user/Update.jsp trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/user/userList.jsp Property changes on: trunk/echobase-tools/src/test/resources/csv/new/input-TSParameters.csv ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/EchoBaseApplicationListener.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/EchoBaseApplicationListener.java 2012-01-15 21:31:49 UTC (rev 283) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/EchoBaseApplicationListener.java 2012-01-15 21:33:13 UTC (rev 284) @@ -218,7 +218,7 @@ "admin user (password admin)."); } - service.createDefaultAdminUser(); + service.createDefaultUsers(); } } finally { transaction.closeContext(); Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureCommonDataCompleteImport.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureCommonDataCompleteImport.java 2012-01-15 21:31:49 UTC (rev 283) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureCommonDataCompleteImport.java 2012-01-15 21:33:13 UTC (rev 284) @@ -26,6 +26,7 @@ import fr.ifremer.echobase.entities.references.AreaOfOperation; import fr.ifremer.echobase.entities.references.Mission; import fr.ifremer.echobase.entities.references.MissionImpl; +import fr.ifremer.echobase.entities.references.Vessel; import fr.ifremer.echobase.services.CommonDataCompleteImportService; import fr.ifremer.echobase.services.EchoBaseServiceSupport; import fr.ifremer.echobase.services.configurations.CommonDataCompleteImportConfiguration; @@ -43,12 +44,15 @@ private static final long serialVersionUID = 1L; - /** Universe of existing voyages. */ + /** Universe of existing missions. */ protected Map<String, String> missions; - /** Universe of existing voyages. */ + /** 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; @@ -77,6 +81,7 @@ missions = loadSortAndDecorate(service, Mission.class); areaOfOperations = loadSortAndDecorate(service, AreaOfOperation.class); + vessels = loadSortAndDecorate(service, Vessel.class); importModes = decorateEnums(SelectedMissionMode.values()); @@ -116,6 +121,10 @@ return areaOfOperations; } + public Map<String, String> getVessels() { + return vessels; + } + public Map<String, String> getImportModes() { return importModes; } @@ -135,18 +144,42 @@ this.importMode = importMode; } - public void setCasinoFile(File file) { - getModel().getCasinoFile().setFile(file); + public void setVoyageFile(File file) { + getModel().getVoyageFile().setFile(file); } - public void setCasinoFileContentType(String contentType) { - getModel().getCasinoFile().setContentType(contentType); + public void setVoyageFileContentType(String contentType) { + getModel().getVoyageFile().setContentType(contentType); } - public void setCasinoFileFileName(String fileName) { - getModel().getCasinoFile().setFileName(fileName); + public void setVoyageFileFileName(String fileName) { + getModel().getVoyageFile().setFileName(fileName); } + public void setTransitFile(File file) { + getModel().getTransitFile().setFile(file); + } + + public void setTransitFileContentType(String contentType) { + getModel().getTransitFile().setContentType(contentType); + } + + public void setTransitFileFileName(String fileName) { + getModel().getTransitFile().setFileName(fileName); + } + + public void setTransectFile(File file) { + getModel().getTransectFile().setFile(file); + } + + public void setTransectFileContentType(String contentType) { + getModel().getTransectFile().setContentType(contentType); + } + + public void setTransectFileFileName(String fileName) { + getModel().getTransectFile().setFileName(fileName); + } + public void setEchotypeFile(File file) { getModel().getEchotypeFile().setFile(file); } Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureCommonDataFromTransectImport.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureCommonDataFromTransectImport.java 2012-01-15 21:31:49 UTC (rev 283) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureCommonDataFromTransectImport.java 2012-01-15 21:33:13 UTC (rev 284) @@ -24,6 +24,7 @@ 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.CommonDataFromTransectImportConfiguration; @@ -43,6 +44,9 @@ /** Universe of existing voyages. */ protected Map<String, String> voyages; + /** Universe of existing vessels. */ + protected Map<String, String> vessels; + public ConfigureCommonDataFromTransectImport() { super(CommonDataFromTransectImportConfiguration.class); } @@ -61,6 +65,7 @@ newService(EchoBaseServiceSupport.class); voyages = loadSortAndDecorate(service, Voyage.class); + vessels = loadSortAndDecorate(service, Vessel.class); return INPUT; } @@ -69,15 +74,19 @@ return voyages; } - public void setCasinoFile(File file) { - getModel().getCasinoFile().setFile(file); + public Map<String, String> getVessels() { + return vessels; } - public void setCasinoFileContentType(String contentType) { - getModel().getCasinoFile().setContentType(contentType); + public void setTransectFile(File file) { + getModel().getTransectFile().setFile(file); } - public void setCasinoFileFileName(String fileName) { - getModel().getCasinoFile().setFileName(fileName); + public void setTransectFileContentType(String contentType) { + getModel().getTransectFile().setContentType(contentType); } + + public void setTransectFileFileName(String fileName) { + getModel().getTransectFile().setFileName(fileName); + } } Modified: trunk/echobase-ui/src/main/resources/config/struts-importData.xml =================================================================== --- trunk/echobase-ui/src/main/resources/config/struts-importData.xml 2012-01-15 21:31:49 UTC (rev 283) +++ trunk/echobase-ui/src/main/resources/config/struts-importData.xml 2012-01-15 21:33:13 UTC (rev 284) @@ -39,13 +39,13 @@ <result name="input">/WEB-INF/jsp/importData/selectImportType.jsp</result> <result type="redirectAction"> <param name="namespace">/importData</param> - <param name="actionName">configure-${mode}</param> + <param name="actionName">configure${mode}</param> <param name="method">input</param> </result> </action> <!-- Configure import --> - <action name="configure-*" + <action name="configure*" class="fr.ifremer.echobase.ui.actions.importData.Configure{1}Import"> <interceptor-ref name="paramsPrepareParamsStackLoggued"/> <result name="input">/WEB-INF/jsp/importData/configure{1}.jsp</result> @@ -56,11 +56,11 @@ </action> <!-- Starts import --> - <action name="import-*" + <action name="import*" class="fr.ifremer.echobase.ui.actions.importData.Launch{1}Import"> <interceptor-ref name="basicStackLoggued"/> <interceptor-ref name="execAndWait"/> - <result name="wait">/WEB-INF/jsp/importData/progress.jsp</result> + <result name="wait">/WEB-INF/jsp/importData/progress{1}.jsp</result> <result>/WEB-INF/jsp/importData/result{1}.jsp</result> </action> Added: 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 (rev 0) +++ trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureAccousticData-validation.xml 2012-01-15 21:33:13 UTC (rev 284) @@ -0,0 +1,66 @@ +<!-- + #%L + EchoBase :: UI + + $Id: ConfigureFiles-validation.xml 136 2011-11-27 10:09:45Z tchemit $ + $HeadURL: http://svn.forge.codelutin.com/svn/echobase/trunk/echobase-ui/src/main/resou... $ + %% + 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 + "-//OpenSymphony Group//XWork Validator 1.0.2//EN" + "http://www.opensymphony.com/xwork/xwork-validator-1.0.2.dtd"> +<validators> + + <field name="model.voyageId"> + <field-validator type="nrequiredstring"> + <message key="echobase.error.import.voyage.required"/> + </field-validator> + </field> + + <field name="model.vesselId"> + <field-validator type="nrequiredstring"> + <message key="echobase.error.import.vessel.required"/> + </field-validator> + </field> + + <field name="model.echosounderSoundSpeed"> + <field-validator type="nrequiredstring"> + <message key="echobase.error.import.echosounderSoundSpeed.required"/> + </field-validator> + </field> + + <field name="model.soundSpeedCalculations"> + <field-validator type="nrequiredstring"> + <message + key="echobase.error.import.soundSpeedCalculations.required"/> + </field-validator> + </field> + + <field name="model.notes"> + <field-validator type="nrequiredstring"> + <message key="echobase.error.import.notes.required"/> + </field-validator> + </field> + + <field name="model.moviesFile.file"> + <field-validator type="required"> + <message key="echobase.error.import.moviesFile.required"/> + </field-validator> + </field> + +</validators> \ No newline at end of file Added: trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureAccousticRegionData-validation.xml =================================================================== --- trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureAccousticRegionData-validation.xml (rev 0) +++ trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureAccousticRegionData-validation.xml 2012-01-15 21:33:13 UTC (rev 284) @@ -0,0 +1,53 @@ +<!-- + #%L + EchoBase :: UI + + $Id: ConfigureFiles-validation.xml 136 2011-11-27 10:09:45Z tchemit $ + $HeadURL: http://svn.forge.codelutin.com/svn/echobase/trunk/echobase-ui/src/main/resou... $ + %% + 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 + "-//OpenSymphony Group//XWork Validator 1.0.2//EN" + "http://www.opensymphony.com/xwork/xwork-validator-1.0.2.dtd"> +<validators> + + <field name="model.voyageId"> + <field-validator type="nrequiredstring"> + <message key="echobase.error.import.voyage.required"/> + </field-validator> + </field> + + <field name="model.vesselId"> + <field-validator type="nrequiredstring"> + <message key="echobase.error.import.vessel.required"/> + </field-validator> + </field> + + <field name="model.regionsFile.file"> + <field-validator type="required"> + <message key="echobase.error.import.regionsFile.required"/> + </field-validator> + </field> + + <field name="model.associationFile.file"> + <field-validator type="required"> + <message key="echobase.error.import.associationFile.required"/> + </field-validator> + </field> + +</validators> \ No newline at end of file Added: trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureCatchesData-validation.xml =================================================================== --- trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureCatchesData-validation.xml (rev 0) +++ trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureCatchesData-validation.xml 2012-01-15 21:33:13 UTC (rev 284) @@ -0,0 +1,59 @@ +<!-- + #%L + EchoBase :: UI + + $Id: ConfigureFiles-validation.xml 136 2011-11-27 10:09:45Z tchemit $ + $HeadURL: http://svn.forge.codelutin.com/svn/echobase/trunk/echobase-ui/src/main/resou... $ + %% + 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 + "-//OpenSymphony Group//XWork Validator 1.0.2//EN" + "http://www.opensymphony.com/xwork/xwork-validator-1.0.2.dtd"> +<validators> + + <field name="model.voyageId"> + <field-validator type="nrequiredstring"> + <message key="echobase.error.import.voyage.required"/> + </field-validator> + </field> + + <field name="model.tlbeStationFile.file"> + <field-validator type="required"> + <message key="echobase.error.import.tlbeStationFile.required"/> + </field-validator> + </field> + + <field name="model.xtblTriFile.file"> + <field-validator type="required"> + <message key="echobase.error.import.xtblTriFile.required"/> + </field-validator> + </field> + + <field name="model.tblMensurationFile.file"> + <field-validator type="required"> + <message key="echobase.error.import.tblMensurationFile.required"/> + </field-validator> + </field> + + <field name="model.tblMensurationClasseFile.file"> + <field-validator type="required"> + <message key="echobase.error.import.tblMensurationClasseFile.required"/> + </field-validator> + </field> + +</validators> \ No newline at end of file Added: trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureCatchesIndividualData-validation.xml =================================================================== --- trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureCatchesIndividualData-validation.xml (rev 0) +++ trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureCatchesIndividualData-validation.xml 2012-01-15 21:33:13 UTC (rev 284) @@ -0,0 +1,41 @@ +<!-- + #%L + EchoBase :: UI + + $Id: ConfigureFiles-validation.xml 136 2011-11-27 10:09:45Z tchemit $ + $HeadURL: http://svn.forge.codelutin.com/svn/echobase/trunk/echobase-ui/src/main/resou... $ + %% + 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 + "-//OpenSymphony Group//XWork Validator 1.0.2//EN" + "http://www.opensymphony.com/xwork/xwork-validator-1.0.2.dtd"> +<validators> + + <field name="model.voyageId"> + <field-validator type="nrequiredstring"> + <message key="echobase.error.import.voyage.required"/> + </field-validator> + </field> + + <field name="model.individualDataFile.file"> + <field-validator type="required"> + <message key="echobase.error.import.individualDataFile.required"/> + </field-validator> + </field> + +</validators> \ No newline at end of file Added: trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureCatchesReference-validation.xml =================================================================== --- trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureCatchesReference-validation.xml (rev 0) +++ trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureCatchesReference-validation.xml 2012-01-15 21:33:13 UTC (rev 284) @@ -0,0 +1,41 @@ +<!-- + #%L + EchoBase :: UI + + $Id: ConfigureFiles-validation.xml 136 2011-11-27 10:09:45Z tchemit $ + $HeadURL: http://svn.forge.codelutin.com/svn/echobase/trunk/echobase-ui/src/main/resou... $ + %% + 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 + "-//OpenSymphony Group//XWork Validator 1.0.2//EN" + "http://www.opensymphony.com/xwork/xwork-validator-1.0.2.dtd"> +<validators> + + <field name="model.lengthAgeKeyFile.file"> + <field-validator type="required"> + <message key="echobase.error.import.lengthAgeKeyFile.required"/> + </field-validator> + </field> + + <field name="model.lengthWeightKeyFile.file"> + <field-validator type="required"> + <message key="echobase.error.import.lengthWeightKeyFile.required"/> + </field-validator> + </field> + +</validators> \ No newline at end of file Copied: trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureCommonDataComplete-validation.xml (from rev 267, trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureFiles-validation.xml) =================================================================== --- trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureCommonDataComplete-validation.xml (rev 0) +++ trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureCommonDataComplete-validation.xml 2012-01-15 21:33:13 UTC (rev 284) @@ -0,0 +1,107 @@ +<!-- + #%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 + "-//OpenSymphony Group//XWork Validator 1.0.2//EN" + "http://www.opensymphony.com/xwork/xwork-validator-1.0.2.dtd"> +<validators> + + <field name="model.missionId"> + <field-validator type="nrequiredstring"> + <message key="echobase.error.import.mission.required"/> + </field-validator> + </field> + + <field name="model.areaOfOperationId"> + <field-validator type="nrequiredstring"> + <message key="echobase.error.import.areaOfOperation.required"/> + </field-validator> + </field> + + <field name="model.vesselId"> + <field-validator type="nrequiredstring"> + <message key="echobase.error.import.vessel.required"/> + </field-validator> + </field> + + <field name="model.voyageDescription"> + <field-validator type="nrequiredstring"> + <message key="echobase.error.import.voyageDescription.required"/> + </field-validator> + </field> + + <field name="model.transitRelatedActivity"> + <field-validator type="nrequiredstring"> + <message key="echobase.error.import.transitRelatedActivity.required"/> + </field-validator> + </field> + + <field name="model.transectLicence"> + <field-validator type="nrequiredstring"> + <message key="echobase.error.import.transectLicence.required"/> + </field-validator> + </field> + + <field name="model.transectGeospatialVerticalPositive"> + <field-validator type="nrequiredstring"> + <message key="echobase.error.import.transectGeospatialVerticalPositive.required"/> + </field-validator> + </field> + + <field name="model.transectBinUnitsPingAxis"> + <field-validator type="nrequiredstring"> + <message key="echobase.error.import.transectBinUnitsPingAxis.required"/> + </field-validator> + </field> + + <field name="model.datum"> + <field-validator type="nrequiredstring"> + <message key="echobase.error.import.datum.required"/> + </field-validator> + </field> + + <field name="model.voyageFile.file"> + <field-validator type="required"> + <message key="echobase.error.import.voyageFile.required"/> + </field-validator> + </field> + + <field name="model.transitFile.file"> + <field-validator type="required"> + <message key="echobase.error.import.transitFile.required"/> + </field-validator> + </field> + + <field name="model.transectFile.file"> + <field-validator type="required"> + <message key="echobase.error.import.transectFile.required"/> + </field-validator> + </field> + + <field name="model.echotypeFile.file"> + <field-validator type="required"> + <message key="echobase.error.import.echotypeFile.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/ConfigureCommonDataComplete-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/ConfigureCommonDataFromTransect-validation.xml =================================================================== --- trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureCommonDataFromTransect-validation.xml (rev 0) +++ trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureCommonDataFromTransect-validation.xml 2012-01-15 21:33:13 UTC (rev 284) @@ -0,0 +1,72 @@ +<!-- + #%L + EchoBase :: UI + + $Id: ConfigureFiles-validation.xml 136 2011-11-27 10:09:45Z tchemit $ + $HeadURL: http://svn.forge.codelutin.com/svn/echobase/trunk/echobase-ui/src/main/resou... $ + %% + 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 + "-//OpenSymphony Group//XWork Validator 1.0.2//EN" + "http://www.opensymphony.com/xwork/xwork-validator-1.0.2.dtd"> +<validators> + + <field name="model.voyageId"> + <field-validator type="nrequiredstring"> + <message key="echobase.error.import.voyage.required"/> + </field-validator> + </field> + + <field name="model.vesselId"> + <field-validator type="nrequiredstring"> + <message key="echobase.error.import.vessel.required"/> + </field-validator> + </field> + + <field name="model.transectLicence"> + <field-validator type="nrequiredstring"> + <message key="echobase.error.import.transectLicence.required"/> + </field-validator> + </field> + + <field name="model.transectGeospatialVerticalPositive"> + <field-validator type="nrequiredstring"> + <message + key="echobase.error.import.transectGeospatialVerticalPositive.required"/> + </field-validator> + </field> + + <field name="model.transectBinUnitsPingAxis"> + <field-validator type="nrequiredstring"> + <message key="echobase.error.import.transectBinUnitsPingAxis.required"/> + </field-validator> + </field> + + <field name="model.datum"> + <field-validator type="nrequiredstring"> + <message key="echobase.error.import.datum.required"/> + </field-validator> + </field> + + <field name="model.transectFile.file"> + <field-validator type="required"> + <message key="echobase.error.import.transectFile.required"/> + </field-validator> + </field> + +</validators> \ No newline at end of file Deleted: trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureFiles-validation.xml =================================================================== --- trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureFiles-validation.xml 2012-01-15 21:31:49 UTC (rev 283) +++ trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureFiles-validation.xml 2012-01-15 21:33:13 UTC (rev 284) @@ -1,81 +0,0 @@ -<!-- - #%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 - "-//OpenSymphony Group//XWork Validator 1.0.2//EN" - "http://www.opensymphony.com/xwork/xwork-validator-1.0.2.dtd"> -<validators> - - <field name="model.mission"> - <field-validator type="required"> - <message key="echobase.error.import.mission.required"/> - </field-validator> - </field> - - <field name="importDataMode"> - <field-validator type="required"> - <message key="echobase.error.import.importDataMode.required"/> - </field-validator> - </field> - - <field name="acoustic"> - <field-validator type="nfieldexpression"> - <param name="expression">model.acousticFile.file != null</param> - <param name="skip">importDataMode.name() != "ALL" && importDataMode.name() != "ACOUSTIC"</param> - <message key="echobase.error.import.acousticFile.required"/> - </field-validator> - </field> - - <field name="capture"> - <field-validator type="nfieldexpression"> - <param name="expression">model.captureFile.file != null</param> - <param name="skip">importDataMode.name() != "ALL"</param> - <message key="echobase.error.import.captureFile.required"/> - </field-validator> - </field> - - <field name="lectureAgeGen"> - <field-validator type="nfieldexpression"> - <param name="expression">model.lectureAgeGenFile.file != null</param> - <param name="skip">importDataMode.name() != "ALL"</param> - <message key="echobase.error.import.lectureAgeGenFile.required"/> - </field-validator> - </field> - - <field name="events"> - <field-validator type="nfieldexpression"> - <param name="expression">model.eventsFile.file != null</param> - <param name="skip">importDataMode.name() != "ALL"</param> - <message key="echobase.error.import.eventsFile.required"/> - </field-validator> - </field> - - <field name="typeEchoSpecies"> - <field-validator type="nfieldexpression"> - <param name="expression">model.typeEchoSpeciesFile.file != null</param> - <param name="skip">importDataMode.name() != "ALL"</param> - <message key="echobase.error.import.typeEchoSpeciesFile.required"/> - </field-validator> - </field> - -</validators> \ No newline at end of file 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-01-15 21:31:49 UTC (rev 283) +++ trunk/echobase-ui/src/main/resources/i18n/echobase-ui_fr_FR.properties 2012-01-15 21:33:13 UTC (rev 284) @@ -19,11 +19,17 @@ echobase.action.reloadSqlQuery=Recharger echobase.action.reset=Annuler echobase.action.return=Retour +echobase.common.transitRelatedActivity=RelatedActivity (transit) +echobase.common.transectLicence=Licence (transect) +echobase.common.transectGeospatialVerticalPositive=GeospatialVerticalPositive (transect) +echobase.common.transectBinUnitsPingAxis=BinUnitsPingAxis (transect) +echobase.common.echosounderSoundSpeed=echosounderSoundSpeed +echobase.common.soundSpeedCalculations=soundSpeedCalculations +echobase.common.pingDutyCycle=pingDutyCycle +echobase.common.notes=notes echobase.action.save=Sauvegarder echobase.action.saveSqlQuery=Enregistrer la requête -echobase.action.validateImportMission=Valider la mission echobase.common.admin=Administrateur -echobase.common.comment=Commentaire echobase.common.email=Email echobase.common.entityType=Type d'entité echobase.common.importDataMode=Type d'import @@ -42,16 +48,38 @@ echobase.error.export.name.requiredstring=Le nom de l'export est obligatoire echobase.error.export.sqlQuery.requiredstring=La requête de l'export est obligatoire echobase.error.export.sqlQuery.wrongformat=La requêtes n'est pas valide -echobase.error.fileDontExist=Fichier inexistant -echobase.error.fileNotFound=Fichier non trouvé +echobase.error.import.areaOfOperation.required=La sélection d'une zone d'opération est obligatoire +echobase.error.import.associationFile.required=La sélection d'un fichier Association est obligatoire +echobase.error.import.datum.required=Datum de la campagne non rengeigné +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.importMode.required=Le mode d'import est obligatoire +echobase.error.import.individualDataFile.required=La sélection d'un fichier individualData est obligatoire +echobase.error.import.lengthAgeKeyFile.required=La sélection d'un fichier lengthAgeKey est obligatoire +echobase.error.import.lengthWeightKeyFile.required=La sélection d'un fichier lengthWeightKey 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 echobase.error.import.missionName.required=Le nom de la mission est obligatoire -echobase.error.importArgument= +echobase.error.import.moviesFile.required=La sélection d'un fichier Movies est obligatoire +echobase.error.import.notes.required=Note des DataProcessing non renseigné +echobase.error.import.regionsFile.required=La sélection d'un fichier Region est obligatoire +echobase.error.import.soundSpeedCalculations.required=soundSpeedCalculations non renseigné +echobase.error.import.tblMensurationClasseFile.required=La sélection d'un fichier tblMensurationClasse est obligatoire +echobase.error.import.tblMensurationFile.required=La sélection d'un fichier tblMensuration est obligatoire +echobase.error.import.tlbeStationFile.required=La sélection d'un fichier tlbeStation est obligatoire +echobase.error.import.transectBinUnitsPingAxis.required=BinUnitsPingAxis des transtects non rengeigné +echobase.error.import.transectFile.required=La sélection d'un fichier Transect est obligatoire +echobase.error.import.transectGeospatialVerticalPositive.required=GeospatialVerticalPositive des transtects non rengeigné +echobase.error.import.transectLicence.required=Licence des transtects non rengeigné +echobase.error.import.transitFile.required=La sélection d'un fichier Transit est obligatoire +echobase.error.import.transitRelatedActivity.required=RelatedActivity des transits non rengeigné +echobase.error.import.vessel.required=La sélection d'un navire est obligatoire +echobase.error.import.voyage.required=La sélection d'une campagne est obligatoire +echobase.error.import.voyageDescription.required=Description de la campagne non rengeigné +echobase.error.import.voyageFile.required=La sélection d'un fichier Voyage est obligatoire +echobase.error.import.xtblTriFile.required=La sélection d'un fichier xtblTri est obligatoire echobase.error.importFile.required=Fichier d'import obligatoire echobase.error.importHistorical.input.required=Le fichier d'import est obligatoire -echobase.error.login.password.requiredstring=Le mot de passe est obligatoire echobase.error.login.unknown=Utilisateur inconnu echobase.error.login.wrongLogin=Le login est déjà utilisé echobase.error.no.embeddedApplication.configurationFound=La configuration de création d'application embarquée non trouvée @@ -63,7 +91,6 @@ echobase.error.warlocation.notFound=L'application n'a pas été trouvé à l'emplacement suivant %s echobase.header.request.result=Résultat de la requête sql echobase.header.user.gridTitle=Liste des utilisateurs -echobase.header.voyageSelect=Selectionnez une campagne echobase.info.dbeditor.propertyDiffsResult=Résultat d'import de données echobase.info.no.sqlQuery.saved=Aucune requête d'export sql enregistrée echobase.info.no.sqlQuery.selected=Aucune requête d'export sql sélectionnée @@ -80,7 +107,6 @@ echobase.label.embeddedWarFileName=Nom du war à utiliser echobase.label.exportDbFileName=Nom du fichier d'export echobase.label.exportFileName=Nom du fichier d'export -echobase.label.import.access=Base access echobase.label.import.accoustique=Fichier accoustique echobase.label.import.events=Fichier evenements echobase.label.import.lectureAgeGen=Fichier lecture age @@ -100,6 +126,7 @@ echobase.label.sqlQueries=Requêtes enregistrées echobase.label.user.login=Utilisateur \: %s echobase.label.voyageToSelect=Voyage à exporter +echobase.legend.connectionToDb.detail=Détail de la connection à la base de données echobase.legend.dbeditor.edit=Edition de '%s' echobase.legend.embeddedApplication.configuration=Configuration de l'application embarquée echobase.legend.exportDb.configuration.files=Configuration de l'export @@ -114,33 +141,28 @@ echobase.legend.importFileResult=Résultat de l'import %s echobase.legend.sqlQuery.configuration=Configuration de la requête echobase.legend.sqlQuery.result=Résultats de la requête -echobase.menu.connectToDbInformations=Se connecter à la base +echobase.menu.connectToDbInformations=Informations de connection à la base de données echobase.menu.createEmbeddedApplication=Créer une application embarquée echobase.menu.dbeditor=Modifier les données echobase.menu.export=Exporter des données echobase.menu.exportDb=Exporter une base complête echobase.menu.importData=Importer des données echobase.menu.importDb=Importer une base complête -echobase.menu.logs=Visualiser les modifications +echobase.menu.logs=Journal des modifications echobase.menu.users=Gérer les utilisateurs echobase.message.askAdministratorPassword=Demander à un administrateur le mot de passe pour l'utilisateur donné -echobase.message.modified.property=Propriété '%s', ancienne valeur \: %s, nouvelle valeur \: %s echobase.message.no.row.selected=Aucune donnée sélectionnée echobase.message.noEntrySelection=Aucune entrée sélectionnée echobase.message.warnEmbeddedApplicationInProgress=Merci de ne pas fermer la fenêtre pour pouvoir accéder aux résultats de la création de l'application embarquée. echobase.message.warnExportInProgress=Merci de ne pas fermer la fenêtre pour pouvoir accéder aux résultats de l'export. echobase.message.warnImportInProgress=Merci de ne pas fermer la fenêtre pour pouvoir accéder aux résultats de l'import. -echobase.title.admin.user.create=Création d'un utilisateur -echobase.title.admin.user.delete=Suppression d'un utilisateur -echobase.title.admin.user.edit=Edition d'un utilisateur -echobase.title.connectToDbInformations=Se connecter à la base de données -echobase.title.connectionToDb.detail=Détail de la connection à la base de données +echobase.title.connectToDbInformations=Informations de connection à la base de données echobase.title.createEmbeddedApplication=Création de l'application embarquée echobase.title.dbEditor=Modification de la base echobase.title.embeddedApplicationProgress=Création de l'application embarquée en cours echobase.title.embeddedApplicationResult=Résultat de la création de l'application embarquée echobase.title.entityModificationLogs=Journal des modifications -echobase.title.export=Export +echobase.title.export=Export Sql echobase.title.exportDb=Export complet de la base echobase.title.exportDbProgress=Export complêt de la base de données en cours echobase.title.exportDbResult=Résultat de l'export complêt de la base de données @@ -151,7 +173,6 @@ echobase.title.importDataProgress=Import de données en cours echobase.title.importDataResult=Résultats de l'import de données echobase.title.importDb=Import de données historiques -echobase.title.importDb.configuration=Configuration d'un import de base de données echobase.title.importDbProgress=Import de données en cours echobase.title.importDbResult=Résultats de l'import de données echobase.title.importTable=Importer une table Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/includes/header.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/includes/header.jsp 2012-01-15 21:31:49 UTC (rev 283) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/includes/header.jsp 2012-01-15 21:33:13 UTC (rev 284) @@ -78,16 +78,6 @@ <s:text name="echobase.menu.dbeditor"/> </s:a> </li> - <li> - <s:a action="logs" namespace="/user"> - <s:text name="echobase.menu.logs"/> - </s:a> - </li> - <li> - <s:a action="connectToDbInformations" namespace="/user"> - <s:text name="echobase.menu.connectToDbInformations"/> - </s:a> - </li> <s:if test="%{userIsAdmin}"> <li> <s:a action="userList" namespace="/user"> @@ -101,6 +91,16 @@ </s:a> </li> </s:if> + <li> + <s:a action="logs" namespace="/user"> + <s:text name="echobase.menu.logs"/> + </s:a> + </li> + <li> + <s:a action="connectToDbInformations" namespace="/user"> + <s:text name="echobase.menu.connectToDbInformations"/> + </s:a> + </li> </ul> </div> </div> Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/connectToDbInformations.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/connectToDbInformations.jsp 2012-01-15 21:31:49 UTC (rev 283) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/connectToDbInformations.jsp 2012-01-15 21:33:13 UTC (rev 284) @@ -29,7 +29,7 @@ <br/> <fieldset> - <legend><s:text name="echobase.title.connectionToDb.detail"/></legend> + <legend><s:text name="echobase.legend.connectionToDb.detail"/></legend> <s:label key="jdbcUrl" label='%{getText("echobase.common.jdbcUrl")}'/> <s:label key="jdbcLogin" label='%{getText("echobase.common.jdbcLogin")}'/> <s:label key="jdbcPassword" label='%{getText("echobase.common.jdbcPassword")} (*)'/> Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/dbeditor/dbeditor.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/dbeditor/dbeditor.jsp 2012-01-15 21:31:49 UTC (rev 283) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/dbeditor/dbeditor.jsp 2012-01-15 21:33:13 UTC (rev 284) @@ -196,11 +196,13 @@ <s:if test="tableSelected"> <sj:tabbedpanel id="io" collapsible="true"> - <sj:tab id="tab_importForm" target="importForm" title="ss" - label="%{getText('echobase.title.importTable')}"/> + <sj:tab id="tab_importForm" target="importForm" + key='echobase.title.importTable'/> + <%--label="%{getText('echobase.title.importTable')}"/>--%> <sj:tab id="tab_exportForm" target="exportForm" - label="%{getText('echobase.title.exportTable')}"/> + key="echobase.title.exportTable"/> + <%--label="%{getText('echobase.title.exportTable')}"/>--%> <s:form id="importForm" namespace="/dbeditor" method="post" enctype="multipart/form-data"> @@ -246,7 +248,7 @@ autowidth="true" rownumbers="false" viewrecords="true" navigatorEdit="false" navigatorSearch="true" navigatorDelete="false" navigatorAdd="false" - rowList="10,15,20, 50" rowNum="10" + rowList="10,15,20,50,100,250,500" rowNum="10" onSelectRowTopics="datas-rowSelect" onCompleteTopics="datas-clearSelect" navigatorSearchOptions="{multipleGroup:false,showQuery:true,multipleSearch:true,sopt:['eq','ne','cn','nc','bw','bn','ew','en','lt','le','gt','ge','nu','nn','in','ni']}"> Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/exportQuery/exportQuery.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/exportQuery/exportQuery.jsp 2012-01-15 21:31:49 UTC (rev 283) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/exportQuery/exportQuery.jsp 2012-01-15 21:33:13 UTC (rev 284) @@ -72,7 +72,7 @@ <s:set var="queryExists" value="query.topiaId != null && query.topiaId != ''"/> -<s:form id="exportQueryForm" namespace="/export"> +<s:form id="exportQueryForm" namespace="/exportQuery"> <s:select key="query.topiaId" label="%{getText('echobase.label.sqlQueries')}" list="queries" headerKey="" headerValue=""/> Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/exportQuery/exportQueryResult.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/exportQuery/exportQueryResult.jsp 2012-01-15 21:31:49 UTC (rev 283) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/exportQuery/exportQueryResult.jsp 2012-01-15 21:33:13 UTC (rev 284) @@ -53,8 +53,8 @@ navigator="true" autowidth="true" rownumbers="false" navigatorEdit="false" navigatorDelete="false" navigatorSearch="false" navigatorRefresh="false" - navigatorAdd="false" rowList="10,15,20,50" rowNum="10" - viewrecords="true"> + navigatorAdd="false" rowList="10,15,20,50,100,250,500" + rowNum="10" viewrecords="true"> <s:iterator value="columnNames" var="name" status="status"> Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/home.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/home.jsp 2012-01-15 21:31:49 UTC (rev 283) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/home.jsp 2012-01-15 21:33:13 UTC (rev 284) @@ -24,5 +24,3 @@ <%@ page language="java" contentType="text/html" pageEncoding="utf-8" %> <%@ taglib prefix="s" uri="/struts-tags" %> <title><s:text name="echobase.title.welcome"/></title> - -<h2><s:text name="echobase.title.welcome"/></h2> 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-01-15 21:31:49 UTC (rev 283) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureAccousticData.jsp 2012-01-15 21:33:13 UTC (rev 284) @@ -24,7 +24,7 @@ <%@page contentType="text/html" pageEncoding="UTF-8" %> <%@ taglib prefix="s" uri="/struts-tags" %> -<title><s:text name="echobase.title.configure.accousticData"/></title> +<title>Configuration <s:text name="echobase.common.importDataMode.accousticData"/></title> <script type="text/javascript"> @@ -48,18 +48,24 @@ label='%{getText("echobase.common.vessel")}' list="vessels" headerKey="" headerValue=""/> - <s:textfield key="model.field1" size="40" required="true" - label='%{getText("echobase.common.field1")}'/> + <s:textfield key="model.echosounderSoundSpeed" size="40" required="true" + label='%{getText("echobase.common.echosounderSoundSpeed")}'/> - <s:textfield key="model.field2" size="40" required="true" - label='%{getText("echobase.common.field2")}'/> + <s:textfield key="model.soundSpeedCalculations" size="40" required="true" + label='%{getText("echobase.common.soundSpeedCalculations")}'/> + <s:textfield key="model.pingDutyCycle" size="40" required="true" + label='%{getText("echobase.common.pingDutyCycle")}'/> + + <s:textfield key="model.notes" size="40" required="true" + label='%{getText("echobase.common.notes")}'/> + <s:file key="moviesFile" required="true" label='%{getText("echobase.common.moviesFile")}'/> </fieldset> <br/> - <s:submit action="configure-AccousticData" + <s:submit action="configureAccousticData" value='%{getText("echobase.action.import")}'/> Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureAccousticRegionData.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureAccousticRegionData.jsp 2012-01-15 21:31:49 UTC (rev 283) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureAccousticRegionData.jsp 2012-01-15 21:33:13 UTC (rev 284) @@ -24,7 +24,7 @@ <%@page contentType="text/html" pageEncoding="UTF-8" %> <%@ taglib prefix="s" uri="/struts-tags" %> -<title><s:text name="echobase.title.configure.accousticRegionData"/></title> +<title>Configuration <s:text name="echobase.common.importDataMode.accousticRegionData"/></title> <script type="text/javascript"> @@ -48,12 +48,6 @@ label='%{getText("echobase.common.vessel")}' list="vessels" headerKey="" headerValue=""/> - <s:textfield key="model.field1" size="40" required="true" - label='%{getText("echobase.common.name")}'/> - - <s:textfield key="model.field2" size="40" required="true" - label='%{getText("echobase.common.name")}'/> - <s:file key="regionsFile" required="true" label='%{getText("echobase.common.regionsFile")}'/> @@ -63,7 +57,7 @@ </fieldset> <br/> - <s:submit action="configure-AccousticRegionData" + <s:submit action="configureAccousticRegionData" value='%{getText("echobase.action.import")}'/> 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-01-15 21:31:49 UTC (rev 283) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureCatchesData.jsp 2012-01-15 21:33:13 UTC (rev 284) @@ -24,7 +24,7 @@ <%@page contentType="text/html" pageEncoding="UTF-8" %> <%@ taglib prefix="s" uri="/struts-tags" %> -<title><s:text name="echobase.title.configure.catchesData"/></title> +<title>Configuration <s:text name="echobase.common.importDataMode.catchesData"/></title> <script type="text/javascript"> @@ -59,7 +59,7 @@ </fieldset> <br/> - <s:submit action="configure-CatchesData" + <s:submit action="configureCatchesData" value='%{getText("echobase.action.import")}'/> Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureCatchesIndividualData.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureCatchesIndividualData.jsp 2012-01-15 21:31:49 UTC (rev 283) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureCatchesIndividualData.jsp 2012-01-15 21:33:13 UTC (rev 284) @@ -24,7 +24,7 @@ <%@page contentType="text/html" pageEncoding="UTF-8" %> <%@ taglib prefix="s" uri="/struts-tags" %> -<title><s:text name="echobase.title.configure.catchesIndividualData"/></title> +<title>Configuration <s:text name="echobase.common.importDataMode.catchesIndividualData"/></title> <script type="text/javascript"> @@ -52,7 +52,7 @@ </fieldset> <br/> - <s:submit action="configure-CatchesIndividualData" + <s:submit action="configureCatchesIndividualData" value='%{getText("echobase.action.import")}'/> Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureCatchesReference.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureCatchesReference.jsp 2012-01-15 21:31:49 UTC (rev 283) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureCatchesReference.jsp 2012-01-15 21:33:13 UTC (rev 284) @@ -24,7 +24,7 @@ <%@page contentType="text/html" pageEncoding="UTF-8" %> <%@ taglib prefix="s" uri="/struts-tags" %> -<title><s:text name="echobase.title.configure.catchesReference"/></title> +<title>Configuration <s:text name="echobase.common.importDataMode.catchesReferences"/></title> <script type="text/javascript"> @@ -49,7 +49,7 @@ </fieldset> <br/> - <s:submit action="configure-CatchesReference" + <s:submit action="configureCatchesReference" value='%{getText("echobase.action.import")}'/> Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureCommonDataComplete.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureCommonDataComplete.jsp 2012-01-15 21:31:49 UTC (rev 283) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureCommonDataComplete.jsp 2012-01-15 21:33:13 UTC (rev 284) @@ -24,7 +24,7 @@ <%@page contentType="text/html" pageEncoding="UTF-8" %> <%@ taglib prefix="s" uri="/struts-tags" %> -<title><s:text name="echobase.title.configure.commonDataComplete"/></title> +<title>Configuration <s:text name="echobase.common.importDataMode.commonDataComplete"/></title> <script type="text/javascript"> @@ -49,7 +49,8 @@ <fieldset> <legend> - <s:text name="echobase.legend.importData.configure.commonDataComplete.selectMission"/> + <s:text + name="echobase.legend.importData.configure.commonDataComplete.selectMission"/> </legend> <s:radio key='importMode' list="importModes" @@ -121,22 +122,45 @@ label='%{getText("echobase.common.areaOfOperation")}' list="areaOfOperations" headerKey="" headerValue=""/> + <s:select key="model.vesselId" value="''" 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")}'/> <s:textfield key="model.datum" size="40" required="true" label='%{getText("echobase.common.datum")}'/> - <s:file key="casinoFile" required="true" - label='%{getText("echobase.common.casinoFile")}'/> + <s:textfield key="model.transitRelatedActivity" size="40" required="true" + label='%{getText("echobase.common.transitRelatedActivity")}'/> + <s:textfield key="model.transectLicence" size="40" required="true" + label='%{getText("echobase.common.transectLicence")}'/> + + <s:textfield key="model.transectGeospatialVerticalPositive" size="40" + required="true" + label='%{getText("echobase.common.transectGeospatialVerticalPositive")}'/> + + <s:textfield key="model.transectBinUnitsPingAxis" size="40" required="true" + label='%{getText("echobase.common.transectBinUnitsPingAxis")}'/> + + <s:file key="voyageFile" required="true" + label='%{getText("echobase.common.voyageFile")}'/> + + <s:file key="transitFile" required="true" + label='%{getText("echobase.common.transitFile")}'/> + + <s:file key="transectFile" required="true" + label='%{getText("echobase.common.transectFile")}'/> + <s:file key="echotypeFile" required="true" label='%{getText("echobase.common.echotypeFile")}'/> </fieldset> <br/> - <s:submit action="configure-CommonDataComplete" + <s:submit action="configureCommonDataComplete" value='%{getText("echobase.action.import")}'/> Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureCommonDataFromTransect.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureCommonDataFromTransect.jsp 2012-01-15 21:31:49 UTC (rev 283) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureCommonDataFromTransect.jsp 2012-01-15 21:33:13 UTC (rev 284) @@ -24,7 +24,7 @@ <%@page contentType="text/html" pageEncoding="UTF-8" %> <%@ taglib prefix="s" uri="/struts-tags" %> -<title><s:text name="echobase.title.configure.commonDataFromTransect"/></title> +<title>Configuration <s:text name="echobase.common.importDataMode.commonDataFromTransect"/></title> <script type="text/javascript"> @@ -45,13 +45,30 @@ label='%{getText("echobase.common.voyage")}' list="voyages" headerKey="" headerValue=""/> - <s:file key="casinoFile" required="true" - label='%{getText("echobase.common.casinoFile")}'/> + <s:select key="model.vesselId" value="''" 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")}'/> + + <s:textfield key="model.transectLicence" size="40" required="true" + label='%{getText("echobase.common.transectLicence")}'/> + + <s:textfield key="model.transectGeospatialVerticalPositive" size="40" + required="true" + label='%{getText("echobase.common.transectGeospatialVerticalPositive")}'/> + + <s:textfield key="model.transectBinUnitsPingAxis" size="40" required="true" + label='%{getText("echobase.common.transectBinUnitsPingAxis")}'/> + + <s:file key="transectFile" required="true" + label='%{getText("echobase.common.transectFile")}'/> + </fieldset> <br/> - <s:submit action="configure-CommonDataFromTransect" + <s:submit action="configureCommonDataFromTransect" value='%{getText("echobase.action.import")}'/> Deleted: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureFiles.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureFiles.jsp 2012-01-15 21:31:49 UTC (rev 283) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureFiles.jsp 2012-01-15 21:33:13 UTC (rev 284) @@ -1,106 +0,0 @@ -<%-- - #%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% - --%> -<%@page contentType="text/html" pageEncoding="UTF-8" %> -<%@ taglib prefix="s" uri="/struts-tags" %> - -<title><s:text name="echobase.title.importData"/></title> - -<script type="text/javascript"> - - function updateMode(newValue) { - switch (newValue) { - case "ALL": - $('[class="inputFile"]').show(); - break; - case "ACOUSTIC": - $('[class="inputFile"]').hide(); - $('#acousticFile').show(); - break; - } - } - - jQuery(document).ready(function () { - - - $('[name="importDataMode"]').change(function(event) { - updateMode(this.value); - }); - var val = $('[name="importDataMode"][checked="checked"]').val(); - updateMode(val); - }); -</script> - -<s:form namespace="/importData" method="POST" enctype="multipart/form-data"> - - <fieldset> - <legend> - <s:text name="echobase.legend.importData.configuration.mission.resume"/> - </legend> - <s:label value="%{model.mission.name}" - key='echobase.common.name'/> - - <s:label value="%{model.mission.missionAbstract}" - key='echobase.common.missionAbstract'/> - </fieldset> - - <hr/> - <fieldset> - <legend> - <s:text name="echobase.legend.importData.configuration.files"/> - </legend> - - <s:hidden key="missionId" label=''/> - - <s:radio key='importDataMode' list="importDataModes" - label='%{getText("echobase.common.importDataMode")}' - required="true"/> - <hr/> - <div class="inputFile" id="acousticFile"> - <s:file id="acoustic" name="acoustic" required="true" - key="echobase.label.import.accoustique"/> - </div> - <div class="inputFile" id="captureFile"> - <s:file name="capture" required="true" - key="echobase.label.import.pecherie"/> - </div> - <div class="inputFile" id="lectureAgeGenFile"> - <s:file name="lectureAgeGen" required="true" - key="echobase.label.import.lectureAgeGen"/> - </div> - <div class="inputFile" id="eventsFile"> - <s:file name="events" required="true" - key="echobase.label.import.events"/> - </div> - <div class="inputFile" id="typeEchoSpeciesFile"> - <s:file name="typeEchoSpecies" required="true" - key="echobase.label.import.typeEchoSpecies"/> - - </div> - </fieldset> - <br/> - <s:submit action="configureFiles" - value='%{getText("echobase.action.import")}'/> - - -</s:form> \ No newline at end of file Deleted: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureMission.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureMission.jsp 2012-01-15 21:31:49 UTC (rev 283) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureMission.jsp 2012-01-15 21:33:13 UTC (rev 284) @@ -1,156 +0,0 @@ -<%-- - #%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% - --%> -<%@page contentType="text/html" pageEncoding="UTF-8" %> -<%@ taglib prefix="s" uri="/struts-tags" %> -<%@ taglib prefix="sj" uri="/struts-jquery-tags" %> - -<script type="text/javascript"> - - jQuery(document).ready(function () { - - $('[name="importMode"]').change(function(event) { - $('[class="importMode"]').hide(); - $('#' + this.value).show(); - }); - var val = $('[name="importMode"][checked="checked"]').val(); - $('[class="importMode"]').hide(); - $("#" + val).show(); - }); -</script> -<title><s:text name="echobase.title.importData.configuration"/></title> - -<s:form id="importForm" namespace="/importData" method="POST"> - - <fieldset> - <legend> - <s:text name="echobase.legend.importData.configuration.mission"/> - </legend> - - <s:radio key='importMode' list="importModes" - label='%{getText("echobase.common.importMode")}' - required="true"/> - - <hr/> - - <div id='USE_EXISTING_MISSION' class='importMode'> - <s:select name="mission.topiaId" value="''" - label='%{getText("echobase.common.mission")}' - list="missions" headerKey="" headerValue=""/> - </div> - - <div id='CREATE_NEW_MISSION' class='importMode'> - - <%-- - String PROPERTY_NAME = "missionName"; - - String PROPERTY_LITTERATURE_REFERENCES = "litteratureReferences"; - - String PROPERTY_MISSION_ABSTRACT = "missionAbstract"; - - String PROPERTY_PROJECT = "project"; - - String PROPERTY_PLATFORM = "platform"; - - String PROPERTY_INSTITUTION = "institution"; - - String PROPERTY_KEYWORDS = "keywords"; - - String PROPERTY_DATA_CENTRE = "dataCentre"; - - String PROPERTY_DATA_CENTRE_EMAIL = "dataCentreEmail"; - - String PROPERTY_AUTHOR = "author"; - - String PROPERTY_AUTHOR_EMAIL = "authorEmail"; - - String PROPERTY_PRINCIPAL_INVESTIGATOR = "principalInvestigator"; - - String PROPERTY_PRINCIPAL_INVESTIGATOR_EMAIL = "principalInvestigatorEmail"; - - String PROPERTY_ORGANISATION_REFERENCES = "organisationReferences"; - - String PROPERTY_DISTRIBUTION_STATEMENT = "distributionStatement"; - - String PROPERTY_ORGANISATION_LEVEL_ACKNOWLEDGEMENTS = "organisationLevelAcknowledgements"; - - String PROPERTY_SOURCE = "source"; - --%> - - <s:textfield key="mission.name" size="40" required="true" - label='%{getText("echobase.common.name")}'/> - - <s:textfield key="mission.missionAbstract" size="40" required="true" - label='%{getText("echobase.common.missionAbstract")}'/> - - <s:textfield key="mission.litteratureReferences" size="40" - label='%{getText("echobase.common.litteratureReferences")}'/> - - <s:textfield key="mission.project" - label='%{getText("echobase.common.project")}'/> - - <s:textfield key="mission.platform" - label='%{getText("echobase.common.platform")}'/> - - <s:textfield key="mission.institution" - label='%{getText("echobase.common.institution")}'/> - - <s:textfield key="mission.keywords" - label='%{getText("echobase.common.keywords")}'/> - - <s:textfield key="mission.dataCentre" - label='%{getText("echobase.common.dataCentre")}'/> - - <s:textfield key="mission.dataCentreEmail" - label='%{getText("echobase.common.dataCentreEmail")}'/> - - <s:textfield key="mission.author" - label='%{getText("echobase.common.author")}'/> - - <s:textfield key="mission.authorEmail" - label='%{getText("echobase.common.authorEmail")}'/> - - <s:textfield key="mission.principalInvestigator" - label='%{getText("echobase.common.principalInvestigator")}'/> - - <s:textfield key="mission.principalInvestigatorEmail" - label='%{getText("echobase.common.principalInvestigatorEmail")}'/> - - <s:textfield key="mission.organisationReferences" - label='%{getText("echobase.common.organisationReferences")}'/> - - <s:textfield key="mission.distributionStatement" - label='%{getText("echobase.common.distributionStatement")}'/> - - <s:textfield key="mission.organisationLevelAcknowledgements" - label='%{getText("echobase.common.organisationLevelAcknowledgements")}'/> - - <s:textfield key="mission.source" - label='%{getText("echobase.common.source")}'/> - </div> - - </fieldset> - <br/> - <s:submit value='%{getText("echobase.action.validateImportMission")}' - action="configureMission"/> -</s:form> \ No newline at end of file Deleted: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/progress.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/progress.jsp 2012-01-15 21:31:49 UTC (rev 283) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/progress.jsp 2012-01-15 21:33:13 UTC (rev 284) @@ -1,40 +0,0 @@ -<%-- - #%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% - --%> -<%@page contentType="text/html" pageEncoding="UTF-8" %> -<%@ taglib prefix="s" uri="/struts-tags" %> -<%@ taglib prefix="sj" uri="/struts-jquery-tags" %> - -<s:url id="url" action="import" namespace="/importData"/> -<meta http-equiv="refresh" content="1;url=${url}"/> - -<title><s:text name="echobase.title.importDataProgress"/></title> - -<%-- TODO letellier 20111104 : Add warn icon --%> -<p><s:text name="echobase.message.warnImportInProgress"/></p> - -<br/> - -<div> - <sj:progressbar value="%{model.progression}"/> -</div> \ No newline at end of file Added: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/progressAccousticData.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/progressAccousticData.jsp (rev 0) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/progressAccousticData.jsp 2012-01-15 21:33:13 UTC (rev 284) @@ -0,0 +1,40 @@ +<%-- + #%L + EchoBase :: UI + + $Id$ + $HeadURL$ + %% + Copyright (C) 2011 - 2012 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% + --%> +<%@page contentType="text/html" pageEncoding="UTF-8" %> +<%@ taglib prefix="s" uri="/struts-tags" %> +<%@ taglib prefix="sj" uri="/struts-jquery-tags" %> + +<s:url id="url" action="import-AccousticData" namespace="/importData"/> +<meta http-equiv="refresh" content="1;url=${url}"/> + +<title><s:text name="echobase.title.importDataProgress"/></title> + +<%-- TODO letellier 20111104 : Add warn icon --%> +<p><s:text name="echobase.message.warnImportInProgress"/></p> + +<br/> + +<div> + <sj:progressbar value="%{model.progression}"/> +</div> \ No newline at end of file Property changes on: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/progressAccousticData.jsp ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/progressAccousticRegionData.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/progressAccousticRegionData.jsp (rev 0) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/progressAccousticRegionData.jsp 2012-01-15 21:33:13 UTC (rev 284) @@ -0,0 +1,40 @@ +<%-- + #%L + EchoBase :: UI + + $Id$ + $HeadURL$ + %% + Copyright (C) 2011 - 2012 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% + --%> +<%@page contentType="text/html" pageEncoding="UTF-8" %> +<%@ taglib prefix="s" uri="/struts-tags" %> +<%@ taglib prefix="sj" uri="/struts-jquery-tags" %> + +<s:url id="url" action="import-AccousticRegionData" namespace="/importData"/> +<meta http-equiv="refresh" content="1;url=${url}"/> + +<title><s:text name="echobase.title.importDataProgress"/></title> + +<%-- TODO letellier 20111104 : Add warn icon --%> +<p><s:text name="echobase.message.warnImportInProgress"/></p> + +<br/> + +<div> + <sj:progressbar value="%{model.progression}"/> +</div> \ No newline at end of file Property changes on: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/progressAccousticRegionData.jsp ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/progressCatchesData.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/progressCatchesData.jsp (rev 0) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/progressCatchesData.jsp 2012-01-15 21:33:13 UTC (rev 284) @@ -0,0 +1,40 @@ +<%-- + #%L + EchoBase :: UI + + $Id$ + $HeadURL$ + %% + Copyright (C) 2011 - 2012 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% + --%> +<%@page contentType="text/html" pageEncoding="UTF-8" %> +<%@ taglib prefix="s" uri="/struts-tags" %> +<%@ taglib prefix="sj" uri="/struts-jquery-tags" %> + +<s:url id="url" action="import-CatchesData" namespace="/importData"/> +<meta http-equiv="refresh" content="1;url=${url}"/> + +<title><s:text name="echobase.title.importDataProgress"/></title> + +<%-- TODO letellier 20111104 : Add warn icon --%> +<p><s:text name="echobase.message.warnImportInProgress"/></p> + +<br/> + +<div> + <sj:progressbar value="%{model.progression}"/> +</div> \ No newline at end of file Property changes on: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/progressCatchesData.jsp ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/progressCatchesIndividualData.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/progressCatchesIndividualData.jsp (rev 0) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/progressCatchesIndividualData.jsp 2012-01-15 21:33:13 UTC (rev 284) @@ -0,0 +1,40 @@ +<%-- + #%L + EchoBase :: UI + + $Id$ + $HeadURL$ + %% + Copyright (C) 2011 - 2012 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% + --%> +<%@page contentType="text/html" pageEncoding="UTF-8" %> +<%@ taglib prefix="s" uri="/struts-tags" %> +<%@ taglib prefix="sj" uri="/struts-jquery-tags" %> + +<s:url id="url" action="import-CatchesIndividualData" namespace="/importData"/> +<meta http-equiv="refresh" content="1;url=${url}"/> + +<title><s:text name="echobase.title.importDataProgress"/></title> + +<%-- TODO letellier 20111104 : Add warn icon --%> +<p><s:text name="echobase.message.warnImportInProgress"/></p> + +<br/> + +<div> + <sj:progressbar value="%{model.progression}"/> +</div> \ No newline at end of file Property changes on: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/progressCatchesIndividualData.jsp ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/progressCatchesReference.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/progressCatchesReference.jsp (rev 0) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/progressCatchesReference.jsp 2012-01-15 21:33:13 UTC (rev 284) @@ -0,0 +1,40 @@ +<%-- + #%L + EchoBase :: UI + + $Id$ + $HeadURL$ + %% + Copyright (C) 2011 - 2012 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% + --%> +<%@page contentType="text/html" pageEncoding="UTF-8" %> +<%@ taglib prefix="s" uri="/struts-tags" %> +<%@ taglib prefix="sj" uri="/struts-jquery-tags" %> + +<s:url id="url" action="import-CatchesReference" namespace="/importData"/> +<meta http-equiv="refresh" content="1;url=${url}"/> + +<title><s:text name="echobase.title.importDataProgress"/></title> + +<%-- TODO letellier 20111104 : Add warn icon --%> +<p><s:text name="echobase.message.warnImportInProgress"/></p> + +<br/> + +<div> + <sj:progressbar value="%{model.progression}"/> +</div> \ No newline at end of file Property changes on: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/progressCatchesReference.jsp ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/progressCommonDataComplete.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/progressCommonDataComplete.jsp (rev 0) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/progressCommonDataComplete.jsp 2012-01-15 21:33:13 UTC (rev 284) @@ -0,0 +1,40 @@ +<%-- + #%L + EchoBase :: UI + + $Id$ + $HeadURL$ + %% + Copyright (C) 2011 - 2012 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% + --%> +<%@page contentType="text/html" pageEncoding="UTF-8" %> +<%@ taglib prefix="s" uri="/struts-tags" %> +<%@ taglib prefix="sj" uri="/struts-jquery-tags" %> + +<s:url id="url" action="import-CommonDataComplete" namespace="/importData"/> +<meta http-equiv="refresh" content="1;url=${url}"/> + +<title><s:text name="echobase.title.importDataProgress"/></title> + +<%-- TODO letellier 20111104 : Add warn icon --%> +<p><s:text name="echobase.message.warnImportInProgress"/></p> + +<br/> + +<div> + <sj:progressbar value="%{model.progression}"/> +</div> \ No newline at end of file Property changes on: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/progressCommonDataComplete.jsp ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/progressCommonDataFromTransect.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/progressCommonDataFromTransect.jsp (rev 0) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/progressCommonDataFromTransect.jsp 2012-01-15 21:33:13 UTC (rev 284) @@ -0,0 +1,40 @@ +<%-- + #%L + EchoBase :: UI + + $Id$ + $HeadURL$ + %% + Copyright (C) 2011 - 2012 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% + --%> +<%@page contentType="text/html" pageEncoding="UTF-8" %> +<%@ taglib prefix="s" uri="/struts-tags" %> +<%@ taglib prefix="sj" uri="/struts-jquery-tags" %> + +<s:url id="url" action="import-CommonDataFromTransect" namespace="/importData"/> +<meta http-equiv="refresh" content="1;url=${url}"/> + +<title><s:text name="echobase.title.importDataProgress"/></title> + +<%-- TODO letellier 20111104 : Add warn icon --%> +<p><s:text name="echobase.message.warnImportInProgress"/></p> + +<br/> + +<div> + <sj:progressbar value="%{model.progression}"/> +</div> \ No newline at end of file Property changes on: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/progressCommonDataFromTransect.jsp ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Deleted: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/result.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/result.jsp 2012-01-15 21:31:49 UTC (rev 283) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/result.jsp 2012-01-15 21:33:13 UTC (rev 284) @@ -1,60 +0,0 @@ -<%-- - #%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% - --%> -<%@page contentType="text/html" pageEncoding="UTF-8" %> -<%@ taglib prefix="s" uri="/struts-tags" %> - -<title><s:text name="echobase.title.importDataResult"/></title> - -<fieldset> - <legend> - <s:text name="echobase.legend.importData.configuration.mission.resume"/> - </legend> - <s:label value="%{model.mission.missionName}" - key='echobase.common.missionName'/> - - <s:label value="%{model.mission.missionAbstract}" - key='echobase.common.missionAbstract'/> -</fieldset> -<br/> -<s:iterator value="importResult" var="entry"> - <s:set var="inputFile" value="%{#entry.key}"/> - <s:set var="result" value="%{#entry.value}"/> - <fieldset> - <legend> - <s:text name="echobase.legend.importFileResult"> - <s:param><strong><s:property - value="%{#inputFile.label}"/></strong></s:param> - </s:text> - </legend> - - <s:label value="%{#inputFile.fileName}" - label="%{getText('echobase.label.importFile')}"/> - - <s:label value="%{#result.numberCreated}" - label="%{getText('echobase.label.numberOfCreatedEntities')}"/> - - <s:label value="%{#result.numberUpdated}" - label="%{getText('echobase.label.numberOfUpdatedEntities')}"/> - </fieldset> -</s:iterator> 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-01-15 21:31:49 UTC (rev 283) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/selectImportType.jsp 2012-01-15 21:33:13 UTC (rev 284) @@ -44,7 +44,7 @@ }); </script> -<s:form namespace="/importData" method="POST"> +<s:form namespace="/importData" method="GET"> <fieldset> <legend> @@ -57,7 +57,8 @@ </fieldset> <br/> - <s:submit action="configure" value='%{getText("echobase.action.import")}'/> + <s:submit action="selectImportType" + value='%{getText("echobase.action.import")}'/> </s:form> \ No newline at end of file Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/modificationLogs.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/modificationLogs.jsp 2012-01-15 21:31:49 UTC (rev 283) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/modificationLogs.jsp 2012-01-15 21:33:13 UTC (rev 284) @@ -32,9 +32,11 @@ jQuery(document).ready(function () { $.addRowSelectTopic('datas', function(event){ var text = $("tr[aria-selected=true] td[aria-describedby='datas_modificationText']").text(); + console.info("New selection = "+text); $('#modificationTextContainter').html(text); }); $.addClearSelectTopic('datas', function(event){ + console.info("Clear selection = "); $('#modificationTextContainter').html("${emptySelection}"); }); }); @@ -50,9 +52,9 @@ autowidth="true" rownumbers="false" viewrecords="true" navigatorEdit="false" navigatorSearch="false" navigatorDelete="false" navigatorAdd="false" - rowList="10,15,20, 50" rowNum="10" + rowList="10,15,20,50,100,250,500" rowNum="10" onSelectRowTopics='datas-rowSelect' - onCompleteTopics='datas-cleanSelect'> + onCompleteTopics="datas-clearSelect"> <sjg:gridColumn name="entityType" sortable="true" title="%{getText('echobase.common.entityType')}"/> Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/user/Create.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/user/Create.jsp 2012-01-15 21:31:49 UTC (rev 283) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/user/Create.jsp 2012-01-15 21:33:13 UTC (rev 284) @@ -27,8 +27,6 @@ <title><s:text name="echobase.label.admin.user.create"/></title> -<h2><s:text name="echobase.label.admin.user.create"/></h2> - <s:form method="post" validate="true" namespace="/user"> <fieldset> <legend> 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-01-15 21:31:49 UTC (rev 283) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/user/Delete.jsp 2012-01-15 21:33:13 UTC (rev 284) @@ -27,8 +27,6 @@ <title><s:text name="echobase.label.admin.user.delete"/></title> -<h2><s:text name="echobase.label.admin.user.delete"/></h2> - <s:form method="post" validate="true" namespace="/user"> <fieldset> <legend> Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/user/Update.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/user/Update.jsp 2012-01-15 21:31:49 UTC (rev 283) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/user/Update.jsp 2012-01-15 21:33:13 UTC (rev 284) @@ -27,8 +27,6 @@ <title><s:text name="echobase.label.admin.user.edit"/></title> -<h2><s:text name="echobase.label.admin.user.edit"/></h2> - <s:form method="post" validate="true" namespace="/user"> <fieldset> <legend> @@ -37,10 +35,12 @@ <s:hidden key="user.id" label=""/> <s:textfield key="user.email" label="%{getText('echobase.common.email')}" size="40" readonly="true"/> - <s:password name="user.password" value="" label="%{getText('echobase.common.password')} (*)" + <s:password name="user.password" value="" + label="%{getText('echobase.common.password')} (*)" size="40"/> <s:checkbox key="user.admin" label="%{getText('echobase.common.admin')}"/> <br/> + <div class="cleanBoth"> (*) Pour ne pas modifier le mot de passe laisser ce champs vide </div> Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/user/userList.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/user/userList.jsp 2012-01-15 21:31:49 UTC (rev 283) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/user/userList.jsp 2012-01-15 21:33:13 UTC (rev 284) @@ -47,9 +47,6 @@ }); </script> -<h2><s:text name="echobase.title.users"/></h2> -<br/> - <sjg:grid id="users" caption="%{getText('echobase.header.user.gridTitle')}" dataType="json" href="%{loadUrl}" gridModel="users" pager="true" pagerButtons="true" pagerInput="true" @@ -59,11 +56,11 @@ navigatorEdit="false" navigatorDelete="false" navigatorSearch="false" navigatorRefresh="false" navigatorAdd="false" viewrecords="true" - rowList="10,15,20, 50" rowNum="10" + rowList="10,15,20,50,100,250,500" rowNum="10" navigatorExtraButtons="{ add: { title : 'Ajouter', icon: 'ui-icon-plus', topic: 'users-rowAdd' }, update: { title : 'Mettre à jour', icon: 'ui-icon-pencil', topic: 'users-rowUpdate' }, - delete : { title : 'Supprimer', icon: 'ui-icon-trash', topic: 'users-rowDelete' } + delete: { title : 'Supprimer', icon: 'ui-icon-trash', topic: 'users-rowDelete' } }"> <sjg:gridColumn name="id" title="id" hidden="true"/> <sjg:gridColumn name="email" width="600" title='%{getText("echobase.common.email")}'