This is an automated email from the git hooks/post-receive script. New commit to branch feature/8180 in repository echobase. See https://gitlab.nuiton.org/codelutin/echobase.git commit efcdae65afc4fa468243ef7aafa973d3666ad1a3 Author: Julien Ruchaud <julien.ruchaud@debux.org> Date: Tue Jul 5 16:03:40 2016 +0200 Add ancillary intrumentation in UI --- .../fr/ifremer/echobase/entities/ImportType.java | 2 +- .../i18n/echobase-domain_en_GB.properties | 8 +-- .../i18n/echobase-domain_fr_FR.properties | 8 +-- ...mportAncillaryInstrumentationActionSupport.java | 5 +- .../ConfigureAncillaryInstrumentationImport.java | 72 ++++++++++++++++++++++ ...igureMooringAncillaryInstrumentationImport.java | 72 ++++++++++++++++++++++ .../ui/actions/importData/ImportMooringMode.java | 5 +- .../ui/actions/importData/ImportVoyageMode.java | 3 + .../LaunchAncillaryInstrumentationImport.java | 47 ++++++++++++++ ...aunchMooringAncillaryInstrumentationImport.java | 47 ++++++++++++++ .../resources/i18n/echobase-ui_en_GB.properties | 26 ++++---- .../resources/i18n/echobase-ui_fr_FR.properties | 8 ++- .../configureAncillaryInstrumentationImport.jsp | 68 ++++++++++++++++++++ ...figureMooringAncillaryInstrumentationImport.jsp | 68 ++++++++++++++++++++ .../progressAncillaryInstrumentationImport.jsp | 40 ++++++++++++ ...ogressMooringAncillaryInstrumentationImport.jsp | 40 ++++++++++++ .../resultAncillaryInstrumentationImport.jsp | 28 +++++++++ ...resultMooringAncillaryInstrumentationImport.jsp | 28 +++++++++ 18 files changed, 548 insertions(+), 27 deletions(-) diff --git a/echobase-domain/src/main/java/fr/ifremer/echobase/entities/ImportType.java b/echobase-domain/src/main/java/fr/ifremer/echobase/entities/ImportType.java index c3e472d..c4716c2 100644 --- a/echobase-domain/src/main/java/fr/ifremer/echobase/entities/ImportType.java +++ b/echobase-domain/src/main/java/fr/ifremer/echobase/entities/ImportType.java @@ -70,7 +70,7 @@ public enum ImportType implements I18nAble { /** Import ancillary instrumentation data. */ COMMON_ANCILLARY_INSTRUMENTATION( - EchoBaseUserEntityEnum.Mooring, + EchoBaseUserEntityEnum.Voyage, n("echobase.common.importType.ancillaryInstrumentationVoyage"), n("echobase.common.importType.ancillaryInstrumentationVoyage.short") ), diff --git a/echobase-domain/src/main/resources/i18n/echobase-domain_en_GB.properties b/echobase-domain/src/main/resources/i18n/echobase-domain_en_GB.properties index 59915f1..1f05a55 100644 --- a/echobase-domain/src/main/resources/i18n/echobase-domain_en_GB.properties +++ b/echobase-domain/src/main/resources/i18n/echobase-domain_en_GB.properties @@ -2,10 +2,10 @@ echobase.common.driverType.h2=H2 Database echobase.common.driverType.postgres=Postgresql Database echobase.common.importType.acoustic=Acoustic data import echobase.common.importType.acoustic.short=Acoustic -echobase.common.importType.ancillaryInstrumentationMooring= -echobase.common.importType.ancillaryInstrumentationMooring.short= -echobase.common.importType.ancillaryInstrumentationVoyage= -echobase.common.importType.ancillaryInstrumentationVoyage.short= +echobase.common.importType.ancillaryInstrumentationMooring=Ancillary instrumentation import +echobase.common.importType.ancillaryInstrumentationMooring.short=Ancillary instrumentation +echobase.common.importType.ancillaryInstrumentationVoyage=Ancillary instrumentation import +echobase.common.importType.ancillaryInstrumentationVoyage.short=Ancillary instrumentation echobase.common.importType.catches=Fishing data import echobase.common.importType.catches.short=Fishing echobase.common.importType.commonDataAll=Voyage / Transit / Transects import diff --git a/echobase-domain/src/main/resources/i18n/echobase-domain_fr_FR.properties b/echobase-domain/src/main/resources/i18n/echobase-domain_fr_FR.properties index 501c657..be654db 100644 --- a/echobase-domain/src/main/resources/i18n/echobase-domain_fr_FR.properties +++ b/echobase-domain/src/main/resources/i18n/echobase-domain_fr_FR.properties @@ -2,10 +2,10 @@ echobase.common.driverType.h2=Base H2 echobase.common.driverType.postgres=Base Postgresql echobase.common.importType.acoustic=Import des données acoustiques echobase.common.importType.acoustic.short=Acoustique -echobase.common.importType.ancillaryInstrumentationMooring= -echobase.common.importType.ancillaryInstrumentationMooring.short= -echobase.common.importType.ancillaryInstrumentationVoyage= -echobase.common.importType.ancillaryInstrumentationVoyage.short= +echobase.common.importType.ancillaryInstrumentationMooring=Import ancillary instrumentation +echobase.common.importType.ancillaryInstrumentationMooring.short=Ancillary instrumentation +echobase.common.importType.ancillaryInstrumentationVoyage=Import ancillary instrumentation +echobase.common.importType.ancillaryInstrumentationVoyage.short=short\=Ancillary instrumentation echobase.common.importType.catches=Import des données de pêche echobase.common.importType.catches.short=Pêche echobase.common.importType.commonDataAll=Import Voyage / Transit / Transects diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/ImportAncillaryInstrumentationActionSupport.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/ImportAncillaryInstrumentationActionSupport.java index a72d0c2..2e00b92 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/ImportAncillaryInstrumentationActionSupport.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/ImportAncillaryInstrumentationActionSupport.java @@ -94,9 +94,10 @@ public abstract class ImportAncillaryInstrumentationActionSupport<M extends Impo String providerId = entity.getTopiaId(); boolean already = providerIds.add(providerId); if (!already) { - updateId(result, EchoBaseUserEntityEnum.AcousticInstrument, entity, rowNumber); + updateId(result, EchoBaseUserEntityEnum.AncillaryInstrumentation, entity, rowNumber); + } else { + result.incrementsNumberUpdated(EchoBaseUserEntityEnum.AncillaryInstrumentation); } - result.incrementsNumberUpdated(EchoBaseUserEntityEnum.AncillaryInstrumentation); if (firstLine) { ancillaryInstrumentations.add(Pair.of(ancillaryInstrumentation.getTopiaId(), providerId)); diff --git a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureAncillaryInstrumentationImport.java b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureAncillaryInstrumentationImport.java new file mode 100644 index 0000000..7e64c8c --- /dev/null +++ b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureAncillaryInstrumentationImport.java @@ -0,0 +1,72 @@ +/* + * #%L + * EchoBase :: UI + * %% + * 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.service.importdata.configurations.VoyageCommonsAncillaryInstrumentationImportConfiguration; + +import java.io.File; +import java.util.Map; + +/** + * Configure a "AncillaryInstrumentation" import. + * + * @author Julien Ruchaud - ruchaud@codelutin.com + * @since 4.0 + */ +public class ConfigureAncillaryInstrumentationImport extends AbstractConfigureImport<VoyageCommonsAncillaryInstrumentationImportConfiguration> { + + private static final long serialVersionUID = 1L; + + /** Universe of existing voyages. */ + protected Map<String, String> voyages; + + public ConfigureAncillaryInstrumentationImport() { + super(VoyageCommonsAncillaryInstrumentationImportConfiguration.class); + } + + @Override + protected VoyageCommonsAncillaryInstrumentationImportConfiguration createModel() { + return new VoyageCommonsAncillaryInstrumentationImportConfiguration(getLocale()); + } + + @Override + protected void prepareInputAction(VoyageCommonsAncillaryInstrumentationImportConfiguration model) { + voyages = userDbPersistenceService.loadSortAndDecorate(Voyage.class); + } + + public Map<String, String> getVoyages() { + return voyages; + } + + public void setAncillaryInstrumentationFile(File file) { + getModel().getAncillaryInstrumentationFile().setFile(file); + } + + public void setAncillaryInstrumentationFileContentType(String contentType) { + getModel().getAncillaryInstrumentationFile().setContentType(contentType); + } + + public void setAncillaryInstrumentationFileFileName(String fileName) { + getModel().getAncillaryInstrumentationFile().setFileName(fileName); + } + +} diff --git a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureMooringAncillaryInstrumentationImport.java b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureMooringAncillaryInstrumentationImport.java new file mode 100644 index 0000000..fcff0e6 --- /dev/null +++ b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureMooringAncillaryInstrumentationImport.java @@ -0,0 +1,72 @@ +/* + * #%L + * EchoBase :: UI + * %% + * 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.Mooring; +import fr.ifremer.echobase.services.service.importdata.configurations.MooringCommonsAncillaryInstrumentationImportConfiguration; + +import java.io.File; +import java.util.Map; + +/** + * Configure a "MooringAncillaryInstrumentation" import. + * + * @author Julien Ruchaud - ruchaud@codelutin.com + * @since 4.0 + */ +public class ConfigureMooringAncillaryInstrumentationImport extends AbstractConfigureImport<MooringCommonsAncillaryInstrumentationImportConfiguration> { + + private static final long serialVersionUID = 1L; + + /** Universe of existing moorings. */ + protected Map<String, String> moorings; + + public ConfigureMooringAncillaryInstrumentationImport() { + super(MooringCommonsAncillaryInstrumentationImportConfiguration.class); + } + + @Override + protected MooringCommonsAncillaryInstrumentationImportConfiguration createModel() { + return new MooringCommonsAncillaryInstrumentationImportConfiguration(getLocale()); + } + + @Override + protected void prepareInputAction(MooringCommonsAncillaryInstrumentationImportConfiguration model) { + moorings = userDbPersistenceService.loadSortAndDecorate(Mooring.class); + } + + public Map<String, String> getMoorings() { + return moorings; + } + + public void setAncillaryInstrumentationFile(File file) { + getModel().getAncillaryInstrumentationFile().setFile(file); + } + + public void setAncillaryInstrumentationFileContentType(String contentType) { + getModel().getAncillaryInstrumentationFile().setContentType(contentType); + } + + public void setAncillaryInstrumentationFileFileName(String fileName) { + getModel().getAncillaryInstrumentationFile().setFileName(fileName); + } + +} diff --git a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ImportMooringMode.java b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ImportMooringMode.java index e31e13b..592f363 100644 --- a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ImportMooringMode.java +++ b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ImportMooringMode.java @@ -29,13 +29,16 @@ import static org.nuiton.i18n.I18n.n; * To define the mode of import data for mooring (says files to be imported). * * @author Julien Ruchaud - ruchaud@codelutin.com - * @since 0.4 + * @since 4.0 */ public enum ImportMooringMode implements I18nAble { /** Import mooring **/ MooringCommons(n("echobase.common.importType.mooring")), + /** Import ancillary instrumentation. */ + MooringAncillaryInstrumentation(ImportType.MOORING_ANCILLARY_INSTRUMENTATION.getI18nKey()), + /** Import accoustic data (Cells ESDU and Elementary). */ MooringAcoustic(ImportType.ACOUSTIC.getI18nKey()), diff --git a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ImportVoyageMode.java b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ImportVoyageMode.java index 6812c5a..f27315a 100644 --- a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ImportVoyageMode.java +++ b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ImportVoyageMode.java @@ -36,6 +36,9 @@ public enum ImportVoyageMode implements I18nAble { /** Import Voyage / Transit / Transect. */ Common(n("echobase.common.importType.common")), + /** Import ancillary instrumentation. */ + AncillaryInstrumentation(ImportType.COMMON_ANCILLARY_INSTRUMENTATION.getI18nKey()), + /** Import operations common data. */ Operation(ImportType.OPERATION.getI18nKey()), diff --git a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/LaunchAncillaryInstrumentationImport.java b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/LaunchAncillaryInstrumentationImport.java new file mode 100644 index 0000000..7ac0443 --- /dev/null +++ b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/LaunchAncillaryInstrumentationImport.java @@ -0,0 +1,47 @@ +/* + * #%L + * EchoBase :: UI + * %% + * 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.EchoBaseUser; +import fr.ifremer.echobase.services.service.importdata.ImportDataResult; +import fr.ifremer.echobase.services.service.importdata.ImportDataService; +import fr.ifremer.echobase.services.service.importdata.ImportException; +import fr.ifremer.echobase.services.service.importdata.configurations.VoyageCommonsAncillaryInstrumentationImportConfiguration; + +/** + * Launch a ancillary instrumentation data import. + * + * @author Julien Ruchaud - ruchaud@codelutin.com + * @since 4.0 + */ +public class LaunchAncillaryInstrumentationImport extends AbstractLaunchImport<VoyageCommonsAncillaryInstrumentationImportConfiguration, ImportDataService> { + + private static final long serialVersionUID = 1L; + + public LaunchAncillaryInstrumentationImport() { + super(VoyageCommonsAncillaryInstrumentationImportConfiguration.class, ImportDataService.class); + } + + @Override + protected ImportDataResult<VoyageCommonsAncillaryInstrumentationImportConfiguration> doImport(ImportDataService service, VoyageCommonsAncillaryInstrumentationImportConfiguration model, EchoBaseUser user) throws ImportException { + return service.doImportVoyageCommonsAncillaryInstrumentation(model, user); + } +} diff --git a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/LaunchMooringAncillaryInstrumentationImport.java b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/LaunchMooringAncillaryInstrumentationImport.java new file mode 100644 index 0000000..200b400 --- /dev/null +++ b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/LaunchMooringAncillaryInstrumentationImport.java @@ -0,0 +1,47 @@ +/* + * #%L + * EchoBase :: UI + * %% + * 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.EchoBaseUser; +import fr.ifremer.echobase.services.service.importdata.ImportDataResult; +import fr.ifremer.echobase.services.service.importdata.ImportDataService; +import fr.ifremer.echobase.services.service.importdata.ImportException; +import fr.ifremer.echobase.services.service.importdata.configurations.MooringCommonsAncillaryInstrumentationImportConfiguration; + +/** + * Launch a ancillary instrumentation data import for mooring. + * + * @author Julien Ruchaud - ruchaud@codelutin.com + * @since 4.0 + */ +public class LaunchMooringAncillaryInstrumentationImport extends AbstractLaunchImport<MooringCommonsAncillaryInstrumentationImportConfiguration, ImportDataService> { + + private static final long serialVersionUID = 1L; + + public LaunchMooringAncillaryInstrumentationImport() { + super(MooringCommonsAncillaryInstrumentationImportConfiguration.class, ImportDataService.class); + } + + @Override + protected ImportDataResult<MooringCommonsAncillaryInstrumentationImportConfiguration> doImport(ImportDataService service, MooringCommonsAncillaryInstrumentationImportConfiguration model, EchoBaseUser user) throws ImportException { + return service.doImportMooringCommonsAncillaryInstrumentation(model, user); + } +} diff --git a/echobase-ui/src/main/resources/i18n/echobase-ui_en_GB.properties b/echobase-ui/src/main/resources/i18n/echobase-ui_en_GB.properties index 6ba21a3..8c5f5f2 100644 --- a/echobase-ui/src/main/resources/i18n/echobase-ui_en_GB.properties +++ b/echobase-ui/src/main/resources/i18n/echobase-ui_en_GB.properties @@ -58,16 +58,17 @@ echobase.common.acquisitionSoftwareVersionME70=acquisitionSoftwareVersion (ME70 echobase.common.actionError=An error occurs while operation\: echobase.common.addDataAcquisition=Always create new DataAcqusitions entries echobase.common.admin=Administrator +echobase.common.ancillaryInstrumentationFile=Ancillary instrumentation file echobase.common.areaOfOperation=AreaOfOperation echobase.common.author=Author echobase.common.authorEmail=Author email -echobase.common.biometrySampleFile= +echobase.common.biometrySampleFile=Biometry sample file echobase.common.cellMapsFishFile=Map cells file (Fishes) echobase.common.cellMapsOtherFile=Map cells file (Other) echobase.common.cellPositionReference=Reference position for cell of echo-integration -echobase.common.cellRegionAssociationFile= -echobase.common.cellRegionResultFile= -echobase.common.cellRegionsFile= +echobase.common.cellRegionAssociationFile=Region association file +echobase.common.cellRegionResultFile=Region result file +echobase.common.cellRegionsFile=Region file echobase.common.code=Code echobase.common.comment=Comment echobase.common.comments=Comments @@ -112,12 +113,13 @@ echobase.common.importNotes=Import notes echobase.common.importResult=Import results echobase.common.importText=import description echobase.common.importType=Import type -echobase.common.importType.acoustic= -echobase.common.importType.catches= +echobase.common.importType.acoustic=Acoustic import +echobase.common.importType.ancillaryInstrumentation=Ancillary instrumentation import +echobase.common.importType.catches=Catches import echobase.common.importType.common=Voyage / Transit / Transect data import echobase.common.importType.mooring=Mooring import -echobase.common.importType.mooringCommons=Import commun -echobase.common.importType.operation=Operation +echobase.common.importType.mooringCommons=Mooring import +echobase.common.importType.operation=Operation import echobase.common.importType.results=Results import echobase.common.importUser=Import user echobase.common.inProgress=Processing... @@ -140,12 +142,12 @@ echobase.common.modificationDate=Last modified date echobase.common.modificationText=Last modification echobase.common.modificationUser=User echobase.common.mooring=Mooring -echobase.common.mooringFile= -echobase.common.moviesFile= +echobase.common.mooringFile=Mooring file +echobase.common.moviesFile=Movies file echobase.common.name=Name echobase.common.northLimit=North limit -echobase.common.operationFile= -echobase.common.operationMetadataFile= +echobase.common.operationFile=Operation file +echobase.common.operationMetadataFile=Operation metadata file echobase.common.operator=Operator echobase.common.organisationLevelAcknowledgements=organisationLevelAcknowledgements echobase.common.organisationReferences=Organisation contact diff --git a/echobase-ui/src/main/resources/i18n/echobase-ui_fr_FR.properties b/echobase-ui/src/main/resources/i18n/echobase-ui_fr_FR.properties index ae4882e..07ba8f6 100644 --- a/echobase-ui/src/main/resources/i18n/echobase-ui_fr_FR.properties +++ b/echobase-ui/src/main/resources/i18n/echobase-ui_fr_FR.properties @@ -58,6 +58,7 @@ echobase.common.acquisitionSoftwareVersionME70=Version du logiciel d'acquisition echobase.common.actionError=Une erreur est survenue pendant l'opération \: echobase.common.addDataAcquisition=Toujours créer de nouvelles entrées DataAcqusitions echobase.common.admin=Administrateur +echobase.common.ancillaryInstrumentationFile=Fichier des données d'ancillary InstrumentationFile echobase.common.areaOfOperation=Zone d'activités echobase.common.author=Auteur echobase.common.authorEmail=Courriel de l'auteur @@ -112,12 +113,13 @@ echobase.common.importNotes=Remarques sur l'import echobase.common.importResult=Résultat de l'import echobase.common.importText=Description echobase.common.importType=Type d'import -echobase.common.importType.acoustic=Accoustiques -echobase.common.importType.catches=Opérations +echobase.common.importType.acoustic=Import des données accoustiques +echobase.common.importType.ancillaryInstrumentation=Import des ancillary instrumentations +echobase.common.importType.catches=Import des captures echobase.common.importType.common=Import des données de Voyage / Transit / Transect echobase.common.importType.mooring=Import des bouées echobase.common.importType.mooringCommons=Commun -echobase.common.importType.operation=Opération +echobase.common.importType.operation=Import des opérations echobase.common.importType.results=Import des résultats echobase.common.importUser=Utilisateur echobase.common.inProgress=En cours... diff --git a/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureAncillaryInstrumentationImport.jsp b/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureAncillaryInstrumentationImport.jsp new file mode 100644 index 0000000..237696d --- /dev/null +++ b/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureAncillaryInstrumentationImport.jsp @@ -0,0 +1,68 @@ +<%-- + #%L + EchoBase :: UI + %% + 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" + src="<s:url value='/js/gridHelper.js' />"></script> + +<title> + Configuration <s:text name="echobase.common.importType.ancillaryInstrumentation"/> +</title> + +<script type="text/javascript"> + + jQuery(document).ready(function () { + $.addCheckFileSize(<s:property value="uploadFileMaxLength"/>); + }); +</script> + +<s:form namespace="/importData" method="POST" enctype="multipart/form-data"> + + <fieldset> + <legend> + <s:text + name="echobase.legend.importData.configure"/> + </legend> + + <div class="cleanBoth help"> + <s:a href="%{getDocumentation('importData.html', null)}" target="doc"> + <s:text name="echobase.action.show.import.documentation"/> + </s:a> + </div> + <br/> + + <s:select key="model.voyageId" requiredLabel="true" + label='%{getText("echobase.common.voyage")}' + list="voyages" headerKey="" headerValue=""/> + + <s:file key="ancillaryInstrumentationFile" requiredLabel="true" + label='%{getText("echobase.common.ancillaryInstrumentationFile")}'/> + + <s:textarea key="model.importNotes" cols="80" rows="5" + label='%{getText("echobase.common.importNotes")}'/> + + </fieldset> + + <br/> + <s:submit action="configureAncillaryInstrumentation-execute" key='echobase.action.import'/> + +</s:form> diff --git a/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureMooringAncillaryInstrumentationImport.jsp b/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureMooringAncillaryInstrumentationImport.jsp new file mode 100644 index 0000000..132f3e3 --- /dev/null +++ b/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureMooringAncillaryInstrumentationImport.jsp @@ -0,0 +1,68 @@ +<%-- + #%L + EchoBase :: UI + %% + 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" + src="<s:url value='/js/gridHelper.js' />"></script> + +<title> + Configuration <s:text name="echobase.common.importType.ancillaryInstrumentation"/> +</title> + +<script type="text/javascript"> + + jQuery(document).ready(function () { + $.addCheckFileSize(<s:property value="uploadFileMaxLength"/>); + }); +</script> + +<s:form namespace="/importData" method="POST" enctype="multipart/form-data"> + + <fieldset> + <legend> + <s:text + name="echobase.legend.importData.configure"/> + </legend> + + <div class="cleanBoth help"> + <s:a href="%{getDocumentation('importData.html', null)}" target="doc"> + <s:text name="echobase.action.show.import.documentation"/> + </s:a> + </div> + <br/> + + <s:select key="model.mooringId" requiredLabel="true" + label='%{getText("echobase.common.mooring")}' + list="moorings" headerKey="" headerValue=""/> + + <s:file key="ancillaryInstrumentationFile" requiredLabel="true" + label='%{getText("echobase.common.ancillaryInstrumentationFile")}'/> + + <s:textarea key="model.importNotes" cols="80" rows="5" + label='%{getText("echobase.common.importNotes")}'/> + + </fieldset> + + <br/> + <s:submit action="configureMooringAncillaryInstrumentation-execute" key='echobase.action.import'/> + +</s:form> diff --git a/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/progressAncillaryInstrumentationImport.jsp b/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/progressAncillaryInstrumentationImport.jsp new file mode 100644 index 0000000..67957f5 --- /dev/null +++ b/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/progressAncillaryInstrumentationImport.jsp @@ -0,0 +1,40 @@ +<%-- + #%L + EchoBase :: UI + %% + 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" %> + +<meta http-equiv="refresh" + content='1;url=<s:url action="importAncillaryInstrumentation" namespace="/importData"/>'/> + +<title> + <s:text name="echobase.common.importType.ancillaryInstrumentation"/> + <s:text name="echobase.common.inProgress"/> +</title> + +<%-- TODO letellier 20111104 : Add warn icon --%> +<p><s:text name="echobase.message.warnImportInProgress"/></p> + +<br/> + +<div> + <sj:progressbar value="%{model.progress}"/> +</div> diff --git a/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/progressMooringAncillaryInstrumentationImport.jsp b/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/progressMooringAncillaryInstrumentationImport.jsp new file mode 100644 index 0000000..b69ec39 --- /dev/null +++ b/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/progressMooringAncillaryInstrumentationImport.jsp @@ -0,0 +1,40 @@ +<%-- + #%L + EchoBase :: UI + %% + 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" %> + +<meta http-equiv="refresh" + content='1;url=<s:url action="importMooringAncillaryInstrumentation" namespace="/importData"/>'/> + +<title> + <s:text name="echobase.common.importType.ancillaryInstrumentation"/> + <s:text name="echobase.common.inProgress"/> +</title> + +<%-- TODO letellier 20111104 : Add warn icon --%> +<p><s:text name="echobase.message.warnImportInProgress"/></p> + +<br/> + +<div> + <sj:progressbar value="%{model.progress}"/> +</div> diff --git a/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/resultAncillaryInstrumentationImport.jsp b/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/resultAncillaryInstrumentationImport.jsp new file mode 100644 index 0000000..fe109ce --- /dev/null +++ b/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/resultAncillaryInstrumentationImport.jsp @@ -0,0 +1,28 @@ +<%-- + #%L + EchoBase :: UI + %% + 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.common.importType.ancillaryInstrumentation"/> +</title> + +<%@ include file="importDataActionResult.jsp" %> diff --git a/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/resultMooringAncillaryInstrumentationImport.jsp b/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/resultMooringAncillaryInstrumentationImport.jsp new file mode 100644 index 0000000..fe109ce --- /dev/null +++ b/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/resultMooringAncillaryInstrumentationImport.jsp @@ -0,0 +1,28 @@ +<%-- + #%L + EchoBase :: UI + %% + 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.common.importType.ancillaryInstrumentation"/> +</title> + +<%@ include file="importDataActionResult.jsp" %> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.