- Echobase-commits - mailman.cloud.codelutin.com

r285 - in trunk/echobase-ui/src/main: java/fr/ifremer/echobase/ui/actions/importData resources/config resources/fr/ifremer/echobase/ui/actions/importData resources/i18n webapp/WEB-INF/jsp/importData
by tchemit＠users.forge.codelutin.com 15 Jan '12

15 Jan '12

Author: tchemit Date: 2012-01-15 23:12:51 +0100 (Sun, 15 Jan 2012) New Revision: 285 Url: http://forge.codelutin.com/repositories/revision/echobase/285 Log: rename import data actions make import data configure validation ok improve i18n for import data Added: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureAccousticData.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureAccousticRegionData.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureCatchesData.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureCatchesIndividualData.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureCatchesReference.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureCommonDataComplete.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureCommonDataFromTransect.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/LaunchAccousticData.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/LaunchAccousticRegionData.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/LaunchCatchesData.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/LaunchCatchesIndividualData.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/LaunchCatchesReference.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/LaunchCommonDataComplete.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/LaunchCommonDataFromTransect.java Removed: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureAccousticDataImport.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureAccousticRegionDataImport.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureCatchesDataImport.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureCatchesIndividualDataImport.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureCatchesReferenceImport.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/java/fr/ifremer/echobase/ui/actions/importData/LaunchAccousticDataImport.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/LaunchAccousticRegionDataImport.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/LaunchCatchesDataImport.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/LaunchCatchesIndividualDataImport.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/LaunchCatchesReferenceImport.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/LaunchCommonDataCompleteImport.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/LaunchCommonDataFromTransectImport.java Modified: trunk/echobase-ui/src/main/resources/config/struts-importData.xml 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/resources/i18n/echobase-ui_fr_FR.properties 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/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 trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/resultAccousticData.jsp trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/resultAccousticRegionData.jsp trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/resultCatchesData.jsp trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/resultCatchesIndividualData.jsp trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/resultCatchesReference.jsp trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/resultCommonDataComplete.jsp trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/resultCommonDataFromTransect.jsp trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/selectImportType.jsp Copied: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureAccousticData.java (from rev 267, trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureAccousticDataImport.java) =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureAccousticData.java (rev 0) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureAccousticData.java 2012-01-15 22:12:51 UTC (rev 285) @@ -0,0 +1,92 @@ +/* + * #%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% + */ +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.AccousticDataImportConfiguration; + +import java.io.File; +import java.util.Map; + +/** + * Configure a accoustic data import. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 0.3 + */ +public class ConfigureAccousticData extends AbstractConfigureImport<AccousticDataImportConfiguration> { + + private static final long serialVersionUID = 1L; + + /** Universe of existing voyages. */ + protected Map<String, String> voyages; + + /** Universe of existing vessels. */ + protected Map<String, String> vessels; + + public ConfigureAccousticData() { + super(AccousticDataImportConfiguration.class); + } + + @Override + protected AccousticDataImportConfiguration createModel() { + return new AccousticDataImportConfiguration(getLocale()); + } + + @Override + public String input() throws Exception { + + super.input(); + + EchoBaseServiceSupport service = + newService(EchoBaseServiceSupport.class); + + voyages = loadSortAndDecorate(service, Voyage.class); + vessels = loadSortAndDecorate(service, Vessel.class); + + return INPUT; + } + + public Map<String, String> getVoyages() { + return voyages; + } + + public Map<String, String> getVessels() { + return vessels; + } + + public void setMoviesFile(File file) { + getModel().getMoviesFile().setFile(file); + } + + public void setMoviesFileContentType(String contentType) { + getModel().getMoviesFile().setContentType(contentType); + } + + public void setMoviesFileFileName(String fileName) { + getModel().getMoviesFile().setFileName(fileName); + } +} Property changes on: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureAccousticData.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Deleted: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureAccousticDataImport.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureAccousticDataImport.java 2012-01-15 21:33:13 UTC (rev 284) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureAccousticDataImport.java 2012-01-15 22:12:51 UTC (rev 285) @@ -1,92 +0,0 @@ -/* - * #%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% - */ -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.AccousticDataImportConfiguration; - -import java.io.File; -import java.util.Map; - -/** - * Configure a accoustic data import. - * - * @author tchemit <chemit(a)codelutin.com> - * @since 0.3 - */ -public class ConfigureAccousticDataImport extends AbstractConfigureImport<AccousticDataImportConfiguration> { - - private static final long serialVersionUID = 1L; - - /** Universe of existing voyages. */ - protected Map<String, String> voyages; - - /** Universe of existing vessels. */ - protected Map<String, String> vessels; - - public ConfigureAccousticDataImport() { - super(AccousticDataImportConfiguration.class); - } - - @Override - protected AccousticDataImportConfiguration createModel() { - return new AccousticDataImportConfiguration(getLocale()); - } - - @Override - public String input() throws Exception { - - super.input(); - - EchoBaseServiceSupport service = - newService(EchoBaseServiceSupport.class); - - voyages = loadSortAndDecorate(service, Voyage.class); - vessels = loadSortAndDecorate(service, Vessel.class); - - return INPUT; - } - - public Map<String, String> getVoyages() { - return voyages; - } - - public Map<String, String> getVessels() { - return vessels; - } - - public void setMoviesFile(File file) { - getModel().getMoviesFile().setFile(file); - } - - public void setMoviesFileContentType(String contentType) { - getModel().getMoviesFile().setContentType(contentType); - } - - public void setMoviesFileFileName(String fileName) { - getModel().getMoviesFile().setFileName(fileName); - } -} Copied: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureAccousticRegionData.java (from rev 267, trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureAccousticRegionDataImport.java) =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureAccousticRegionData.java (rev 0) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureAccousticRegionData.java 2012-01-15 22:12:51 UTC (rev 285) @@ -0,0 +1,104 @@ +/* + * #%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% + */ +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.AccousticRegionDataImportConfiguration; + +import java.io.File; +import java.util.Map; + +/** + * Configure a "accoustic region data" import. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 0.3 + */ +public class ConfigureAccousticRegionData extends AbstractConfigureImport<AccousticRegionDataImportConfiguration> { + + private static final long serialVersionUID = 1L; + + /** Universe of existing voyages. */ + protected Map<String, String> voyages; + + /** Universe of existing vessels. */ + protected Map<String, String> vessels; + + public ConfigureAccousticRegionData() { + super(AccousticRegionDataImportConfiguration.class); + } + + @Override + protected AccousticRegionDataImportConfiguration createModel() { + return new AccousticRegionDataImportConfiguration(getLocale()); + } + + @Override + public String input() throws Exception { + + super.input(); + + EchoBaseServiceSupport service = + newService(EchoBaseServiceSupport.class); + + voyages = loadSortAndDecorate(service, Voyage.class); + vessels = loadSortAndDecorate(service, Vessel.class); + + return INPUT; + } + + public Map<String, String> getVoyages() { + return voyages; + } + + public Map<String, String> getVessels() { + return vessels; + } + + public void setRegionsFile(File file) { + getModel().getRegionsFile().setFile(file); + } + + public void setRegionsFileContentType(String contentType) { + getModel().getRegionsFile().setContentType(contentType); + } + + public void setRegionsFileFileName(String fileName) { + getModel().getRegionsFile().setFileName(fileName); + } + + public void setAssociationFile(File file) { + getModel().getAssociationFile().setFile(file); + } + + public void setAssociationFileContentType(String contentType) { + getModel().getAssociationFile().setContentType(contentType); + } + + public void setAssociationFileFileName(String fileName) { + getModel().getAssociationFile().setFileName(fileName); + } +} Property changes on: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureAccousticRegionData.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Deleted: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureAccousticRegionDataImport.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureAccousticRegionDataImport.java 2012-01-15 21:33:13 UTC (rev 284) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureAccousticRegionDataImport.java 2012-01-15 22:12:51 UTC (rev 285) @@ -1,104 +0,0 @@ -/* - * #%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% - */ -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.AccousticRegionDataImportConfiguration; - -import java.io.File; -import java.util.Map; - -/** - * Configure a "accoustic region data" import. - * - * @author tchemit <chemit(a)codelutin.com> - * @since 0.3 - */ -public class ConfigureAccousticRegionDataImport extends AbstractConfigureImport<AccousticRegionDataImportConfiguration> { - - private static final long serialVersionUID = 1L; - - /** Universe of existing voyages. */ - protected Map<String, String> voyages; - - /** Universe of existing vessels. */ - protected Map<String, String> vessels; - - public ConfigureAccousticRegionDataImport() { - super(AccousticRegionDataImportConfiguration.class); - } - - @Override - protected AccousticRegionDataImportConfiguration createModel() { - return new AccousticRegionDataImportConfiguration(getLocale()); - } - - @Override - public String input() throws Exception { - - super.input(); - - EchoBaseServiceSupport service = - newService(EchoBaseServiceSupport.class); - - voyages = loadSortAndDecorate(service, Voyage.class); - vessels = loadSortAndDecorate(service, Vessel.class); - - return INPUT; - } - - public Map<String, String> getVoyages() { - return voyages; - } - - public Map<String, String> getVessels() { - return vessels; - } - - public void setRegionsFile(File file) { - getModel().getRegionsFile().setFile(file); - } - - public void setRegionsFileContentType(String contentType) { - getModel().getRegionsFile().setContentType(contentType); - } - - public void setRegionsFileFileName(String fileName) { - getModel().getRegionsFile().setFileName(fileName); - } - - public void setAssociationFile(File file) { - getModel().getAssociationFile().setFile(file); - } - - public void setAssociationFileContentType(String contentType) { - getModel().getAssociationFile().setContentType(contentType); - } - - public void setAssociationFileFileName(String fileName) { - getModel().getAssociationFile().setFileName(fileName); - } -} Copied: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureCatchesData.java (from rev 267, trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureCatchesDataImport.java) =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureCatchesData.java (rev 0) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureCatchesData.java 2012-01-15 22:12:51 UTC (rev 285) @@ -0,0 +1,119 @@ +/* + * #%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% + */ +package fr.ifremer.echobase.ui.actions.importData; + +import fr.ifremer.echobase.entities.data.Voyage; +import fr.ifremer.echobase.services.EchoBaseServiceSupport; +import fr.ifremer.echobase.services.configurations.CatchesDataImportConfiguration; + +import java.io.File; +import java.util.Map; + +/** + * Configure a "catches data" import. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 0.3 + */ +public class ConfigureCatchesData extends AbstractConfigureImport<CatchesDataImportConfiguration> { + + private static final long serialVersionUID = 1L; + + /** Universe of existing voyages. */ + protected Map<String, String> voyages; + + public ConfigureCatchesData() { + super(CatchesDataImportConfiguration.class); + } + + @Override + protected CatchesDataImportConfiguration createModel() { + return new CatchesDataImportConfiguration(getLocale()); + } + + @Override + public String input() throws Exception { + + super.input(); + + EchoBaseServiceSupport service = + newService(EchoBaseServiceSupport.class); + + voyages = loadSortAndDecorate(service, Voyage.class); + + return INPUT; + } + + public Map<String, String> getVoyages() { + return voyages; + } + + public void setTlbeStationFile(File file) { + getModel().getTlbeStationFile().setFile(file); + } + + public void setTlbeStationFileContentType(String contentType) { + getModel().getTlbeStationFile().setContentType(contentType); + } + + public void setTlbeStationFileFileName(String fileName) { + getModel().getTlbeStationFile().setFileName(fileName); + } + + public void setXtblTriFile(File file) { + getModel().getXtblTriFile().setFile(file); + } + + public void setXtblTriFileContentType(String contentType) { + getModel().getXtblTriFile().setContentType(contentType); + } + + public void setXtblTriFileFileName(String fileName) { + getModel().getXtblTriFile().setFileName(fileName); + } + + public void setTblMensurationFile(File file) { + getModel().getTblMensurationFile().setFile(file); + } + + public void setTblMensurationFileContentType(String contentType) { + getModel().getTblMensurationFile().setContentType(contentType); + } + + public void setTblMensurationFileFileName(String fileName) { + getModel().getTblMensurationFile().setFileName(fileName); + } + + public void setTblMensurationClasseFile(File file) { + getModel().getTblMensurationClasseFile().setFile(file); + } + + public void setTblMensurationClasseFileContentType(String contentType) { + getModel().getTblMensurationClasseFile().setContentType(contentType); + } + + public void setTblMensurationClasseFileFileName(String fileName) { + getModel().getTblMensurationClasseFile().setFileName(fileName); + } +} Property changes on: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureCatchesData.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Deleted: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureCatchesDataImport.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureCatchesDataImport.java 2012-01-15 21:33:13 UTC (rev 284) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureCatchesDataImport.java 2012-01-15 22:12:51 UTC (rev 285) @@ -1,119 +0,0 @@ -/* - * #%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% - */ -package fr.ifremer.echobase.ui.actions.importData; - -import fr.ifremer.echobase.entities.data.Voyage; -import fr.ifremer.echobase.services.EchoBaseServiceSupport; -import fr.ifremer.echobase.services.configurations.CatchesDataImportConfiguration; - -import java.io.File; -import java.util.Map; - -/** - * Configure a "catches data" import. - * - * @author tchemit <chemit(a)codelutin.com> - * @since 0.3 - */ -public class ConfigureCatchesDataImport extends AbstractConfigureImport<CatchesDataImportConfiguration> { - - private static final long serialVersionUID = 1L; - - /** Universe of existing voyages. */ - protected Map<String, String> voyages; - - public ConfigureCatchesDataImport() { - super(CatchesDataImportConfiguration.class); - } - - @Override - protected CatchesDataImportConfiguration createModel() { - return new CatchesDataImportConfiguration(getLocale()); - } - - @Override - public String input() throws Exception { - - super.input(); - - EchoBaseServiceSupport service = - newService(EchoBaseServiceSupport.class); - - voyages = loadSortAndDecorate(service, Voyage.class); - - return INPUT; - } - - public Map<String, String> getVoyages() { - return voyages; - } - - public void setTlbeStationFile(File file) { - getModel().getTlbeStationFile().setFile(file); - } - - public void setTlbeStationFileContentType(String contentType) { - getModel().getTlbeStationFile().setContentType(contentType); - } - - public void setTlbeStationFileFileName(String fileName) { - getModel().getTlbeStationFile().setFileName(fileName); - } - - public void setXtblTriFile(File file) { - getModel().getXtblTriFile().setFile(file); - } - - public void setXtblTriFileContentType(String contentType) { - getModel().getXtblTriFile().setContentType(contentType); - } - - public void setXtblTriFileFileName(String fileName) { - getModel().getXtblTriFile().setFileName(fileName); - } - - public void setTblMensurationFile(File file) { - getModel().getTblMensurationFile().setFile(file); - } - - public void setTblMensurationFileContentType(String contentType) { - getModel().getTblMensurationFile().setContentType(contentType); - } - - public void setTblMensurationFileFileName(String fileName) { - getModel().getTblMensurationFile().setFileName(fileName); - } - - public void setTblMensurationClasseFile(File file) { - getModel().getTblMensurationClasseFile().setFile(file); - } - - public void setTblMensurationClasseFileContentType(String contentType) { - getModel().getTblMensurationClasseFile().setContentType(contentType); - } - - public void setTblMensurationClasseFileFileName(String fileName) { - getModel().getTblMensurationClasseFile().setFileName(fileName); - } -} Copied: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureCatchesIndividualData.java (from rev 267, trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureCatchesIndividualDataImport.java) =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureCatchesIndividualData.java (rev 0) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureCatchesIndividualData.java 2012-01-15 22:12:51 UTC (rev 285) @@ -0,0 +1,83 @@ +/* + * #%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% + */ +package fr.ifremer.echobase.ui.actions.importData; + +import fr.ifremer.echobase.entities.data.Voyage; +import fr.ifremer.echobase.services.EchoBaseServiceSupport; +import fr.ifremer.echobase.services.configurations.CatchesIndividualDataImportConfiguration; + +import java.io.File; +import java.util.Map; + +/** + * Configure a "catches individual data" import. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 0.3 + */ +public class ConfigureCatchesIndividualData extends AbstractConfigureImport<CatchesIndividualDataImportConfiguration> { + + private static final long serialVersionUID = 1L; + + /** Universe of existing voyages. */ + protected Map<String, String> voyages; + + public ConfigureCatchesIndividualData() { + super(CatchesIndividualDataImportConfiguration.class); + } + + @Override + protected CatchesIndividualDataImportConfiguration createModel() { + return new CatchesIndividualDataImportConfiguration(getLocale()); + } + + @Override + public String input() throws Exception { + + super.input(); + + EchoBaseServiceSupport service = + newService(EchoBaseServiceSupport.class); + + voyages = loadSortAndDecorate(service, Voyage.class); + + return INPUT; + } + + public Map<String, String> getVoyages() { + return voyages; + } + + public void setIndividualDataFile(File file) { + getModel().getIndividualDataFile().setFile(file); + } + + public void setIndividualDataFileContentType(String contentType) { + getModel().getIndividualDataFile().setContentType(contentType); + } + + public void setIndividualDataFileFileName(String fileName) { + getModel().getIndividualDataFile().setFileName(fileName); + } +} Property changes on: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureCatchesIndividualData.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Deleted: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureCatchesIndividualDataImport.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureCatchesIndividualDataImport.java 2012-01-15 21:33:13 UTC (rev 284) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureCatchesIndividualDataImport.java 2012-01-15 22:12:51 UTC (rev 285) @@ -1,83 +0,0 @@ -/* - * #%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% - */ -package fr.ifremer.echobase.ui.actions.importData; - -import fr.ifremer.echobase.entities.data.Voyage; -import fr.ifremer.echobase.services.EchoBaseServiceSupport; -import fr.ifremer.echobase.services.configurations.CatchesIndividualDataImportConfiguration; - -import java.io.File; -import java.util.Map; - -/** - * Configure a "catches individual data" import. - * - * @author tchemit <chemit(a)codelutin.com> - * @since 0.3 - */ -public class ConfigureCatchesIndividualDataImport extends AbstractConfigureImport<CatchesIndividualDataImportConfiguration> { - - private static final long serialVersionUID = 1L; - - /** Universe of existing voyages. */ - protected Map<String, String> voyages; - - public ConfigureCatchesIndividualDataImport() { - super(CatchesIndividualDataImportConfiguration.class); - } - - @Override - protected CatchesIndividualDataImportConfiguration createModel() { - return new CatchesIndividualDataImportConfiguration(getLocale()); - } - - @Override - public String input() throws Exception { - - super.input(); - - EchoBaseServiceSupport service = - newService(EchoBaseServiceSupport.class); - - voyages = loadSortAndDecorate(service, Voyage.class); - - return INPUT; - } - - public Map<String, String> getVoyages() { - return voyages; - } - - public void setIndividualDataFile(File file) { - getModel().getIndividualDataFile().setFile(file); - } - - public void setIndividualDataFileContentType(String contentType) { - getModel().getIndividualDataFile().setContentType(contentType); - } - - public void setIndividualDataFileFileName(String fileName) { - getModel().getIndividualDataFile().setFileName(fileName); - } -} Copied: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureCatchesReference.java (from rev 267, trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureCatchesReferenceImport.java) =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureCatchesReference.java (rev 0) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureCatchesReference.java 2012-01-15 22:12:51 UTC (rev 285) @@ -0,0 +1,72 @@ +/* + * #%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% + */ +package fr.ifremer.echobase.ui.actions.importData; + +import fr.ifremer.echobase.services.configurations.CatchesReferenceImportConfiguration; + +import java.io.File; + +/** + * Configure a accoustic data import. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 0.3 + */ +public class ConfigureCatchesReference extends AbstractConfigureImport<CatchesReferenceImportConfiguration> { + + private static final long serialVersionUID = 1L; + + public ConfigureCatchesReference() { + super(CatchesReferenceImportConfiguration.class); + } + + @Override + protected CatchesReferenceImportConfiguration createModel() { + return new CatchesReferenceImportConfiguration(getLocale()); + } + + public void setLengthAgeKeyFile(File file) { + getModel().getLengthAgeKeyFile().setFile(file); + } + + public void setLengthAgeKeyFileContentType(String contentType) { + getModel().getLengthAgeKeyFile().setContentType(contentType); + } + + public void setLengthAgeKeyFileFileName(String fileName) { + getModel().getLengthAgeKeyFile().setFileName(fileName); + } + + public void setLengthWeightKeyFile(File file) { + getModel().getLengthWeightKeyFile().setFile(file); + } + + public void setLengthWeightKeyFileContentType(String contentType) { + getModel().getLengthWeightKeyFile().setContentType(contentType); + } + + public void setLengthWeightKeyFileFileName(String fileName) { + getModel().getLengthWeightKeyFile().setFileName(fileName); + } +} Property changes on: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureCatchesReference.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Deleted: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureCatchesReferenceImport.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureCatchesReferenceImport.java 2012-01-15 21:33:13 UTC (rev 284) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureCatchesReferenceImport.java 2012-01-15 22:12:51 UTC (rev 285) @@ -1,72 +0,0 @@ -/* - * #%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% - */ -package fr.ifremer.echobase.ui.actions.importData; - -import fr.ifremer.echobase.services.configurations.CatchesReferenceImportConfiguration; - -import java.io.File; - -/** - * Configure a accoustic data import. - * - * @author tchemit <chemit(a)codelutin.com> - * @since 0.3 - */ -public class ConfigureCatchesReferenceImport extends AbstractConfigureImport<CatchesReferenceImportConfiguration> { - - private static final long serialVersionUID = 1L; - - public ConfigureCatchesReferenceImport() { - super(CatchesReferenceImportConfiguration.class); - } - - @Override - protected CatchesReferenceImportConfiguration createModel() { - return new CatchesReferenceImportConfiguration(getLocale()); - } - - public void setLengthAgeKeyFileFile(File file) { - getModel().getLengthAgeKeyFile().setFile(file); - } - - public void setLengthAgeKeyFileContentType(String contentType) { - getModel().getLengthAgeKeyFile().setContentType(contentType); - } - - public void setLengthAgeKeyFileFileName(String fileName) { - getModel().getLengthAgeKeyFile().setFileName(fileName); - } - - public void setLengthWeightKeyFileFile(File file) { - getModel().getLengthWeightKeyFile().setFile(file); - } - - public void setLengthWeightKeyFileContentType(String contentType) { - getModel().getLengthWeightKeyFile().setContentType(contentType); - } - - public void setLengthWeightKeyFileFileName(String fileName) { - getModel().getLengthWeightKeyFile().setFileName(fileName); - } -} Copied: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureCommonDataComplete.java (from rev 284, 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/ConfigureCommonDataComplete.java (rev 0) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureCommonDataComplete.java 2012-01-15 22:12:51 UTC (rev 285) @@ -0,0 +1,196 @@ +/* + * #%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% + */ +package fr.ifremer.echobase.ui.actions.importData; + +import com.opensymphony.xwork2.interceptor.annotations.InputConfig; +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; + +import java.io.File; +import java.util.Map; + +/** + * Configure a accoustic data import. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 0.3 + */ +public class ConfigureCommonDataComplete extends AbstractConfigureImport<CommonDataCompleteImportConfiguration> { + + private static final long serialVersionUID = 1L; + + /** Universe of existing missions. */ + protected Map<String, String> missions; + + /** 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; + + /** Selected import mode. */ + protected SelectedMissionMode importMode; + + /** mission to create (if asked to create a new mission). */ + protected Mission mission; + + public ConfigureCommonDataComplete() { + super(CommonDataCompleteImportConfiguration.class); + } + + @Override + protected CommonDataCompleteImportConfiguration createModel() { + return new CommonDataCompleteImportConfiguration(getLocale()); + } + + @Override + public String input() throws Exception { + + super.input(); + + EchoBaseServiceSupport service = + newService(EchoBaseServiceSupport.class); + + missions = loadSortAndDecorate(service, Mission.class); + areaOfOperations = loadSortAndDecorate(service, AreaOfOperation.class); + vessels = loadSortAndDecorate(service, Vessel.class); + + importModes = decorateEnums(SelectedMissionMode.values()); + + if (importMode == null) { + importMode = SelectedMissionMode.USE_EXISTING_MISSION; + } + + return INPUT; + } + + @InputConfig(methodName = "input") + @Override + public String execute() throws Exception { + + super.execute(); + + if (importMode == SelectedMissionMode.CREATE_NEW_MISSION) { + + // create voyage in db + CommonDataCompleteImportService service = + newService(CommonDataCompleteImportService.class); + + Mission missionToCreate = getMission(); + + Mission missionSaved = service.createMission(missionToCreate); + + getModel().setMissionId(missionSaved.getTopiaId()); + } + + return SUCCESS; + } + + public Map<String, String> getMissions() { + return missions; + } + + public Map<String, String> getAreaOfOperations() { + return areaOfOperations; + } + + public Map<String, String> getVessels() { + return vessels; + } + + public Map<String, String> getImportModes() { + return importModes; + } + + public SelectedMissionMode getImportMode() { + return importMode; + } + + public Mission getMission() { + if (mission == null) { + mission = new MissionImpl(); + } + return mission; + } + + public void setImportMode(SelectedMissionMode importMode) { + this.importMode = importMode; + } + + public void setVoyageFile(File file) { + getModel().getVoyageFile().setFile(file); + } + + public void setVoyageFileContentType(String contentType) { + getModel().getVoyageFile().setContentType(contentType); + } + + 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); + } + + public void setEchotypeFileContentType(String contentType) { + getModel().getEchotypeFile().setContentType(contentType); + } + + public void setEchotypeFileFileName(String fileName) { + getModel().getEchotypeFile().setFileName(fileName); + } +} Property changes on: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureCommonDataComplete.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Deleted: 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:33:13 UTC (rev 284) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureCommonDataCompleteImport.java 2012-01-15 22:12:51 UTC (rev 285) @@ -1,194 +0,0 @@ -/* - * #%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% - */ -package fr.ifremer.echobase.ui.actions.importData; - -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; - -import java.io.File; -import java.util.Map; - -/** - * Configure a accoustic data import. - * - * @author tchemit <chemit(a)codelutin.com> - * @since 0.3 - */ -public class ConfigureCommonDataCompleteImport extends AbstractConfigureImport<CommonDataCompleteImportConfiguration> { - - private static final long serialVersionUID = 1L; - - /** Universe of existing missions. */ - protected Map<String, String> missions; - - /** 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; - - /** Selected import mode. */ - protected SelectedMissionMode importMode; - - /** mission to create (if asked to create a new mission). */ - protected Mission mission; - - public ConfigureCommonDataCompleteImport() { - super(CommonDataCompleteImportConfiguration.class); - } - - @Override - protected CommonDataCompleteImportConfiguration createModel() { - return new CommonDataCompleteImportConfiguration(getLocale()); - } - - @Override - public String input() throws Exception { - - super.input(); - - EchoBaseServiceSupport service = - newService(EchoBaseServiceSupport.class); - - missions = loadSortAndDecorate(service, Mission.class); - areaOfOperations = loadSortAndDecorate(service, AreaOfOperation.class); - vessels = loadSortAndDecorate(service, Vessel.class); - - importModes = decorateEnums(SelectedMissionMode.values()); - - if (importMode == null) { - importMode = SelectedMissionMode.USE_EXISTING_MISSION; - } - - return INPUT; - } - - @Override - public String execute() throws Exception { - - super.execute(); - - if (importMode == SelectedMissionMode.CREATE_NEW_MISSION) { - - // create voyage in db - CommonDataCompleteImportService service = - newService(CommonDataCompleteImportService.class); - - Mission missionToCreate = getMission(); - - Mission missionSaved = service.createMission(missionToCreate); - - getModel().setMissionId(missionSaved.getTopiaId()); - } - - return SUCCESS; - } - - public Map<String, String> getMissions() { - return missions; - } - - public Map<String, String> getAreaOfOperations() { - return areaOfOperations; - } - - public Map<String, String> getVessels() { - return vessels; - } - - public Map<String, String> getImportModes() { - return importModes; - } - - public SelectedMissionMode getImportMode() { - return importMode; - } - - public Mission getMission() { - if (mission == null) { - mission = new MissionImpl(); - } - return mission; - } - - public void setImportMode(SelectedMissionMode importMode) { - this.importMode = importMode; - } - - public void setVoyageFile(File file) { - getModel().getVoyageFile().setFile(file); - } - - public void setVoyageFileContentType(String contentType) { - getModel().getVoyageFile().setContentType(contentType); - } - - 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); - } - - public void setEchotypeFileContentType(String contentType) { - getModel().getEchotypeFile().setContentType(contentType); - } - - public void setEchotypeFileFileName(String fileName) { - getModel().getEchotypeFile().setFileName(fileName); - } -} Copied: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureCommonDataFromTransect.java (from rev 284, 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/ConfigureCommonDataFromTransect.java (rev 0) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureCommonDataFromTransect.java 2012-01-15 22:12:51 UTC (rev 285) @@ -0,0 +1,92 @@ +/* + * #%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% + */ +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; + +import java.io.File; +import java.util.Map; + +/** + * Configure a "common data from transect" import. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 0.3 + */ +public class ConfigureCommonDataFromTransect extends AbstractConfigureImport<CommonDataFromTransectImportConfiguration> { + + private static final long serialVersionUID = 1L; + + /** Universe of existing voyages. */ + protected Map<String, String> voyages; + + /** Universe of existing vessels. */ + protected Map<String, String> vessels; + + public ConfigureCommonDataFromTransect() { + super(CommonDataFromTransectImportConfiguration.class); + } + + @Override + protected CommonDataFromTransectImportConfiguration createModel() { + return new CommonDataFromTransectImportConfiguration(getLocale()); + } + + @Override + public String input() throws Exception { + + super.input(); + + EchoBaseServiceSupport service = + newService(EchoBaseServiceSupport.class); + + voyages = loadSortAndDecorate(service, Voyage.class); + vessels = loadSortAndDecorate(service, Vessel.class); + + return INPUT; + } + + public Map<String, String> getVoyages() { + return voyages; + } + + public Map<String, String> getVessels() { + return vessels; + } + + 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); + } +} Property changes on: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureCommonDataFromTransect.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Deleted: 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:33:13 UTC (rev 284) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureCommonDataFromTransectImport.java 2012-01-15 22:12:51 UTC (rev 285) @@ -1,92 +0,0 @@ -/* - * #%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% - */ -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; - -import java.io.File; -import java.util.Map; - -/** - * Configure a "common data from transect" import. - * - * @author tchemit <chemit(a)codelutin.com> - * @since 0.3 - */ -public class ConfigureCommonDataFromTransectImport extends AbstractConfigureImport<CommonDataFromTransectImportConfiguration> { - - private static final long serialVersionUID = 1L; - - /** Universe of existing voyages. */ - protected Map<String, String> voyages; - - /** Universe of existing vessels. */ - protected Map<String, String> vessels; - - public ConfigureCommonDataFromTransectImport() { - super(CommonDataFromTransectImportConfiguration.class); - } - - @Override - protected CommonDataFromTransectImportConfiguration createModel() { - return new CommonDataFromTransectImportConfiguration(getLocale()); - } - - @Override - public String input() throws Exception { - - super.input(); - - EchoBaseServiceSupport service = - newService(EchoBaseServiceSupport.class); - - voyages = loadSortAndDecorate(service, Voyage.class); - vessels = loadSortAndDecorate(service, Vessel.class); - - return INPUT; - } - - public Map<String, String> getVoyages() { - return voyages; - } - - public Map<String, String> getVessels() { - return vessels; - } - - 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); - } -} Copied: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/LaunchAccousticData.java (from rev 267, trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/LaunchAccousticDataImport.java) =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/LaunchAccousticData.java (rev 0) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/LaunchAccousticData.java 2012-01-15 22:12:51 UTC (rev 285) @@ -0,0 +1,43 @@ +/* + * #%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% + */ +package fr.ifremer.echobase.ui.actions.importData; + +import fr.ifremer.echobase.services.AccousticDataImportService; +import fr.ifremer.echobase.services.configurations.AccousticDataImportConfiguration; + +/** + * Configure a accoustic data import. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 0.3 + */ +public class LaunchAccousticData extends AbstractLaunchImport<AccousticDataImportConfiguration, AccousticDataImportService> { + + private static final long serialVersionUID = 1L; + + public LaunchAccousticData() { + super(AccousticDataImportConfiguration.class, AccousticDataImportService.class); + } + +} Property changes on: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/LaunchAccousticData.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Deleted: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/LaunchAccousticDataImport.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/LaunchAccousticDataImport.java 2012-01-15 21:33:13 UTC (rev 284) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/LaunchAccousticDataImport.java 2012-01-15 22:12:51 UTC (rev 285) @@ -1,43 +0,0 @@ -/* - * #%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% - */ -package fr.ifremer.echobase.ui.actions.importData; - -import fr.ifremer.echobase.services.AccousticDataImportService; -import fr.ifremer.echobase.services.configurations.AccousticDataImportConfiguration; - -/** - * Configure a accoustic data import. - * - * @author tchemit <chemit(a)codelutin.com> - * @since 0.3 - */ -public class LaunchAccousticDataImport extends AbstractLaunchImport<AccousticDataImportConfiguration, AccousticDataImportService> { - - private static final long serialVersionUID = 1L; - - public LaunchAccousticDataImport() { - super(AccousticDataImportConfiguration.class, AccousticDataImportService.class); - } - -} Copied: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/LaunchAccousticRegionData.java (from rev 267, trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/LaunchAccousticRegionDataImport.java) =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/LaunchAccousticRegionData.java (rev 0) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/LaunchAccousticRegionData.java 2012-01-15 22:12:51 UTC (rev 285) @@ -0,0 +1,43 @@ +/* + * #%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% + */ +package fr.ifremer.echobase.ui.actions.importData; + +import fr.ifremer.echobase.services.AccousticRegionDataImportService; +import fr.ifremer.echobase.services.configurations.AccousticRegionDataImportConfiguration; + +/** + * Configure a accoustic data import. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 0.3 + */ +public class LaunchAccousticRegionData extends AbstractLaunchImport<AccousticRegionDataImportConfiguration, AccousticRegionDataImportService> { + + private static final long serialVersionUID = 1L; + + public LaunchAccousticRegionData() { + super(AccousticRegionDataImportConfiguration.class, AccousticRegionDataImportService.class); + } + +} Property changes on: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/LaunchAccousticRegionData.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Deleted: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/LaunchAccousticRegionDataImport.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/LaunchAccousticRegionDataImport.java 2012-01-15 21:33:13 UTC (rev 284) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/LaunchAccousticRegionDataImport.java 2012-01-15 22:12:51 UTC (rev 285) @@ -1,43 +0,0 @@ -/* - * #%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% - */ -package fr.ifremer.echobase.ui.actions.importData; - -import fr.ifremer.echobase.services.AccousticRegionDataImportService; -import fr.ifremer.echobase.services.configurations.AccousticRegionDataImportConfiguration; - -/** - * Configure a accoustic data import. - * - * @author tchemit <chemit(a)codelutin.com> - * @since 0.3 - */ -public class LaunchAccousticRegionDataImport extends AbstractLaunchImport<AccousticRegionDataImportConfiguration, AccousticRegionDataImportService> { - - private static final long serialVersionUID = 1L; - - public LaunchAccousticRegionDataImport() { - super(AccousticRegionDataImportConfiguration.class, AccousticRegionDataImportService.class); - } - -} Copied: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/LaunchCatchesData.java (from rev 267, trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/LaunchCatchesDataImport.java) =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/LaunchCatchesData.java (rev 0) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/LaunchCatchesData.java 2012-01-15 22:12:51 UTC (rev 285) @@ -0,0 +1,43 @@ +/* + * #%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% + */ +package fr.ifremer.echobase.ui.actions.importData; + +import fr.ifremer.echobase.services.CatchesDataImportService; +import fr.ifremer.echobase.services.configurations.CatchesDataImportConfiguration; + +/** + * Configure a accoustic data import. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 0.3 + */ +public class LaunchCatchesData extends AbstractLaunchImport<CatchesDataImportConfiguration, CatchesDataImportService> { + + private static final long serialVersionUID = 1L; + + public LaunchCatchesData() { + super(CatchesDataImportConfiguration.class, CatchesDataImportService.class); + } + +} Property changes on: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/LaunchCatchesData.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Deleted: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/LaunchCatchesDataImport.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/LaunchCatchesDataImport.java 2012-01-15 21:33:13 UTC (rev 284) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/LaunchCatchesDataImport.java 2012-01-15 22:12:51 UTC (rev 285) @@ -1,43 +0,0 @@ -/* - * #%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% - */ -package fr.ifremer.echobase.ui.actions.importData; - -import fr.ifremer.echobase.services.CatchesDataImportService; -import fr.ifremer.echobase.services.configurations.CatchesDataImportConfiguration; - -/** - * Configure a accoustic data import. - * - * @author tchemit <chemit(a)codelutin.com> - * @since 0.3 - */ -public class LaunchCatchesDataImport extends AbstractLaunchImport<CatchesDataImportConfiguration, CatchesDataImportService> { - - private static final long serialVersionUID = 1L; - - public LaunchCatchesDataImport() { - super(CatchesDataImportConfiguration.class, CatchesDataImportService.class); - } - -} Copied: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/LaunchCatchesIndividualData.java (from rev 267, trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/LaunchCatchesIndividualDataImport.java) =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/LaunchCatchesIndividualData.java (rev 0) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/LaunchCatchesIndividualData.java 2012-01-15 22:12:51 UTC (rev 285) @@ -0,0 +1,43 @@ +/* + * #%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% + */ +package fr.ifremer.echobase.ui.actions.importData; + +import fr.ifremer.echobase.services.CatchesIndividualDataImportService; +import fr.ifremer.echobase.services.configurations.CatchesIndividualDataImportConfiguration; + +/** + * Configure a accoustic data import. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 0.3 + */ +public class LaunchCatchesIndividualData extends AbstractLaunchImport<CatchesIndividualDataImportConfiguration, CatchesIndividualDataImportService> { + + private static final long serialVersionUID = 1L; + + public LaunchCatchesIndividualData() { + super(CatchesIndividualDataImportConfiguration.class, CatchesIndividualDataImportService.class); + } + +} Property changes on: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/LaunchCatchesIndividualData.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Deleted: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/LaunchCatchesIndividualDataImport.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/LaunchCatchesIndividualDataImport.java 2012-01-15 21:33:13 UTC (rev 284) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/LaunchCatchesIndividualDataImport.java 2012-01-15 22:12:51 UTC (rev 285) @@ -1,43 +0,0 @@ -/* - * #%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% - */ -package fr.ifremer.echobase.ui.actions.importData; - -import fr.ifremer.echobase.services.CatchesIndividualDataImportService; -import fr.ifremer.echobase.services.configurations.CatchesIndividualDataImportConfiguration; - -/** - * Configure a accoustic data import. - * - * @author tchemit <chemit(a)codelutin.com> - * @since 0.3 - */ -public class LaunchCatchesIndividualDataImport extends AbstractLaunchImport<CatchesIndividualDataImportConfiguration, CatchesIndividualDataImportService> { - - private static final long serialVersionUID = 1L; - - public LaunchCatchesIndividualDataImport() { - super(CatchesIndividualDataImportConfiguration.class, CatchesIndividualDataImportService.class); - } - -} Copied: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/LaunchCatchesReference.java (from rev 267, trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/LaunchCatchesReferenceImport.java) =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/LaunchCatchesReference.java (rev 0) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/LaunchCatchesReference.java 2012-01-15 22:12:51 UTC (rev 285) @@ -0,0 +1,43 @@ +/* + * #%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% + */ +package fr.ifremer.echobase.ui.actions.importData; + +import fr.ifremer.echobase.services.CatchesReferenceImportService; +import fr.ifremer.echobase.services.configurations.CatchesReferenceImportConfiguration; + +/** + * Configure a accoustic data import. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 0.3 + */ +public class LaunchCatchesReference extends AbstractLaunchImport<CatchesReferenceImportConfiguration, CatchesReferenceImportService> { + + private static final long serialVersionUID = 1L; + + public LaunchCatchesReference() { + super(CatchesReferenceImportConfiguration.class, CatchesReferenceImportService.class); + } + +} Property changes on: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/LaunchCatchesReference.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Deleted: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/LaunchCatchesReferenceImport.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/LaunchCatchesReferenceImport.java 2012-01-15 21:33:13 UTC (rev 284) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/LaunchCatchesReferenceImport.java 2012-01-15 22:12:51 UTC (rev 285) @@ -1,43 +0,0 @@ -/* - * #%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% - */ -package fr.ifremer.echobase.ui.actions.importData; - -import fr.ifremer.echobase.services.CatchesReferenceImportService; -import fr.ifremer.echobase.services.configurations.CatchesReferenceImportConfiguration; - -/** - * Configure a accoustic data import. - * - * @author tchemit <chemit(a)codelutin.com> - * @since 0.3 - */ -public class LaunchCatchesReferenceImport extends AbstractLaunchImport<CatchesReferenceImportConfiguration, CatchesReferenceImportService> { - - private static final long serialVersionUID = 1L; - - public LaunchCatchesReferenceImport() { - super(CatchesReferenceImportConfiguration.class, CatchesReferenceImportService.class); - } - -} Copied: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/LaunchCommonDataComplete.java (from rev 267, trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/LaunchCommonDataCompleteImport.java) =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/LaunchCommonDataComplete.java (rev 0) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/LaunchCommonDataComplete.java 2012-01-15 22:12:51 UTC (rev 285) @@ -0,0 +1,43 @@ +/* + * #%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% + */ +package fr.ifremer.echobase.ui.actions.importData; + +import fr.ifremer.echobase.services.CommonDataCompleteImportService; +import fr.ifremer.echobase.services.configurations.CommonDataCompleteImportConfiguration; + +/** + * Configure a accoustic data import. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 0.3 + */ +public class LaunchCommonDataComplete extends AbstractLaunchImport<CommonDataCompleteImportConfiguration, CommonDataCompleteImportService> { + + private static final long serialVersionUID = 1L; + + public LaunchCommonDataComplete() { + super(CommonDataCompleteImportConfiguration.class, CommonDataCompleteImportService.class); + } + +} Property changes on: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/LaunchCommonDataComplete.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Deleted: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/LaunchCommonDataCompleteImport.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/LaunchCommonDataCompleteImport.java 2012-01-15 21:33:13 UTC (rev 284) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/LaunchCommonDataCompleteImport.java 2012-01-15 22:12:51 UTC (rev 285) @@ -1,43 +0,0 @@ -/* - * #%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% - */ -package fr.ifremer.echobase.ui.actions.importData; - -import fr.ifremer.echobase.services.CommonDataCompleteImportService; -import fr.ifremer.echobase.services.configurations.CommonDataCompleteImportConfiguration; - -/** - * Configure a accoustic data import. - * - * @author tchemit <chemit(a)codelutin.com> - * @since 0.3 - */ -public class LaunchCommonDataCompleteImport extends AbstractLaunchImport<CommonDataCompleteImportConfiguration, CommonDataCompleteImportService> { - - private static final long serialVersionUID = 1L; - - public LaunchCommonDataCompleteImport() { - super(CommonDataCompleteImportConfiguration.class, CommonDataCompleteImportService.class); - } - -} Copied: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/LaunchCommonDataFromTransect.java (from rev 267, trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/LaunchCommonDataFromTransectImport.java) =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/LaunchCommonDataFromTransect.java (rev 0) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/LaunchCommonDataFromTransect.java 2012-01-15 22:12:51 UTC (rev 285) @@ -0,0 +1,43 @@ +/* + * #%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% + */ +package fr.ifremer.echobase.ui.actions.importData; + +import fr.ifremer.echobase.services.CommonDataFromTransectImportService; +import fr.ifremer.echobase.services.configurations.CommonDataFromTransectImportConfiguration; + +/** + * Configure a accoustic data import. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 0.3 + */ +public class LaunchCommonDataFromTransect extends AbstractLaunchImport<CommonDataFromTransectImportConfiguration, CommonDataFromTransectImportService> { + + private static final long serialVersionUID = 1L; + + public LaunchCommonDataFromTransect() { + super(CommonDataFromTransectImportConfiguration.class, CommonDataFromTransectImportService.class); + } + +} Property changes on: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/LaunchCommonDataFromTransect.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Deleted: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/LaunchCommonDataFromTransectImport.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/LaunchCommonDataFromTransectImport.java 2012-01-15 21:33:13 UTC (rev 284) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/LaunchCommonDataFromTransectImport.java 2012-01-15 22:12:51 UTC (rev 285) @@ -1,43 +0,0 @@ -/* - * #%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% - */ -package fr.ifremer.echobase.ui.actions.importData; - -import fr.ifremer.echobase.services.CommonDataFromTransectImportService; -import fr.ifremer.echobase.services.configurations.CommonDataFromTransectImportConfiguration; - -/** - * Configure a accoustic data import. - * - * @author tchemit <chemit(a)codelutin.com> - * @since 0.3 - */ -public class LaunchCommonDataFromTransectImport extends AbstractLaunchImport<CommonDataFromTransectImportConfiguration, CommonDataFromTransectImportService> { - - private static final long serialVersionUID = 1L; - - public LaunchCommonDataFromTransectImport() { - super(CommonDataFromTransectImportConfiguration.class, CommonDataFromTransectImportService.class); - } - -} 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:33:13 UTC (rev 284) +++ trunk/echobase-ui/src/main/resources/config/struts-importData.xml 2012-01-15 22:12:51 UTC (rev 285) @@ -46,7 +46,7 @@  <action name="configure*" - class="fr.ifremer.echobase.ui.actions.importData.Configure{1}Import"> + class="fr.ifremer.echobase.ui.actions.importData.Configure{1}"> <interceptor-ref name="paramsPrepareParamsStackLoggued"/> <result name="input">/WEB-INF/jsp/importData/configure{1}.jsp</result> <result type="redirectAction"> @@ -57,7 +57,7 @@  <action name="import*" - class="fr.ifremer.echobase.ui.actions.importData.Launch{1}Import"> + class="fr.ifremer.echobase.ui.actions.importData.Launch{1}"> <interceptor-ref name="basicStackLoggued"/> <interceptor-ref name="execAndWait"/> <result name="wait">/WEB-INF/jsp/importData/progress{1}.jsp</result> Modified: trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureAccousticData-validation.xml =================================================================== --- trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureAccousticData-validation.xml 2012-01-15 21:33:13 UTC (rev 284) +++ trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureAccousticData-validation.xml 2012-01-15 22:12:51 UTC (rev 285) @@ -57,8 +57,9 @@ </field-validator> </field> - <field name="model.moviesFile.file"> - <field-validator type="required"> + <field name="moviesFile"> + <field-validator type="nfieldexpression"> + <param name="expression">model.moviesFile.file!=null</param> <message key="echobase.error.import.moviesFile.required"/> </field-validator> </field> Modified: 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 2012-01-15 21:33:13 UTC (rev 284) +++ trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureAccousticRegionData-validation.xml 2012-01-15 22:12:51 UTC (rev 285) @@ -38,14 +38,16 @@ </field-validator> </field> - <field name="model.regionsFile.file"> - <field-validator type="required"> + <field name="regionsFile"> + <field-validator type="nfieldexpression"> + <param name="expression">model.regionsFile.file!=null</param> <message key="echobase.error.import.regionsFile.required"/> </field-validator> </field> - <field name="model.associationFile.file"> - <field-validator type="required"> + <field name="associationFile"> + <field-validator type="nfieldexpression"> + <param name="expression">model.associationFile.file!=null</param> <message key="echobase.error.import.associationFile.required"/> </field-validator> </field> Modified: 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 2012-01-15 21:33:13 UTC (rev 284) +++ trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureCatchesData-validation.xml 2012-01-15 22:12:51 UTC (rev 285) @@ -32,26 +32,30 @@ </field-validator> </field> - <field name="model.tlbeStationFile.file"> - <field-validator type="required"> + <field name="tlbeStationFile"> + <field-validator type="nfieldexpression"> + <param name="expression">model.tlbeStationFile.file!=null</param> <message key="echobase.error.import.tlbeStationFile.required"/> </field-validator> </field> - <field name="model.xtblTriFile.file"> - <field-validator type="required"> + <field name="xtblTriFile"> + <field-validator type="nfieldexpression"> + <param name="expression">model.xtblTriFile.file!=null</param> <message key="echobase.error.import.xtblTriFile.required"/> </field-validator> </field> - <field name="model.tblMensurationFile.file"> - <field-validator type="required"> + <field name="tblMensurationFile"> + <field-validator type="nfieldexpression"> + <param name="expression">model.tblMensurationFile.file!=null</param> <message key="echobase.error.import.tblMensurationFile.required"/> </field-validator> </field> - <field name="model.tblMensurationClasseFile.file"> - <field-validator type="required"> + <field name="tblMensurationClasseFile"> + <field-validator type="nfieldexpression"> + <param name="expression">model.tblMensurationClasseFile.file!=null</param> <message key="echobase.error.import.tblMensurationClasseFile.required"/> </field-validator> </field> Modified: 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 2012-01-15 21:33:13 UTC (rev 284) +++ trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureCatchesIndividualData-validation.xml 2012-01-15 22:12:51 UTC (rev 285) @@ -32,8 +32,9 @@ </field-validator> </field> - <field name="model.individualDataFile.file"> - <field-validator type="required"> + <field name="individualDataFile"> + <field-validator type="nfieldexpression"> + <param name="expression">model.individualDataFile.file!=null</param> <message key="echobase.error.import.individualDataFile.required"/> </field-validator> </field> Modified: 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 2012-01-15 21:33:13 UTC (rev 284) +++ trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureCatchesReference-validation.xml 2012-01-15 22:12:51 UTC (rev 285) @@ -26,14 +26,16 @@ "http://www.opensymphony.com/xwork/xwork-validator-1.0.2.dtd"> <validators> - <field name="model.lengthAgeKeyFile.file"> - <field-validator type="required"> + <field name="lengthAgeKeyFile"> + <field-validator type="nfieldexpression"> + <param name="expression">model.lengthAgeKeyFile.file!=null</param> <message key="echobase.error.import.lengthAgeKeyFile.required"/> </field-validator> </field> - <field name="model.lengthWeightKeyFile.file"> - <field-validator type="required"> + <field name="lengthWeightKeyFile"> + <field-validator type="nfieldexpression"> + <param name="expression">model.lengthWeightKeyFile.file!=null</param> <message key="echobase.error.import.lengthWeightKeyFile.required"/> </field-validator> </field> Modified: 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/ConfigureCommonDataComplete-validation.xml 2012-01-15 21:33:13 UTC (rev 284) +++ trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureCommonDataComplete-validation.xml 2012-01-15 22:12:51 UTC (rev 285) @@ -80,26 +80,30 @@ </field-validator> </field> - <field name="model.voyageFile.file"> - <field-validator type="required"> + <field name="voyageFile"> + <field-validator type="nfieldexpression"> + <param name="expression">model.voyageFile.file!=null</param> <message key="echobase.error.import.voyageFile.required"/> </field-validator> </field> - <field name="model.transitFile.file"> - <field-validator type="required"> + <field name="transitFile"> + <field-validator type="nfieldexpression"> + <param name="expression">model.transitFile.file!=null</param> <message key="echobase.error.import.transitFile.required"/> </field-validator> </field> - <field name="model.transectFile.file"> - <field-validator type="required"> + <field name="transectFile"> + <field-validator type="nfieldexpression"> + <param name="expression">model.transectFile.file!=null</param> <message key="echobase.error.import.transectFile.required"/> </field-validator> </field> - <field name="model.echotypeFile.file"> - <field-validator type="required"> + <field name="echotypeFile"> + <field-validator type="nfieldexpression"> + <param name="expression">model.echotypeFile.file!=null</param> <message key="echobase.error.import.echotypeFile.required"/> </field-validator> </field> Modified: 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 2012-01-15 21:33:13 UTC (rev 284) +++ trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureCommonDataFromTransect-validation.xml 2012-01-15 22:12:51 UTC (rev 285) @@ -63,8 +63,9 @@ </field-validator> </field> - <field name="model.transectFile.file"> - <field-validator type="required"> + <field name="transectFile"> + <field-validator type="nfieldexpression"> + <param name="expression">model.transectFile.file!=null</param> <message key="echobase.error.import.transectFile.required"/> </field-validator> </field> Modified: trunk/echobase-ui/src/main/resources/i18n/echobase-ui_fr_FR.properties =================================================================== --- trunk/echobase-ui/src/main/resources/i18n/echobase-ui_fr_FR.properties 2012-01-15 21:33:13 UTC (rev 284) +++ trunk/echobase-ui/src/main/resources/i18n/echobase-ui_fr_FR.properties 2012-01-15 22:12:51 UTC (rev 285) @@ -19,27 +19,29 @@ 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.common.admin=Administrateur +echobase.common.echosounderSoundSpeed=echosounderSoundSpeed echobase.common.email=Email echobase.common.entityType=Type d'entité echobase.common.importDataMode=Type d'import echobase.common.importMode=Type de mission echobase.common.importMode.createNewMission=Créer une nouvelle mission echobase.common.importMode.useExistingMission=Utiliser une mission existante +echobase.common.importResult=Résultat \: +echobase.common.inProgress=en cours... echobase.common.jdbcLogin=Login de connexion echobase.common.jdbcPassword=Mot de passe echobase.common.jdbcUrl=Url de connexion +echobase.common.notes=notes echobase.common.password=Mot de passe +echobase.common.pingDutyCycle=pingDutyCycle +echobase.common.soundSpeedCalculations=soundSpeedCalculations +echobase.common.transectBinUnitsPingAxis=BinUnitsPingAxis (transect) +echobase.common.transectGeospatialVerticalPositive=GeospatialVerticalPositive (transect) +echobase.common.transectLicence=Licence (transect) +echobase.common.transitRelatedActivity=RelatedActivity (transit) echobase.common.user=Utilisateur echobase.common.voyageDescription=Description echobase.error.bad.password=Mot de passe incorrrect 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:33:13 UTC (rev 284) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureAccousticData.jsp 2012-01-15 22:12:51 UTC (rev 285) @@ -24,7 +24,8 @@ <%@page contentType="text/html" pageEncoding="UTF-8" %> <%@ taglib prefix="s" uri="/struts-tags" %> -<title>Configuration <s:text name="echobase.common.importDataMode.accousticData"/></title> +<title>Configuration <s:text + name="echobase.common.importDataMode.accousticData"/></title> <script type="text/javascript"> 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:33:13 UTC (rev 284) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureAccousticRegionData.jsp 2012-01-15 22:12:51 UTC (rev 285) @@ -24,7 +24,8 @@ <%@page contentType="text/html" pageEncoding="UTF-8" %> <%@ taglib prefix="s" uri="/struts-tags" %> -<title>Configuration <s:text name="echobase.common.importDataMode.accousticRegionData"/></title> +<title>Configuration <s:text + name="echobase.common.importDataMode.accousticRegionData"/></title> <script type="text/javascript"> 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:33:13 UTC (rev 284) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureCatchesData.jsp 2012-01-15 22:12:51 UTC (rev 285) @@ -24,7 +24,8 @@ <%@page contentType="text/html" pageEncoding="UTF-8" %> <%@ taglib prefix="s" uri="/struts-tags" %> -<title>Configuration <s:text name="echobase.common.importDataMode.catchesData"/></title> +<title>Configuration <s:text + name="echobase.common.importDataMode.catchesData"/></title> <script type="text/javascript"> 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:33:13 UTC (rev 284) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureCatchesIndividualData.jsp 2012-01-15 22:12:51 UTC (rev 285) @@ -24,7 +24,8 @@ <%@page contentType="text/html" pageEncoding="UTF-8" %> <%@ taglib prefix="s" uri="/struts-tags" %> -<title>Configuration <s:text name="echobase.common.importDataMode.catchesIndividualData"/></title> +<title>Configuration <s:text + name="echobase.common.importDataMode.catchesIndividualData"/></title> <script type="text/javascript"> 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:33:13 UTC (rev 284) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureCatchesReference.jsp 2012-01-15 22:12:51 UTC (rev 285) @@ -24,7 +24,8 @@ <%@page contentType="text/html" pageEncoding="UTF-8" %> <%@ taglib prefix="s" uri="/struts-tags" %> -<title>Configuration <s:text name="echobase.common.importDataMode.catchesReferences"/></title> +<title>Configuration <s:text + name="echobase.common.importDataMode.catchesReferences"/></title> <script type="text/javascript"> 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:33:13 UTC (rev 284) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureCommonDataComplete.jsp 2012-01-15 22:12:51 UTC (rev 285) @@ -24,7 +24,8 @@ <%@page contentType="text/html" pageEncoding="UTF-8" %> <%@ taglib prefix="s" uri="/struts-tags" %> -<title>Configuration <s:text name="echobase.common.importDataMode.commonDataComplete"/></title> +<title>Configuration <s:text + name="echobase.common.importDataMode.commonDataComplete"/></title> <script type="text/javascript"> 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:33:13 UTC (rev 284) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureCommonDataFromTransect.jsp 2012-01-15 22:12:51 UTC (rev 285) @@ -24,7 +24,8 @@ <%@page contentType="text/html" pageEncoding="UTF-8" %> <%@ taglib prefix="s" uri="/struts-tags" %> -<title>Configuration <s:text name="echobase.common.importDataMode.commonDataFromTransect"/></title> +<title>Configuration <s:text + name="echobase.common.importDataMode.commonDataFromTransect"/></title> <script type="text/javascript"> Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/progressAccousticData.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/progressAccousticData.jsp 2012-01-15 21:33:13 UTC (rev 284) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/progressAccousticData.jsp 2012-01-15 22:12:51 UTC (rev 285) @@ -28,7 +28,8 @@ <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> +<title><s:text name="echobase.common.importDataMode.accousticData"/> <s:text + name="echobase.common.inProgress"/></title> <%-- TODO letellier 20111104 : Add warn icon --%> <p><s:text name="echobase.message.warnImportInProgress"/></p> Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/progressAccousticRegionData.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/progressAccousticRegionData.jsp 2012-01-15 21:33:13 UTC (rev 284) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/progressAccousticRegionData.jsp 2012-01-15 22:12:51 UTC (rev 285) @@ -28,7 +28,8 @@ <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> +<title><s:text name="echobase.common.importDataMode.accousticRegionData"/> + <s:text name="echobase.common.inProgress"/></title> <%-- TODO letellier 20111104 : Add warn icon --%> <p><s:text name="echobase.message.warnImportInProgress"/></p> Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/progressCatchesData.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/progressCatchesData.jsp 2012-01-15 21:33:13 UTC (rev 284) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/progressCatchesData.jsp 2012-01-15 22:12:51 UTC (rev 285) @@ -28,7 +28,8 @@ <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> +<title><s:text name="echobase.common.importDataMode.catchesData"/> <s:text + name="echobase.common.inProgress"/></title> <%-- TODO letellier 20111104 : Add warn icon --%> <p><s:text name="echobase.message.warnImportInProgress"/></p> Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/progressCatchesIndividualData.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/progressCatchesIndividualData.jsp 2012-01-15 21:33:13 UTC (rev 284) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/progressCatchesIndividualData.jsp 2012-01-15 22:12:51 UTC (rev 285) @@ -28,7 +28,8 @@ <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> +<title><s:text name="echobase.common.importDataMode.accousticRegionData"/> + <s:text name="echobase.common.inProgress"/></title> <%-- TODO letellier 20111104 : Add warn icon --%> <p><s:text name="echobase.message.warnImportInProgress"/></p> Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/progressCatchesReference.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/progressCatchesReference.jsp 2012-01-15 21:33:13 UTC (rev 284) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/progressCatchesReference.jsp 2012-01-15 22:12:51 UTC (rev 285) @@ -28,7 +28,8 @@ <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> +<title><s:text name="echobase.common.importDataMode.catchesReferences"/> <s:text + name="echobase.common.inProgress"/></title> <%-- TODO letellier 20111104 : Add warn icon --%> <p><s:text name="echobase.message.warnImportInProgress"/></p> Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/progressCommonDataComplete.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/progressCommonDataComplete.jsp 2012-01-15 21:33:13 UTC (rev 284) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/progressCommonDataComplete.jsp 2012-01-15 22:12:51 UTC (rev 285) @@ -28,7 +28,8 @@ <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> +<title><s:text name="echobase.common.importDataMode.commonDataComplete"/> + <s:text name="echobase.common.inProgress"/></title> <%-- TODO letellier 20111104 : Add warn icon --%> <p><s:text name="echobase.message.warnImportInProgress"/></p> Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/progressCommonDataFromTransect.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/progressCommonDataFromTransect.jsp 2012-01-15 21:33:13 UTC (rev 284) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/progressCommonDataFromTransect.jsp 2012-01-15 22:12:51 UTC (rev 285) @@ -28,7 +28,9 @@ <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> +<title> + <s:text name="echobase.common.importDataMode.commonDataFromTransect"/> <s:text + name="echobase.common.inProgress"/></title> <%-- TODO letellier 20111104 : Add warn icon --%> <p><s:text name="echobase.message.warnImportInProgress"/></p> Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/resultAccousticData.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/resultAccousticData.jsp 2012-01-15 21:33:13 UTC (rev 284) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/resultAccousticData.jsp 2012-01-15 22:12:51 UTC (rev 285) @@ -24,7 +24,8 @@ <%@page contentType="text/html" pageEncoding="UTF-8" %> <%@ taglib prefix="s" uri="/struts-tags" %> -<title><s:text name="echobase.title.importDataResult.accousticData"/></title> +<title><s:text name="echobase.common.importResult"/> <s:text + name="echobase.common.importDataMode.accousticData"/></title> <fieldset> <legend> Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/resultAccousticRegionData.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/resultAccousticRegionData.jsp 2012-01-15 21:33:13 UTC (rev 284) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/resultAccousticRegionData.jsp 2012-01-15 22:12:51 UTC (rev 285) @@ -24,7 +24,8 @@ <%@page contentType="text/html" pageEncoding="UTF-8" %> <%@ taglib prefix="s" uri="/struts-tags" %> -<title><s:text name="echobase.title.importDataResult.accousticRegionData"/></title> +<title><s:text name="echobase.common.importResult"/> <s:text + name="echobase.common.importDataMode.accousticRegionData"/></title> <fieldset> <legend> Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/resultCatchesData.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/resultCatchesData.jsp 2012-01-15 21:33:13 UTC (rev 284) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/resultCatchesData.jsp 2012-01-15 22:12:51 UTC (rev 285) @@ -24,7 +24,8 @@ <%@page contentType="text/html" pageEncoding="UTF-8" %> <%@ taglib prefix="s" uri="/struts-tags" %> -<title><s:text name="echobase.title.importDataResult.catchesData"/></title> +<title><s:text name="echobase.common.importResult"/> <s:text + name="echobase.common.importDataMode.catchesData"/></title> <fieldset> <legend> Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/resultCatchesIndividualData.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/resultCatchesIndividualData.jsp 2012-01-15 21:33:13 UTC (rev 284) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/resultCatchesIndividualData.jsp 2012-01-15 22:12:51 UTC (rev 285) @@ -24,7 +24,8 @@ <%@page contentType="text/html" pageEncoding="UTF-8" %> <%@ taglib prefix="s" uri="/struts-tags" %> -<title><s:text name="echobase.title.importDataResult.catchesIndividualData"/></title> +<title><s:text name="echobase.common.importResult"/> <s:text + name="echobase.common.importDataMode.catchesIndividualData"/></title> <fieldset> <legend> Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/resultCatchesReference.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/resultCatchesReference.jsp 2012-01-15 21:33:13 UTC (rev 284) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/resultCatchesReference.jsp 2012-01-15 22:12:51 UTC (rev 285) @@ -24,7 +24,8 @@ <%@page contentType="text/html" pageEncoding="UTF-8" %> <%@ taglib prefix="s" uri="/struts-tags" %> -<title><s:text name="echobase.title.importDataResult.catchesReference"/></title> +<title><s:text name="echobase.common.importResult"/> <s:text + name="echobase.common.importDataMode.catchesReferences"/></title> <fieldset> <legend> Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/resultCommonDataComplete.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/resultCommonDataComplete.jsp 2012-01-15 21:33:13 UTC (rev 284) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/resultCommonDataComplete.jsp 2012-01-15 22:12:51 UTC (rev 285) @@ -24,7 +24,8 @@ <%@page contentType="text/html" pageEncoding="UTF-8" %> <%@ taglib prefix="s" uri="/struts-tags" %> -<title><s:text name="echobase.title.importDataResult.commonDataComplete"/></title> +<title><s:text name="echobase.common.importResult"/> <s:text + name="echobase.common.importDataMode.commonDataComplete"/></title> <fieldset> <legend> Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/resultCommonDataFromTransect.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/resultCommonDataFromTransect.jsp 2012-01-15 21:33:13 UTC (rev 284) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/resultCommonDataFromTransect.jsp 2012-01-15 22:12:51 UTC (rev 285) @@ -24,7 +24,8 @@ <%@page contentType="text/html" pageEncoding="UTF-8" %> <%@ taglib prefix="s" uri="/struts-tags" %> -<title><s:text name="echobase.title.importDataResult.commonDataFromTransect"/></title> +<title><s:text name="echobase.common.importResult"/> <s:text + name="echobase.common.importDataMode.commonDataFromTransect"/></title> <fieldset> <legend> 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:33:13 UTC (rev 284) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/selectImportType.jsp 2012-01-15 22:12:51 UTC (rev 285) @@ -31,12 +31,12 @@ function updateMode(newValue) { // change the action target $('#selectImportType_configure').attr('name', - 'action:configure-'+newValue+'!input'); + 'action:configure-' + newValue + '!input'); } jQuery(document).ready(function () { - $('[name="mode"]').change(function(event) { + $('[name="mode"]').change(function (event) { updateMode(this.value); }); var val = $('[name="mode"][checked="checked"]').val(); @@ -52,7 +52,7 @@ </legend> <s:radio key='mode' list="modes" cssClass="cleanBoth" label='%{getText("echobase.common.importDataMode")}' - required="true" template="myradiomap" /> + required="true" template="myradiomap"/> </fieldset>

1 0

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/
by tchemit＠users.forge.codelutin.com 15 Jan '12

15 Jan '12

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>  - <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>  - <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 @@ + +<!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 @@ + +<!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 @@ + +<!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 @@ + +<!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 @@ + +<!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 @@ + +<!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 @@ + +<!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 @@ - -<!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")}'

1 0

r283 - in trunk/echobase-services/src/main: java/fr/ifremer/echobase/services java/fr/ifremer/echobase/services/configurations resources/i18n
by tchemit＠users.forge.codelutin.com 15 Jan '12

15 Jan '12

Author: tchemit Date: 2012-01-15 22:31:49 +0100 (Sun, 15 Jan 2012) New Revision: 283 Url: http://forge.codelutin.com/repositories/revision/echobase/283 Log: - continue import data definition - create also a default user:user (not admin) Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/AbstractImportDataService.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/CommonDataCompleteImportService.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/CommonDataFromTransectImportService.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/EmbeddedApplicationService.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/UserService.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/configurations/AccousticDataImportConfiguration.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/configurations/AccousticRegionDataImportConfiguration.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/configurations/CatchesDataImportConfiguration.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/configurations/CatchesIndividualDataImportConfiguration.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/configurations/CatchesReferenceImportConfiguration.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/configurations/CommonDataCompleteImportConfiguration.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/configurations/CommonDataFromTransectImportConfiguration.java trunk/echobase-services/src/main/resources/i18n/echobase-services_fr_FR.properties Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/AbstractImportDataService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/AbstractImportDataService.java 2012-01-15 21:30:41 UTC (rev 282) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/AbstractImportDataService.java 2012-01-15 21:31:49 UTC (rev 283) @@ -26,7 +26,9 @@ import fr.ifremer.echobase.InputFile; import fr.ifremer.echobase.entities.EchoBaseUser; import fr.ifremer.echobase.services.configurations.AbstractImportConfiguration; +import org.nuiton.topia.TopiaException; +import java.io.IOException; import java.util.Map; /** @@ -37,5 +39,5 @@ */ public abstract class AbstractImportDataService<M extends AbstractImportConfiguration> extends EchoBaseServiceSupport { - public abstract Map<InputFile, CsvImportResult> startImport(M configuration, EchoBaseUser user); + public abstract Map<InputFile, CsvImportResult> startImport(M configuration, EchoBaseUser user) throws IOException, TopiaException; } Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/CommonDataCompleteImportService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/CommonDataCompleteImportService.java 2012-01-15 21:30:41 UTC (rev 282) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/CommonDataCompleteImportService.java 2012-01-15 21:31:49 UTC (rev 283) @@ -24,13 +24,32 @@ package fr.ifremer.echobase.services; import com.google.common.collect.Maps; +import fr.ifremer.echobase.EchoBaseFunctions; import fr.ifremer.echobase.EchoBaseTechnicalException; import fr.ifremer.echobase.InputFile; import fr.ifremer.echobase.entities.EchoBaseUser; +import fr.ifremer.echobase.entities.data.Transect; +import fr.ifremer.echobase.entities.data.Transit; +import fr.ifremer.echobase.entities.data.Voyage; +import fr.ifremer.echobase.entities.data.VoyageImpl; +import fr.ifremer.echobase.entities.references.AreaOfOperation; import fr.ifremer.echobase.entities.references.Mission; +import fr.ifremer.echobase.entities.references.Vessel; import fr.ifremer.echobase.services.configurations.CommonDataCompleteImportConfiguration; +import fr.ifremer.echobase.services.csv.CsvModelUtil; +import org.apache.commons.collections.CollectionUtils; import org.nuiton.topia.TopiaException; +import org.nuiton.topia.persistence.TopiaDAO; +import org.nuiton.util.csv.Import; +import org.nuiton.util.csv.ImportModel; +import org.nuiton.util.csv.ImportToMap; +import java.io.BufferedReader; +import java.io.FileReader; +import java.io.IOException; +import java.io.Reader; +import java.util.Date; +import java.util.List; import java.util.Map; /** @@ -42,11 +61,44 @@ public class CommonDataCompleteImportService extends AbstractImportDataService<CommonDataCompleteImportConfiguration> { @Override - public Map<InputFile, CsvImportResult> startImport(CommonDataCompleteImportConfiguration configuration, EchoBaseUser user) { + public Map<InputFile, CsvImportResult> startImport(CommonDataCompleteImportConfiguration configuration, + EchoBaseUser user) throws IOException, TopiaException { + Map<InputFile, CsvImportResult> result = Maps.newHashMap(); + char csvSeparator = serviceContext.getConfiguration().getCsvSeparator(); - importCasinoFile(configuration.getCasinoFile(), csvSeparator); + Mission mission = getEntityById(Mission.class, configuration.getMissionId()); + AreaOfOperation areaOfOperation = getEntityById(AreaOfOperation.class, configuration.getAreaOfOperationId()); + Vessel vessel = getEntityById(Vessel.class, configuration.getVesselId()); + + importVoyageFile(configuration.getVoyageFile(), + mission, + areaOfOperation, + configuration.getVoyageDescription(), + configuration.getDatum(), + csvSeparator); + + List<Voyage> allVoyages = getEntities(Voyage.class); + Map<String, Voyage> voyageMap = Maps.uniqueIndex( + allVoyages, EchoBaseFunctions.VOYAGE_NAME); + + importTransitFile(configuration.getTransitFile(), + voyageMap, + configuration.getTransitRelatedActivity(), + csvSeparator); + + importTransectFile(configuration.getTransectFile(), + vessel, + voyageMap, + configuration.getDatum(), + configuration.getTransectLicence(), + configuration.getTransectGeospatialVerticalPositive(), + configuration.getTransectBinUnitsPingAxis(), + csvSeparator); + importEchotypeFile(configuration.getEchotypeFile(), csvSeparator); + + commitTransaction("Could not commit transaction of common data import"); return result; } @@ -61,10 +113,224 @@ } } - private void importCasinoFile(InputFile casinoFile, char csvSeparator) { + protected void importVoyageFile(InputFile inputFile, + Mission mission, + AreaOfOperation areaOfOperation, + String voyageDescription, + String datum, + char csvSeparator) throws IOException, TopiaException { + + + ImportModel<Voyage> csvModel = new VoyageImportModel(csvSeparator); + + TopiaDAO<Voyage> dao = getDAO(Voyage.class); + Reader reader = new BufferedReader(new FileReader(inputFile.getFile())); + try { + Import<Voyage> importer = Import.newImport(csvModel, reader); + for (Voyage voyage : importer) { + voyage.setMission(mission); + voyage.setAreaOfOperation(areaOfOperation); + voyage.setDescription(voyageDescription); + voyage.setDatum(datum); + dao.create(voyage); + } + + } finally { + reader.close(); + } } - private void importEchotypeFile(InputFile echotypeFile, char csvSeparator) { + protected void importTransitFile(InputFile inputFile, + Map<String, Voyage> voyageMap, + String relatedActivity, + char csvSeparator) throws TopiaException, IOException { + TransitImportModel csvModel = new TransitImportModel(csvSeparator, voyageMap); + TopiaDAO<Transit> dao = getDAO(Transit.class); + + Reader reader = new BufferedReader(new FileReader(inputFile.getFile())); + try { + ImportToMap importer = ImportToMap.newImport(csvModel, reader); + for (Map<String, Object> row : importer) { + + Voyage voyage = (Voyage) row.get(TransitImportModel.TRANSIT_VoyageId); + + Transit transit = dao.create(); + + transit.setDescription((String) row.get(Transit.PROPERTY_DESCRIPTION)); + transit.setStartLocality((String) row.get(Transit.PROPERTY_START_LOCALITY)); + transit.setEndLocality((String) row.get(Transit.PROPERTY_END_LOCALITY)); + + transit.setStartTime((Date) row.get(Transit.PROPERTY_START_TIME)); + transit.setEndTime((Date) row.get(Transit.PROPERTY_END_TIME)); + transit.setRelatedActivity(relatedActivity); + voyage.addTransit(transit); + } + + } finally { + reader.close(); + } } + + private void importTransectFile(InputFile inputFile, + Vessel vessel, + Map<String, Voyage> voyageMap, + String datum, + String license, + String geospatialVerticalPositive, + String binUnitsPingAxis, + char csvSeparator + ) throws TopiaException, IOException { + + TransectImportModel csvModel = new TransectImportModel(csvSeparator, voyageMap); + + TopiaDAO<Transect> dao = getDAO(Transect.class); + + /* + modelBuilder.newMandatoryColumn(TRANSECT_stratum, TRANSECT_stratum); + modelBuilder.newMandatoryColumn(TRANSECT_datef, TRANSECT_datef, CsvModelUtil.DAY); + modelBuilder.newMandatoryColumn(TRANSECT_heuref, TRANSECT_heuref, CsvModelUtil.TIME); + */ + Reader reader = new BufferedReader(new FileReader(inputFile.getFile())); + try { + ImportToMap importer = ImportToMap.newImport(csvModel, reader); + for (Map<String, Object> row : importer) { + + Voyage voyage = (Voyage) row.get(TransectImportModel.TRANSECT_VoyageID); + + Transect transect = dao.create( + Transect.PROPERTY_VESSEL, vessel + ); + + transect.setTitle((String) row.get(Transect.PROPERTY_TITLE)); + transect.setTransectAbstract((String) row.get(Transect.PROPERTY_TRANSECT_ABSTRACT)); + transect.setComment((String) row.get(Transect.PROPERTY_COMMENT)); + + transect.setDatum(datum); + transect.setLicence(license); + transect.setGeospatialVerticalPositive(geospatialVerticalPositive); + transect.setBinUnitsPingAxis(binUnitsPingAxis); + + transect.setDateCreated((Date) row.get(Transect.PROPERTY_DATE_CREATED)); + transect.setTimeCoverageStart((Date) row.get(Transect.PROPERTY_TIME_COVERAGE_START)); + transect.setTimeCoverageEnd((Date) row.get(Transect.PROPERTY_TIME_COVERAGE_END)); + + + transect.setGeospatialLatMin((Float) row.get(Transect.PROPERTY_GEOSPATIAL_LAT_MIN)); + transect.setGeospatialLonMin((Float) row.get(Transect.PROPERTY_GEOSPATIAL_LON_MIN)); + transect.setGeospatialVerticalMin((Float) row.get(Transect.PROPERTY_GEOSPATIAL_VERTICAL_MIN)); + + transect.setGeospatialLatMax((Float) row.get(Transect.PROPERTY_GEOSPATIAL_LAT_MAX)); + transect.setGeospatialLonMax((Float) row.get(Transect.PROPERTY_GEOSPATIAL_LON_MAX)); + transect.setGeospatialVerticalMax((Float) row.get(Transect.PROPERTY_GEOSPATIAL_VERTICAL_MAX)); + + // find out the transit where to reattach the transect + List<Transit> transits = voyage.getTransit(); + + Transit transit = null; + + if (CollectionUtils.isNotEmpty(transits)) { + for (Transit aTransit : transits) { + transit = aTransit; + break; + } + } + if (transit == null) { + throw new EchoBaseTechnicalException( + "Could not find transit to reattach transect " + + transect.getTitle()); + } + + transit.addTransect(transect); + } + + } finally { + reader.close(); + } + } + + private void importEchotypeFile(InputFile inputFile, char csvSeparator) { + + } + + protected static class VoyageImportModel extends CsvModelUtil.AbstractImportModel<Voyage> { + + public VoyageImportModel(char separator) { + super(separator); + modelBuilder.newMandatoryColumn("VoyageName", Voyage.PROPERTY_NAME); + modelBuilder.newMandatoryColumn("VoyageStartDate", Voyage.PROPERTY_START_DATE, CsvModelUtil.DAY); + modelBuilder.newMandatoryColumn("VoyageEndDate", Voyage.PROPERTY_END_DATE, CsvModelUtil.DAY); + modelBuilder.newMandatoryColumn("StartPort", Voyage.PROPERTY_START_PORT); + modelBuilder.newMandatoryColumn("EndPort", Voyage.PROPERTY_END_PORT); + } + + @Override + public Voyage newEmptyInstance() { + return new VoyageImpl(); + } + } + + protected static class TransitImportModel extends CsvModelUtil.AbstractImportModel<Map<String, Object>> { + + public static final String TRANSIT_VoyageId = "VoyageId"; + + protected final Map<String, Voyage> voyageMap; + + public TransitImportModel(char separator, + Map<String, Voyage> voyageMap) { + super(separator); + this.voyageMap = voyageMap; + modelBuilder.newMandatoryColumn(TRANSIT_VoyageId, TRANSIT_VoyageId, CsvModelUtil.newForeignKeyValue(Voyage.class, voyageMap)); + modelBuilder.newMandatoryColumn("TransitName", Transit.PROPERTY_DESCRIPTION); + modelBuilder.newMandatoryColumn("StartTime", Transit.PROPERTY_START_TIME, CsvModelUtil.DAY_TIME); + modelBuilder.newMandatoryColumn("EndTime", Transit.PROPERTY_END_TIME, CsvModelUtil.DAY_TIME); + modelBuilder.newMandatoryColumn("StartLocality", Transit.PROPERTY_START_LOCALITY); + modelBuilder.newMandatoryColumn("EndLocality", Transit.PROPERTY_END_LOCALITY); + } + + @Override + public Map<String, Object> newEmptyInstance() { + return null; + } + } + + protected static class TransectImportModel extends CsvModelUtil.AbstractImportModel<Map<String, Object>> { + + public static final String TRANSECT_stratum = "stratum"; + public static final String TRANSECT_VoyageID = "VoyageID"; + public static final String TRANSECT_datef = "datef"; + public static final String TRANSECT_heuref = "heuref"; + + protected final Map<String, Voyage> voyageMap; + + public TransectImportModel(char separator, + Map<String, Voyage> voyageMap) { + super(separator); + this.voyageMap = voyageMap; + + modelBuilder.newMandatoryColumn("Title", Transect.PROPERTY_TITLE); + modelBuilder.newMandatoryColumn("abstract", Transect.PROPERTY_TRANSECT_ABSTRACT); + modelBuilder.newMandatoryColumn(TRANSECT_stratum, TRANSECT_stratum); + modelBuilder.newMandatoryColumn("comment", Transect.PROPERTY_COMMENT); + modelBuilder.newMandatoryColumn(TRANSECT_VoyageID, TRANSECT_VoyageID, CsvModelUtil.newForeignKeyValue(Voyage.class, voyageMap)); + modelBuilder.newMandatoryColumn(TRANSECT_datef, TRANSECT_datef, CsvModelUtil.DAY); + modelBuilder.newMandatoryColumn(TRANSECT_heuref, TRANSECT_heuref, CsvModelUtil.TIME); + + modelBuilder.newMandatoryColumn("DateCreated", Transect.PROPERTY_DATE_CREATED, CsvModelUtil.IMPORT_DAY2); + modelBuilder.newMandatoryColumn("TimeCoverageStart", Transect.PROPERTY_TIME_COVERAGE_START, CsvModelUtil.TIME); + modelBuilder.newMandatoryColumn("TimeCoverageEnd", Transect.PROPERTY_TIME_COVERAGE_END, CsvModelUtil.TIME); + modelBuilder.newMandatoryColumn("GeospatialLonMin", Transect.PROPERTY_GEOSPATIAL_LON_MIN, CsvModelUtil.PRIMITIVE_FLOAT); + modelBuilder.newMandatoryColumn("GeospatialLatMin", Transect.PROPERTY_GEOSPATIAL_LAT_MIN, CsvModelUtil.PRIMITIVE_FLOAT); + modelBuilder.newMandatoryColumn("GeospatialVerticalMin", Transect.PROPERTY_GEOSPATIAL_VERTICAL_MIN, CsvModelUtil.PRIMITIVE_FLOAT); + modelBuilder.newMandatoryColumn("GeospatialLonMax", Transect.PROPERTY_GEOSPATIAL_LON_MAX, CsvModelUtil.PRIMITIVE_FLOAT); + modelBuilder.newMandatoryColumn("GeospatialLatMax", Transect.PROPERTY_GEOSPATIAL_LAT_MAX, CsvModelUtil.PRIMITIVE_FLOAT); + modelBuilder.newMandatoryColumn("GeospatialVerticalMax", Transect.PROPERTY_GEOSPATIAL_VERTICAL_MAX, CsvModelUtil.PRIMITIVE_FLOAT); + } + + @Override + public Map<String, Object> newEmptyInstance() { + return null; + } + + } } Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/CommonDataFromTransectImportService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/CommonDataFromTransectImportService.java 2012-01-15 21:30:41 UTC (rev 282) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/CommonDataFromTransectImportService.java 2012-01-15 21:31:49 UTC (rev 283) @@ -24,10 +24,26 @@ package fr.ifremer.echobase.services; import com.google.common.collect.Maps; +import fr.ifremer.echobase.EchoBaseTechnicalException; import fr.ifremer.echobase.InputFile; import fr.ifremer.echobase.entities.EchoBaseUser; +import fr.ifremer.echobase.entities.data.Transect; +import fr.ifremer.echobase.entities.data.Transit; +import fr.ifremer.echobase.entities.data.Voyage; +import fr.ifremer.echobase.entities.references.Vessel; import fr.ifremer.echobase.services.configurations.CommonDataFromTransectImportConfiguration; +import fr.ifremer.echobase.services.csv.CsvModelUtil; +import org.apache.commons.collections.CollectionUtils; +import org.nuiton.topia.TopiaException; +import org.nuiton.topia.persistence.TopiaDAO; +import org.nuiton.util.csv.ImportToMap; +import java.io.BufferedReader; +import java.io.FileReader; +import java.io.IOException; +import java.io.Reader; +import java.util.Date; +import java.util.List; import java.util.Map; /** @@ -39,15 +55,133 @@ public class CommonDataFromTransectImportService extends AbstractImportDataService<CommonDataFromTransectImportConfiguration> { @Override - public Map<InputFile, CsvImportResult> startImport(CommonDataFromTransectImportConfiguration configuration, EchoBaseUser user) { + public Map<InputFile, CsvImportResult> startImport(CommonDataFromTransectImportConfiguration configuration, + EchoBaseUser user) throws IOException, TopiaException { Map<InputFile, CsvImportResult> result = Maps.newHashMap(); char csvSeparator = serviceContext.getConfiguration().getCsvSeparator(); - importCasinoFile(configuration.getCasinoFile(), csvSeparator); + Voyage voyage = getEntityById(Voyage.class, configuration.getVoyageId()); + Vessel vessel = getEntityById(Vessel.class, configuration.getVesselId()); + + importTransectFile(configuration.getTransectFile(), + voyage, + vessel, + configuration.getDatum(), + configuration.getTransectLicence(), + configuration.getTransectGeospatialVerticalPositive(), + configuration.getTransectBinUnitsPingAxis(), + csvSeparator); return result; } - protected void importCasinoFile(InputFile inputFile, char csvSeparator) { + private void importTransectFile(InputFile inputFile, + Voyage voyage, + Vessel vessel, + String datum, + String license, + String geospatialVerticalPositive, + String binUnitsPingAxis, + char csvSeparator + ) throws TopiaException, IOException { + TransectImportModel csvModel = new TransectImportModel(csvSeparator); + + TopiaDAO<Transect> dao = getDAO(Transect.class); + + /* + modelBuilder.newMandatoryColumn(TRANSECT_stratum, TRANSECT_stratum); + modelBuilder.newMandatoryColumn(TRANSECT_datef, TRANSECT_datef, CsvModelUtil.DAY); + modelBuilder.newMandatoryColumn(TRANSECT_heuref, TRANSECT_heuref, CsvModelUtil.TIME); + */ + Reader reader = new BufferedReader(new FileReader(inputFile.getFile())); + try { + ImportToMap importer = ImportToMap.newImport(csvModel, reader); + for (Map<String, Object> row : importer) { + + + Transect transect = dao.create( + Transect.PROPERTY_VESSEL, vessel + ); + + transect.setTitle((String) row.get(Transect.PROPERTY_TITLE)); + transect.setTransectAbstract((String) row.get(Transect.PROPERTY_TRANSECT_ABSTRACT)); + transect.setComment((String) row.get(Transect.PROPERTY_COMMENT)); + + transect.setDatum(datum); + transect.setLicence(license); + transect.setGeospatialVerticalPositive(geospatialVerticalPositive); + transect.setBinUnitsPingAxis(binUnitsPingAxis); + + transect.setDateCreated((Date) row.get(Transect.PROPERTY_DATE_CREATED)); + transect.setTimeCoverageStart((Date) row.get(Transect.PROPERTY_TIME_COVERAGE_START)); + transect.setTimeCoverageEnd((Date) row.get(Transect.PROPERTY_TIME_COVERAGE_END)); + + + transect.setGeospatialLatMin((Float) row.get(Transect.PROPERTY_GEOSPATIAL_LAT_MIN)); + transect.setGeospatialLonMin((Float) row.get(Transect.PROPERTY_GEOSPATIAL_LON_MIN)); + transect.setGeospatialVerticalMin((Float) row.get(Transect.PROPERTY_GEOSPATIAL_VERTICAL_MIN)); + + transect.setGeospatialLatMax((Float) row.get(Transect.PROPERTY_GEOSPATIAL_LAT_MAX)); + transect.setGeospatialLonMax((Float) row.get(Transect.PROPERTY_GEOSPATIAL_LON_MAX)); + transect.setGeospatialVerticalMax((Float) row.get(Transect.PROPERTY_GEOSPATIAL_VERTICAL_MAX)); + + // find out the transit where to reattach the transect + List<Transit> transits = voyage.getTransit(); + + Transit transit = null; + + if (CollectionUtils.isNotEmpty(transits)) { + for (Transit aTransit : transits) { + transit = aTransit; + break; + } + } + if (transit == null) { + throw new EchoBaseTechnicalException( + "Could not find transit to reattach transect " + + transect.getTitle()); + } + + transit.addTransect(transect); + } + + } finally { + reader.close(); + } } + + protected static class TransectImportModel extends CsvModelUtil.AbstractImportModel<Map<String, Object>> { + + public static final String TRANSECT_stratum = "stratum"; + public static final String TRANSECT_VoyageID = "VoyageID"; + public static final String TRANSECT_datef = "datef"; + public static final String TRANSECT_heuref = "heuref"; + + public TransectImportModel(char separator) { + super(separator); + + modelBuilder.newMandatoryColumn("Title", Transect.PROPERTY_TITLE); + modelBuilder.newMandatoryColumn("abstract", Transect.PROPERTY_TRANSECT_ABSTRACT); + modelBuilder.newMandatoryColumn(TRANSECT_stratum, TRANSECT_stratum); + modelBuilder.newMandatoryColumn("comment", Transect.PROPERTY_COMMENT); + modelBuilder.newMandatoryColumn(TRANSECT_datef, TRANSECT_datef, CsvModelUtil.DAY); + modelBuilder.newMandatoryColumn(TRANSECT_heuref, TRANSECT_heuref, CsvModelUtil.TIME); + + modelBuilder.newMandatoryColumn("DateCreated", Transect.PROPERTY_DATE_CREATED, CsvModelUtil.IMPORT_DAY2); + modelBuilder.newMandatoryColumn("TimeCoverageStart", Transect.PROPERTY_TIME_COVERAGE_START, CsvModelUtil.TIME); + modelBuilder.newMandatoryColumn("TimeCoverageEnd", Transect.PROPERTY_TIME_COVERAGE_END, CsvModelUtil.TIME); + modelBuilder.newMandatoryColumn("GeospatialLonMin", Transect.PROPERTY_GEOSPATIAL_LON_MIN, CsvModelUtil.PRIMITIVE_FLOAT); + modelBuilder.newMandatoryColumn("GeospatialLatMin", Transect.PROPERTY_GEOSPATIAL_LAT_MIN, CsvModelUtil.PRIMITIVE_FLOAT); + modelBuilder.newMandatoryColumn("GeospatialVerticalMin", Transect.PROPERTY_GEOSPATIAL_VERTICAL_MIN, CsvModelUtil.PRIMITIVE_FLOAT); + modelBuilder.newMandatoryColumn("GeospatialLonMax", Transect.PROPERTY_GEOSPATIAL_LON_MAX, CsvModelUtil.PRIMITIVE_FLOAT); + modelBuilder.newMandatoryColumn("GeospatialLatMax", Transect.PROPERTY_GEOSPATIAL_LAT_MAX, CsvModelUtil.PRIMITIVE_FLOAT); + modelBuilder.newMandatoryColumn("GeospatialVerticalMax", Transect.PROPERTY_GEOSPATIAL_VERTICAL_MAX, CsvModelUtil.PRIMITIVE_FLOAT); + } + + @Override + public Map<String, Object> newEmptyInstance() { + return null; + } + + } } Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/EmbeddedApplicationService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/EmbeddedApplicationService.java 2012-01-15 21:30:41 UTC (rev 282) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/EmbeddedApplicationService.java 2012-01-15 21:31:49 UTC (rev 283) @@ -195,7 +195,7 @@ newServiceContext.newService(UserService.class); // create admin user - userService.createDefaultAdminUser(); + userService.createDefaultUsers(); // get admin from h2 db EchoBaseUser admin = userService.getUserByEmail( Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/UserService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/UserService.java 2012-01-15 21:30:41 UTC (rev 282) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/UserService.java 2012-01-15 21:31:49 UTC (rev 283) @@ -24,7 +24,6 @@ package fr.ifremer.echobase.services; import com.google.common.base.Preconditions; -import fr.ifremer.echobase.EchoBaseConfiguration; import fr.ifremer.echobase.EchoBaseTechnicalException; import fr.ifremer.echobase.entities.EchoBaseUser; import fr.ifremer.echobase.entities.EchoBaseUserDAO; @@ -47,6 +46,10 @@ public static final String DEFAULT_ADMIN_PASSWORD = "admin"; + public static final String DEFAULT_USER_EMAIL = "user"; + + public static final String DEFAULT_USER_PASSWORD = "user"; + public List<EchoBaseUser> getUsers() { return getUsers(null); } @@ -127,7 +130,7 @@ return s.equals(user.getPassword()); } - public void createDefaultAdminUser() { + public void createDefaultUsers() { EchoBaseUserDTO userDTO; userDTO = new EchoBaseUserDTOImpl(); userDTO.setEmail(DEFAULT_ADMIN_EMAIL); @@ -135,15 +138,11 @@ userDTO.setAdmin(true); createOrUpdate(userDTO); - if (getConfiguration().getOptionAsBoolean(EchoBaseConfiguration.OPTION_CREATE_ADMINS)) { - for (int i = 0; i < 1000; i++) { - userDTO = new EchoBaseUserDTOImpl(); - userDTO.setEmail(DEFAULT_ADMIN_EMAIL + i); - userDTO.setPassword(DEFAULT_ADMIN_PASSWORD); - userDTO.setAdmin(i % 2 == 0); - createOrUpdate(userDTO); - } - } + userDTO = new EchoBaseUserDTOImpl(); + userDTO.setEmail(DEFAULT_USER_EMAIL); + userDTO.setPassword(DEFAULT_USER_PASSWORD); + userDTO.setAdmin(false); + createOrUpdate(userDTO); } public static String encodePassword(String password) { Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/configurations/AccousticDataImportConfiguration.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/configurations/AccousticDataImportConfiguration.java 2012-01-15 21:30:41 UTC (rev 282) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/configurations/AccousticDataImportConfiguration.java 2012-01-15 21:31:49 UTC (rev 283) @@ -45,12 +45,18 @@ /** Selected vessel id to find out transect where to import datas. */ protected String vesselId; - /** Manual field 1. */ - protected String field1; + /** Manual echosounderSoundSpeed. */ + protected String echosounderSoundSpeed = "Variable"; - /** Manual field 2. */ - protected String field2; + /** Manual soundSpeedCalculations. */ + protected String soundSpeedCalculations = "SVProbe"; + /** Manual pingDutyCycle. */ + protected String pingDutyCycle = "ME70Table"; + + /** Manual notes. */ + protected String notes; + /** Movies file to import. */ protected final InputFile moviesFile; @@ -74,22 +80,38 @@ this.vesselId = vesselId; } - public String getField1() { - return field1; + public String getEchosounderSoundSpeed() { + return echosounderSoundSpeed; } - public void setField1(String field1) { - this.field1 = field1; + public void setEchosounderSoundSpeed(String echosounderSoundSpeed) { + this.echosounderSoundSpeed = echosounderSoundSpeed; } - public String getField2() { - return field2; + public String getSoundSpeedCalculations() { + return soundSpeedCalculations; } - public void setField2(String field2) { - this.field2 = field2; + public void setSoundSpeedCalculations(String soundSpeedCalculations) { + this.soundSpeedCalculations = soundSpeedCalculations; } + public String getPingDutyCycle() { + return pingDutyCycle; + } + + public void setPingDutyCycle(String pingDutyCycle) { + this.pingDutyCycle = pingDutyCycle; + } + + public String getNotes() { + return notes; + } + + public void setNotes(String notes) { + this.notes = notes; + } + public InputFile getMoviesFile() { return moviesFile; } Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/configurations/AccousticRegionDataImportConfiguration.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/configurations/AccousticRegionDataImportConfiguration.java 2012-01-15 21:30:41 UTC (rev 282) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/configurations/AccousticRegionDataImportConfiguration.java 2012-01-15 21:31:49 UTC (rev 283) @@ -39,19 +39,12 @@ private static final long serialVersionUID = 1L; - /** Selected voyage id where to import datas. */ protected String voyageId; /** Selected vessel id to find out transect where to import datas. */ protected String vesselId; - /** Manual field 1. */ - protected String field1; - - /** Manual field 2. */ - protected String field2; - /** Region file to import. */ protected final InputFile regionsFile; @@ -59,8 +52,10 @@ protected final InputFile associationFile; public AccousticRegionDataImportConfiguration(Locale locale) { - regionsFile = InputFile.newFile(l_(locale, "echobase.common.regionsFile")); - associationFile = InputFile.newFile(l_(locale, "echobase.common.associationFile")); + regionsFile = InputFile.newFile( + l_(locale, "echobase.common.regionsFile")); + associationFile = InputFile.newFile( + l_(locale, "echobase.common.associationFile")); } public String getVoyageId() { @@ -79,22 +74,6 @@ this.vesselId = vesselId; } - public String getField1() { - return field1; - } - - public void setField1(String field1) { - this.field1 = field1; - } - - public String getField2() { - return field2; - } - - public void setField2(String field2) { - this.field2 = field2; - } - public InputFile getRegionsFile() { return regionsFile; } Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/configurations/CatchesDataImportConfiguration.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/configurations/CatchesDataImportConfiguration.java 2012-01-15 21:30:41 UTC (rev 282) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/configurations/CatchesDataImportConfiguration.java 2012-01-15 21:31:49 UTC (rev 283) @@ -55,10 +55,14 @@ protected final InputFile tblMensurationClasseFile; public CatchesDataImportConfiguration(Locale locale) { - tlbeStationFile = InputFile.newFile(l_(locale, "echobase.common.tlbeStationFile")); - xtblTriFile = InputFile.newFile(l_(locale, "echobase.common.xtblTriFile")); - tblMensurationFile = InputFile.newFile(l_(locale, "echobase.common.tblMensurationFile")); - tblMensurationClasseFile = InputFile.newFile(l_(locale, "echobase.common.tblMensurationClasseFile")); + tlbeStationFile = InputFile.newFile( + l_(locale, "echobase.common.tlbeStationFile")); + xtblTriFile = InputFile.newFile( + l_(locale, "echobase.common.xtblTriFile")); + tblMensurationFile = InputFile.newFile( + l_(locale, "echobase.common.tblMensurationFile")); + tblMensurationClasseFile = InputFile.newFile( + l_(locale, "echobase.common.tblMensurationClasseFile")); } public String getVoyageId() { @@ -73,7 +77,6 @@ return tlbeStationFile; } - public InputFile getXtblTriFile() { return xtblTriFile; } @@ -88,6 +91,7 @@ @Override public InputFile[] getInputFiles() { - return new InputFile[]{tlbeStationFile, xtblTriFile, tblMensurationFile, tblMensurationClasseFile}; + return new InputFile[]{tlbeStationFile, xtblTriFile, + tblMensurationFile, tblMensurationClasseFile}; } } Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/configurations/CatchesIndividualDataImportConfiguration.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/configurations/CatchesIndividualDataImportConfiguration.java 2012-01-15 21:30:41 UTC (rev 282) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/configurations/CatchesIndividualDataImportConfiguration.java 2012-01-15 21:31:49 UTC (rev 283) @@ -46,7 +46,8 @@ protected final InputFile individualDataFile; public CatchesIndividualDataImportConfiguration(Locale locale) { - individualDataFile = InputFile.newFile(l_(locale, "echobase.common.individualDataFile")); + individualDataFile = InputFile.newFile( + l_(locale, "echobase.common.individualDataFile")); } public String getVoyageId() { Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/configurations/CatchesReferenceImportConfiguration.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/configurations/CatchesReferenceImportConfiguration.java 2012-01-15 21:30:41 UTC (rev 282) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/configurations/CatchesReferenceImportConfiguration.java 2012-01-15 21:31:49 UTC (rev 283) @@ -46,8 +46,10 @@ protected final InputFile lengthWeightKeyFile; public CatchesReferenceImportConfiguration(Locale locale) { - lengthAgeKeyFile = InputFile.newFile(l_(locale, "echobase.common.lengthAgeKeyFile")); - lengthWeightKeyFile = InputFile.newFile(l_(locale, "echobase.common.lengthWeightKeyFile")); + lengthAgeKeyFile = InputFile.newFile( + l_(locale, "echobase.common.lengthAgeKeyFile")); + lengthWeightKeyFile = InputFile.newFile( + l_(locale, "echobase.common.lengthWeightKeyFile")); } public InputFile getLengthAgeKeyFile() { Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/configurations/CommonDataCompleteImportConfiguration.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/configurations/CommonDataCompleteImportConfiguration.java 2012-01-15 21:30:41 UTC (rev 282) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/configurations/CommonDataCompleteImportConfiguration.java 2012-01-15 21:31:49 UTC (rev 283) @@ -45,21 +45,48 @@ /** Selected area of operation to use for voyage. */ protected String areaOfOperationId; + /** Selected vessel to use for transect. */ + protected String vesselId; + /** Manual description of voyage. */ protected String voyageDescription; + /** transit related activity. */ + protected String transitRelatedActivity; + + /** transect license. */ + protected String transectLicence; + + /** transect geospatialVerticalPositive. */ + protected String transectGeospatialVerticalPositive = "down"; + + /** transect binUnitsPingAxis. */ + protected String transectBinUnitsPingAxis = "1 nautical mile"; + /** Manual datum to use in voyage. */ protected String datum = "WGS84"; - /** Casino file to import. */ - protected final InputFile casinoFile; + /** Voyage file to import. */ + protected final InputFile voyageFile; + /** Transit file to import. */ + protected final InputFile transitFile; + + /** Transect file to import. */ + protected final InputFile transectFile; + /** Echotype file to import. */ protected final InputFile echotypeFile; public CommonDataCompleteImportConfiguration(Locale locale) { - casinoFile = InputFile.newFile(l_(locale, "echobase.common.casinoFile")); - echotypeFile = InputFile.newFile(l_(locale, "echobase.common.echotypeFile")); + voyageFile = InputFile.newFile( + l_(locale, "echobase.common.voyageFile")); + transitFile = InputFile.newFile( + l_(locale, "echobase.common.transitFile")); + transectFile = InputFile.newFile( + l_(locale, "echobase.common.transectFile")); + echotypeFile = InputFile.newFile( + l_(locale, "echobase.common.echotypeFile")); } public String getMissionId() { @@ -78,6 +105,14 @@ this.areaOfOperationId = areaOfOperationId; } + public String getVesselId() { + return vesselId; + } + + public void setVesselId(String vesselId) { + this.vesselId = vesselId; + } + public String getVoyageDescription() { return voyageDescription; } @@ -94,16 +129,57 @@ this.datum = datum; } - public InputFile getCasinoFile() { - return casinoFile; + public String getTransitRelatedActivity() { + return transitRelatedActivity; } + public void setTransitRelatedActivity(String transitRelatedActivity) { + this.transitRelatedActivity = transitRelatedActivity; + } + + public String getTransectLicence() { + return transectLicence; + } + + public void setTransectLicence(String transectLicence) { + this.transectLicence = transectLicence; + } + + public String getTransectGeospatialVerticalPositive() { + return transectGeospatialVerticalPositive; + } + + public void setTransectGeospatialVerticalPositive(String transectGeospatialVerticalPositive) { + this.transectGeospatialVerticalPositive = transectGeospatialVerticalPositive; + } + + public String getTransectBinUnitsPingAxis() { + return transectBinUnitsPingAxis; + } + + public void setTransectBinUnitsPingAxis(String transectBinUnitsPingAxis) { + this.transectBinUnitsPingAxis = transectBinUnitsPingAxis; + } + + public InputFile getVoyageFile() { + return voyageFile; + } + + public InputFile getTransitFile() { + return transitFile; + } + + public InputFile getTransectFile() { + return transectFile; + } + public InputFile getEchotypeFile() { return echotypeFile; } @Override public InputFile[] getInputFiles() { - return new InputFile[]{casinoFile, echotypeFile}; + return new InputFile[]{voyageFile, transitFile, + transectFile, echotypeFile}; } } Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/configurations/CommonDataFromTransectImportConfiguration.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/configurations/CommonDataFromTransectImportConfiguration.java 2012-01-15 21:30:41 UTC (rev 282) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/configurations/CommonDataFromTransectImportConfiguration.java 2012-01-15 21:31:49 UTC (rev 283) @@ -42,11 +42,27 @@ /** Selected voyage id where to import datas. */ protected String voyageId; - /** Casino file to import. */ - protected final InputFile casinoFile; + /** Selected vessel to use for transect. */ + protected String vesselId; + /** transect license. */ + protected String transectLicence; + + /** transect geospatialVerticalPositive. */ + protected String transectGeospatialVerticalPositive = "down"; + + /** transect binUnitsPingAxis. */ + protected String transectBinUnitsPingAxis = "1 nautical mile"; + + /** Manual datum to use in voyage. */ + protected String datum = "WGS84"; + + /** Transect file to import. */ + protected final InputFile transectFile; + public CommonDataFromTransectImportConfiguration(Locale locale) { - casinoFile = InputFile.newFile(l_(locale, "echobase.common.casinoFile")); + transectFile = InputFile.newFile( + l_(locale, "echobase.common.transectFile")); } public String getVoyageId() { @@ -57,12 +73,52 @@ this.voyageId = voyageId; } - public InputFile getCasinoFile() { - return casinoFile; + public String getVesselId() { + return vesselId; } + public void setVesselId(String vesselId) { + this.vesselId = vesselId; + } + + public String getDatum() { + return datum; + } + + public void setDatum(String datum) { + this.datum = datum; + } + + public String getTransectLicence() { + return transectLicence; + } + + public void setTransectLicence(String transectLicence) { + this.transectLicence = transectLicence; + } + + public String getTransectGeospatialVerticalPositive() { + return transectGeospatialVerticalPositive; + } + + public void setTransectGeospatialVerticalPositive(String transectGeospatialVerticalPositive) { + this.transectGeospatialVerticalPositive = transectGeospatialVerticalPositive; + } + + public String getTransectBinUnitsPingAxis() { + return transectBinUnitsPingAxis; + } + + public void setTransectBinUnitsPingAxis(String transectBinUnitsPingAxis) { + this.transectBinUnitsPingAxis = transectBinUnitsPingAxis; + } + + public InputFile getTransectFile() { + return transectFile; + } + @Override public InputFile[] getInputFiles() { - return new InputFile[]{casinoFile}; + return new InputFile[]{transectFile}; } } Modified: trunk/echobase-services/src/main/resources/i18n/echobase-services_fr_FR.properties =================================================================== --- trunk/echobase-services/src/main/resources/i18n/echobase-services_fr_FR.properties 2012-01-15 21:30:41 UTC (rev 282) +++ trunk/echobase-services/src/main/resources/i18n/echobase-services_fr_FR.properties 2012-01-15 21:31:49 UTC (rev 283) @@ -2,7 +2,7 @@ echobase.common.echotypeFile=Fichier echotype echobase.common.importDataMode.accousticData=Import des données accoustiques echobase.common.importDataMode.accousticRegionData=Import des cellules régions (accoustique) -echobase.common.importDataMode.catchesData=Import des donées de pêche non biométrie +echobase.common.importDataMode.catchesData=Import des données de pêche non biométrie echobase.common.importDataMode.catchesIndividualData=Import des données de pêche biométire echobase.common.importDataMode.catchesReferences=Import du référentiel pêche echobase.common.importDataMode.commonDataComplete=Import de données communes

1 0

r282 - trunk/echobase-entities/src/main/java/fr/ifremer/echobase
by tchemit＠users.forge.codelutin.com 15 Jan '12

15 Jan '12

Author: tchemit Date: 2012-01-15 22:30:41 +0100 (Sun, 15 Jan 2012) New Revision: 282 Url: http://forge.codelutin.com/repositories/revision/echobase/282 Log: remove unused configuration option Modified: trunk/echobase-entities/src/main/java/fr/ifremer/echobase/EchoBaseConfiguration.java Modified: trunk/echobase-entities/src/main/java/fr/ifremer/echobase/EchoBaseConfiguration.java =================================================================== --- trunk/echobase-entities/src/main/java/fr/ifremer/echobase/EchoBaseConfiguration.java 2012-01-15 19:39:51 UTC (rev 281) +++ trunk/echobase-entities/src/main/java/fr/ifremer/echobase/EchoBaseConfiguration.java 2012-01-15 21:30:41 UTC (rev 282) @@ -47,8 +47,6 @@ protected static final Log log = LogFactory.getLog(EchoBaseConfiguration.class); - public static final String OPTION_CREATE_ADMINS = "createAdmins"; - public static final String OPTION_UPDATE_SCHEMA = "updateSchema"; public static final String OPTION_AUTO_LOGIN = "autoLogin";

1 0

r281 - trunk/echobase-services/src/main/java/fr/ifremer/echobase/services
by tchemit＠users.forge.codelutin.com 15 Jan '12

15 Jan '12

Author: tchemit Date: 2012-01-15 20:39:51 +0100 (Sun, 15 Jan 2012) New Revision: 281 Url: http://forge.codelutin.com/repositories/revision/echobase/281 Log: remove commented code Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ExportDbService.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ExportService.java Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ExportDbService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ExportDbService.java 2012-01-15 19:38:46 UTC (rev 280) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ExportDbService.java 2012-01-15 19:39:51 UTC (rev 281) @@ -79,16 +79,10 @@ model.setNbSteps(entries.length); -// List<EchoBaseEntityEnum> referenceTypes = -// Arrays.asList(EntitiesUtil.getReferenceTypes()); for (MetaFilenameAware entry : entries) { model.incrementsProgression(); -// if (!referenceTypes.contains(entry.getSource())) { -// // remove this when tests are ok. -// continue; -// } File entryFile = new File(dir, entry.getFilename()); if (entry instanceof AssociationMeta) { AssociationMeta associationMeta = (AssociationMeta) entry; Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ExportService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ExportService.java 2012-01-15 19:38:46 UTC (rev 280) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ExportService.java 2012-01-15 19:39:51 UTC (rev 281) @@ -142,21 +142,7 @@ DbEditorService service = getService(DbEditorService.class); TableMeta tableMeta = service.getTableMeta(associationMeta.getSource()); -// long s0 = TimeLog.getTime(); List<TopiaEntity> datas = service.getEntities(tableMeta, null, null, null, "size(e." + associationMeta.getName() + ") > 0"); -// List<TopiaEntity> datas = service.getEntities(tableMeta, null, null, null, null); -// timeLog.log(s0, "prepareExport::getEntities"); -// s0 = TimeLog.getTime(); -// EntityOperator<TopiaEntity> operator = associationMeta.getOperator(); -// Iterator<TopiaEntity> itr = datas.iterator(); -// while (itr.hasNext()) { -// TopiaEntity entity = itr.next(); -// int size = operator.sizeChild(associationMeta.getName(), entity); -// if (size == 0) { -// itr.remove(); -// } -// } -// timeLog.log(s0, "prepareExport::removeEmptyChilds"); ExportModel<TopiaEntity> model = buildForExport(associationMeta); return Export.newExport(model, datas); }

1 0

r280 - trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv
by tchemit＠users.forge.codelutin.com 15 Jan '12

15 Jan '12

Author: tchemit Date: 2012-01-15 20:38:46 +0100 (Sun, 15 Jan 2012) New Revision: 280 Url: http://forge.codelutin.com/repositories/revision/echobase/280 Log: improve csv api Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/CsvModelUtil.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/EntityAssociationExportModel.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/EntityAssociationImportModel.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/EntityCsvModel.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/ExportQueryCsvModel.java Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/CsvModelUtil.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/CsvModelUtil.java 2012-01-15 19:37:20 UTC (rev 279) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/CsvModelUtil.java 2012-01-15 19:38:46 UTC (rev 280) @@ -34,6 +34,12 @@ import org.nuiton.topia.persistence.TopiaEntity; import org.nuiton.util.StringUtil; import org.nuiton.util.csv.Common; +import org.nuiton.util.csv.ExportModel; +import org.nuiton.util.csv.ExportableColumn; +import org.nuiton.util.csv.ImportExportModel; +import org.nuiton.util.csv.ImportModel; +import org.nuiton.util.csv.ImportableColumn; +import org.nuiton.util.csv.ModelBuilder; import org.nuiton.util.csv.ValueFormatter; import org.nuiton.util.csv.ValueParser; import org.nuiton.util.csv.ValueParserFormatter; @@ -43,6 +49,7 @@ import java.util.Arrays; import java.util.Collection; import java.util.Date; +import java.util.List; import java.util.Locale; import java.util.Map; @@ -106,7 +113,10 @@ } public static final ValueParser<Date> IMPORT_DAY = new DateValue("dd/MM/yy"); + public static final ValueParser<Date> IMPORT_DAY2 = new DateValue("dd-MM-yy"); + public static final ValueParser<Date> TIME = new DateValue("HH:mm:ss"); + public static final ValueParser<Boolean> INT_TO_BOOLEAN_PARSER = new ValueParser<Boolean>() { @Override @@ -285,4 +295,84 @@ protected CsvModelUtil() { // avoid instanciation on helper class } + + public static abstract class AbstractImportModel<E> implements ImportModel<E> { + + private final char separator; + + protected final ModelBuilder<E> modelBuilder; + + public AbstractImportModel(char separator) { + this.separator = separator; + modelBuilder = new ModelBuilder<E>(); + } + + @Override + public final char getSeparator() { + return separator; + } + + @Override + public void pushCsvHeaderNames(List<String> headerNames) { + } + + @Override + public final Iterable<ImportableColumn<E, Object>> getColumnsForImport() { + return (Iterable) modelBuilder.getColumnsForImport(); + } + } + + public static abstract class AbstractImportExportModel<E> implements ImportExportModel<E> { + + private final char separator; + + protected final ModelBuilder<E> modelBuilder; + + public AbstractImportExportModel(char separator) { + this.separator = separator; + modelBuilder = new ModelBuilder<E>(); + } + + @Override + public final char getSeparator() { + return separator; + } + + @Override + public void pushCsvHeaderNames(List<String> headerNames) { + } + + @Override + public final Iterable<ExportableColumn<E, Object>> getColumnsForExport() { + return (Iterable) modelBuilder.getColumnsForImport(); + } + + @Override + public final Iterable<ImportableColumn<E, Object>> getColumnsForImport() { + return (Iterable) modelBuilder.getColumnsForImport(); + } + } + + public static abstract class AbstractExportModel<E> implements ExportModel<E> { + + private final char separator; + + protected final ModelBuilder<E> modelBuilder; + + public AbstractExportModel(char separator) { + this.separator = separator; + modelBuilder = new ModelBuilder<E>(); + } + + @Override + public final char getSeparator() { + return separator; + } + + @Override + public final Iterable<ExportableColumn<E, Object>> getColumnsForExport() { + return (Iterable) modelBuilder.getColumnsForImport(); + } + + } } Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/EntityAssociationExportModel.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/EntityAssociationExportModel.java 2012-01-15 19:37:20 UTC (rev 279) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/EntityAssociationExportModel.java 2012-01-15 19:38:46 UTC (rev 280) @@ -26,25 +26,17 @@ import fr.ifremer.echobase.entities.meta.AssociationMeta; import org.nuiton.topia.persistence.TopiaEntity; import org.nuiton.util.csv.ExportModel; -import org.nuiton.util.csv.ExportableColumn; -import org.nuiton.util.csv.ModelBuilder; -import java.util.Collection; - /** * A model to export associations of entities into csv files. * * @author tchemit <chemit(a)codelutin.com> * @since 0.2 */ -public class EntityAssociationExportModel<E extends TopiaEntity> implements ExportModel<E> { +public class EntityAssociationExportModel<E extends TopiaEntity> extends CsvModelUtil.AbstractExportModel<E> { - protected final char separator; - protected final AssociationMeta meta; - protected ModelBuilder<E> modelBuilder; - public static <E extends TopiaEntity> ExportModel<E> newExportModel(char separator, AssociationMeta meta ) { @@ -66,21 +58,9 @@ return model; } - @Override - public char getSeparator() { - return separator; - } - - @Override - public Iterable<ExportableColumn<E, Object>> getColumnsForExport() { - return (Collection) - modelBuilder.getColumnsForExport(); - } - protected EntityAssociationExportModel(char separator, AssociationMeta meta) { - this.separator = separator; + super(separator); this.meta = meta; - modelBuilder = new ModelBuilder<E>(); } Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/EntityAssociationImportModel.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/EntityAssociationImportModel.java 2012-01-15 19:37:20 UTC (rev 279) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/EntityAssociationImportModel.java 2012-01-15 19:38:46 UTC (rev 280) @@ -26,11 +26,7 @@ import fr.ifremer.echobase.entities.meta.AssociationMeta; import org.nuiton.topia.persistence.TopiaEntity; import org.nuiton.util.csv.ImportModel; -import org.nuiton.util.csv.ImportableColumn; -import org.nuiton.util.csv.ModelBuilder; -import java.util.Collection; -import java.util.List; import java.util.Map; /** @@ -39,14 +35,10 @@ * @author tchemit <chemit(a)codelutin.com> * @since 0.2 */ -public class EntityAssociationImportModel implements ImportModel<Map<String, Object>> { +public class EntityAssociationImportModel extends CsvModelUtil.AbstractImportModel<Map<String, Object>> { - protected final char separator; - protected final AssociationMeta meta; - protected ModelBuilder<Map<String, Object>> modelBuilder; - public static ImportModel<Map<String, Object>> newImportModel(char separator, AssociationMeta meta ) { @@ -70,29 +62,14 @@ } @Override - public char getSeparator() { - return separator; - } - - @Override - public Iterable<ImportableColumn<Map<String, Object>, Object>> getColumnsForImport() { - return (Collection) - modelBuilder.getColumnsForImport(); - } - - @Override - public void pushCsvHeaderNames(List<String> headerNames) { - } - - @Override public Map<String, Object> newEmptyInstance() { return null; } - protected EntityAssociationImportModel(char separator, AssociationMeta meta) { - this.separator = separator; + protected EntityAssociationImportModel(char separator, + AssociationMeta meta) { + super(separator); this.meta = meta; - modelBuilder = new ModelBuilder<Map<String, Object>>(); } Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/EntityCsvModel.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/EntityCsvModel.java 2012-01-15 19:37:20 UTC (rev 279) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/EntityCsvModel.java 2012-01-15 19:38:46 UTC (rev 280) @@ -26,15 +26,11 @@ import com.google.common.base.Function; import fr.ifremer.echobase.entities.meta.TableMeta; import org.nuiton.topia.persistence.TopiaEntity; -import org.nuiton.util.csv.ExportableColumn; -import org.nuiton.util.csv.ImportExportModel; import org.nuiton.util.csv.ImportableColumn; -import org.nuiton.util.csv.ModelBuilder; import org.nuiton.util.csv.ValueParser; import java.util.Collection; import java.util.Date; -import java.util.List; /** * A model to import / export entities into csv files. @@ -42,14 +38,10 @@ * @author tchemit <chemit(a)codelutin.com> * @since 0.2 */ -public class EntityCsvModel<E extends TopiaEntity> implements ImportExportModel<E> { +public class EntityCsvModel<E extends TopiaEntity> extends CsvModelUtil.AbstractImportExportModel<E> { - protected final char separator; - protected final TableMeta tableMeta; - protected ModelBuilder<E> modelBuilder; - public static <E extends TopiaEntity> EntityCsvModel<E> newModel( char separator, TableMeta tableMeta @@ -65,27 +57,6 @@ return new EntityCsvModel<E>(separator, tableMeta, idHeader); } - @Override - public char getSeparator() { - return separator; - } - - @Override - public Collection<ExportableColumn<E, Object>> getColumnsForExport() { - return (Collection) - modelBuilder.getColumnsForExport(); - } - - @Override - public Collection<ImportableColumn<E, Object>> getColumnsForImport() { - return (Collection) - modelBuilder.getColumnsForImport(); - } - - @Override - public void pushCsvHeaderNames(List<String> headerNames) { - } - public <T> ImportableColumn<E, T> newIgnoredColumn(String headerName) { return modelBuilder.newIgnoredColumn(headerName); } @@ -252,9 +223,8 @@ protected EntityCsvModel(char separator, TableMeta tableMeta) { - this.separator = separator; + super(separator); this.tableMeta = tableMeta; - modelBuilder = new ModelBuilder<E>(); } protected EntityCsvModel(char separator, Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/ExportQueryCsvModel.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/ExportQueryCsvModel.java 2012-01-15 19:37:20 UTC (rev 279) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/ExportQueryCsvModel.java 2012-01-15 19:38:46 UTC (rev 280) @@ -24,13 +24,7 @@ package fr.ifremer.echobase.services.csv; import fr.ifremer.echobase.services.ExportQueryService; -import org.nuiton.util.csv.ExportableColumn; -import org.nuiton.util.csv.ImportExportModel; -import org.nuiton.util.csv.ImportableColumn; -import org.nuiton.util.csv.ModelBuilder; -import java.util.Collection; -import java.util.List; import java.util.Map; /** @@ -39,16 +33,11 @@ * @author tchemit <chemit(a)codelutin.com> * @since 0.2 */ -public class ExportQueryCsvModel implements ImportExportModel<Map<String, Object>> { +public class ExportQueryCsvModel extends CsvModelUtil.AbstractExportModel<Map<String, Object>> { - protected final char separator; - - protected final ModelBuilder<?> modelBuilder; - public ExportQueryCsvModel(char separator, String[] columnHeaders) { - this.separator = separator; - modelBuilder = new ModelBuilder<Object>(); + super(separator); for (String columnHeader : columnHeaders) { modelBuilder.newColumnForExport( columnHeader, @@ -58,29 +47,4 @@ } } - @Override - public char getSeparator() { - return separator; - } - - @Override - public Collection<ExportableColumn<Map<String, Object>, Object>> getColumnsForExport() { - return (Collection) modelBuilder.getColumnsForExport(); - } - - @Override - public Collection<ImportableColumn<Map<String, Object>, Object>> getColumnsForImport() { - // never do import from this model - throw new UnsupportedOperationException(); - } - - @Override - public void pushCsvHeaderNames(List<String> headerNames) { - } - - @Override - public Map<String, Object> newEmptyInstance() { - // never do import from this model - throw new UnsupportedOperationException(); - } }

1 0

r279 - in trunk: echobase-entities/src/main/resources/i18n echobase-entities/src/main/xmi echobase-services/src/main/resources/i18n
by tchemit＠users.forge.codelutin.com 15 Jan '12

15 Jan '12

Author: tchemit Date: 2012-01-15 20:37:20 +0100 (Sun, 15 Jan 2012) New Revision: 279 Url: http://forge.codelutin.com/repositories/revision/echobase/279 Log: add some order on some associations + i18n Modified: trunk/echobase-entities/src/main/resources/i18n/echobase-entities_fr_FR.properties trunk/echobase-entities/src/main/xmi/echobase.properties trunk/echobase-services/src/main/resources/i18n/echobase-services_fr_FR.properties Modified: trunk/echobase-entities/src/main/resources/i18n/echobase-entities_fr_FR.properties =================================================================== --- trunk/echobase-entities/src/main/resources/i18n/echobase-entities_fr_FR.properties 2012-01-13 17:45:03 UTC (rev 278) +++ trunk/echobase-entities/src/main/resources/i18n/echobase-entities_fr_FR.properties 2012-01-15 19:37:20 UTC (rev 279) @@ -130,7 +130,6 @@ echobase.common.loggedDataDatatype= echobase.common.loggedDataFormat= echobase.common.longName= -echobase.common.m= echobase.common.maxDepth= echobase.common.maxFishLength= echobase.common.maxLatitude= @@ -156,7 +155,6 @@ echobase.common.modificationDate=Date de modification echobase.common.modificationText=Modification echobase.common.modificationUser=Utilisateur -echobase.common.mz= echobase.common.name=Nom echobase.common.noiseDesign= echobase.common.notes= @@ -166,7 +164,6 @@ echobase.common.operationEvent= echobase.common.operationMetadata= echobase.common.operationMetadataValue= -echobase.common.operationType= echobase.common.operator= echobase.common.organisationLevelAcknowledgements=organisationLevelAcknowledgements echobase.common.organisationReferences=Références organisation @@ -188,7 +185,6 @@ echobase.common.qualityDataFlagValues= echobase.common.r2= echobase.common.raptriBiometryDataType= -echobase.common.reference= echobase.common.referenceDatum=referenceDatum echobase.common.referenceDatumType= echobase.common.referencingMethod= Modified: trunk/echobase-entities/src/main/xmi/echobase.properties =================================================================== --- trunk/echobase-entities/src/main/xmi/echobase.properties 2012-01-13 17:45:03 UTC (rev 278) +++ trunk/echobase-entities/src/main/xmi/echobase.properties 2012-01-15 19:37:20 UTC (rev 279) @@ -32,6 +32,14 @@ model.tagValue.doNotGenerateBooleanGetMethods=true model.tagValue.indexForeignKeys=true +# ordered +fr.ifremer.echobase.entities.data.Voyage.attribute.transit.stereotype=ordered +fr.ifremer.echobase.entities.data.Voyage.attribute.transit.tagvalue.orderBy=startTime +fr.ifremer.echobase.entities.data.Transit.attribute.transect.stereotype=ordered +fr.ifremer.echobase.entities.data.Transit.attribute.transect.tagvalue.orderBy=timeCoverageStart +fr.ifremer.echobase.entities.data.Transect.attribute.operation.stereotype=ordered +fr.ifremer.echobase.entities.data.Transect.attribute.operation.tagvalue.orderBy=gearShootingStartTime + # big text zone fr.ifremer.echobase.entities.EntityModificationLog.attribute.modificationText.tagvalue.type=text Modified: trunk/echobase-services/src/main/resources/i18n/echobase-services_fr_FR.properties =================================================================== --- trunk/echobase-services/src/main/resources/i18n/echobase-services_fr_FR.properties 2012-01-13 17:45:03 UTC (rev 278) +++ trunk/echobase-services/src/main/resources/i18n/echobase-services_fr_FR.properties 2012-01-15 19:37:20 UTC (rev 279) @@ -1,5 +1,4 @@ echobase.common.associationFile=Fichier d'associations de cellules -echobase.common.casinoFile=Fichier Casino echobase.common.echotypeFile=Fichier echotype echobase.common.importDataMode.accousticData=Import des données accoustiques echobase.common.importDataMode.accousticRegionData=Import des cellules régions (accoustique) @@ -17,4 +16,7 @@ echobase.common.tblMensurationClasseFile=Fichier de classes de mensuration echobase.common.tblMensurationFile=Fichier de mensuration echobase.common.tlbeStationFile=Fichier des stations +echobase.common.transectFile=Fichier des transects +echobase.common.transitFile=Fichier des transits +echobase.common.voyageFile=Fichier des voayges echobase.common.xtblTriFile=Fichier Tri

1 0

r278 - trunk/echobase-tools/src/test/java/fr/ifremer/echobase/tools/loaders
by tchemit＠users.forge.codelutin.com 13 Jan '12

13 Jan '12

Author: tchemit Date: 2012-01-13 18:45:03 +0100 (Fri, 13 Jan 2012) New Revision: 278 Url: http://forge.codelutin.com/repositories/revision/echobase/278 Log: fix compile Modified: trunk/echobase-tools/src/test/java/fr/ifremer/echobase/tools/loaders/CellLoaderIT.java Modified: trunk/echobase-tools/src/test/java/fr/ifremer/echobase/tools/loaders/CellLoaderIT.java =================================================================== --- trunk/echobase-tools/src/test/java/fr/ifremer/echobase/tools/loaders/CellLoaderIT.java 2012-01-13 17:41:09 UTC (rev 277) +++ trunk/echobase-tools/src/test/java/fr/ifremer/echobase/tools/loaders/CellLoaderIT.java 2012-01-13 17:45:03 UTC (rev 278) @@ -45,6 +45,7 @@ import org.junit.runner.RunWith; import org.junit.runners.Parameterized; import org.nuiton.topia.TopiaException; +import org.nuiton.util.TimeLog; import java.io.File; import java.io.IOException; @@ -66,6 +67,8 @@ private static final Log log = LogFactory.getLog(CellLoaderIT.class); + public static final TimeLog TIME_LOG = new TimeLog(DbEditorService.class); + /** Id of data processing to treat. */ private String dataProcessingId; @@ -130,7 +133,7 @@ super.tearDown(); if (log.isInfoEnabled()) { - log.info("TimeLogs : " + DbEditorService.timeLog.getCallCount()); + log.info("TimeLogs : " + TIME_LOG.getCallCount()); } }

1 0

r277 - in trunk: echobase-services/src/main/java/fr/ifremer/echobase/services echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders
by tchemit＠users.forge.codelutin.com 13 Jan '12

13 Jan '12

Author: tchemit Date: 2012-01-13 18:41:09 +0100 (Fri, 13 Jan 2012) New Revision: 277 Url: http://forge.codelutin.com/repositories/revision/echobase/277 Log: fix more sonar errors Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/DbEditorService.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ExportService.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ImportDbService.java trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/SampleLoader.java Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/DbEditorService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/DbEditorService.java 2012-01-13 17:29:04 UTC (rev 276) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/DbEditorService.java 2012-01-13 17:41:09 UTC (rev 277) @@ -41,7 +41,6 @@ import org.nuiton.topia.framework.TopiaQuery; import org.nuiton.topia.persistence.TopiaDAO; import org.nuiton.topia.persistence.TopiaEntity; -import org.nuiton.util.TimeLog; import org.nuiton.util.beans.BeanMonitor; import org.nuiton.util.beans.PropertyDiff; import org.nuiton.util.csv.ExportableColumn; @@ -63,8 +62,6 @@ /** Logger. */ private static final Log log = LogFactory.getLog(DbEditorService.class); - public static final TimeLog timeLog = new TimeLog(DbEditorService.class); - protected DecoratorService getDecoratorService() { return getService(DecoratorService.class); } Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ExportService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ExportService.java 2012-01-13 17:29:04 UTC (rev 276) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ExportService.java 2012-01-13 17:41:09 UTC (rev 277) @@ -50,7 +50,7 @@ /** Logger. */ private static final Log log = LogFactory.getLog(ExportService.class); - public static final TimeLog timeLog = new TimeLog(ExportService.class); + public static final TimeLog TIME_LOG = new TimeLog(ExportService.class); public <E extends TopiaEntity> ExportModel<E> buildForExport(AssociationMeta associationMeta) { @@ -101,14 +101,14 @@ } long s1 = TimeLog.getTime(); Export<TopiaEntity> export = prepareExport(tableMeta); - timeLog.log(s1, "exportDatas::prepareExport"); + TIME_LOG.log(s1, "exportDatas::prepareExport"); long s2 = TimeLog.getTime(); try { export.exportToFile(file); } catch (Exception eee) { throw new EchoBaseTechnicalException("Can not export datas", eee); } - timeLog.log(s2, "exportDatas::exportToFile"); + TIME_LOG.log(s2, "exportDatas::exportToFile"); } public void exportDatas(AssociationMeta associationMeta, File file) { @@ -118,7 +118,7 @@ } long s1 = TimeLog.getTime(); Export<TopiaEntity> export = prepareExport(associationMeta); - timeLog.log(s1, "exportDatas::prepareExport"); + TIME_LOG.log(s1, "exportDatas::prepareExport"); long s2 = TimeLog.getTime(); try { @@ -126,7 +126,7 @@ } catch (Exception eee) { throw new EchoBaseTechnicalException("Can not export datas", eee); } - timeLog.log(s2, "exportDatas::exportToFile"); + TIME_LOG.log(s2, "exportDatas::exportToFile"); } protected Export<TopiaEntity> prepareExport(TableMeta tableMeta) { Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ImportDbService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ImportDbService.java 2012-01-13 17:29:04 UTC (rev 276) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ImportDbService.java 2012-01-13 17:41:09 UTC (rev 277) @@ -66,7 +66,7 @@ private static final Log log = LogFactory.getLog(ImportDbService.class); - public static final TimeLog timeLog = new TimeLog(ImportDbService.class); + public static final TimeLog TIME_LOG = new TimeLog(ImportDbService.class); /** * Import a complete db from the given zip file. @@ -153,12 +153,9 @@ result.put(entry, zipEntry); } } - if (!missingEntries.isEmpty()) { - - if (log.isWarnEnabled()) { - log.warn("There is " + missingEntries.size() + " missing files " + - " in import " + file + "\n" + StringUtil.join(missingEntries, "\n", false)); - } + if (!missingEntries.isEmpty() && log.isWarnEnabled()) { + log.warn("There is " + missingEntries.size() + " missing files " + + " in import " + file + "\n" + StringUtil.join(missingEntries, "\n", false)); } return result; @@ -219,13 +216,13 @@ } } - timeLog.log(s0, "importFile::done"); + TIME_LOG.log(s0, "importFile::done"); s0 = TimeLog.getTime(); flushTransaction(); - timeLog.log(s0, "importFile::flushTransaction"); + TIME_LOG.log(s0, "importFile::flushTransaction"); } protected void importEntityFile(TableMeta meta, Modified: trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/SampleLoader.java =================================================================== --- trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/SampleLoader.java 2012-01-13 17:29:04 UTC (rev 276) +++ trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/SampleLoader.java 2012-01-13 17:41:09 UTC (rev 277) @@ -314,26 +314,18 @@ } } - if (!operationNotFound.isEmpty()) { - if (log.isWarnEnabled()) { - log.warn("operation not found : \n" + StringUtil.join(operationNotFound, "\n", false)); - } + if (!operationNotFound.isEmpty() && log.isWarnEnabled()) { + log.warn("operation not found : \n" + StringUtil.join(operationNotFound, "\n", false)); } - if (!ntotNull.isEmpty()) { - if (log.isWarnEnabled()) { - log.warn("NTOT is null for operation :\n" + StringUtil.join(ntotNull, "\n", false)); - } + if (!ntotNull.isEmpty() && log.isWarnEnabled()) { + log.warn("NTOT is null for operation :\n" + StringUtil.join(ntotNull, "\n", false)); } - if (!pmensNull.isEmpty()) { - if (log.isWarnEnabled()) { - log.warn("PESP_MENS is null for operation\n" + StringUtil.join(pmensNull, "\n", false)); - } + if (!pmensNull.isEmpty() && log.isWarnEnabled()) { + log.warn("PESP_MENS is null for operation\n" + StringUtil.join(pmensNull, "\n", false)); } - if (!valeurBiometryNull.isEmpty()) { - if (log.isWarnEnabled()) { - log.warn("Null value of VALEUR_BIOMETRIE for operationId/Species/Individu/Code param\n" + StringUtil.join(valeurBiometryNull, "\n", false)); - } + if (!valeurBiometryNull.isEmpty() && log.isWarnEnabled()) { + log.warn("Null value of VALEUR_BIOMETRIE for operationId/Species/Individu/Code param\n" + StringUtil.join(valeurBiometryNull, "\n", false)); } if (log.isInfoEnabled()) { log.info("Found " + nbSampleTotal + " 'total' sample(s).");

1 0

r276 - in trunk: echobase-entities/src/main/java/fr/ifremer/echobase echobase-entities/src/main/java/fr/ifremer/echobase/entities echobase-services/src/main/java/fr/ifremer/echobase/services echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/user echobase-ui/src/main/java/fr/ifremer/echobase/ui/interceptors
by tchemit＠users.forge.codelutin.com 13 Jan '12

13 Jan '12

Author: tchemit Date: 2012-01-13 18:29:04 +0100 (Fri, 13 Jan 2012) New Revision: 276 Url: http://forge.codelutin.com/repositories/revision/echobase/276 Log: fix more sonar errors Modified: trunk/echobase-entities/src/main/java/fr/ifremer/echobase/EchoBaseConfiguration.java trunk/echobase-entities/src/main/java/fr/ifremer/echobase/entities/EntitiesUtil.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/DbEditorService.java trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/DataAcquisitionLoader.java trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/EchotypeLoader.java trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/EntityLoader.java trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/OperationLoader.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor/AbstractLoadPage.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor/SaveEntity.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/user/Create.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/user/Delete.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/user/Update.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/interceptors/CheckLogguedInterceptor.java Modified: trunk/echobase-entities/src/main/java/fr/ifremer/echobase/EchoBaseConfiguration.java =================================================================== --- trunk/echobase-entities/src/main/java/fr/ifremer/echobase/EchoBaseConfiguration.java 2012-01-13 17:06:50 UTC (rev 275) +++ trunk/echobase-entities/src/main/java/fr/ifremer/echobase/EchoBaseConfiguration.java 2012-01-13 17:29:04 UTC (rev 276) @@ -156,7 +156,7 @@ * @param key the configuration option key which contains the location of * the directory to create */ - protected void createDirectory(EchoBaseConfigurationOption key) { + private void createDirectory(EchoBaseConfigurationOption key) { File directory = applicationConfig.getOptionAsFile(key.getKey()); Modified: trunk/echobase-entities/src/main/java/fr/ifremer/echobase/entities/EntitiesUtil.java =================================================================== --- trunk/echobase-entities/src/main/java/fr/ifremer/echobase/entities/EntitiesUtil.java 2012-01-13 17:06:50 UTC (rev 275) +++ trunk/echobase-entities/src/main/java/fr/ifremer/echobase/entities/EntitiesUtil.java 2012-01-13 17:29:04 UTC (rev 276) @@ -226,4 +226,8 @@ return result; } + protected EntitiesUtil() { + // avoid to instanciate helper class + } + } Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/DbEditorService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/DbEditorService.java 2012-01-13 17:06:50 UTC (rev 275) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/DbEditorService.java 2012-01-13 17:29:04 UTC (rev 276) @@ -202,13 +202,13 @@ try { o = column.parseValue(stringValue); } catch (Exception e) { - throw new EchoBaseTechnicalException("Could not parse property [" + propertyName + "] with value " + stringValue); + throw new EchoBaseTechnicalException("Could not parse property [" + propertyName + "] with value " + stringValue, e); } try { column.setValue(entity, o); } catch (Exception e) { throw new EchoBaseTechnicalException( - "Could not set property [" + propertyName + "] with value " + stringValue + " to entity " + entity); + "Could not set property [" + propertyName + "] with value " + stringValue + " to entity " + entity, e); } } @@ -303,7 +303,7 @@ String topiaId = entity.getTopiaId(); - buffer = new StringBuilder(messagePrefix + "\n"); + buffer = new StringBuilder(messagePrefix).append('\n'); if (monitor == null) { // no monitor, means this is a creation of an object Modified: trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/DataAcquisitionLoader.java =================================================================== --- trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/DataAcquisitionLoader.java 2012-01-13 17:06:50 UTC (rev 275) +++ trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/DataAcquisitionLoader.java 2012-01-13 17:29:04 UTC (rev 276) @@ -71,7 +71,7 @@ TopiaDAO<DataAcquisition> dao = getDAO(); - Map<String, Map<String, Object>> EI_SONDEURByVesselName = Maps.uniqueIndex( + Map<String, Map<String, Object>> eI_SONDEURByVesselName = Maps.uniqueIndex( db.getTable("EI_SONDEUR"), EchoBaseFunctions.newRowFunction("ID_REFSONDEUR")); List<DataAcquisition> dataAcquisitions = Lists.newArrayList(); @@ -87,7 +87,7 @@ AcousticInstrument acousticInstrument = getFK( acousticInstrumentsByName, acousticInstrumentId); Map<String, Object> sondeurRow = getFK( - EI_SONDEURByVesselName, acousticInstrumentId); + eI_SONDEURByVesselName, acousticInstrumentId); Float transceiverAcquisitionAbsorption = (Float) sondeurRow.get("ALPHA"); Float transceiverAcquisitionPower = (Float) sondeurRow.get("PUISSANCE_MAX"); Modified: trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/EchotypeLoader.java =================================================================== --- trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/EchotypeLoader.java 2012-01-13 17:06:50 UTC (rev 275) +++ trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/EchotypeLoader.java 2012-01-13 17:29:04 UTC (rev 276) @@ -35,8 +35,6 @@ import fr.ifremer.echobase.services.DbEditorService; import fr.ifremer.echobase.services.csv.EntityCsvModel; import fr.ifremer.echobase.tools.FileType; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.nuiton.util.csv.Import; import java.io.File; @@ -52,9 +50,6 @@ */ public class EchotypeLoader extends EntityLoader<Echotype> { - /** Logger. */ - private static final Log log = LogFactory.getLog(EchotypeLoader.class); - public EchotypeLoader() { super(Echotype.class, new EchoBaseEntityEnum[]{EchoBaseEntityEnum.Species}, Modified: trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/EntityLoader.java =================================================================== --- trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/EntityLoader.java 2012-01-13 17:06:50 UTC (rev 275) +++ trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/EntityLoader.java 2012-01-13 17:29:04 UTC (rev 276) @@ -205,9 +205,9 @@ log.info("Import " + entityType + " from " + csvfile); } - TableMeta meta = getTable(entityType); + TableMeta tableMeta = getTable(entityType); - EntityCsvModel<E> csvModel = createCsvImportModel(meta); + EntityCsvModel<E> csvModel = createCsvImportModel(tableMeta); BufferedReader bf = new BufferedReader(new FileReader(csvfile)); try { @@ -218,7 +218,7 @@ DbEditorService dbEditorService = getService(DbEditorService.class); - importNewEntities(dbEditorService, meta, importer); + importNewEntities(dbEditorService, tableMeta, importer); } finally { importer.close(); @@ -232,9 +232,6 @@ bf.close(); } -// File out = getTableFile(outputDir, meta, FileType.NEW); -// getExportService().exportDatas(meta, out); - exportDatas(outputDir, FileType.NEW); exportAssociations(outputDir, FileType.ASSOCIATION); @@ -245,7 +242,9 @@ } } - protected void importNewEntities(DbEditorService dbEditorService, TableMeta meta, Import<E> importer) { + protected void importNewEntities(DbEditorService dbEditorService, + TableMeta meta, + Import<E> importer) { for (E entity : importer) { dbEditorService.saveEntity(meta, @@ -291,7 +290,9 @@ } } - protected void exportData(File outputDir, FileType targetType, TableMeta meta) throws IOException { + protected void exportData(File outputDir, + FileType targetType, + TableMeta meta) throws IOException { File out = getTableFile(outputDir, meta, targetType); @@ -322,7 +323,8 @@ return new File(parentDir, meta.getFilename()); } - public void copyStreamToFile(File file, FileType fileType) throws IOException { + public void copyStreamToFile(File file, + FileType fileType) throws IOException { String path = "/csv/" + fileType.name().toLowerCase() + "/" + file.getName(); InputStream stream = getClass().getResourceAsStream(path); @@ -352,9 +354,10 @@ File out = getTableFile(directory, meta, fileType); copyStreamToFile(out, fileType); - CsvImportResult result = CsvImportResult.newResult(meta.getSource(), - out.getAbsolutePath(), - true); + CsvImportResult result = CsvImportResult.newResult( + meta.getSource(), + out.getAbsolutePath(), + true); BufferedReader bf = new BufferedReader(new FileReader(out)); try { @@ -425,20 +428,20 @@ // load a association input - AssociationMeta meta = (AssociationMeta) entry; + AssociationMeta associationMeta = (AssociationMeta) entry; if (log.isInfoEnabled()) { - log.info("Will import " + meta); + log.info("Will import " + associationMeta); } - EchoBaseEntityEnum target = meta.getTarget(); + EchoBaseEntityEnum target = associationMeta.getTarget(); List<TopiaEntity> targetEntities = getEntities(target); Map<String, TopiaEntity> targetsById = Maps.uniqueIndex(targetEntities, EchoBaseFunctions.TO_TOPIAID); - ImportModel<Map<String, Object>> model = service.buildForImport(meta); + ImportModel<Map<String, Object>> model = service.buildForImport(associationMeta); - EchoBaseEntityEnum sourceType = meta.getSource(); + EchoBaseEntityEnum sourceType = associationMeta.getSource(); ImportToMap importer = ImportToMap.newImport(model, reader); @@ -455,7 +458,7 @@ TopiaEntity targetEntity = targetsById.get(association); associationEntities.add(targetEntity); } - meta.setChilds(e, associationEntities); + associationMeta.setChilds(e, associationEntities); csvResult.incrementsNumberUpdated(); } @@ -468,29 +471,31 @@ // normal entity table import - TableMeta meta = (TableMeta) entry; + TableMeta tableMeta = (TableMeta) entry; if (log.isInfoEnabled()) { - log.info("Will import " + meta); + log.info("Will import " + tableMeta); } - ImportModel<TopiaEntity> model = service.buildForImport(meta); + ImportModel<TopiaEntity> model = service.buildForImport(tableMeta); Import<TopiaEntity> importer = Import.newImport(model, reader); try { - TopiaDAO<TopiaEntity> dao = getDAO(meta.getSource()); + TopiaDAO<TopiaEntity> dao = getDAO(tableMeta.getSource()); for (TopiaEntity entity : importer) { TopiaEntity entityToSave = dao.create(TopiaEntity.TOPIA_ID, entity.getTopiaId()); - meta.copy(entity, entityToSave); + tableMeta.copy(entity, entityToSave); csvResult.incrementsNumberUpdated(); } } catch (Exception eee) { - throw new EchoBaseTechnicalException("Could not import entities of type " + meta.getSource(), eee); + throw new EchoBaseTechnicalException( + "Could not import entities of type " + + tableMeta.getSource(), eee); } finally { importer.close(); Modified: trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/OperationLoader.java =================================================================== --- trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/OperationLoader.java 2012-01-13 17:06:50 UTC (rev 275) +++ trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/OperationLoader.java 2012-01-13 17:29:04 UTC (rev 276) @@ -122,20 +122,20 @@ } //SONDE - OperationMetadata MeanWaterDepthOperationMeta; + OperationMetadata meanWaterDepthOperationMeta; //JOUR_NUIT - OperationMetadata DielPeriodOperationMeta; + OperationMetadata dielPeriodOperationMeta; //SONDEDEB - OperationMetadata StartWaterDepthOperationMeta; + OperationMetadata startWaterDepthOperationMeta; //SONDEFIN - OperationMetadata EndWaterDepthOperationMeta; + OperationMetadata endWaterDepthOperationMeta; //LFUNES - GearMetadata CableLengthGearMeta; + GearMetadata cableLengthGearMeta; //VMIN - GearMetadata MinSpeedGearMeta; + GearMetadata minSpeedGearMeta; //VMAX - GearMetadata MaxSpeedGearMeta; + GearMetadata maxSpeedGearMeta; TopiaDAO<Operation> dao; TopiaDAO<OperationMetadataValue> operationMetadataValueDAO; @@ -161,38 +161,38 @@ (OperationMetadataDAO) getDAO(OperationMetadata.class); //SONDE - MeanWaterDepthOperationMeta = + meanWaterDepthOperationMeta = operationMetadataDAO.findByName("MeanWaterDepth"); - Preconditions.checkNotNull(MeanWaterDepthOperationMeta); + Preconditions.checkNotNull(meanWaterDepthOperationMeta); //JOUR_NUIT - DielPeriodOperationMeta = + dielPeriodOperationMeta = operationMetadataDAO.findByName("DielPeriod"); - Preconditions.checkNotNull(DielPeriodOperationMeta); + Preconditions.checkNotNull(dielPeriodOperationMeta); //SONDEDEB - StartWaterDepthOperationMeta = operationMetadataDAO.findByProperties( + startWaterDepthOperationMeta = operationMetadataDAO.findByProperties( OperationMetadata.PROPERTY_NAME, "WaterDepth", OperationMetadata.PROPERTY_OPERATION_EVENT + "." + OperationEvent.PROPERTY_NAME, "ShootingStart" ); - Preconditions.checkNotNull(StartWaterDepthOperationMeta); + Preconditions.checkNotNull(startWaterDepthOperationMeta); //SONDEFIN - EndWaterDepthOperationMeta = operationMetadataDAO.findByProperties( + endWaterDepthOperationMeta = operationMetadataDAO.findByProperties( OperationMetadata.PROPERTY_NAME, "WaterDepth", OperationMetadata.PROPERTY_OPERATION_EVENT + "." + OperationEvent.PROPERTY_NAME, "HaulingEnd" ); - Preconditions.checkNotNull(EndWaterDepthOperationMeta); + Preconditions.checkNotNull(endWaterDepthOperationMeta); GearMetadataDAO gearMetadataDAO = (GearMetadataDAO) getDAO(GearMetadata.class); //LFUNES - CableLengthGearMeta = gearMetadataDAO.findByType("CableLength"); - Preconditions.checkNotNull(CableLengthGearMeta); + cableLengthGearMeta = gearMetadataDAO.findByType("CableLength"); + Preconditions.checkNotNull(cableLengthGearMeta); //VMIN - MinSpeedGearMeta = gearMetadataDAO.findByType("MinSpeed"); - Preconditions.checkNotNull(MinSpeedGearMeta); + minSpeedGearMeta = gearMetadataDAO.findByType("MinSpeed"); + Preconditions.checkNotNull(minSpeedGearMeta); //VMAX - MaxSpeedGearMeta = gearMetadataDAO.findByType("MaxSpeed"); - Preconditions.checkNotNull(MaxSpeedGearMeta); + maxSpeedGearMeta = gearMetadataDAO.findByType("MaxSpeed"); + Preconditions.checkNotNull(maxSpeedGearMeta); dao = getDAO(); operationMetadataValueDAO = getDAO(OperationMetadataValue.class); @@ -324,31 +324,31 @@ ); addOperationMetadataValue(operation, - MeanWaterDepthOperationMeta, + meanWaterDepthOperationMeta, row.get("SONDE")); addOperationMetadataValue(operation, - DielPeriodOperationMeta, + dielPeriodOperationMeta, row.get("JOUR_NUIT")); addOperationMetadataValue(operation, - StartWaterDepthOperationMeta, + startWaterDepthOperationMeta, row.get("SONDEDEB")); addOperationMetadataValue(operation, - EndWaterDepthOperationMeta, + endWaterDepthOperationMeta, row.get("SONDEFIN")); addGearMetadataValue(operation, - CableLengthGearMeta, + cableLengthGearMeta, row.get("LFUNES")); addGearMetadataValue(operation, - MinSpeedGearMeta, + minSpeedGearMeta, row.get("VMIN")); addGearMetadataValue(operation, - MaxSpeedGearMeta, + maxSpeedGearMeta, row.get("VMAX")); return operation; Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor/AbstractLoadPage.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor/AbstractLoadPage.java 2012-01-13 17:06:50 UTC (rev 275) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor/AbstractLoadPage.java 2012-01-13 17:29:04 UTC (rev 276) @@ -73,11 +73,11 @@ public void load() throws Exception { entityTypes = Maps.newTreeMap(); DbMeta dbMeta = getEchoBaseApplicationContext().getDbMeta(); - for (TableMeta tableMeta : dbMeta) { + for (TableMeta meta : dbMeta) { // keep only editable metas - if (dbMeta.isEditable(tableMeta)) { - String name = tableMeta.getName(); + if (dbMeta.isEditable(meta)) { + String name = meta.getName(); entityTypes.put(name, name); } } Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor/SaveEntity.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor/SaveEntity.java 2012-01-13 17:06:50 UTC (rev 275) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor/SaveEntity.java 2012-01-13 17:29:04 UTC (rev 276) @@ -50,8 +50,8 @@ /** id of entity to save. */ protected String topiaId; - /** Metas of the table */ - protected TableMeta tableMeta; +// /** Metas of the table */ +// protected TableMeta tableMeta; protected Map<String, String[]> params; Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/user/Create.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/user/Create.java 2012-01-13 17:06:50 UTC (rev 275) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/user/Create.java 2012-01-13 17:29:04 UTC (rev 276) @@ -56,15 +56,15 @@ } public String execute() throws Exception { - EchoBaseUserDTO user = getUser(); - String userEmail = user.getEmail(); + EchoBaseUserDTO userToCreate = getUser(); + String userEmail = userToCreate.getEmail(); if (log.isInfoEnabled()) { log.info("will create user " + userEmail); } // create user - getUserService().createOrUpdate(user); + getUserService().createOrUpdate(userToCreate); // add info message addActionMessage(_("echobase.info.user.create", userEmail)); @@ -74,8 +74,8 @@ @Override public void validate() { - EchoBaseUserDTO user = getUser(); - String userEmail = user.getEmail(); + EchoBaseUserDTO userToValidate = getUser(); + String userEmail = userToValidate.getEmail(); // login + password required if (StringUtils.isEmpty(userEmail)) { @@ -101,7 +101,7 @@ } } - String userPassword = user.getPassword(); + String userPassword = userToValidate.getPassword(); if (StringUtils.isEmpty(userPassword)) { // empty user password Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/user/Delete.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/user/Delete.java 2012-01-13 17:06:50 UTC (rev 275) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/user/Delete.java 2012-01-13 17:29:04 UTC (rev 276) @@ -58,15 +58,15 @@ public String execute() throws Exception { - EchoBaseUserDTO user = getUser(); - String userEmail = user.getEmail(); + EchoBaseUserDTO userToDelete = getUser(); + String userEmail = userToDelete.getEmail(); if (log.isInfoEnabled()) { log.info("will delete user " + userEmail); } // delete user - getUserService().delete(user); + getUserService().delete(userToDelete); // add info message addActionMessage(_("echobase.info.user.delete", userEmail)); Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/user/Update.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/user/Update.java 2012-01-13 17:06:50 UTC (rev 275) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/user/Update.java 2012-01-13 17:29:04 UTC (rev 276) @@ -58,15 +58,15 @@ @Override public String execute() throws Exception { - EchoBaseUserDTO user = getUser(); - String userEmail = user.getEmail(); + EchoBaseUserDTO userToUpdate = getUser(); + String userEmail = userToUpdate.getEmail(); if (log.isInfoEnabled()) { log.info("will update user " + userEmail); } // update user - getUserService().createOrUpdate(user); + getUserService().createOrUpdate(userToUpdate); // add info message addActionMessage(_("echobase.info.user.update", userEmail)); Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/interceptors/CheckLogguedInterceptor.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/interceptors/CheckLogguedInterceptor.java 2012-01-13 17:06:50 UTC (rev 275) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/interceptors/CheckLogguedInterceptor.java 2012-01-13 17:29:04 UTC (rev 276) @@ -65,8 +65,8 @@ boolean autoLogin = EchoBaseActionSupport.getEchoBaseApplicationContext() - .getConfiguration() - .getOptionAsBoolean(EchoBaseConfiguration.OPTION_AUTO_LOGIN); + .getConfiguration() + .getOptionAsBoolean(EchoBaseConfiguration.OPTION_AUTO_LOGIN); if (autoLogin) { // by-pass login @@ -74,12 +74,12 @@ if (log.isInfoEnabled()) { log.info("AutotLogin with admin/admin user"); } - LoginAction loginAction = new LoginAction(); - loginAction.setSession(invocation.getInvocationContext().getSession()); - loginAction.setEmail("admin"); - loginAction.setPassword("admin"); + LoginAction logAction = new LoginAction(); + logAction.setSession(invocation.getInvocationContext().getSession()); + logAction.setEmail("admin"); + logAction.setPassword("admin"); try { - loginAction.doLogin(); + logAction.doLogin(); } catch (Exception eee) { if (log.isErrorEnabled()) { log.error("Could not auto-login", eee);

1 0