branch feature/8180 updated (ff095a2 -> 6627c4c)
This is an automated email from the git hooks/post-receive script. New change to branch feature/8180 in repository echobase. See https://gitlab.nuiton.org/codelutin/echobase.git from ff095a2 Plug action but they are not implemented new 6627c4c Plug action but they are not implemented The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 6627c4c23d0a791f91727fae8b861ff15a4e1634 Author: Julien Ruchaud <julien.ruchaud@debux.org> Date: Mon Jun 13 16:02:44 2016 +0200 Plug action but they are not implemented Summary of changes: .../echobase/entities/data/MooringImpl.java | 18 ++++ echobase-domain/src/main/xmi/echobase.zargo | Bin 98244 -> 98231 bytes .../services/service/UserDbPersistenceService.java | 13 +++ ....java => MooringCodeAlreadyExistException.java} | 8 +- .../{MissionService.java => MooringService.java} | 18 ++-- .../ui/actions/importData/CreateMooring.java | 117 +++++++++++++++++++++ .../ui/actions/importData/ImportMooringMode.java | 3 - .../ui/actions/importData/SelectImportType.java | 2 +- .../main/resources/config/struts-importData.xml | 12 +++ .../resources/i18n/echobase-ui_en_GB.properties | 20 ++++ .../resources/i18n/echobase-ui_fr_FR.properties | 20 ++++ .../WEB-INF/jsp/importData/createMooring.jsp | 103 ++++++++++++++++++ 12 files changed, 317 insertions(+), 17 deletions(-) create mode 100644 echobase-domain/src/main/java/fr/ifremer/echobase/entities/data/MooringImpl.java copy echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/{MissionNameAlreadyExistException.java => MooringCodeAlreadyExistException.java} (82%) copy echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/{MissionService.java => MooringService.java} (77%) create mode 100644 echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/CreateMooring.java create mode 100644 echobase-ui/src/main/webapp/WEB-INF/jsp/importData/createMooring.jsp -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
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 6627c4c23d0a791f91727fae8b861ff15a4e1634 Author: Julien Ruchaud <julien.ruchaud@debux.org> Date: Mon Jun 13 16:02:44 2016 +0200 Plug action but they are not implemented --- .../echobase/entities/data/MooringImpl.java | 18 ++++ echobase-domain/src/main/xmi/echobase.zargo | Bin 98244 -> 98231 bytes .../services/service/UserDbPersistenceService.java | 13 +++ .../MooringCodeAlreadyExistException.java | 31 ++++++ .../service/importdata/MooringService.java | 61 +++++++++++ .../ui/actions/importData/CreateMooring.java | 117 +++++++++++++++++++++ .../ui/actions/importData/ImportMooringMode.java | 3 - .../ui/actions/importData/SelectImportType.java | 2 +- .../main/resources/config/struts-importData.xml | 12 +++ .../resources/i18n/echobase-ui_en_GB.properties | 20 ++++ .../resources/i18n/echobase-ui_fr_FR.properties | 20 ++++ .../WEB-INF/jsp/importData/createMooring.jsp | 103 ++++++++++++++++++ 12 files changed, 396 insertions(+), 4 deletions(-) diff --git a/echobase-domain/src/main/java/fr/ifremer/echobase/entities/data/MooringImpl.java b/echobase-domain/src/main/java/fr/ifremer/echobase/entities/data/MooringImpl.java new file mode 100644 index 0000000..6adea21 --- /dev/null +++ b/echobase-domain/src/main/java/fr/ifremer/echobase/entities/data/MooringImpl.java @@ -0,0 +1,18 @@ +package fr.ifremer.echobase.entities.data; + +/** + * Default implementation of {@link Mooring}. + * + * @author Julien Ruchaud - ruchaud@codelutin.com + * @since 0.5 + */ +public class MooringImpl extends MooringAbstract { + + private static final long serialVersionUID = 4049916052281439032L; + + public MooringImpl() { + this.zunits = "m"; + this.projection = "WGS84"; + } + +} //MooringImpl diff --git a/echobase-domain/src/main/xmi/echobase.zargo b/echobase-domain/src/main/xmi/echobase.zargo index 9c6ffc7..0be020a 100644 Binary files a/echobase-domain/src/main/xmi/echobase.zargo and b/echobase-domain/src/main/xmi/echobase.zargo differ diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/UserDbPersistenceService.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/UserDbPersistenceService.java index 39b9a02..f10199b 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/UserDbPersistenceService.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/UserDbPersistenceService.java @@ -50,6 +50,7 @@ import fr.ifremer.echobase.entities.data.Echotype; import fr.ifremer.echobase.entities.data.GearMetadataValue; import fr.ifremer.echobase.entities.data.LengthAgeKey; import fr.ifremer.echobase.entities.data.LengthWeightKey; +import fr.ifremer.echobase.entities.data.Mooring; import fr.ifremer.echobase.entities.data.Operation; import fr.ifremer.echobase.entities.data.OperationMetadataValue; import fr.ifremer.echobase.entities.data.Result; @@ -707,6 +708,18 @@ public class UserDbPersistenceService extends EchoBaseServiceSupport { } //------------------------------------------------------------------------// + //--- Mooring ------------------------------------------------------------// + //------------------------------------------------------------------------// + + public boolean isMooringExistByCode(String code) { + return persistenceContext.getMooringDao().forCodeEquals(code).exists(); + } + + public Mooring createMooring(Mooring mooring) { + return persistenceContext.getMooringDao().create(mooring); + } + + //------------------------------------------------------------------------// //--- Mission ------------------------------------------------------------// //------------------------------------------------------------------------// diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/MooringCodeAlreadyExistException.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/MooringCodeAlreadyExistException.java new file mode 100644 index 0000000..226a206 --- /dev/null +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/MooringCodeAlreadyExistException.java @@ -0,0 +1,31 @@ +/* + * #%L + * EchoBase :: Services + * %% + * 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.services.service.importdata; + +/** + * Execption throws when create mooring with same code. + * + * @author Julien Ruchaud - ruchaud@codelutin.com + * @since 0.5 + */ +public class MooringCodeAlreadyExistException extends Exception { + private static final long serialVersionUID = 1L; +} diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/MooringService.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/MooringService.java new file mode 100644 index 0000000..7e600e7 --- /dev/null +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/MooringService.java @@ -0,0 +1,61 @@ +/* + * #%L + * EchoBase :: Services + * %% + * 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.services.service.importdata; + +import com.google.common.base.Preconditions; +import fr.ifremer.echobase.EchoBaseTechnicalException; +import fr.ifremer.echobase.entities.data.Mooring; +import fr.ifremer.echobase.services.EchoBaseServiceSupport; +import fr.ifremer.echobase.services.service.UserDbPersistenceService; +import org.nuiton.topia.persistence.TopiaException; + +import javax.inject.Inject; + +/** + * Service to create mooring. + * + * @author Tony Chemit - chemit@codelutin.com + * @since 0.5 + */ +public class MooringService extends EchoBaseServiceSupport { + + @Inject + protected UserDbPersistenceService persistenceService; + + public Mooring createMooring(Mooring mooring) throws MooringCodeAlreadyExistException { + + Preconditions.checkNotNull(mooring); + + try { + // check mission name is unique + boolean exists = persistenceService.isMissionExistByName(mooring.getCode()); + + if (exists) { + throw new MooringCodeAlreadyExistException(); + } + Mooring result = persistenceService.createMooring(mooring); + persistenceService.commit(); + return result; + } catch (TopiaException eee) { + throw new EchoBaseTechnicalException(eee); + } + } +} diff --git a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/CreateMooring.java b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/CreateMooring.java new file mode 100644 index 0000000..c4419dc --- /dev/null +++ b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/CreateMooring.java @@ -0,0 +1,117 @@ +/* + * #%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 com.google.common.base.Preconditions; +import fr.ifremer.echobase.entities.data.Mooring; +import fr.ifremer.echobase.entities.data.MooringImpl; +import fr.ifremer.echobase.entities.references.Mission; +import fr.ifremer.echobase.services.service.UserDbPersistenceService; +import fr.ifremer.echobase.services.service.importdata.MooringCodeAlreadyExistException; +import fr.ifremer.echobase.services.service.importdata.MooringService; +import fr.ifremer.echobase.ui.actions.EchoBaseActionSupport; +import java.util.Map; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + +import javax.inject.Inject; + +/** + * To create a new mooring + * + * @author Julien Ruchaud - ruchaud@codelutin.com + * @since 0.5 + */ +public class CreateMooring extends EchoBaseActionSupport { + + private static final long serialVersionUID = 1L; + + /** Logger. */ + private static final Log log = LogFactory.getLog(CreateMooring.class); + + /** Mooring to create. */ + protected Mooring mooring; + + protected String missionId; + + public Mooring getMooring() { + if (mooring == null) { + mooring = new MooringImpl(); + } + return mooring; + } + + /** Universe of existing missions. */ + protected Map<String, String> missions; + + public Map<String, String> getMissions() { + return missions; + } + + public void setMissionId(String missionId) { + this.missionId = missionId; + } + + public String getMissionId() { + return missionId; + } + + @Override + public final String input() throws Exception { + missions = userDbPersistenceService.loadSortAndDecorate(Mission.class); + return INPUT; + } + + @Override + public String execute() throws Exception { + + Preconditions.checkNotNull(mooring); + + String result = INPUT; + + try { + Mission mission = userDbPersistenceService.getMission(this.missionId); + mooring.setMission(mission); + Mooring mooringSaved = mooringService.createMooring(mooring); + + if (log.isInfoEnabled()) { + log.info("Created mooring : " + mooringSaved.getTopiaId()); + } + addFlashMessage( + t("echobase.information.mooring.created", mooringSaved.getCode())); + result = SUCCESS; + } catch (MooringCodeAlreadyExistException e) { + addFieldError("mooring.code", + t("echobase.error.mooring.code.already.exist")); + } + return result; + } + + //------------------------------------------------------------------------// + //-- Injected objects // + //------------------------------------------------------------------------// + + @Inject + protected transient MooringService mooringService; + + @Inject + protected transient UserDbPersistenceService userDbPersistenceService; +} 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 3bbf379..dbd772e 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 @@ -33,9 +33,6 @@ import static org.nuiton.i18n.I18n.n; */ public enum ImportMooringMode implements I18nAble { - /** Import Mooring. */ - Mooring(n("echobase.common.importType.mooring")), - /** 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/SelectImportType.java b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/SelectImportType.java index 4e94e0e..f88d748 100644 --- a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/SelectImportType.java +++ b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/SelectImportType.java @@ -76,7 +76,7 @@ public class SelectImportType extends EchoBaseActionSupport { voyageMode = ImportVoyageMode.Common; } if (mooringMode == null) { - mooringMode = ImportMooringMode.Mooring; + mooringMode = ImportMooringMode.MooringAcoustic; } return INPUT; } diff --git a/echobase-ui/src/main/resources/config/struts-importData.xml b/echobase-ui/src/main/resources/config/struts-importData.xml index ea02e23..2effe4c 100644 --- a/echobase-ui/src/main/resources/config/struts-importData.xml +++ b/echobase-ui/src/main/resources/config/struts-importData.xml @@ -103,6 +103,18 @@ </result> </action> + <!-- CreateOrUpdate a new mooring --> + <action name="createMooring" + class="fr.ifremer.echobase.ui.actions.importData.CreateMooring"> + <interceptor-ref name="prepareParamsStackLogguedWithDb"/> + <result name="input">/WEB-INF/jsp/importData/createMooring.jsp</result> + <result type="redirectAction"> + <param name="namespace">/importData</param> + <param name="actionName">selectImportType</param> + <param name="method">input</param> + </result> + </action> + </package> </struts> 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 434edc9..2614147 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 @@ -8,6 +8,7 @@ echobase.action.connectToWorkingDb=Connect echobase.action.create=Create echobase.action.createEmbeddedApplication=Create a portable database echobase.action.createMission=Create mission +echobase.action.createMooring=Create mooring echobase.action.createNewMission=Create a new mission echobase.action.createNewMooring=Create a new mooring echobase.action.createPostgresDb=Create database @@ -67,7 +68,9 @@ echobase.common.cellPositionReference=cellPositionReference echobase.common.cellRegionAssociationFile= echobase.common.cellRegionResultFile= echobase.common.cellRegionsFile= +echobase.common.code=Code echobase.common.comment=Comment +echobase.common.comments=Comments echobase.common.communityIndicator=Community indicators echobase.common.confirmDelete=Confirm to delete selected data echobase.common.dataCentre=Data center @@ -75,9 +78,13 @@ echobase.common.dataCentreEmail=Data center email echobase.common.dataProcessing=DataProcessing echobase.common.dataProcessingNotes=Data processing notes echobase.common.datum=Datum +echobase.common.deploymentDate=Deployment date +echobase.common.depth=Depth echobase.common.description=Description echobase.common.digitThreshold=Digitization threshold echobase.common.distributionStatement=Distribution statement +echobase.common.downLimit=Down limit +echobase.common.eastLimit=East limit echobase.common.echotypeFile= echobase.common.email=E-mail echobase.common.entityId=ID @@ -132,8 +139,10 @@ echobase.common.modificationText=Last modification echobase.common.modificationUser=User echobase.common.moviesFile= echobase.common.name=Name +echobase.common.northLimit=North limit echobase.common.operationFile= echobase.common.operationMetadataFile= +echobase.common.operator=Operator echobase.common.organisationLevelAcknowledgements=organisationLevelAcknowledgements echobase.common.organisationReferences=Organisation contact echobase.common.password=Password @@ -146,14 +155,18 @@ echobase.common.principalInvestigatorEmail=Researcher e-mail echobase.common.processingDescription=Data processing description echobase.common.processingTemplate=Data processing template echobase.common.project=Project +echobase.common.projection=Projection echobase.common.publishable=Make the project publishable via Coser echobase.common.resultLabel=Results label +echobase.common.retrievalDate=Retrieval date echobase.common.selectall=Select All echobase.common.selectnone=Unselect All +echobase.common.siteName=Site name echobase.common.soundSpeedCalculationsER60=Sound speed calculations method (ER60 instrument) echobase.common.soundSpeedCalculationsME70=Sound speed calculation method (ME70 instrument) echobase.common.sounderConstant=Sounder constant (if relevant) echobase.common.source=Source +echobase.common.southLimit=South limit echobase.common.spatialAware=Is database spatial aware ? echobase.common.spatialStructureFound=Is database spatialized ? echobase.common.startEndDate=Start - End date @@ -167,13 +180,17 @@ echobase.common.transectGeospatialVerticalPositive=GeospatialVerticalPositive (t echobase.common.transectLicence=Data license (transect) echobase.common.transitFile= echobase.common.transitRelatedActivity=Transit related activities +echobase.common.units=Units +echobase.common.upLimit= echobase.common.user=User echobase.common.userName=User name echobase.common.vessel=Vessel echobase.common.voyage=Cruise echobase.common.voyageDescription=Description echobase.common.voyageFile= +echobase.common.westLimit=West limit echobase.common.zone=Zone (Coser) +echobase.common.zunits=Units up/down limit echobase.confirm.delete.query=Delete query echobase.confirm.delete.selected.importData=Delete selected imports echobase.confirm.delete.workingDbConfiguration=Delete working database configuration @@ -308,6 +325,7 @@ echobase.info.workingDbconfiguration.deleted=Working database configuration '%s' echobase.info.workingDbconfiguration.disconnected=Disconnected from working database '%s' echobase.info.workingDbconfiguration.spatialStructureAdded=Spatial layout added to working database. echobase.information.mission.created=Mission %s created +echobase.information.mooring.created=Mooring %s created echobase.information.one.file.required=Please provide at least one import file echobase.label.admin.user.create=User creation in process echobase.label.admin.user.delete=Deleting user @@ -349,6 +367,7 @@ echobase.legend.importData.configuration.selectImportTypeMooring=Type of import echobase.legend.importData.configuration.selectImportTypeVoyage=Type of import selection for voyage echobase.legend.importData.configure=Import configuration echobase.legend.importData.createMission=Mission caracteristics +echobase.legend.importData.createMooring=Mooring caracteristics echobase.legend.importData.result.resume=Results of data import echobase.legend.importDb.configuration=Configure import echobase.legend.importDb.resume=Results of database import @@ -406,6 +425,7 @@ echobase.title.confirm.deleteWorkingDbConfiguration=Delete a configuration echobase.title.connectToDbInformations=Database connection information echobase.title.createEmbeddedApplication=Create a portable database echobase.title.createMission=Create a mission +echobase.title.createMooring=Create a mooring echobase.title.dashboard=Dashboard echobase.title.dbEditor=Modify data echobase.title.dbEditor.read=Data display 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 0cc34a0..a2f1e80 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 @@ -8,6 +8,7 @@ echobase.action.connectToWorkingDb=Se connecter echobase.action.create=Créer echobase.action.createEmbeddedApplication=Créer l'application echobase.action.createMission=Créer la mission +echobase.action.createMooring=Créer la bouée echobase.action.createNewMission=Créer une nouvelle mission echobase.action.createNewMooring=Créer une nouvelle bouée echobase.action.createPostgresDb=Créer la base @@ -67,7 +68,9 @@ echobase.common.cellPositionReference=Référentiel géographique des cellules d echobase.common.cellRegionAssociationFile= echobase.common.cellRegionResultFile= echobase.common.cellRegionsFile= +echobase.common.code=Code echobase.common.comment=Commentaire +echobase.common.comments=Commentaires echobase.common.communityIndicator=indicateurs de communauté echobase.common.confirmDelete=Confirmer la suppression de la donnée echobase.common.dataCentre=Centre de données @@ -75,9 +78,13 @@ echobase.common.dataCentreEmail=Courriel du centre de données echobase.common.dataProcessing=DataProcessing echobase.common.dataProcessingNotes=Notes sur le pré-traitement des données echobase.common.datum=Référenciel +echobase.common.deploymentDate=Date de déploiement +echobase.common.depth=Profondeur echobase.common.description=Description echobase.common.digitThreshold=Seuil de numérisation echobase.common.distributionStatement=Conditions de diffusion des données +echobase.common.downLimit=Limite basse +echobase.common.eastLimit=Limite Est echobase.common.echotypeFile= echobase.common.email=Courriel echobase.common.entityId=Identifiant de l'entité @@ -132,8 +139,10 @@ echobase.common.modificationText=Modification echobase.common.modificationUser=Utilisateur echobase.common.moviesFile= echobase.common.name=Nom +echobase.common.northLimit=Limite Nord echobase.common.operationFile= echobase.common.operationMetadataFile= +echobase.common.operator=Opérateur echobase.common.organisationLevelAcknowledgements=organisationLevelAcknowledgements echobase.common.organisationReferences=Références de l'organisation echobase.common.password=Mot de passe @@ -146,14 +155,18 @@ echobase.common.principalInvestigatorEmail=Courriel du chercheur echobase.common.processingDescription=Description de la méthode de pré-traitement des données echobase.common.processingTemplate=Intitulé de la méthode de pré-traitement des données echobase.common.project=Projet +echobase.common.projection=Projection echobase.common.publishable=Rendre le projet publiable via Coser echobase.common.resultLabel=Intitulé des résultats +echobase.common.retrievalDate=Date de récupération echobase.common.selectall=Tout sélectionner echobase.common.selectnone=Tout désélectionner +echobase.common.siteName=Nom du site echobase.common.soundSpeedCalculationsER60=Méthode de calcul de la célérité du son (ER60) echobase.common.soundSpeedCalculationsME70=Méthode de calcul de la célérité du son (ME70) echobase.common.sounderConstant=Constante sondeur (si besoin) echobase.common.source=Source +echobase.common.southLimit=Limite Sud echobase.common.spatialAware=Base spatialisée ? echobase.common.spatialStructureFound=Base spatialisée ? echobase.common.startEndDate=Date de début - fin @@ -167,13 +180,17 @@ echobase.common.transectGeospatialVerticalPositive=Direction de l'axe vertical d echobase.common.transectLicence=Licence pour la diffusion des données (transect) echobase.common.transitFile= echobase.common.transitRelatedActivity=Travaux réalisés pendant le transit +echobase.common.units=Unité +echobase.common.upLimit=Limite haute echobase.common.user=Utilisateur echobase.common.userName=Nom de l'utilisateur echobase.common.vessel=Navire echobase.common.voyage=Campagne echobase.common.voyageDescription=Description echobase.common.voyageFile= +echobase.common.westLimit=Limite Ouest echobase.common.zone=Zone (Coser) +echobase.common.zunits=Unité limite haute/basse echobase.confirm.delete.query=Confirmer la suppression de la requête echobase.confirm.delete.selected.importData=Confirmer la suppression des imports sélectionnés echobase.confirm.delete.workingDbConfiguration=Confirmer la suppression de la configuration suivante @@ -311,6 +328,7 @@ echobase.info.workingDbconfiguration.deleted=Configuration à la base de travail echobase.info.workingDbconfiguration.disconnected=Déconnexion de la base de travail '%s' echobase.info.workingDbconfiguration.spatialStructureAdded=La base a été spatialisée (ajout des tables echobase_cell_spatial et echobase_operation_spatial) echobase.information.mission.created=La mission %s a été créée +echobase.information.mooring.created=La bouée %s a été créée echobase.information.one.file.required=Veuillez fournir au moins un fichiers à importer echobase.label.admin.user.create=Création d'un utilisateur echobase.label.admin.user.delete=Suppression d'un utilisateur @@ -352,6 +370,7 @@ echobase.legend.importData.configuration.selectImportTypeMooring=Sélection du t echobase.legend.importData.configuration.selectImportTypeVoyage=Sélection du type d'import pour les voyages echobase.legend.importData.configure=Configurer l'import echobase.legend.importData.createMission=Caractéristiques de la mission +echobase.legend.importData.createMooring=Caractéristiques de la bouée echobase.legend.importData.result.resume=Résultats de l'import de données echobase.legend.importDb.configuration=Configuration de l'import echobase.legend.importDb.resume=Résumé de l'import de base de données @@ -409,6 +428,7 @@ echobase.title.confirm.deleteWorkingDbConfiguration=Supprimer la configuration echobase.title.connectToDbInformations=Informations de connexion à la base de données echobase.title.createEmbeddedApplication=Création de l'application embarquée echobase.title.createMission=Créer une mission +echobase.title.createMooring=Créer une bouée echobase.title.dashboard=Tableau de bord echobase.title.dbEditor=Modification des données echobase.title.dbEditor.read=Visualisation des données diff --git a/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/createMooring.jsp b/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/createMooring.jsp new file mode 100644 index 0000000..ac48a7f --- /dev/null +++ b/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/createMooring.jsp @@ -0,0 +1,103 @@ +<%-- + #%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" %> + +<title><s:text name="echobase.title.createMooring"/></title> + +<s:form namespace="/importData" method="POST"> + + <fieldset> + <legend> + <s:text name="echobase.legend.importData.createMooring"/> + </legend> + + <s:select key="missionId" requiredLabel="true" + label='%{getText("echobase.common.mission")}' + list="missions" headerKey="" headerValue=""/> + + <s:textfield key="mooring.code" size="40" requiredLabel="true" + label='%{getText("echobase.common.code")}'/> + + <s:textfield key="mooring.description" size="40" + label='%{getText("echobase.common.description")}'/> + + <s:textfield key="mooring.depth" + label='%{getText("echobase.common.depth")}'/> + + <s:textfield key="mooring.northLimit" + label='%{getText("echobase.common.northLimit")}'/> + + <s:textfield key="mooring.eastLimit" + label='%{getText("echobase.common.eastLimit")}'/> + + <s:textfield key="mooring.southLimit" + label='%{getText("echobase.common.southLimit")}'/> + + <s:textfield key="mooring.westLimit" + label='%{getText("echobase.common.westLimit")}'/> + + <s:textfield key="mooring.upLimit" + label='%{getText("echobase.common.upLimit")}'/> + + <s:textfield key="mooring.downLimit" + label='%{getText("echobase.common.downLimit")}'/> + + <s:textfield key="mooring.units" + label='%{getText("echobase.common.units")}'/> + + <s:textfield key="mooring.zunits" + label='%{getText("echobase.common.zunits")}'/> + + <s:textfield key="mooring.projection" + label='%{getText("echobase.common.projection")}'/> + + <sj:datepicker label='%{getText("echobase.common.deploymentDate")}' + key="mooring.deploymentDate" + value="%{mooring.deploymentDate}" + displayFormat="dd/mm/yy" timepicker="true" + timepickerShowSecond="true" + timepickerFormat="hh:mm:ss"/> + + <sj:datepicker label='%{getText("echobase.common.retrievalDate")}' + key="mooring.retrievalDate" + value="%{mooring.retrievalDate}" + displayFormat="dd/mm/yy" timepicker="true" + timepickerShowSecond="true" + timepickerFormat="hh:mm:ss"/> + + <s:textfield key="mooring.siteName" + label='%{getText("echobase.common.siteName")}'/> + + <s:textfield key="mooring.operator" + label='%{getText("echobase.common.operator")}'/> + + <s:textfield key="mooring.comments" size="40" + label='%{getText("echobase.common.comments")}'/> + + </fieldset> + + <br/> + + <s:submit action="createMooring" key='echobase.action.createMooring'/> + +</s:form> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm