This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository echobase. See https://gitlab.nuiton.org/codelutin/echobase.git commit 20110c76d6368d74206a9b119c0f42b112972133 Author: Julien Ruchaud <julien.ruchaud@debux.org> Date: Thu Oct 20 17:03:18 2016 +0200 Add missing for atlantos export --- .../echobase/entities/references/MissionImpl.java | 12 +++++ .../WorkingDbMigrationCallBackForVersion3_911.java | 53 +++++++++++++++++++++ .../workingDb/h2/3.905-0-update-model.sql | 4 -- .../workingDb/h2/3.905-2-migrate-voyage-ports.sql | 3 -- ...grate-voyage-ports.sql => 3.911-0-atlantos.sql} | 13 ++--- .../workingDb/pg/3.905-0-update-model.sql | 4 -- .../workingDb/pg/3.905-2-migrate-voyage-ports.sql | 3 -- .../3.911-0-atlantos.sql} | 13 ++--- echobase-domain/src/main/xmi/echobase.properties | 2 +- echobase-domain/src/main/xmi/echobase.zargo | Bin 99798 -> 100263 bytes .../service/atlantos/xml/XmlAccousticExport.java | 2 +- .../actions/ImportAcousticsActionSupport.java | 8 +++- .../ImportAcousticsConfiguration.java | 30 ++++++++++++ .../resources/echobase-importDb-referentiel.zip | Bin 50514 -> 50551 bytes .../resources/i18n/echobase-ui_en_GB.properties | 4 ++ .../resources/i18n/echobase-ui_fr_FR.properties | 4 ++ .../jsp/importData/configureAcousticImport.jsp | 12 +++++ .../importData/configureMooringAcousticImport.jsp | 12 +++++ .../WEB-INF/jsp/importData/createMission.jsp | 3 ++ 19 files changed, 146 insertions(+), 36 deletions(-) diff --git a/echobase-domain/src/main/java/fr/ifremer/echobase/entities/references/MissionImpl.java b/echobase-domain/src/main/java/fr/ifremer/echobase/entities/references/MissionImpl.java new file mode 100644 index 0000000..d9e7b89 --- /dev/null +++ b/echobase-domain/src/main/java/fr/ifremer/echobase/entities/references/MissionImpl.java @@ -0,0 +1,12 @@ +package fr.ifremer.echobase.entities.references; + +public class MissionImpl extends MissionAbstract { + + private static final long serialVersionUID = 7161911112897999922L; + + public MissionImpl() { + this.country = "France"; + } + + +} //MissionImpl diff --git a/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/workingDb/WorkingDbMigrationCallBackForVersion3_911.java b/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/workingDb/WorkingDbMigrationCallBackForVersion3_911.java new file mode 100644 index 0000000..b7ce008 --- /dev/null +++ b/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/workingDb/WorkingDbMigrationCallBackForVersion3_911.java @@ -0,0 +1,53 @@ +package fr.ifremer.echobase.persistence.migration.workingDb; + +/* + * #%L + * EchoBase :: Domain + * %% + * Copyright (C) 2011 - 2016 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% + */ + +import org.nuiton.topia.persistence.TopiaException; +import org.nuiton.topia.persistence.support.TopiaSqlSupport; +import org.nuiton.version.Version; +import org.nuiton.version.Versions; + +import java.util.List; + +/** + * Created on 26/04/16. + * + * @author Julien Ruchaud - ruchaud@codelutin.com + * @since 4.0 + */ +public class WorkingDbMigrationCallBackForVersion3_911 extends WorkingDbMigrationCallBackForVersionSupport { + + @Override + public Version getVersion() { + return Versions.valueOf("3.911"); + } + + @Override + protected void prepareMigrationScript(TopiaSqlSupport sqlSupport, + List<String> queries, + boolean showSql, + boolean showProgression) throws TopiaException { + + addSpecificScript("3.911-0-atlantos.sql", queries); + } + +} diff --git a/echobase-domain/src/main/resources/migration/workingDb/h2/3.905-0-update-model.sql b/echobase-domain/src/main/resources/migration/workingDb/h2/3.905-0-update-model.sql index d595d7c..3629169 100644 --- a/echobase-domain/src/main/resources/migration/workingDb/h2/3.905-0-update-model.sql +++ b/echobase-domain/src/main/resources/migration/workingDb/h2/3.905-0-update-model.sql @@ -18,10 +18,6 @@ -- along with this program. If not, see <http://www.gnu.org/licenses/>. -- #L% --- -<<<<<<< HEAD -======= - ->>>>>>> 943c4a4ec5c1f34addc3d88a7c9ad46f34d23eb9 -- PORT create table port (topiaId varchar(255) not null, topiaVersion bigint not null, code varchar(255) not null, topiaCreateDate timestamp, name varchar(255) not null, shortName varchar(255), lastModification timestamp); diff --git a/echobase-domain/src/main/resources/migration/workingDb/h2/3.905-2-migrate-voyage-ports.sql b/echobase-domain/src/main/resources/migration/workingDb/h2/3.905-2-migrate-voyage-ports.sql index defacf5..e7ac51f 100644 --- a/echobase-domain/src/main/resources/migration/workingDb/h2/3.905-2-migrate-voyage-ports.sql +++ b/echobase-domain/src/main/resources/migration/workingDb/h2/3.905-2-migrate-voyage-ports.sql @@ -18,10 +18,7 @@ -- along with this program. If not, see <http://www.gnu.org/licenses/>. -- #L% --- -<<<<<<< HEAD -======= ->>>>>>> 943c4a4ec5c1f34addc3d88a7c9ad46f34d23eb9 -- Change ports name update voyage v SET startPort = (select p.topiaId from port p where upper(p.name) = upper(v.startPortName) limit 1); update voyage v SET endPort = (select p.topiaId from port p where upper(p.name) = upper(v.endPortName) limit 1); diff --git a/echobase-domain/src/main/resources/migration/workingDb/h2/3.905-2-migrate-voyage-ports.sql b/echobase-domain/src/main/resources/migration/workingDb/h2/3.911-0-atlantos.sql similarity index 63% copy from echobase-domain/src/main/resources/migration/workingDb/h2/3.905-2-migrate-voyage-ports.sql copy to echobase-domain/src/main/resources/migration/workingDb/h2/3.911-0-atlantos.sql index defacf5..41595e2 100644 --- a/echobase-domain/src/main/resources/migration/workingDb/h2/3.905-2-migrate-voyage-ports.sql +++ b/echobase-domain/src/main/resources/migration/workingDb/h2/3.911-0-atlantos.sql @@ -18,14 +18,9 @@ -- along with this program. If not, see <http://www.gnu.org/licenses/>. -- #L% --- -<<<<<<< HEAD -======= ->>>>>>> 943c4a4ec5c1f34addc3d88a7c9ad46f34d23eb9 --- Change ports name -update voyage v SET startPort = (select p.topiaId from port p where upper(p.name) = upper(v.startPortName) limit 1); -update voyage v SET endPort = (select p.topiaId from port p where upper(p.name) = upper(v.endPortName) limit 1); +create table vocabularyciem (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp, label varchar(255) not null, code varchar(255) not null); +alter table vocabularyciem add constraint PK_VOCA primary key (topiaId); +alter table vocabularyciem add constraint UK_VOCA_LABEL unique (label); --- Remove old port name columns -alter table voyage drop column startPortName; -alter table voyage drop column endPortName; +alter table mission add column country varchar(255); \ No newline at end of file diff --git a/echobase-domain/src/main/resources/migration/workingDb/pg/3.905-0-update-model.sql b/echobase-domain/src/main/resources/migration/workingDb/pg/3.905-0-update-model.sql index 518029b..0cd3c29 100644 --- a/echobase-domain/src/main/resources/migration/workingDb/pg/3.905-0-update-model.sql +++ b/echobase-domain/src/main/resources/migration/workingDb/pg/3.905-0-update-model.sql @@ -18,10 +18,6 @@ -- along with this program. If not, see <http://www.gnu.org/licenses/>. -- #L% --- -<<<<<<< HEAD -======= - ->>>>>>> 943c4a4ec5c1f34addc3d88a7c9ad46f34d23eb9 -- PORT create table port (topiaId character varying(255) not null, topiaVersion bigint not null, code character varying(255) not null, topiaCreateDate timestamp, name character varying(255) not null, shortName character varying(255), lastModification timestamp); diff --git a/echobase-domain/src/main/resources/migration/workingDb/pg/3.905-2-migrate-voyage-ports.sql b/echobase-domain/src/main/resources/migration/workingDb/pg/3.905-2-migrate-voyage-ports.sql index 5b2bed4..cb3b35c 100644 --- a/echobase-domain/src/main/resources/migration/workingDb/pg/3.905-2-migrate-voyage-ports.sql +++ b/echobase-domain/src/main/resources/migration/workingDb/pg/3.905-2-migrate-voyage-ports.sql @@ -18,10 +18,7 @@ -- along with this program. If not, see <http://www.gnu.org/licenses/>. -- #L% --- -<<<<<<< HEAD -======= ->>>>>>> 943c4a4ec5c1f34addc3d88a7c9ad46f34d23eb9 -- Change ports name update voyage as v SET startPort = p.topiaid FROM ( select pp.topiaId, vv.topiaId as voyageId from port as pp, voyage as vv WHERE upper(pp.name) = upper(vv.startPortName) ) as p WHERE v.startPortName is not null and v.topiaId = p.voyageId; update voyage as v SET endPort = p.topiaid FROM ( select pp.topiaId, vv.topiaId as voyageId from port as pp, voyage as vv WHERE upper(pp.name) = upper(vv.endPortName) ) as p WHERE v.endPortName is not null and v.topiaId = p.voyageId; diff --git a/echobase-domain/src/main/resources/migration/workingDb/h2/3.905-2-migrate-voyage-ports.sql b/echobase-domain/src/main/resources/migration/workingDb/pg/3.911-0-atlantos.sql similarity index 63% copy from echobase-domain/src/main/resources/migration/workingDb/h2/3.905-2-migrate-voyage-ports.sql copy to echobase-domain/src/main/resources/migration/workingDb/pg/3.911-0-atlantos.sql index defacf5..6abcc27 100644 --- a/echobase-domain/src/main/resources/migration/workingDb/h2/3.905-2-migrate-voyage-ports.sql +++ b/echobase-domain/src/main/resources/migration/workingDb/pg/3.911-0-atlantos.sql @@ -18,14 +18,9 @@ -- along with this program. If not, see <http://www.gnu.org/licenses/>. -- #L% --- -<<<<<<< HEAD -======= ->>>>>>> 943c4a4ec5c1f34addc3d88a7c9ad46f34d23eb9 --- Change ports name -update voyage v SET startPort = (select p.topiaId from port p where upper(p.name) = upper(v.startPortName) limit 1); -update voyage v SET endPort = (select p.topiaId from port p where upper(p.name) = upper(v.endPortName) limit 1); +create table vocabularyciem (topiaId character varying(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp, label character varying(255) not null, code character varying(255) not null); +alter table vocabularyciem add constraint PK_VOCA primary key (topiaId); +alter table vocabularyciem add constraint UK_VOCA_LABEL unique (label); --- Remove old port name columns -alter table voyage drop column startPortName; -alter table voyage drop column endPortName; +alter table mission add column country character varying(255); diff --git a/echobase-domain/src/main/xmi/echobase.properties b/echobase-domain/src/main/xmi/echobase.properties index f03f910..4cf2ff5 100644 --- a/echobase-domain/src/main/xmi/echobase.properties +++ b/echobase-domain/src/main/xmi/echobase.properties @@ -23,7 +23,7 @@ model.tagValue.notGenerateToString=true model.tagValue.generateOperatorForDAOHelper=true -model.tagValue.version=3.910 +model.tagValue.version=3.911 model.tagValue.generatePropertyChangeSupport=false model.tagValue.generateBooleanGetMethods=false model.tagValue.indexForeignKeys=true diff --git a/echobase-domain/src/main/xmi/echobase.zargo b/echobase-domain/src/main/xmi/echobase.zargo index 9298b39..07304da 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/atlantos/xml/XmlAccousticExport.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/atlantos/xml/XmlAccousticExport.java index 6361330..4ca5420 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/atlantos/xml/XmlAccousticExport.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/atlantos/xml/XmlAccousticExport.java @@ -314,7 +314,7 @@ public class XmlAccousticExport implements EchoBaseService { xml.create("Survey", "IDREF", getVocabularyCode(voyage.getMission().getName(), "AC_Survey_PELGAS")); xml.create("Country", - "IDREF", getVocabularyCode(voyage.getMission().getName(), "ISO_3166_FR")); // see ticket to finish + "IDREF", getVocabularyCode(voyage.getMission().getCountry(), "ISO_3166_FR")); xml.create("Platform", "IDREF", getVocabularyCode(transect.getVessel().getCode(), "SHIPC_35HT")); xml.create("StartDate", diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/ImportAcousticsActionSupport.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/ImportAcousticsActionSupport.java index ee97253..cb89458 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/ImportAcousticsActionSupport.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/ImportAcousticsActionSupport.java @@ -183,7 +183,7 @@ public abstract class ImportAcousticsActionSupport<M extends ImportAcousticsConf } // create data processing - dataProcessing = createDataProcessing(dataProcessingId, softwareVersion, soundSpeedCalculations, row); + dataProcessing = createDataProcessing(dataProcessingId, soundSpeedCalculations, row); if (log.isDebugEnabled()) { log.debug("[row " + rowNumber + "] New dataProcessing to use (" + dataProcessing.getId() + ")"); @@ -662,6 +662,7 @@ public abstract class ImportAcousticsActionSupport<M extends ImportAcousticsConf String loggedDataFormat = configuration.getLoggedDataFormat(); String loggedDataDatatype = configuration.getLoggedDataDatatype(); String pingDutyCycle = configuration.getPingDutyCycle(); + String softwareName = configuration.getAcquisitionSoftwareName(); DataAcquisition dataAcquisition = getPersistenceService().createDataAcquisition(instrument); @@ -673,6 +674,7 @@ public abstract class ImportAcousticsActionSupport<M extends ImportAcousticsConf dataAcquisition.setPingDutyCycle(pingDutyCycle); dataAcquisition.setEchosounderSoundSpeed(row.getSoundCelerity()); dataAcquisition.setSoundSpeedCalculations(soundSpeedCalculations); + dataAcquisition.setSoftwareName(softwareName); // fill from csv file float transceiverAcquisitionAbsorption = row.getTransceiverAcquisitionAbsorption(); @@ -697,7 +699,6 @@ public abstract class ImportAcousticsActionSupport<M extends ImportAcousticsConf } private DataProcessing createDataProcessing(String id, - String softwareVersion, String soundSpeedCalculations, E row) { @@ -710,6 +711,8 @@ public abstract class ImportAcousticsActionSupport<M extends ImportAcousticsConf float digitThreshold = configuration.getDigitThreshold(); String acousticDensityUnit = configuration.getAcousticDensityUnit(); String notes = configuration.getNotes(); + String softwareName = configuration.getProcessingSoftwareName(); + String softwareVersion = configuration.getProcessingSoftwareVersion(); DataProcessing dataProcessing = getPersistenceService().createDataProcessing(id, processingTemplate); @@ -719,6 +722,7 @@ public abstract class ImportAcousticsActionSupport<M extends ImportAcousticsConf dataProcessing.setDigitThreshold(digitThreshold); dataProcessing.setAcousticDensityUnit(acousticDensityUnit); dataProcessing.setNotes(notes); + dataProcessing.setSoftwareName(softwareName); dataProcessing.setProcessingSoftwareVersion(softwareVersion); dataProcessing.setTransceiverProcessingAbsorptionDescription(transceiverAcquisitionAbsorptionDescription); dataProcessing.setEchosounderSoundSpeed(row.getSoundCelerity()); diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/configurations/ImportAcousticsConfiguration.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/configurations/ImportAcousticsConfiguration.java index c0a89e5..db6a7d1 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/configurations/ImportAcousticsConfiguration.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/configurations/ImportAcousticsConfiguration.java @@ -43,6 +43,8 @@ public class ImportAcousticsConfiguration extends ImportDataConfigurationSupport protected boolean addDataAcquisition = true; /** Manual transceiverAcquisitionAbsorptionDescription. */ protected String transceiverAcquisitionAbsorptionDescription = "(i) Equation: Francois and garrison 1982,(ii) CTD, (iii) nominal value for entire data set"; + /** Manual acquisitionSoftwareName. */ + protected String acquisitionSoftwareName = "ER60"; /** Manual acquisitionSoftwareVersion (ER60 instrument). */ protected String acquisitionSoftwareVersionER60; /** Manual acquisitionSoftwareVersion (ME70 instrument). */ @@ -59,6 +61,10 @@ public class ImportAcousticsConfiguration extends ImportDataConfigurationSupport protected String soundSpeedCalculationsME70 = "(i) Equation: Mackenzie (1980), (ii) Hull-mounted thermosalinometer, (iii) surface absorption value recomputed every 30s and applied to the entire data set"; /** Manual sounderConstant. */ protected String sounderConstant = EchoBaseCsvUtil.NA; + /** Manual processingSoftwareName. */ + protected String processingSoftwareName = "Movies3D"; + /** Manual processingSoftwareVersion. */ + protected String processingSoftwareVersion; /** Manual processingTemplate. */ protected String processingTemplate; /** Manual processingDescription. */ @@ -208,6 +214,30 @@ public class ImportAcousticsConfiguration extends ImportDataConfigurationSupport this.cellPositionReference = cellPositionReference; } + public String getAcquisitionSoftwareName() { + return acquisitionSoftwareName; + } + + public void setAcquisitionSoftwareName(String acquisitionSoftwareName) { + this.acquisitionSoftwareName = acquisitionSoftwareName; + } + + public String getProcessingSoftwareName() { + return processingSoftwareName; + } + + public void setProcessingSoftwareName(String processingSoftwareName) { + this.processingSoftwareName = processingSoftwareName; + } + + public String getProcessingSoftwareVersion() { + return processingSoftwareVersion; + } + + public void setProcessingSoftwareVersion(String processingSoftwareVersion) { + this.processingSoftwareVersion = processingSoftwareVersion; + } + @Override public InputFile[] getInputFiles() { return new InputFile[]{moviesFile}; diff --git a/echobase-services/src/test/resources/echobase-importDb-referentiel.zip b/echobase-services/src/test/resources/echobase-importDb-referentiel.zip index 47f1ef8..d3adb1e 100644 Binary files a/echobase-services/src/test/resources/echobase-importDb-referentiel.zip and b/echobase-services/src/test/resources/echobase-importDb-referentiel.zip differ 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 8c5f5f2..d96c533 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 @@ -53,6 +53,7 @@ echobase.action.workingDbconfiguration.connect=Connect echobase.action.workingDbconfiguration.disconnect=Disconnect echobase.action.workingDbconfiguration.downloadDriver=Download jdbc driver echobase.common.acousticDensityUnit=acousticDensityUnit +echobase.common.acquisitionSoftwareName=Acquisition software echobase.common.acquisitionSoftwareVersionER60=acquisitionSoftwareVersion (ER60 instrument) echobase.common.acquisitionSoftwareVersionME70=acquisitionSoftwareVersion (ME70 instrument) echobase.common.actionError=An error occurs while operation\: @@ -74,6 +75,7 @@ echobase.common.comment=Comment echobase.common.comments=Comments echobase.common.communityIndicator=Community indicators echobase.common.confirmDelete=Confirm to delete selected data +echobase.common.country=Country echobase.common.dataCentre=Data center echobase.common.dataCentreEmail=Data center email echobase.common.dataProcessing=DataProcessing @@ -159,6 +161,8 @@ echobase.common.populationIndicator=Population indicators echobase.common.principalInvestigator=Researcher echobase.common.principalInvestigatorEmail=Researcher e-mail echobase.common.processingDescription=Data processing description +echobase.common.processingSoftwareName=Procession software +echobase.common.processingSoftwareVersion=Procession software version echobase.common.processingTemplate=Data processing template echobase.common.project=Project echobase.common.projection=Projection 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 07ba8f6..b490554 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 @@ -53,6 +53,7 @@ echobase.action.workingDbconfiguration.connect=Sélectionner une base de travail echobase.action.workingDbconfiguration.disconnect=Se déconnecter echobase.action.workingDbconfiguration.downloadDriver=Télécharger le pilote jdbc echobase.common.acousticDensityUnit=Unité des densités acoustiques +echobase.common.acquisitionSoftwareName=Logiciel d'acquisition echobase.common.acquisitionSoftwareVersionER60=Version du logiciel d'acquisition ER60 echobase.common.acquisitionSoftwareVersionME70=Version du logiciel d'acquisition ME70 echobase.common.actionError=Une erreur est survenue pendant l'opération \: @@ -74,6 +75,7 @@ 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.country=Pays echobase.common.dataCentre=Centre de données echobase.common.dataCentreEmail=Courriel du centre de données echobase.common.dataProcessing=DataProcessing @@ -159,6 +161,8 @@ echobase.common.populationIndicator=indicateurs de population echobase.common.principalInvestigator=Chercheur echobase.common.principalInvestigatorEmail=Courriel du chercheur echobase.common.processingDescription=Description de la méthode de pré-traitement des données +echobase.common.processingSoftwareName=Logiciel de traitement +echobase.common.processingSoftwareVersion=Version du logiciel de traitement echobase.common.processingTemplate=Intitulé de la méthode de pré-traitement des données echobase.common.project=Projet echobase.common.projection=Projection diff --git a/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureAcousticImport.jsp b/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureAcousticImport.jsp index 87c36ac..81c7775 100644 --- a/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureAcousticImport.jsp +++ b/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureAcousticImport.jsp @@ -75,6 +75,10 @@ size="80" requiredLabel="true" label='%{getText("echobase.common.transceiverAcquisitionAbsorptionDescription")}'/> + <s:textfield key="model.acquisitionSoftwareName" size="80" + requiredLabel="true" + label='%{getText("echobase.common.acquisitionSoftwareName")}'/> + <s:textfield key="model.acquisitionSoftwareVersionER60" size="80" requiredLabel="true" label='%{getText("echobase.common.acquisitionSoftwareVersionER60")}'/> @@ -103,6 +107,14 @@ <s:textfield key="model.sounderConstant" size="80" requiredLabel="true" label='%{getText("echobase.common.sounderConstant")}'/> + <s:textfield key="model.processingSoftwareName" size="80" + requiredLabel="true" + label='%{getText("echobase.common.processingSoftwareName")}'/> + + <s:textfield key="model.processingSoftwareVersion" size="80" + requiredLabel="true" + label='%{getText("echobase.common.processingSoftwareVersion")}'/> + <s:textfield key="model.processingTemplate" size="80" requiredLabel="true" label='%{getText("echobase.common.processingTemplate")}'/> diff --git a/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureMooringAcousticImport.jsp b/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureMooringAcousticImport.jsp index cd7322c..118ebff 100644 --- a/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureMooringAcousticImport.jsp +++ b/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureMooringAcousticImport.jsp @@ -64,6 +64,10 @@ size="80" requiredLabel="true" label='%{getText("echobase.common.transceiverAcquisitionAbsorptionDescription")}'/> + <s:textfield key="model.acquisitionSoftwareName" size="80" + requiredLabel="true" + label='%{getText("echobase.common.acquisitionSoftwareName")}'/> + <s:textfield key="model.acquisitionSoftwareVersionER60" size="80" requiredLabel="true" label='%{getText("echobase.common.acquisitionSoftwareVersionER60")}'/> @@ -92,6 +96,14 @@ <s:textfield key="model.sounderConstant" size="80" requiredLabel="true" label='%{getText("echobase.common.sounderConstant")}'/> + <s:textfield key="model.processingSoftwareName" size="80" + requiredLabel="true" + label='%{getText("echobase.common.processingSoftwareName")}'/> + + <s:textfield key="model.processingSoftwareVersion" size="80" + requiredLabel="true" + label='%{getText("echobase.common.processingSoftwareVersion")}'/> + <s:textfield key="model.processingTemplate" size="80" requiredLabel="true" label='%{getText("echobase.common.processingTemplate")}'/> diff --git a/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/createMission.jsp b/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/createMission.jsp index 1cb456a..c3588fd 100644 --- a/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/createMission.jsp +++ b/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/createMission.jsp @@ -48,6 +48,9 @@ <s:textfield key="mission.institution" label='%{getText("echobase.common.institution")}'/> + <s:textfield key="mission.country" + label='%{getText("echobase.common.country")}'/> + <s:textfield key="mission.keywords" label='%{getText("echobase.common.keywords")}'/> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.