Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 2f4955da by Tony Chemit at 2020-08-23T14:28:13+02:00 Ajout référentiel PS Logbook WellsState - See #1300 - - - - - 25 changed files: - + client-datasource-editor-ps/src/main/java/fr/ird/observe/client/datasource/editor/content/ref/ps/logbook/WellsStateUI.jaxx - + client-datasource-editor-ps/src/main/java/fr/ird/observe/client/datasource/editor/content/ref/ps/logbook/WellsStateUIHandler.java - + client-datasource-editor-ps/src/main/java/fr/ird/observe/client/datasource/editor/content/ref/ps/logbook/WellsStateUIModel.java - dto/src/main/i18n/getters/eugene.getter - dto/src/main/java/fr/ird/observe/dto/decoration/init/ReferentialPsLogbookModelDecoratorInitializer.java - dto/src/main/java/fr/ird/observe/spi/DtoModelClasses.java - dto/src/main/models/Observe-04-referential-ps-logbook.model - observe-i18n/src/main/i18n/translations/observe_en_GB.properties - observe-i18n/src/main/i18n/translations/observe_es_ES.properties - observe-i18n/src/main/i18n/translations/observe_fr_FR.properties - persistence/src/main/java/fr/ird/observe/entities/Entities.java - persistence/src/main/java/fr/ird/observe/entities/migration/DataSourceMigrationForVersion_8_1.java - persistence/src/main/models/Observe-04-referential-ps-logbook.model - + persistence/src/main/resources/db/migration/8.1/03_ps_logbook_add_referential_wellsState-common.sql - test/src/main/java/fr/ird/observe/test/ObserveFixtures.java - test/src/main/resources/db/8.1/dataForTestLongline.sql.gz - test/src/main/resources/db/8.1/dataForTestSeine.sql.gz - test/src/main/resources/db/8.1/empty_h2.sql.gz - test/src/main/resources/db/8.1/empty_pg.sql.gz - test/src/main/resources/db/8.1/referentiel.sql.gz - test/src/main/resources/fixtures/count-referential-common.properties - test/src/main/resources/fixtures/count-referential-seine.properties - test/src/main/resources/fixtures/global.properties - test/src/main/resources/fixtures/validate-service-referential.properties - test/src/main/resources/fixtures/validate-service-seine-trips.properties Changes: ===================================== client-datasource-editor-ps/src/main/java/fr/ird/observe/client/datasource/editor/content/ref/ps/logbook/WellsStateUI.jaxx ===================================== @@ -0,0 +1,86 @@ +<!-- + #%L + ObServe :: Client DataSource Editor PS + %% + Copyright (C) 2008 - 2020 IRD, Code Lutin, Ultreia.io + %% + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU 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 General Public + License along with this program. If not, see + <http://www.gnu.org/licenses/gpl-3.0.html>. + #L% + --> + +<fr.ird.observe.client.datasource.editor.content.ref.ContentI18nReferentialUI beanScope="bean" + i18n="fr.ird.observe.dto.referential.ps.logbook.WellsStateDto" + superGenericType='WellsStateDto, WellsStateReference, WellsStateUI'> + + <import> + fr.ird.observe.dto.reference.ReferentialDtoReference + fr.ird.observe.dto.referential.ps.logbook.WellsStateDto + fr.ird.observe.dto.referential.ps.logbook.WellsStateReference + fr.ird.observe.client.util.UIHelper + + io.ultreia.java4all.jaxx.widgets.combobox.JaxxComboBox + org.nuiton.jaxx.widgets.text.NormalTextEditor + fr.ird.observe.client.util.BeanEnumEditor + fr.ird.observe.client.util.BeanCheckBox + + static fr.ird.observe.client.util.UIHelper.getStringValue + fr.ird.observe.dto.referential.ReferenceStatus + </import> + + <!-- validator --> + <BeanValidator id='validator' autoField='true' + beanClass='fr.ird.observe.dto.referential.ps.logbook.WellsStateDto' + context='create' errorTableModel='{getErrorTableModel()}'> + <field name="enabled" component="status"/> + </BeanValidator> + + <!-- model --> + <WellsStateUIModel id='model' constructorParams='@override'/> + + <!-- edit bean --> + <WellsStateDto id='bean'/> + + <Table id='editTable'> + + <!-- uri --> + <row> + <cell anchor="west"> + <JLabel id='uriLabel'/> + </cell> + <cell anchor='east' weightx="1" fill="both"> + <NormalTextEditor id='uri'/> + </cell> + </row> + + <!-- code / status --> + <row> + <cell anchor="west"> + <JLabel id='codeStatusLabel'/> + </cell> + <cell anchor='east' weightx="1" fill="both"> + <JPanel id='codeStatusPanel' layout='{new BorderLayout()}'> + <NormalTextEditor id='code' constraints='BorderLayout.WEST'/> + <BeanEnumEditor id='status' constructorParams='ReferenceStatus.class' genericType='ReferenceStatus' constraints='BorderLayout.CENTER'/> + </JPanel> + </cell> + </row> + + <!-- needComment --> + <row> + <cell anchor='east' weightx="1" fill="both" columns="2"> + <BeanCheckBox id='needComment'/> + </cell> + </row> + </Table> + +</fr.ird.observe.client.datasource.editor.content.ref.ContentI18nReferentialUI> ===================================== client-datasource-editor-ps/src/main/java/fr/ird/observe/client/datasource/editor/content/ref/ps/logbook/WellsStateUIHandler.java ===================================== @@ -0,0 +1,39 @@ +package fr.ird.observe.client.datasource.editor.content.ref.ps.logbook; + +/*- + * #%L + * ObServe :: Client DataSource Editor PS + * %% + * Copyright (C) 2008 - 2020 IRD, Code Lutin, Ultreia.io + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU 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 General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + +import fr.ird.observe.client.datasource.editor.content.ref.ContentReferentialUIHandler; +import fr.ird.observe.dto.referential.ps.logbook.WellsStateDto; +import fr.ird.observe.dto.referential.ps.logbook.WellsStateReference; +import org.nuiton.jaxx.runtime.spi.UIHandler; + +/** + * Created on 23/08/2020. + * + * @author Tony Chemit - dev@tchemit.fr + * @since 8.1.0 + */ +public class WellsStateUIHandler +extends ContentReferentialUIHandler<WellsStateDto, WellsStateReference, WellsStateUI> implements UIHandler<WellsStateUI> { + +} ===================================== client-datasource-editor-ps/src/main/java/fr/ird/observe/client/datasource/editor/content/ref/ps/logbook/WellsStateUIModel.java ===================================== @@ -0,0 +1,41 @@ +package fr.ird.observe.client.datasource.editor.content.ref.ps.logbook; + +/*- + * #%L + * ObServe :: Client DataSource Editor PS + * %% + * Copyright (C) 2008 - 2020 IRD, Code Lutin, Ultreia.io + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU 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 General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + +import fr.ird.observe.client.datasource.editor.content.ref.ContentReferentialUIModel; +import fr.ird.observe.dto.referential.ps.logbook.WellsStateDto; +import fr.ird.observe.dto.referential.ps.logbook.WellsStateReference; + +/** + * Created on 23/08/2020. + * + * @author Tony Chemit - dev@tchemit.fr + * @since 8.1.0 + */ +public class WellsStateUIModel extends ContentReferentialUIModel<WellsStateDto, WellsStateReference> { + + public WellsStateUIModel() { + super(WellsStateDto.class); + } + +} ===================================== dto/src/main/i18n/getters/eugene.getter ===================================== @@ -109,6 +109,7 @@ observe.referential.ps.common.TransmittingBuoyOwnership.type observe.referential.ps.common.TransmittingBuoyType.type observe.referential.ps.common.VesselActivity.type observe.referential.ps.logbook.WeightCategory.type +observe.referential.ps.logbook.WellsState.type observe.referential.ps.observation.DetectionMode.type observe.referential.ps.observation.InformationSource.type observe.referential.ps.observation.NonTargetCatchReleaseConformity.type ===================================== dto/src/main/java/fr/ird/observe/dto/decoration/init/ReferentialPsLogbookModelDecoratorInitializer.java ===================================== @@ -24,14 +24,16 @@ package fr.ird.observe.dto.decoration.init; import fr.ird.observe.dto.decoration.DecoratorService; import fr.ird.observe.dto.referential.ps.logbook.WeightCategoryDto; +import fr.ird.observe.dto.referential.ps.logbook.WellsStateDto; import fr.ird.observe.dto.referential.ps.logbook.WeightCategoryReference; +import fr.ird.observe.dto.referential.ps.logbook.WellsStateReference; import fr.ird.observe.spi.model.initializer.ObserveReferentialPsLogbookModelInitializer; /** * Created on 23/08/2020. * * @author Tony Chemit - dev@tchemit.fr - * @since + * @since 8.1.0 */ public class ReferentialPsLogbookModelDecoratorInitializer extends ModelDecoratorInitializerSupport implements ObserveReferentialPsLogbookModelInitializer { public ReferentialPsLogbookModelDecoratorInitializer(DecoratorService decoratorService) { @@ -42,4 +44,8 @@ public class ReferentialPsLogbookModelDecoratorInitializer extends ModelDecorat public void initPsLogbookWeightCategoryDto() { registerDefaultReferentialAndReferentialReferenceDecorator(WeightCategoryDto.class, WeightCategoryReference.class, libelle); } + @Override + public void initPsLogbookWellsStateDto() { + registerDefaultReferentialAndReferentialReferenceDecorator(WellsStateDto.class, WellsStateReference.class, libelle); + } } ===================================== dto/src/main/java/fr/ird/observe/spi/DtoModelClasses.java ===================================== @@ -92,7 +92,8 @@ public class DtoModelClasses { fr.ird.observe.dto.referential.ps.observation.ObservedSystemDto.class ); public static final ImmutableSet<Class<? extends ReferentialDto>> SEINE_LOGBOOK_REFERENTIAL_TYPES = ImmutableSet.of( - fr.ird.observe.dto.referential.ps.logbook.WeightCategoryDto.class + fr.ird.observe.dto.referential.ps.logbook.WeightCategoryDto.class, + fr.ird.observe.dto.referential.ps.logbook.WellsStateDto.class ); public static final ImmutableSet<Class<? extends ReferentialDto>> SEINE_REFERENTIAL_TYPES = ImmutableSet.<Class<? extends ReferentialDto>>builder() ===================================== dto/src/main/models/Observe-04-referential-ps-logbook.model ===================================== @@ -2,3 +2,5 @@ package fr.ird.observe.dto.referential.ps.logbook | form=self packagePriority=4 referential.ps.logbook.WeightCategory > referential.I18nReferential >> reference.ReferentialDtoReferenceWithNoCodeAware | references=code,label,uri,species species {*:1} fr.ird.observe.dto.referential.common.SpeciesReference | notNull + +referential.ps.logbook.WellsState > referential.I18nReferential ===================================== observe-i18n/src/main/i18n/translations/observe_en_GB.properties ===================================== @@ -1843,6 +1843,7 @@ observe.referential.ps.common.TransmittingBuoyTypeDto.validation.technology.too. observe.referential.ps.common.VesselActivity.allowFad=Allow Fad ? observe.referential.ps.common.VesselActivity.type=Vessel activity (Seine) observe.referential.ps.logbook.WeightCategory.type=Weight category +observe.referential.ps.logbook.WellsState.type=Wells state observe.referential.ps.observation.DetectionMode.type=Detection mode observe.referential.ps.observation.InformationSource.type=Information source observe.referential.ps.observation.NonTargetCatchReleaseConformity.type=Release conformity ===================================== observe-i18n/src/main/i18n/translations/observe_es_ES.properties ===================================== @@ -1843,6 +1843,7 @@ observe.referential.ps.common.TransmittingBuoyTypeDto.validation.technology.too. observe.referential.ps.common.VesselActivity.allowFad=Utilisation Object flottant ? \#TODO observe.referential.ps.common.VesselActivity.type=Actividad buque \#TODO-SP observe.referential.ps.logbook.WeightCategory.type=Categoría de peso +observe.referential.ps.logbook.WellsState.type=Wells state \#TODO observe.referential.ps.observation.DetectionMode.type=Modo de detección observe.referential.ps.observation.InformationSource.type=Information source \#TODO observe.referential.ps.observation.NonTargetCatchReleaseConformity.type=Conformidad en la liberacion de especies no objetivo ===================================== observe-i18n/src/main/i18n/translations/observe_fr_FR.properties ===================================== @@ -1843,6 +1843,7 @@ observe.referential.ps.common.TransmittingBuoyTypeDto.validation.technology.too. observe.referential.ps.common.VesselActivity.allowFad=Utilisation Object flottant ? observe.referential.ps.common.VesselActivity.type=Activité bateau (Senne) observe.referential.ps.logbook.WeightCategory.type=Catégorie de poids +observe.referential.ps.logbook.WellsState.type=État de remplissage des cuves observe.referential.ps.observation.DetectionMode.type=Mode détection observe.referential.ps.observation.InformationSource.type=Origine de l'information observe.referential.ps.observation.NonTargetCatchReleaseConformity.type=Conformité à la libération ===================================== persistence/src/main/java/fr/ird/observe/entities/Entities.java ===================================== @@ -97,6 +97,7 @@ public class Entities { ObserveEntityEnum.ps_observation_ObservedSystem, ObserveEntityEnum.ps_logbook_WeightCategory, + ObserveEntityEnum.ps_logbook_WellsState, ObserveEntityEnum.ll_common_BaitSettingStatus, ObserveEntityEnum.ll_common_BaitType, ===================================== persistence/src/main/java/fr/ird/observe/entities/migration/DataSourceMigrationForVersion_8_1.java ===================================== @@ -48,6 +48,7 @@ public class DataSourceMigrationForVersion_8_1 extends MigrationVersionResource executor.addScript("01","ps_observation_add_referential_InformationSource"); executor.addScript("02","ps_logbook_move_referential_weightCategory"); + executor.addScript("03","ps_logbook_add_referential_wellsState"); } } ===================================== persistence/src/main/models/Observe-04-referential-ps-logbook.model ===================================== @@ -2,3 +2,5 @@ package fr.ird.observe.entities.referential.ps.logbook | entity dbSchema=ps_logb referential.ps.logbook.WeightCategory > referential.I18nReferentialEntity | entity species {*:1} referential.common.Species | lazy=false + +referential.ps.logbook.WellsState > referential.I18nReferentialEntity | entity ===================================== persistence/src/main/resources/db/migration/8.1/03_ps_logbook_add_referential_wellsState-common.sql ===================================== @@ -0,0 +1,27 @@ +--- +-- #%L +-- ObServe :: Persistence +-- %% +-- Copyright (C) 2008 - 2020 IRD, Code Lutin, Ultreia.io +-- %% +-- This program is free software: you can redistribute it and/or modify +-- it under the terms of the GNU 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 General Public +-- License along with this program. If not, see +-- <http://www.gnu.org/licenses/gpl-3.0.html>. +-- #L% +--- +CREATE TABLE ps_logbook.WellsState(topiaId VARCHAR(255) NOT NULL,topiaVersion BIGINT NOT NULL, topiaCreateDate DATE, lastUpdateDate TIMESTAMP NOT NULL, code VARCHAR(255), status INTEGER DEFAULT 1, needComment BOOLEAN DEFAULT false, uri VARCHAR(255), homeId VARCHAR(255), label1 VARCHAR(255), label2 VARCHAR(255), label3 VARCHAR(255),label4 VARCHAR(255),label5 VARCHAR(255),label6 VARCHAR(255),label7 VARCHAR(255),label8 VARCHAR(255)); +ALTER TABLE ps_logbook.WellsState ADD CONSTRAINT PK_WellsState PRIMARY KEY(topiaid); +INSERT INTO common.LASTUPDATEDATE(topiaId, topiaversion, topiacreatedate, TYPE , LASTUPDATEDATE) values ('fr.ird.observe.entities.LastUpdateDate#666#2003', 0, '2020-08-23'::date, 'fr.ird.observe.entities.referentiel.ps.logbook.WellsState', '2020-08-23 10:57:53.455000'::timestamp); + +INSERT INTO ps_logbook.WellsState(topiaid, topiaversion, topiacreatedate, lastupdatedate, status, needComment, code, label1, label2, label3) values ('fr.ird.referential.ps.logbook.WellsState#666#01' , 0, '2020-08-23'::date, '2020-08-23 10:57:53.455000'::timestamp, 1, false, '1', 'Wells empty' , 'Cuves vides' , 'Wells empty #TODO'); +INSERT INTO ps_logbook.WellsState(topiaid, topiaversion, topiacreatedate, lastupdatedate, status, needComment, code, label1, label2, label3) values ('fr.ird.referential.ps.logbook.WellsState#666#02' , 0, '2020-08-23'::date, '2020-08-23 10:57:53.455000'::timestamp, 1, false, '2', ' Wells not empty' , 'Cuves non vides' , 'Wells not empty #TODO'); ===================================== test/src/main/java/fr/ird/observe/test/ObserveFixtures.java ===================================== @@ -51,6 +51,7 @@ public class ObserveFixtures { "fr.ird.observe.dto.referential.common.", "fr.ird.observe.dto.referential.ps.common.", "fr.ird.observe.dto.referential.ps.observation.", + "fr.ird.observe.dto.referential.ps.logbook.", "fr.ird.observe.dto.referential.ll.common.", "fr.ird.observe.dto.referential.ll.observation.", "fr.ird.observe.dto.referential.ll.logbook.", @@ -58,6 +59,7 @@ public class ObserveFixtures { "fr.ird.observe.dto.data.", "fr.ird.observe.dto.data.ps.common.", "fr.ird.observe.dto.data.ps.observation.", + "fr.ird.observe.dto.data.ps.logbook.", "fr.ird.observe.dto.data.ll.common.", "fr.ird.observe.dto.data.ll.observation.", "fr.ird.observe.dto.data.ll.logbook.", ===================================== test/src/main/resources/db/8.1/dataForTestLongline.sql.gz ===================================== Binary files a/test/src/main/resources/db/8.1/dataForTestLongline.sql.gz and b/test/src/main/resources/db/8.1/dataForTestLongline.sql.gz differ ===================================== test/src/main/resources/db/8.1/dataForTestSeine.sql.gz ===================================== Binary files a/test/src/main/resources/db/8.1/dataForTestSeine.sql.gz and b/test/src/main/resources/db/8.1/dataForTestSeine.sql.gz differ ===================================== test/src/main/resources/db/8.1/empty_h2.sql.gz ===================================== Binary files a/test/src/main/resources/db/8.1/empty_h2.sql.gz and b/test/src/main/resources/db/8.1/empty_h2.sql.gz differ ===================================== test/src/main/resources/db/8.1/empty_pg.sql.gz ===================================== Binary files a/test/src/main/resources/db/8.1/empty_pg.sql.gz and b/test/src/main/resources/db/8.1/empty_pg.sql.gz differ ===================================== test/src/main/resources/db/8.1/referentiel.sql.gz ===================================== Binary files a/test/src/main/resources/db/8.1/referentiel.sql.gz and b/test/src/main/resources/db/8.1/referentiel.sql.gz differ ===================================== test/src/main/resources/fixtures/count-referential-common.properties ===================================== @@ -27,7 +27,7 @@ common.gear_gearcharacteristic=29 common.gearcharacteristic=22 common.gearcharacteristictype=6 common.harbour=74 -common.lastupdatedate=123 +common.lastupdatedate=124 common.lengthlengthparameter=0 common.lengthmeasuremethod=4 common.lengthweightparameter=361 ===================================== test/src/main/resources/fixtures/count-referential-seine.properties ===================================== @@ -40,3 +40,4 @@ ps_observation.reasonfornullset=10 ps_observation.speciesstatus=4 ps_observation.surroundingactivity=8 ps_logbook.weightcategory=110 +ps_logbook.wellsstate=2 ===================================== test/src/main/resources/fixtures/global.properties ===================================== @@ -33,7 +33,7 @@ GEAR_USE_FEATURES_SEINE_ID_1=fr.ird.data.ps.common.GearUseFeatures#1440486230661 SPECIES_GROUP_ID=fr.ird.referential.common.SpeciesGroup#1239832683689#0.7120116158620075 REFERENCE_DATA_COUNT=45 # for fr.ird.observe.services.local.service.referential.differential.DifferentialModelTest -REFERENTIAL_COUNT=3022 +REFERENTIAL_COUNT=3024 # was 59 DATA_FORM_COUNT=42 VALIDATORS_COUNT=46 @@ -44,11 +44,11 @@ VALIDATOR_UPDATE_REFERENTIAL_COUNT=3 VALIDATOR_UPDATE_ENTITY_DATA_COUNT=40 VALIDATOR_UPDATE_EXTRA_CREATE_DATA_COUNT=9 ENTITIES_LIMIT_SIZE=100 -ENTITY_BINDER_REFERENTIAL_COUNT=78 +ENTITY_BINDER_REFERENTIAL_COUNT=79 # was 130 VALIDATOR_CREATE_ENTITY_DATA_COUNT_REAL=45 # was 133 VALIDATOR_UPDATE_ENTITY_DATA_COUNT_REAL=45 -VALIDATOR_UPDATE_REFERENTIAL_COUNT_REAL=78 -VALIDATOR_CREATE_REFERENTIAL_COUNT_REAL=78 +VALIDATOR_UPDATE_REFERENTIAL_COUNT_REAL=79 +VALIDATOR_CREATE_REFERENTIAL_COUNT_REAL=79 ===================================== test/src/main/resources/fixtures/validate-service-referential.properties ===================================== @@ -19,83 +19,85 @@ # <http://www.gnu.org/licenses/gpl-3.0.html>. # #L% ### -DataQualityDto=1 -SpeciesGroupReleaseModeDto=1 -SettingShapeDto=3 -BaitHaulingStatusDto=3 -ObservationMethodDto=1 -TransmittingBuoyOperationDto=3 +common.DataQualityDto=1 +common.SpeciesGroupReleaseModeDto=1 +ll.common.SettingShapeDto=3 +ll.observation.BaitHaulingStatusDto=3 +ll.common.ObservationMethodDto=1 +ps.common.TransmittingBuoyOperationDto=3 ps.logbook.WeightCategoryDto=3 -LengthMeasureMethodDto=1 -WeightMeasureMethodDto=1 -ReasonForNoFishingDto=3 -ObservedSystemDto=4 +common.LengthMeasureMethodDto=1 +common.WeightMeasureMethodDto=1 +ps.observation.ReasonForNoFishingDto=3 +ps.observation.ObservedSystemDto=4 #FIXME We were at 20 just before usage of application-context... -SpeciesDto=14 -PersonDto=4 -HookPositionDto=1 -HookTypeDto=1 -SpeciesListDto=2 -LightsticksColorDto=2 -BaitSettingStatusDto=1 -VesselTypeDto=3 -SexDto=2 -NonTargetCatchReleaseConformityDto=2 -MaturityStatusDto=3 -LengthWeightParameterDto=3 -NonTargetCatchReleaseStatusDto=2 -SurroundingActivityDto=3 -ItemVerticalPositionDto=1 -OceanDto=3 +common.SpeciesDto=14 +common.PersonDto=4 +ll.observation.HookPositionDto=1 +ll.common.HookTypeDto=1 +common.SpeciesListDto=2 +ll.common.LightsticksColorDto=2 +ll.common.BaitSettingStatusDto=1 +common.VesselTypeDto=3 +common.SexDto=2 +ps.observation.NonTargetCatchReleaseConformityDto=2 +ll.observation.MaturityStatusDto=3 +common.LengthWeightParameterDto=3 +ps.observation.NonTargetCatchReleaseStatusDto=2 +ps.observation.SurroundingActivityDto=3 +ll.observation.ItemVerticalPositionDto=1 +common.OceanDto=3 ps.common.VesselActivityDto=4 -HarbourDto=8 -HealthStatusDto=1 -ObjectOperationDto=2 -SensorDataFormatDto=1 -ObjectMaterialTypeDto=2 +common.HarbourDto=8 +ll.common.HealthStatusDto=1 +ps.common.ObjectOperationDto=2 +ll.observation.SensorDataFormatDto=1 +ps.common.ObjectMaterialTypeDto=2 #FIXME We were at 6 just before usage of application-context... -CountryDto=5 -ReasonForNullSetDto=3 -FpaZoneDto=5 -NonTargetCatchReleasingTimeDto=1 -EncounterTypeDto=1 -VesselDto=10 -MitigationTypeDto=1 -VesselSizeCategoryDto=1 -SizeMeasureTypeDto=3 -ShipOwnerDto=3 -CatchFateDto=1 -GearCharacteristicTypeDto=2 -GearCharacteristicDto=1 -ReasonForDiscardDto=3 -WeightMeasureTypeDto=1 -LightsticksTypeDto=1 +common.CountryDto=5 +ps.observation.ReasonForNullSetDto=3 +common.FpaZoneDto=5 +ps.observation.NonTargetCatchReleasingTimeDto=1 +ll.observation.EncounterTypeDto=1 +common.VesselDto=10 +ll.common.MitigationTypeDto=1 +common.VesselSizeCategoryDto=1 +common.SizeMeasureTypeDto=3 +common.ShipOwnerDto=3 +ll.common.CatchFateDto=1 +common.GearCharacteristicTypeDto=2 +common.GearCharacteristicDto=1 +ps.observation.ReasonForDiscardDto=3 +common.WeightMeasureTypeDto=1 +ll.common.LightsticksTypeDto=1 #FIXME Should be 0 when I18n will be ok -InformationSourceDto=1 -ItemHorizontalPositionDto=3 -OrganismDto=4 -GearDto=2 -DetectionModeDto=3 -HookSizeDto=3 -SensorBrandDto=1 -SensorTypeDto=3 -TransmittingBuoyTypeDto=3 -SpeciesFateDto=3 -WindDto=1 -SpeciesStatusDto=3 +ps.observation.InformationSourceDto=1 +#FIXME Should be 0 when I18n will be ok +ps.logbook.WellsStateDto=1 +ll.observation.ItemHorizontalPositionDto=3 +common.OrganismDto=4 +common.GearDto=2 +ps.observation.DetectionModeDto=3 +ll.common.HookSizeDto=3 +ll.observation.SensorBrandDto=1 +ll.observation.SensorTypeDto=3 +ps.common.TransmittingBuoyTypeDto=3 +ps.common.SpeciesFateDto=3 +common.WindDto=1 +ps.observation.SpeciesStatusDto=3 ll.common.VesselActivityDto=2 -ObjectMaterialDto=11 +ps.observation.ObjectMaterialDto=11 #FIXME We were at 3 just before usage of application-context... -LineTypeDto=2 +ll.common.LineTypeDto=2 #FIXME We were at 9 just before usage of application-context... -ProgramDto=8 -BaitTypeDto=3 -SpeciesGroupDto=2 -StomachFullnessDto=3 -ConservationDto=1 -OnBoardProcessingDto=1 -DataSourceDto=2 -TripTypeDto=1 -CompagniesDto=3 -SchoolTypeDto=1 -TransmittingBuoyOwnershipDto=2 +common.ProgramDto=8 +ll.common.BaitTypeDto=3 +common.SpeciesGroupDto=2 +ll.observation.StomachFullnessDto=3 +ll.landing.ConservationDto=1 +ll.common.OnBoardProcessingDto=1 +ll.landing.DataSourceDto=2 +ll.common.TripTypeDto=1 +ll.landing.CompagniesDto=3 +ps.common.SchoolTypeDto=1 +ps.common.TransmittingBuoyOwnershipDto=2 ===================================== test/src/main/resources/fixtures/validate-service-seine-trips.properties ===================================== @@ -19,12 +19,12 @@ # <http://www.gnu.org/licenses/gpl-3.0.html>. # #L% ### -TripDto=5 -RouteDto=3 -ActivityDto=11 -TransmittingBuoyDto=2 -SetDto=3 -CatchDto=4 -SizeDto=2 -FloatingObjectDto=1 -FloatingObjectPartDto=1 +ps.common.TripDto=5 +ps.observation.RouteDto=3 +ps.observation.ActivityDto=11 +ps.observation.TransmittingBuoyDto=2 +ps.observation.SetDto=3 +ps.observation.CatchDto=4 +ps.observation.SizeDto=2 +ps.observation.FloatingObjectDto=1 +ps.observation.FloatingObjectPartDto=1 View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/2f4955daf75fef4a16989e8c09... -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/2f4955daf75fef4a16989e8c09... You're receiving this email because of your account on gitlab.com.