March 2020 - Observe-commits - mailman.cloud.codelutin.com

[Git][ultreiaio/ird-observe][develop] 11 commits: Réusinage de la table transmittingbuoy - Closes #1456
by Tony CHEMIT 31 Mar '20

31 Mar '20

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 1274d767 by tchemit at 2020-03-31T11:41:00+02:00 Réusinage de la table transmittingbuoy - Closes #1456 - - - - - afe640e0 by tchemit at 2020-03-31T11:41:02+02:00 Correction de la migration 7.4.0 - Closes #1458 - - - - - 5a3362c7 by tchemit at 2020-03-31T11:41:02+02:00 add fixme - - - - - d1b91fcd by tchemit at 2020-03-31T11:41:02+02:00 More detail when can't get last update date - - - - - 1c61cf53 by tchemit at 2020-03-31T11:41:02+02:00 bind species on TargetCatch - - - - - d4e0c3ec by tchemit at 2020-03-31T11:41:02+02:00 [SFA] LL / Logbooks / Samples : modification d'espèce (application sur les autres formulaires) - Closes #1453 - - - - - 71eed123 by tchemit at 2020-03-31T11:41:02+02:00 Improve some i18n keys - - - - - 91584d1c by tchemit at 2020-03-31T11:41:02+02:00 Ajouter l'icone de l'application lors du lancement de l'application en mode autre - Closes #1459 - - - - - 7d67ac90 by tchemit at 2020-03-31T11:41:02+02:00 Realign persistence migration with version 7 - - - - - ececfd13 by tchemit at 2020-03-31T11:41:02+02:00 Le calcul des vitesses a eu un raté après avoir fait usage de la fonction "Voulez-vous créer l'activité de fin de veille ?" - Closes #1100 - - - - - 57ee0b5f by tchemit at 2020-03-31T14:28:57+02:00 [REFERENTIEL BALISES] Ajout d'un champ 'technology' - Closes #1460 - - - - - 30 changed files: - client-core/src/main/java/fr/ird/observe/client/main/ObserveMainUI.jcss - client-core/src/main/java/fr/ird/observe/client/main/ObserveMainUIHandler.java - client-core/src/main/java/fr/ird/observe/client/util/UIHelper.java - client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/content/ContentUIHandler.java - client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/wizard/RemoteUILauncher.java - client-datasource-editor-ps/src/main/i18n/getters/java.getter - client-datasource-editor-ps/src/main/i18n/getters/jaxx.getter - client-datasource-editor-ps/src/main/java/fr/ird/observe/client/datasource/dcp/presets/observation/FloatingObjectBuoyPresetUI.jaxx - client-datasource-editor-ps/src/main/java/fr/ird/observe/client/datasource/dcp/presets/observation/FloatingObjectBuoyPresetUI.jcss - client-datasource-editor-ps/src/main/java/fr/ird/observe/client/datasource/dcp/presets/observation/FloatingObjectBuoyPresetUIModel.java - client-datasource-editor-ps/src/main/java/fr/ird/observe/client/datasource/dcp/presets/observation/FloatingObjectPresetUIHandler.java - client-datasource-editor-ps/src/main/java/fr/ird/observe/client/datasource/dcp/presets/observation/UIHandlerSupport.java - client-datasource-editor-ps/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ps/observation/FloatingObjectUI.jaxx - client-datasource-editor-ps/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ps/observation/FloatingObjectUI.jcss - client-datasource-editor-ps/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ps/observation/FloatingObjectUIHandler.java - client-datasource-editor-ps/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ps/observation/FloatingObjectUIModel.java - client-datasource-editor-ps/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ps/observation/NonTargetCatchUIHandler.java - client-datasource-editor-ps/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ps/observation/NonTargetSampleUIHandler.java - client-datasource-editor-ps/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ps/observation/ObjectObservedSpeciesUIHandler.java - client-datasource-editor-ps/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ps/observation/ObjectSchoolEstimateUIHandler.java - client-datasource-editor-ps/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ps/observation/SchoolEstimateUI.jcss - client-datasource-editor-ps/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ps/observation/SchoolEstimateUIHandler.java - client-datasource-editor-ps/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ps/observation/TargetCatchUI.jcss - client-datasource-editor-ps/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ps/observation/TargetCatchUIHandler.java - client-datasource-editor-ps/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ps/observation/TargetDiscardCatchUI.jcss - client-datasource-editor-ps/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ps/observation/TargetDiscardCatchUIHandler.java - client-datasource-editor-ps/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ps/observation/TargetSampleUIHandler.java - client-datasource-editor-ps/src/main/java/fr/ird/observe/client/datasource/editor/content/ref/ps/common/TransmittingBuoyTypeUI.jaxx - dto/src/main/java/fr/ird/observe/dto/data/ps/dcp/FloatingObjectBuoyPreset.java - dto/src/main/java/fr/ird/observe/dto/data/ps/dcp/FloatingObjectPreset.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/3e0a60b59666a8ab3ff0e476… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/3e0a60b59666a8ab3ff0e476… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-7.x] [REFERENTIEL BALISES] Ajout d'un champ 'technology' - Closes #1460
by Tony CHEMIT 31 Mar '20

31 Mar '20

Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: 0a0d2335 by tchemit at 2020-03-31T14:03:45+02:00 [REFERENTIEL BALISES] Ajout d'un champ 'technology' - Closes #1460 - - - - - 22 changed files: - client-core/src/main/i18n/getters/jaxx.getter - client-core/src/main/java/fr/ird/observe/client/ui/content/ref/seine/TransmittingBuoyTypeUI.jaxx - + client-core/src/main/java/fr/ird/observe/client/ui/content/ref/seine/TransmittingBuoyTypeUI.jcss - dto/src/main/models/Observe.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/binder/referential/seine/TransmittingBuoyTypeEntityDtoBinder.java - persistence/src/main/java/fr/ird/observe/persistence/migration/DataSourceMigrationForVersion_7_5.java - persistence/src/main/models/Observe.model - + persistence/src/main/resources/db/migration/7.5/02_add_transmittingBuoyType_technology_field-common.sql - test/src/main/java/fr/ird/observe/test/ObserveFixtures.java - test/src/main/resources/db/7.5/dataForTestLongline.sql.gz - test/src/main/resources/db/7.5/dataForTestSeine.sql.gz - test/src/main/resources/db/7.5/empty_h2.sql.gz - test/src/main/resources/db/7.5/empty_pg.sql.gz - test/src/main/resources/db/7.5/referentiel.sql.gz - validation/src/main/i18n/getters/validation-fields.getter - validation/src/main/i18n/getters/validation-messages.getter - + validation/src/main/resources/fr/ird/observe/dto/referential/seine/TransmittingBuoyTypeDto-create-error-validation.xml - + validation/src/main/resources/fr/ird/observe/dto/referential/seine/TransmittingBuoyTypeDto-update-error-validation.xml - validation/src/test/java/fr/ird/observe/validation/BeanValidatorDetectorTest.java Changes: ===================================== client-core/src/main/i18n/getters/jaxx.getter ===================================== @@ -644,6 +644,7 @@ observe.common.TransmittingBuoyDto.noBuoy observe.common.TransmittingBuoyDto.ownership observe.common.TransmittingBuoyDto.transmittingBuoyOperation observe.common.TransmittingBuoyDto.transmittingBuoyType +observe.common.TransmittingBuoyTypeDto.technology observe.common.TripDto.action.close.tip observe.common.TripDto.action.closeAndCreate observe.common.TripDto.action.closeAndCreate.tip ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/ref/seine/TransmittingBuoyTypeUI.jaxx ===================================== @@ -28,12 +28,13 @@ <import> fr.ird.observe.dto.reference.ReferentialDtoReference + fr.ird.observe.dto.referential.ReferenceStatus fr.ird.observe.dto.referential.seine.TransmittingBuoyTypeDto fr.ird.observe.dto.referential.seine.TransmittingBuoyTypeReference + org.nuiton.jaxx.widgets.text.BigTextEditor static fr.ird.observe.client.ui.util.UIHelper.getStringValue - fr.ird.observe.dto.referential.ReferenceStatus </import>  @@ -79,5 +80,13 @@ </cell> </row> </Table> + <Table id='editMoreExtraTable'> +  + <row> + <cell weightx="1" weighty="1" fill="both" columns="2"> + <BigTextEditor id="technology"/> + </cell> + </row> + </Table> </fr.ird.observe.client.ui.content.ref.ContentI18nReferenceUI> ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/ref/seine/TransmittingBuoyTypeUI.jcss ===================================== @@ -0,0 +1,26 @@ +/*- + * #%L + * ObServe :: Client core + * %% + * 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% + */ + +#technology { + model:{getBean()}; + i18nProperty:""; +} ===================================== dto/src/main/models/Observe.model ===================================== @@ -589,6 +589,7 @@ referential.seine.SurroundingActivity > referential.I18nReferential referential.seine.TransmittingBuoyOperation > referential.I18nReferential referential.seine.TransmittingBuoyType > referential.I18nReferential +technology + {*:1} String referential.seine.VesselActivitySeine > referential.I18nReferential | references=code,label,uri,allowFad allowFad + {*:1} boolean ===================================== observe-i18n/src/main/i18n/translations/observe_en_GB.properties ===================================== @@ -1543,6 +1543,7 @@ observe.common.TransmittingBuoyDto.type=Transmitting buoy observe.common.TransmittingBuoyDto.types=Transmitting buoys observe.common.TransmittingBuoyOperationDto.type=Transmitting buoy operation observe.common.TransmittingBuoyOperationDto.types=Transmitting buoy operations +observe.common.TransmittingBuoyTypeDto.technology=Technologies observe.common.TransmittingBuoyTypeDto.type=Transmitting buoy type observe.common.TransmittingBuoyTypeDto.types=Transmitting buoy types observe.common.TripDto.action.close.tip=Close the opened maree @@ -2315,6 +2316,7 @@ observe.validation.tdr.deployementStart.before.fishingStart=fishing start time m observe.validation.tdr.fishingEnd.before.deployementEnd=Deployement end time must be before fishing end time. observe.validation.tdr.fishingStart.before.fishingEnd=Fishing end time must be before fishing start time. observe.validation.tdr.required.position=Position must be filled. +observe.validation.technology.too.big=Field size can not exceed %s characters (actual length\: %s). observe.validation.trip.endDate.after.startDate=End date of the trip must be after trip start date. observe.validation.trip.invalid.date=Observation date must be after route date (route at position %1$s is not correct). observe.validation.trip.invalid.endDate=Trip end date must be after a route date (route at position %1$s is not correct). ===================================== observe-i18n/src/main/i18n/translations/observe_es_ES.properties ===================================== @@ -1543,6 +1543,7 @@ observe.common.TransmittingBuoyDto.type=Baliza emisora observe.common.TransmittingBuoyDto.types=Balizas emisoras observe.common.TransmittingBuoyOperationDto.type=Operación baliza observe.common.TransmittingBuoyOperationDto.types=Operaciones baliza +observe.common.TransmittingBuoyTypeDto.technology=Tecnologías observe.common.TransmittingBuoyTypeDto.type=Tipo de baliza observe.common.TransmittingBuoyTypeDto.types=Tipos de baliza observe.common.TripDto.action.close.tip=Cierre de la marea abierta @@ -2315,6 +2316,7 @@ observe.validation.tdr.deployementStart.before.fishingStart=La FechaHora de inic observe.validation.tdr.fishingEnd.before.deployementEnd=La FechaHora de fin de despliegue debe ir después de la FechaHora de fin de pesca observe.validation.tdr.fishingStart.before.fishingEnd=La FechaHora de fin de pesca debe llegar después del inicio del de inicio de pesca observe.validation.tdr.required.position=Deben registrarse posiciones +observe.validation.technology.too.big=El tamaño está limitado a %s caracteres (tamaño actual\: %s). observe.validation.trip.endDate.after.startDate=La fecha de fin de marea debe ser superior a la fecha de inicio observe.validation.trip.invalid.date=La fecha de esta ruta debe ser superior al la fecha de la ruta anterior (la ruta en la línea %1$s es incorrecta) observe.validation.trip.invalid.endDate=La fecha de fin de marea debe ser superior a la fecha de las rutas de la marea (la ruta %1$s es incorrecta) ===================================== observe-i18n/src/main/i18n/translations/observe_fr_FR.properties ===================================== @@ -1543,6 +1543,7 @@ observe.common.TransmittingBuoyDto.type=Balise lue observe.common.TransmittingBuoyDto.types=Balises lues observe.common.TransmittingBuoyOperationDto.type=Opération balise observe.common.TransmittingBuoyOperationDto.types=Opérations balise +observe.common.TransmittingBuoyTypeDto.technology=Technologies observe.common.TransmittingBuoyTypeDto.type=Type de balise observe.common.TransmittingBuoyTypeDto.types=Types de balise observe.common.TripDto.action.close.tip=Clôturer la marée ouverte @@ -2315,6 +2316,7 @@ observe.validation.tdr.deployementStart.before.fishingStart=L'horodatage de déb observe.validation.tdr.fishingEnd.before.deployementEnd=L'horodatage de fin de déploiement doit être après le début de celui de fin de pêche. observe.validation.tdr.fishingStart.before.fishingEnd=L'horodatage de fin de pêche doit être après le début de celui de début de pêche. observe.validation.tdr.required.position=Pas de position renseignée sur la palangre. +observe.validation.technology.too.big=La taille du champs est limitée à %s caractères (taille actuelle %s). observe.validation.trip.endDate.after.startDate=La date de fin de marée doit être supérieure à sa date de début. observe.validation.trip.invalid.date=Le jour d'observation doit être supérieure à celui d'une route précédente. (la route à la position %1$s est incorrecte). observe.validation.trip.invalid.endDate=La date de fin de marée doit être supérieure au jour d'observation de chaque route. (la route à la position %1$s est incorrecte). ===================================== persistence/src/main/java/fr/ird/observe/binder/referential/seine/TransmittingBuoyTypeEntityDtoBinder.java ===================================== @@ -40,20 +40,16 @@ public class TransmittingBuoyTypeEntityDtoBinder extends ReferentialEntityDtoBin @Override public void copyToEntity(ReferentialLocale referentialLocale, TransmittingBuoyTypeDto dto, TransmittingBuoyType entity) { - - copyDtoReferentialFieldsToEntity(dto, entity); copyDtoI18nFieldsToEntity(dto, entity); - + entity.setTechnology(dto.getTechnology()); } @Override public void copyToDto(ReferentialLocale referentialLocale, TransmittingBuoyType entity, TransmittingBuoyTypeDto dto) { - - copyEntityReferentialFieldsToDto(entity, dto); copyEntityI18nFieldsToDto(entity, dto); - + dto.setTechnology(entity.getTechnology()); } } ===================================== persistence/src/main/java/fr/ird/observe/persistence/migration/DataSourceMigrationForVersion_7_5.java ===================================== @@ -41,6 +41,7 @@ public class DataSourceMigrationForVersion_7_5 extends MigrationVersionResource @Override public void generateSqlScript(MigrationVersionResourceExecutor executor) { executor.addScript("01", "migrate_TransmittingBuoyOperation_brand"); + executor.addScript("02", "add_transmittingBuoyType_technology_field"); } } ===================================== persistence/src/main/models/Observe.model ===================================== @@ -629,6 +629,7 @@ referentiel.seine.SurroundingActivity > referentiel.I18nReferentialEntity | enti referentiel.seine.TransmittingBuoyOperation > referentiel.I18nReferentialEntity | entity referentiel.seine.TransmittingBuoyType > referentiel.I18nReferentialEntity | entity +technology + {*:1} String | hibernateAttributeType=text referentiel.seine.VesselActivitySeine > referentiel.I18nReferentialEntity | entity dbName=VesselActivity allowFad + {*:1} boolean ===================================== persistence/src/main/resources/db/migration/7.5/02_add_transmittingBuoyType_technology_field-common.sql ===================================== @@ -0,0 +1,22 @@ +--- +-- #%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% +--- +ALTER TABLE observe_seine.TransmittingBuoyType ADD COLUMN technology VARCHAR(1024); ===================================== test/src/main/java/fr/ird/observe/test/ObserveFixtures.java ===================================== @@ -68,16 +68,16 @@ public class ObserveFixtures { public static final int REFERENTIAL_FORM_COUNT = ENTITY_BINDER_REFERENTIAL_COUNT; public static final int DATA_FORM_COUNT = 47; - public static final int VALIDATORS_COUNT = 52;//90; + public static final int VALIDATORS_COUNT = 54;//90; public static final int VALIDATOR_CREATE_DATA_COUNT = 9; //8; // public static final int VALIDATOR_CREATE_ENTITY_DATA_COUNT = 33; public static final int VALIDATOR_CREATE_ENTITY_DATA_COUNT_REAL = 112; public static final int VALIDATOR_UPDATE_DATA_COUNT = 23;//32; // public static final int VALIDATOR_UPDATE_ENTITY_DATA_COUNT = 35; public static final int VALIDATOR_UPDATE_ENTITY_DATA_COUNT_REAL = 113; - public static final int VALIDATOR_UPDATE_REFERENTIAL_COUNT = 4;//17; + public static final int VALIDATOR_UPDATE_REFERENTIAL_COUNT = 5;//17; public static final int VALIDATOR_UPDATE_REFERENTIAL_COUNT_REAL = 66; - public static final int VALIDATOR_CREATE_REFERENTIAL_COUNT = 3;//18; + public static final int VALIDATOR_CREATE_REFERENTIAL_COUNT = 4;//18; public static final int VALIDATOR_CREATE_REFERENTIAL_COUNT_REAL = 66; public static final int VALIDATOR_UPDATE_EXTRA_CREATE_DATA_COUNT = 13; ===================================== test/src/main/resources/db/7.5/dataForTestLongline.sql.gz ===================================== Binary files a/test/src/main/resources/db/7.5/dataForTestLongline.sql.gz and b/test/src/main/resources/db/7.5/dataForTestLongline.sql.gz differ ===================================== test/src/main/resources/db/7.5/dataForTestSeine.sql.gz ===================================== Binary files a/test/src/main/resources/db/7.5/dataForTestSeine.sql.gz and b/test/src/main/resources/db/7.5/dataForTestSeine.sql.gz differ ===================================== test/src/main/resources/db/7.5/empty_h2.sql.gz ===================================== Binary files a/test/src/main/resources/db/7.5/empty_h2.sql.gz and b/test/src/main/resources/db/7.5/empty_h2.sql.gz differ ===================================== test/src/main/resources/db/7.5/empty_pg.sql.gz ===================================== Binary files a/test/src/main/resources/db/7.5/empty_pg.sql.gz and b/test/src/main/resources/db/7.5/empty_pg.sql.gz differ ===================================== test/src/main/resources/db/7.5/referentiel.sql.gz ===================================== Binary files a/test/src/main/resources/db/7.5/referentiel.sql.gz and b/test/src/main/resources/db/7.5/referentiel.sql.gz differ ===================================== validation/src/main/i18n/getters/validation-fields.getter ===================================== @@ -267,6 +267,7 @@ observe.common.TdrDto.section observe.common.TdrDto.sensorBrand observe.common.TransmittingBuoyDto.transmittingBuoyOperation observe.common.TransmittingBuoyDto.transmittingBuoyType +observe.common.TransmittingBuoyTypeDto.technology observe.common.TripLonglineDto.activityLongline observe.common.TripLonglineDto.dataEntryOperator observe.common.TripLonglineDto.totalFishingOperationsNumber ===================================== validation/src/main/i18n/getters/validation-messages.getter ===================================== @@ -60,6 +60,7 @@ observe.validation.tdr.deployementStart.before.fishingStart observe.validation.tdr.fishingEnd.before.deployementEnd observe.validation.tdr.fishingStart.before.fishingEnd observe.validation.tdr.required.position +observe.validation.technology.too.big observe.validation.trip.endDate.after.startDate observe.validation.trip.invalid.date observe.validation.trip.invalid.endDate ===================================== validation/src/main/resources/fr/ird/observe/dto/referential/seine/TransmittingBuoyTypeDto-create-error-validation.xml ===================================== @@ -0,0 +1,32 @@ + +<!DOCTYPE validators PUBLIC + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> +<validators> + <field name="technology"> + <field-validator type="commentLengthFieldDto"> + <message>observe.validation.technology.too.big##${maxLength}##${commentLength}</message> + </field-validator> + </field> + +</validators> ===================================== validation/src/main/resources/fr/ird/observe/dto/referential/seine/TransmittingBuoyTypeDto-update-error-validation.xml ===================================== @@ -0,0 +1,32 @@ + +<!DOCTYPE validators PUBLIC + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> +<validators> + <field name="technology"> + <field-validator type="commentLengthFieldDto"> + <message>observe.validation.technology.too.big##${maxLength}##${commentLength}</message> + </field-validator> + </field> + +</validators> ===================================== validation/src/test/java/fr/ird/observe/validation/BeanValidatorDetectorTest.java ===================================== @@ -55,6 +55,7 @@ import fr.ird.observe.dto.referential.LengthLengthParameterDto; import fr.ird.observe.dto.referential.LengthWeightParameterDto; import fr.ird.observe.dto.referential.SpeciesListDto; import fr.ird.observe.dto.referential.seine.ObjectMaterialDto; +import fr.ird.observe.dto.referential.seine.TransmittingBuoyTypeDto; import fr.ird.observe.spi.DtoModelClasses; import fr.ird.observe.test.ObserveFixtures; import org.junit.Assert; @@ -141,6 +142,7 @@ public class BeanValidatorDetectorTest extends AbstractValidatorDetectorTest { // ShipOwnerDto.class, // SpeciesDto.class, SpeciesListDto.class, + TransmittingBuoyTypeDto.class, TripLonglineDto.class, TripSeineDto.class); // , @@ -202,6 +204,7 @@ public class BeanValidatorDetectorTest extends AbstractValidatorDetectorTest { TargetLengthDto.class, TdrDto.class, // TransmittingBuoyDto.class, + TransmittingBuoyTypeDto.class, TripLonglineDto.class, // TripLonglineGearUseDto.class, TripSeineDto.class); View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/0a0d2335094b297e6feb1511c… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/0a0d2335094b297e6feb1511c… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-7.x] [REFERENTIEL BALISES] Ajout d'un champ 'technology' - Closes #1460
by Tony CHEMIT 31 Mar '20

31 Mar '20

Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: fac52d61 by tchemit at 2020-03-31T13:26:14+02:00 [REFERENTIEL BALISES] Ajout d'un champ 'technology' - Closes #1460 - - - - - 3 changed files: - test/src/main/java/fr/ird/observe/test/ObserveFixtures.java - + validation/src/main/resources/fr/ird/observe/dto/referential/seine/TransmittingBuoyTypeDto-update-error-validation.xml - validation/src/test/java/fr/ird/observe/validation/BeanValidatorDetectorTest.java Changes: ===================================== test/src/main/java/fr/ird/observe/test/ObserveFixtures.java ===================================== @@ -68,14 +68,14 @@ public class ObserveFixtures { public static final int REFERENTIAL_FORM_COUNT = ENTITY_BINDER_REFERENTIAL_COUNT; public static final int DATA_FORM_COUNT = 47; - public static final int VALIDATORS_COUNT = 53;//90; + public static final int VALIDATORS_COUNT = 54;//90; public static final int VALIDATOR_CREATE_DATA_COUNT = 9; //8; // public static final int VALIDATOR_CREATE_ENTITY_DATA_COUNT = 33; public static final int VALIDATOR_CREATE_ENTITY_DATA_COUNT_REAL = 112; public static final int VALIDATOR_UPDATE_DATA_COUNT = 23;//32; // public static final int VALIDATOR_UPDATE_ENTITY_DATA_COUNT = 35; public static final int VALIDATOR_UPDATE_ENTITY_DATA_COUNT_REAL = 113; - public static final int VALIDATOR_UPDATE_REFERENTIAL_COUNT = 4;//17; + public static final int VALIDATOR_UPDATE_REFERENTIAL_COUNT = 5;//17; public static final int VALIDATOR_UPDATE_REFERENTIAL_COUNT_REAL = 66; public static final int VALIDATOR_CREATE_REFERENTIAL_COUNT = 4;//18; public static final int VALIDATOR_CREATE_REFERENTIAL_COUNT_REAL = 66; ===================================== validation/src/main/resources/fr/ird/observe/dto/referential/seine/TransmittingBuoyTypeDto-update-error-validation.xml ===================================== @@ -0,0 +1,32 @@ + +<!DOCTYPE validators PUBLIC + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> +<validators> + <field name="technology"> + <field-validator type="commentLengthFieldDto"> + <message>observe.validation.technology.too.big##${maxLength}##${commentLength}</message> + </field-validator> + </field> + +</validators> ===================================== validation/src/test/java/fr/ird/observe/validation/BeanValidatorDetectorTest.java ===================================== @@ -204,6 +204,7 @@ public class BeanValidatorDetectorTest extends AbstractValidatorDetectorTest { TargetLengthDto.class, TdrDto.class, // TransmittingBuoyDto.class, + TransmittingBuoyTypeDto.class, TripLonglineDto.class, // TripLonglineGearUseDto.class, TripSeineDto.class); View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/fac52d61563cf5b1be48a9c7f… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/fac52d61563cf5b1be48a9c7f… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-7.x] [REFERENTIEL BALISES] Ajout d'un champ 'technology' - Closes #1460
by Tony CHEMIT 31 Mar '20

31 Mar '20

Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: 28ae605e by tchemit at 2020-03-31T13:20:39+02:00 [REFERENTIEL BALISES] Ajout d'un champ 'technology' - Closes #1460 - - - - - 1 changed file: - + validation/src/main/resources/fr/ird/observe/dto/referential/seine/TransmittingBuoyTypeDto-update-error-validation.xml Changes: ===================================== validation/src/main/resources/fr/ird/observe/dto/referential/seine/TransmittingBuoyTypeDto-update-error-validation.xml ===================================== @@ -0,0 +1,32 @@ + +<!DOCTYPE validators PUBLIC + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> +<validators> + <field name="technology"> + <field-validator type="commentLengthFieldDto"> + <message>observe.validation.technology.too.big##${maxLength}##${commentLength}</message> + </field-validator> + </field> + +</validators> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/28ae605e01ef478f7da527d07… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/28ae605e01ef478f7da527d07… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-7.x] [REFERENTIEL BALISES] Ajout d'un champ 'technology' - Closes #1460
by Tony CHEMIT 31 Mar '20

31 Mar '20

Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: a35bd711 by tchemit at 2020-03-31T13:12:47+02:00 [REFERENTIEL BALISES] Ajout d'un champ 'technology' - Closes #1460 - - - - - 21 changed files: - client-core/src/main/i18n/getters/jaxx.getter - client-core/src/main/java/fr/ird/observe/client/ui/content/ref/seine/TransmittingBuoyTypeUI.jaxx - + client-core/src/main/java/fr/ird/observe/client/ui/content/ref/seine/TransmittingBuoyTypeUI.jcss - dto/src/main/models/Observe.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/binder/referential/seine/TransmittingBuoyTypeEntityDtoBinder.java - persistence/src/main/java/fr/ird/observe/persistence/migration/DataSourceMigrationForVersion_7_5.java - persistence/src/main/models/Observe.model - + persistence/src/main/resources/db/migration/7.5/02_add_transmittingBuoyType_technology_field-common.sql - test/src/main/java/fr/ird/observe/test/ObserveFixtures.java - test/src/main/resources/db/7.5/dataForTestLongline.sql.gz - test/src/main/resources/db/7.5/dataForTestSeine.sql.gz - test/src/main/resources/db/7.5/empty_h2.sql.gz - test/src/main/resources/db/7.5/empty_pg.sql.gz - test/src/main/resources/db/7.5/referentiel.sql.gz - validation/src/main/i18n/getters/validation-fields.getter - validation/src/main/i18n/getters/validation-messages.getter - + validation/src/main/resources/fr/ird/observe/dto/referential/seine/TransmittingBuoyTypeDto-create-error-validation.xml - validation/src/test/java/fr/ird/observe/validation/BeanValidatorDetectorTest.java Changes: ===================================== client-core/src/main/i18n/getters/jaxx.getter ===================================== @@ -644,6 +644,7 @@ observe.common.TransmittingBuoyDto.noBuoy observe.common.TransmittingBuoyDto.ownership observe.common.TransmittingBuoyDto.transmittingBuoyOperation observe.common.TransmittingBuoyDto.transmittingBuoyType +observe.common.TransmittingBuoyTypeDto.technology observe.common.TripDto.action.close.tip observe.common.TripDto.action.closeAndCreate observe.common.TripDto.action.closeAndCreate.tip ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/ref/seine/TransmittingBuoyTypeUI.jaxx ===================================== @@ -28,12 +28,13 @@ <import> fr.ird.observe.dto.reference.ReferentialDtoReference + fr.ird.observe.dto.referential.ReferenceStatus fr.ird.observe.dto.referential.seine.TransmittingBuoyTypeDto fr.ird.observe.dto.referential.seine.TransmittingBuoyTypeReference + org.nuiton.jaxx.widgets.text.BigTextEditor static fr.ird.observe.client.ui.util.UIHelper.getStringValue - fr.ird.observe.dto.referential.ReferenceStatus </import>  @@ -79,5 +80,13 @@ </cell> </row> </Table> + <Table id='editMoreExtraTable'> +  + <row> + <cell weightx="1" weighty="1" fill="both" columns="2"> + <BigTextEditor id="technology"/> + </cell> + </row> + </Table> </fr.ird.observe.client.ui.content.ref.ContentI18nReferenceUI> ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/ref/seine/TransmittingBuoyTypeUI.jcss ===================================== @@ -0,0 +1,26 @@ +/*- + * #%L + * ObServe :: Client core + * %% + * 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% + */ + +#technology { + model:{getBean()}; + i18nProperty:""; +} ===================================== dto/src/main/models/Observe.model ===================================== @@ -589,6 +589,7 @@ referential.seine.SurroundingActivity > referential.I18nReferential referential.seine.TransmittingBuoyOperation > referential.I18nReferential referential.seine.TransmittingBuoyType > referential.I18nReferential +technology + {*:1} String referential.seine.VesselActivitySeine > referential.I18nReferential | references=code,label,uri,allowFad allowFad + {*:1} boolean ===================================== observe-i18n/src/main/i18n/translations/observe_en_GB.properties ===================================== @@ -1543,6 +1543,7 @@ observe.common.TransmittingBuoyDto.type=Transmitting buoy observe.common.TransmittingBuoyDto.types=Transmitting buoys observe.common.TransmittingBuoyOperationDto.type=Transmitting buoy operation observe.common.TransmittingBuoyOperationDto.types=Transmitting buoy operations +observe.common.TransmittingBuoyTypeDto.technology=Technologies observe.common.TransmittingBuoyTypeDto.type=Transmitting buoy type observe.common.TransmittingBuoyTypeDto.types=Transmitting buoy types observe.common.TripDto.action.close.tip=Close the opened maree @@ -2315,6 +2316,7 @@ observe.validation.tdr.deployementStart.before.fishingStart=fishing start time m observe.validation.tdr.fishingEnd.before.deployementEnd=Deployement end time must be before fishing end time. observe.validation.tdr.fishingStart.before.fishingEnd=Fishing end time must be before fishing start time. observe.validation.tdr.required.position=Position must be filled. +observe.validation.technology.too.big=Field size can not exceed %s characters (actual length\: %s). observe.validation.trip.endDate.after.startDate=End date of the trip must be after trip start date. observe.validation.trip.invalid.date=Observation date must be after route date (route at position %1$s is not correct). observe.validation.trip.invalid.endDate=Trip end date must be after a route date (route at position %1$s is not correct). ===================================== observe-i18n/src/main/i18n/translations/observe_es_ES.properties ===================================== @@ -1543,6 +1543,7 @@ observe.common.TransmittingBuoyDto.type=Baliza emisora observe.common.TransmittingBuoyDto.types=Balizas emisoras observe.common.TransmittingBuoyOperationDto.type=Operación baliza observe.common.TransmittingBuoyOperationDto.types=Operaciones baliza +observe.common.TransmittingBuoyTypeDto.technology=Tecnologías observe.common.TransmittingBuoyTypeDto.type=Tipo de baliza observe.common.TransmittingBuoyTypeDto.types=Tipos de baliza observe.common.TripDto.action.close.tip=Cierre de la marea abierta @@ -2315,6 +2316,7 @@ observe.validation.tdr.deployementStart.before.fishingStart=La FechaHora de inic observe.validation.tdr.fishingEnd.before.deployementEnd=La FechaHora de fin de despliegue debe ir después de la FechaHora de fin de pesca observe.validation.tdr.fishingStart.before.fishingEnd=La FechaHora de fin de pesca debe llegar después del inicio del de inicio de pesca observe.validation.tdr.required.position=Deben registrarse posiciones +observe.validation.technology.too.big=El tamaño está limitado a %s caracteres (tamaño actual\: %s). observe.validation.trip.endDate.after.startDate=La fecha de fin de marea debe ser superior a la fecha de inicio observe.validation.trip.invalid.date=La fecha de esta ruta debe ser superior al la fecha de la ruta anterior (la ruta en la línea %1$s es incorrecta) observe.validation.trip.invalid.endDate=La fecha de fin de marea debe ser superior a la fecha de las rutas de la marea (la ruta %1$s es incorrecta) ===================================== observe-i18n/src/main/i18n/translations/observe_fr_FR.properties ===================================== @@ -1543,6 +1543,7 @@ observe.common.TransmittingBuoyDto.type=Balise lue observe.common.TransmittingBuoyDto.types=Balises lues observe.common.TransmittingBuoyOperationDto.type=Opération balise observe.common.TransmittingBuoyOperationDto.types=Opérations balise +observe.common.TransmittingBuoyTypeDto.technology=Technologies observe.common.TransmittingBuoyTypeDto.type=Type de balise observe.common.TransmittingBuoyTypeDto.types=Types de balise observe.common.TripDto.action.close.tip=Clôturer la marée ouverte @@ -2315,6 +2316,7 @@ observe.validation.tdr.deployementStart.before.fishingStart=L'horodatage de déb observe.validation.tdr.fishingEnd.before.deployementEnd=L'horodatage de fin de déploiement doit être après le début de celui de fin de pêche. observe.validation.tdr.fishingStart.before.fishingEnd=L'horodatage de fin de pêche doit être après le début de celui de début de pêche. observe.validation.tdr.required.position=Pas de position renseignée sur la palangre. +observe.validation.technology.too.big=\=La taille du champs est limitée à %s caractères (taille actuelle %s). observe.validation.trip.endDate.after.startDate=La date de fin de marée doit être supérieure à sa date de début. observe.validation.trip.invalid.date=Le jour d'observation doit être supérieure à celui d'une route précédente. (la route à la position %1$s est incorrecte). observe.validation.trip.invalid.endDate=La date de fin de marée doit être supérieure au jour d'observation de chaque route. (la route à la position %1$s est incorrecte). ===================================== persistence/src/main/java/fr/ird/observe/binder/referential/seine/TransmittingBuoyTypeEntityDtoBinder.java ===================================== @@ -40,20 +40,16 @@ public class TransmittingBuoyTypeEntityDtoBinder extends ReferentialEntityDtoBin @Override public void copyToEntity(ReferentialLocale referentialLocale, TransmittingBuoyTypeDto dto, TransmittingBuoyType entity) { - - copyDtoReferentialFieldsToEntity(dto, entity); copyDtoI18nFieldsToEntity(dto, entity); - + entity.setTechnology(dto.getTechnology()); } @Override public void copyToDto(ReferentialLocale referentialLocale, TransmittingBuoyType entity, TransmittingBuoyTypeDto dto) { - - copyEntityReferentialFieldsToDto(entity, dto); copyEntityI18nFieldsToDto(entity, dto); - + dto.setTechnology(entity.getTechnology()); } } ===================================== persistence/src/main/java/fr/ird/observe/persistence/migration/DataSourceMigrationForVersion_7_5.java ===================================== @@ -41,6 +41,7 @@ public class DataSourceMigrationForVersion_7_5 extends MigrationVersionResource @Override public void generateSqlScript(MigrationVersionResourceExecutor executor) { executor.addScript("01", "migrate_TransmittingBuoyOperation_brand"); + executor.addScript("02", "add_transmittingBuoyType_technology_field"); } } ===================================== persistence/src/main/models/Observe.model ===================================== @@ -629,6 +629,7 @@ referentiel.seine.SurroundingActivity > referentiel.I18nReferentialEntity | enti referentiel.seine.TransmittingBuoyOperation > referentiel.I18nReferentialEntity | entity referentiel.seine.TransmittingBuoyType > referentiel.I18nReferentialEntity | entity +technology + {*:1} String | hibernateAttributeType=text referentiel.seine.VesselActivitySeine > referentiel.I18nReferentialEntity | entity dbName=VesselActivity allowFad + {*:1} boolean ===================================== persistence/src/main/resources/db/migration/7.5/02_add_transmittingBuoyType_technology_field-common.sql ===================================== @@ -0,0 +1,22 @@ +--- +-- #%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% +--- +ALTER TABLE observe_seine.TransmittingBuoyType ADD COLUMN technology VARCHAR(1024); ===================================== test/src/main/java/fr/ird/observe/test/ObserveFixtures.java ===================================== @@ -68,7 +68,7 @@ public class ObserveFixtures { public static final int REFERENTIAL_FORM_COUNT = ENTITY_BINDER_REFERENTIAL_COUNT; public static final int DATA_FORM_COUNT = 47; - public static final int VALIDATORS_COUNT = 52;//90; + public static final int VALIDATORS_COUNT = 53;//90; public static final int VALIDATOR_CREATE_DATA_COUNT = 9; //8; // public static final int VALIDATOR_CREATE_ENTITY_DATA_COUNT = 33; public static final int VALIDATOR_CREATE_ENTITY_DATA_COUNT_REAL = 112; @@ -77,7 +77,7 @@ public class ObserveFixtures { public static final int VALIDATOR_UPDATE_ENTITY_DATA_COUNT_REAL = 113; public static final int VALIDATOR_UPDATE_REFERENTIAL_COUNT = 4;//17; public static final int VALIDATOR_UPDATE_REFERENTIAL_COUNT_REAL = 66; - public static final int VALIDATOR_CREATE_REFERENTIAL_COUNT = 3;//18; + public static final int VALIDATOR_CREATE_REFERENTIAL_COUNT = 4;//18; public static final int VALIDATOR_CREATE_REFERENTIAL_COUNT_REAL = 66; public static final int VALIDATOR_UPDATE_EXTRA_CREATE_DATA_COUNT = 13; ===================================== test/src/main/resources/db/7.5/dataForTestLongline.sql.gz ===================================== Binary files a/test/src/main/resources/db/7.5/dataForTestLongline.sql.gz and b/test/src/main/resources/db/7.5/dataForTestLongline.sql.gz differ ===================================== test/src/main/resources/db/7.5/dataForTestSeine.sql.gz ===================================== Binary files a/test/src/main/resources/db/7.5/dataForTestSeine.sql.gz and b/test/src/main/resources/db/7.5/dataForTestSeine.sql.gz differ ===================================== test/src/main/resources/db/7.5/empty_h2.sql.gz ===================================== Binary files a/test/src/main/resources/db/7.5/empty_h2.sql.gz and b/test/src/main/resources/db/7.5/empty_h2.sql.gz differ ===================================== test/src/main/resources/db/7.5/empty_pg.sql.gz ===================================== Binary files a/test/src/main/resources/db/7.5/empty_pg.sql.gz and b/test/src/main/resources/db/7.5/empty_pg.sql.gz differ ===================================== test/src/main/resources/db/7.5/referentiel.sql.gz ===================================== Binary files a/test/src/main/resources/db/7.5/referentiel.sql.gz and b/test/src/main/resources/db/7.5/referentiel.sql.gz differ ===================================== validation/src/main/i18n/getters/validation-fields.getter ===================================== @@ -267,6 +267,7 @@ observe.common.TdrDto.section observe.common.TdrDto.sensorBrand observe.common.TransmittingBuoyDto.transmittingBuoyOperation observe.common.TransmittingBuoyDto.transmittingBuoyType +observe.common.TransmittingBuoyTypeDto.technology observe.common.TripLonglineDto.activityLongline observe.common.TripLonglineDto.dataEntryOperator observe.common.TripLonglineDto.totalFishingOperationsNumber ===================================== validation/src/main/i18n/getters/validation-messages.getter ===================================== @@ -60,6 +60,7 @@ observe.validation.tdr.deployementStart.before.fishingStart observe.validation.tdr.fishingEnd.before.deployementEnd observe.validation.tdr.fishingStart.before.fishingEnd observe.validation.tdr.required.position +observe.validation.technology.too.big observe.validation.trip.endDate.after.startDate observe.validation.trip.invalid.date observe.validation.trip.invalid.endDate ===================================== validation/src/main/resources/fr/ird/observe/dto/referential/seine/TransmittingBuoyTypeDto-create-error-validation.xml ===================================== @@ -0,0 +1,32 @@ + +<!DOCTYPE validators PUBLIC + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> +<validators> + <field name="technology"> + <field-validator type="commentLengthFieldDto"> + <message>observe.validation.technology.too.big##${maxLength}##${commentLength}</message> + </field-validator> + </field> + +</validators> ===================================== validation/src/test/java/fr/ird/observe/validation/BeanValidatorDetectorTest.java ===================================== @@ -55,6 +55,7 @@ import fr.ird.observe.dto.referential.LengthLengthParameterDto; import fr.ird.observe.dto.referential.LengthWeightParameterDto; import fr.ird.observe.dto.referential.SpeciesListDto; import fr.ird.observe.dto.referential.seine.ObjectMaterialDto; +import fr.ird.observe.dto.referential.seine.TransmittingBuoyTypeDto; import fr.ird.observe.spi.DtoModelClasses; import fr.ird.observe.test.ObserveFixtures; import org.junit.Assert; @@ -141,6 +142,7 @@ public class BeanValidatorDetectorTest extends AbstractValidatorDetectorTest { // ShipOwnerDto.class, // SpeciesDto.class, SpeciesListDto.class, + TransmittingBuoyTypeDto.class, TripLonglineDto.class, TripSeineDto.class); // , View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/a35bd711351d3a244796225d2… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/a35bd711351d3a244796225d2… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-7.x] 4 commits: Réusinage de la table transmittingbuoy - Closes #1456
by Tony CHEMIT 31 Mar '20

31 Mar '20

Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: 03cdafe9 by tchemit at 2020-03-31T11:25:10+02:00 Réusinage de la table transmittingbuoy - Closes #1456 - - - - - f607b4da by tchemit at 2020-03-31T11:25:12+02:00 Correction de la migration 7.4.0 - Closes #1458 - - - - - 0c3fe14e by tchemit at 2020-03-31T11:25:12+02:00 Ajouter l'icone de l'application lors du lancement de l'application en mode autre - Closes #1459 - - - - - 1b7c34eb by tchemit at 2020-03-31T11:25:12+02:00 Le calcul des vitesses a eu un raté après avoir fait usage de la fonction "Voulez-vous créer l'activité de fin de veille ?" - Closes #1100 - - - - - 30 changed files: - client-core/src/main/i18n/getters/java.getter - client-core/src/main/i18n/getters/jaxx.getter - client-core/src/main/java/fr/ird/observe/client/db/ObserveSwingDataSource.java - client-core/src/main/java/fr/ird/observe/client/ui/ObserveMainUI.jcss - client-core/src/main/java/fr/ird/observe/client/ui/ObserveMainUIHandler.java - client-core/src/main/java/fr/ird/observe/client/ui/admin/AdminUILauncher.java - client-core/src/main/java/fr/ird/observe/client/ui/content/ContentUIHandler.java - − client-core/src/main/java/fr/ird/observe/client/ui/content/data/seine/FloatingObjectTransmittingBuoyOperationUI.jaxx - − client-core/src/main/java/fr/ird/observe/client/ui/content/data/seine/FloatingObjectTransmittingBuoyOperationUI.jcss - − client-core/src/main/java/fr/ird/observe/client/ui/content/data/seine/FloatingObjectTransmittingBuoyOperationUIHandler.java - client-core/src/main/java/fr/ird/observe/client/ui/content/data/seine/FloatingObjectUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/content/data/seine/FloatingObjectUI.jcss - client-core/src/main/java/fr/ird/observe/client/ui/content/data/seine/FloatingObjectUIHandler.java - client-core/src/main/java/fr/ird/observe/client/ui/content/data/seine/FloatingObjectUIModel.java - client-core/src/main/java/fr/ird/observe/client/ui/content/data/seine/dcp/FloatingObjectPartsTreeTable.java - client-core/src/main/java/fr/ird/observe/client/ui/storage/RemoteUILauncher.java - client-core/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/seine/FloatingObjectSeineNavigationTreeNode.java - − client-core/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/seine/FloatingObjectTransmittingBuoyNavigationTreeNode.java - client-core/src/main/java/fr/ird/observe/client/ui/util/UIHelper.java - client-core/src/main/java/fr/ird/observe/client/validation/ObserveSwingValidator.java - dto/src/main/java/fr/ird/observe/binder/data/seine/TransmittingBuoyDtoReferenceBinder.java - dto/src/main/java/fr/ird/observe/dto/data/seine/FloatingObjectTransmittingBuoyDto.java → dto/src/main/java/fr/ird/observe/dto/data/seine/FloatingObjectDto.java - dto/src/main/java/fr/ird/observe/dto/decoration/DecoratorService.java - dto/src/main/java/fr/ird/observe/spi/DtoModelClasses.java - dto/src/main/java/fr/ird/observe/validation/validators/AbstractSpeciesFieldDtoValidator.java - dto/src/main/java/fr/ird/observe/validation/validators/ActivitySeineObservedSystemValidator.java - dto/src/main/java/fr/ird/observe/validation/validators/ActivitySimpleSpeedDtoValidator.java - dto/src/main/java/fr/ird/observe/validation/validators/ActivitySpeedDtoValidator.java - dto/src/main/java/fr/ird/observe/validation/validators/NonTargetCatchObservedSystemValidator.java - dto/src/main/java/fr/ird/observe/validation/validators/SetLonglineUniqueHomeIdDtoValidator.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/1312c7a52e7d6fc75a46f35c… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/1312c7a52e7d6fc75a46f35c… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 9 commits: Correction de la migration 7.4.0 - Closes #1458
by Tony CHEMIT 30 Mar '20

30 Mar '20

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 8cc7fafe by tchemit at 2020-03-30T15:34:03+02:00 Correction de la migration 7.4.0 - Closes #1458 - - - - - ab5d98ce by tchemit at 2020-03-30T15:34:03+02:00 add fixme - - - - - 57902457 by tchemit at 2020-03-30T15:34:03+02:00 More detail when can't get last update date - - - - - 4d609d8a by tchemit at 2020-03-30T15:34:04+02:00 bind species on TargetCatch - - - - - bd455492 by tchemit at 2020-03-30T15:34:04+02:00 [SFA] LL / Logbooks / Samples : modification d'espèce (application sur les autres formulaires) - Closes #1453 - - - - - 58e56db3 by tchemit at 2020-03-30T15:34:04+02:00 Improve some i18n keys - - - - - eb165bbe by tchemit at 2020-03-30T15:34:04+02:00 Ajouter l'icone de l'application lors du lancement de l'application en mode autre - Closes #1459 - - - - - 49ffd420 by tchemit at 2020-03-30T15:34:04+02:00 Realign persistence migration with version 7 - - - - - 3e0a60b5 by tchemit at 2020-03-30T15:34:05+02:00 Le calcul des vitesses a eu un raté après avoir fait usage de la fonction "Voulez-vous créer l'activité de fin de veille ?" - Closes #1100 - - - - - 30 changed files: - client-core/src/main/java/fr/ird/observe/client/main/ObserveMainUI.jcss - client-core/src/main/java/fr/ird/observe/client/main/ObserveMainUIHandler.java - client-core/src/main/java/fr/ird/observe/client/util/UIHelper.java - client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/content/ContentUIHandler.java - client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/wizard/RemoteUILauncher.java - client-datasource-editor-ps/src/main/i18n/getters/java.getter - client-datasource-editor-ps/src/main/i18n/getters/jaxx.getter - client-datasource-editor-ps/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ps/observation/NonTargetCatchUIHandler.java - client-datasource-editor-ps/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ps/observation/NonTargetSampleUIHandler.java - client-datasource-editor-ps/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ps/observation/ObjectObservedSpeciesUIHandler.java - client-datasource-editor-ps/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ps/observation/ObjectSchoolEstimateUIHandler.java - client-datasource-editor-ps/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ps/observation/SchoolEstimateUI.jcss - client-datasource-editor-ps/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ps/observation/SchoolEstimateUIHandler.java - client-datasource-editor-ps/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ps/observation/TargetCatchUI.jcss - client-datasource-editor-ps/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ps/observation/TargetCatchUIHandler.java - client-datasource-editor-ps/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ps/observation/TargetDiscardCatchUI.jcss - client-datasource-editor-ps/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ps/observation/TargetDiscardCatchUIHandler.java - client-datasource-editor-ps/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ps/observation/TargetSampleUIHandler.java - 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/data/ps/observation/TargetCatchImpl.java - + persistence/src/main/java/fr/ird/observe/entities/migration/DataSourceMigrationForVersion_7_1.java - + persistence/src/main/java/fr/ird/observe/entities/migration/DataSourceMigrationForVersion_7_2.java - persistence/src/main/java/fr/ird/observe/entities/migration/DataSourceMigrationForVersion_8_0_RC_2.java → persistence/src/main/java/fr/ird/observe/entities/migration/DataSourceMigrationForVersion_7_3.java - persistence/src/main/java/fr/ird/observe/entities/migration/DataSourceMigrationForVersion_8_0_RC_1.java → persistence/src/main/java/fr/ird/observe/entities/migration/DataSourceMigrationForVersion_8_0.java - + persistence/src/main/resources/db/migration/7.1/01_add_not_null_on_length_weight_parameters-common.sql - + persistence/src/main/resources/db/migration/7.1/02_add_not_null_on_length_length_parameters-common.sql - + persistence/src/main/resources/db/migration/7.1/03_add_not_null_on_technical_fields-common.sql - + persistence/src/main/resources/db/migration/7.2/01_fix_trip_longline_comment-H2.sql The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/360ee96704687fadb5f17b05… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/360ee96704687fadb5f17b05… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 2 commits: Realign persistence migration with version 7
by Tony CHEMIT 30 Mar '20

30 Mar '20

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: c2cadbfd by tchemit at 2020-03-29T20:10:51+02:00 Realign persistence migration with version 7 - - - - - 360ee967 by tchemit at 2020-03-30T15:14:39+02:00 Le calcul des vitesses a eu un raté après avoir fait usage de la fonction "Voulez-vous créer l'activité de fin de veille ?" - Closes #1100 - - - - - 30 changed files: - + persistence/src/main/java/fr/ird/observe/entities/migration/DataSourceMigrationForVersion_7_1.java - + persistence/src/main/java/fr/ird/observe/entities/migration/DataSourceMigrationForVersion_7_2.java - persistence/src/main/java/fr/ird/observe/entities/migration/DataSourceMigrationForVersion_8_0_RC_2.java → persistence/src/main/java/fr/ird/observe/entities/migration/DataSourceMigrationForVersion_7_3.java - persistence/src/main/java/fr/ird/observe/entities/migration/DataSourceMigrationForVersion_8_0_RC_1.java → persistence/src/main/java/fr/ird/observe/entities/migration/DataSourceMigrationForVersion_8_0.java - + persistence/src/main/resources/db/migration/7.1/01_add_not_null_on_length_weight_parameters-common.sql - + persistence/src/main/resources/db/migration/7.1/02_add_not_null_on_length_length_parameters-common.sql - + persistence/src/main/resources/db/migration/7.1/03_add_not_null_on_technical_fields-common.sql - + persistence/src/main/resources/db/migration/7.2/01_fix_trip_longline_comment-H2.sql - + persistence/src/main/resources/db/migration/7.2/01_fix_trip_longline_comment-PG.sql - + persistence/src/main/resources/db/migration/7.3/01_ps_observation_drop_set_fields-H2.sql - + persistence/src/main/resources/db/migration/7.3/01_ps_observation_drop_set_fields-PG.sql - + persistence/src/main/resources/db/migration/7.3/02_fix_object_material_empty_standard_code-common.sql - persistence/src/main/resources/db/migration/8.0-RC-1/01_move_wind_referential-H2.sql → persistence/src/main/resources/db/migration/8.0/01_move_wind_referential-H2.sql - persistence/src/main/resources/db/migration/8.0-RC-1/01_move_wind_referential-PG.sql → persistence/src/main/resources/db/migration/8.0/01_move_wind_referential-PG.sql - persistence/src/main/resources/db/migration/8.0-RC-1/02_wind_i18n-common.sql → persistence/src/main/resources/db/migration/8.0/02_wind_i18n-common.sql - persistence/src/main/resources/db/migration/8.0-RC-1/03_update_vesseltype-common.sql → persistence/src/main/resources/db/migration/8.0/03_update_vesseltype-common.sql - persistence/src/main/resources/db/migration/8.0-RC-1/04_update_person-common.sql → persistence/src/main/resources/db/migration/8.0/04_update_person-common.sql - persistence/src/main/resources/db/migration/8.0-RC-1/04_update_person2-common.sql → persistence/src/main/resources/db/migration/8.0/04_update_person2-common.sql - persistence/src/main/resources/db/migration/8.0-RC-1/05_rename_tripType-common.sql → persistence/src/main/resources/db/migration/8.0/05_rename_tripType-common.sql - persistence/src/main/resources/db/migration/8.0-RC-1/06_fill_vessel_activity-common.sql → persistence/src/main/resources/db/migration/8.0/06_fill_vessel_activity-common.sql - persistence/src/main/resources/db/migration/8.0-RC-1/07_add_weight_determination_method-common.sql → persistence/src/main/resources/db/migration/8.0/07_add_weight_determination_method-common.sql - persistence/src/main/resources/db/migration/8.0-RC-1/08_add_weight_category-common.sql → persistence/src/main/resources/db/migration/8.0/08_add_weight_category-common.sql - persistence/src/main/resources/db/migration/8.0-RC-1/09_add_compagnies-common.sql → persistence/src/main/resources/db/migration/8.0/09_add_compagnies-common.sql - persistence/src/main/resources/db/migration/8.0-RC-1/101_create_common_schema-common.sql → persistence/src/main/resources/db/migration/8.0/101_create_common_schema-common.sql - persistence/src/main/resources/db/migration/8.0-RC-1/102_create_ps_common_schema-common.sql → persistence/src/main/resources/db/migration/8.0/102_create_ps_common_schema-common.sql - persistence/src/main/resources/db/migration/8.0-RC-1/103_create_ps_observation_schema-common.sql → persistence/src/main/resources/db/migration/8.0/103_create_ps_observation_schema-common.sql - persistence/src/main/resources/db/migration/8.0-RC-1/104_create_ll_common_schema-common.sql → persistence/src/main/resources/db/migration/8.0/104_create_ll_common_schema-common.sql - persistence/src/main/resources/db/migration/8.0-RC-1/105_create_ll_observation_schema-common.sql → persistence/src/main/resources/db/migration/8.0/105_create_ll_observation_schema-common.sql - persistence/src/main/resources/db/migration/8.0-RC-1/106_create_ll_logbook_schema-common.sql → persistence/src/main/resources/db/migration/8.0/106_create_ll_logbook_schema-common.sql - persistence/src/main/resources/db/migration/8.0-RC-1/107_create_ll_landing_schema-common.sql → persistence/src/main/resources/db/migration/8.0/107_create_ll_landing_schema-common.sql The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/33db59d9ea46025abee75050… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/33db59d9ea46025abee75050… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-7.x] 3 commits: Correction de la migration 7.4.0 - Closes #1458
by Tony CHEMIT 29 Mar '20

29 Mar '20

Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: 6cf0382c by tchemit at 2020-03-29T14:35:25+02:00 Correction de la migration 7.4.0 - Closes #1458 - - - - - f2e8235b by tchemit at 2020-03-29T14:35:27+02:00 Ajouter l'icone de l'application lors du lancement de l'application en mode autre - Closes #1459 - - - - - 1312c7a5 by tchemit at 2020-03-29T18:38:05+02:00 Le calcul des vitesses a eu un raté après avoir fait usage de la fonction "Voulez-vous créer l'activité de fin de veille ?" - Closes #1100 - - - - - 18 changed files: - client-core/src/main/java/fr/ird/observe/client/ui/ObserveMainUI.jcss - client-core/src/main/java/fr/ird/observe/client/ui/ObserveMainUIHandler.java - client-core/src/main/java/fr/ird/observe/client/ui/admin/AdminUILauncher.java - client-core/src/main/java/fr/ird/observe/client/ui/storage/RemoteUILauncher.java - client-core/src/main/java/fr/ird/observe/client/ui/util/UIHelper.java - client-core/src/main/java/fr/ird/observe/client/validation/ObserveSwingValidator.java - dto/src/main/java/fr/ird/observe/validation/validators/AbstractSpeciesFieldDtoValidator.java - dto/src/main/java/fr/ird/observe/validation/validators/ActivitySeineObservedSystemValidator.java - dto/src/main/java/fr/ird/observe/validation/validators/ActivitySimpleSpeedDtoValidator.java - dto/src/main/java/fr/ird/observe/validation/validators/ActivitySpeedDtoValidator.java - dto/src/main/java/fr/ird/observe/validation/validators/NonTargetCatchObservedSystemValidator.java - dto/src/main/java/fr/ird/observe/validation/validators/SetLonglineUniqueHomeIdDtoValidator.java - dto/src/main/java/fr/ird/observe/validation/validators/SetLonglineUniqueNumberDtoValidator.java - persistence/src/main/resources/db/migration/7.4/03_rename_referential-H2.sql - pom.xml - test/src/main/resources/db/7.5/dataForTestLongline.sql.gz - test/src/main/resources/db/7.5/dataForTestSeine.sql.gz - test/src/main/resources/db/7.5/referentiel.sql.gz Changes: ===================================== client-core/src/main/java/fr/ird/observe/client/ui/ObserveMainUI.jcss ===================================== @@ -34,7 +34,6 @@ JSplitPane { #mainFrame { defaultCloseOperation: "do_nothing_on_close"; - iconImage: {SwingUtil.createImageIcon("logo.png").getImage()}; } #menu { ===================================== client-core/src/main/java/fr/ird/observe/client/ui/ObserveMainUIHandler.java ===================================== @@ -22,6 +22,7 @@ package fr.ird.observe.client.ui; import fr.ird.observe.client.ObserveSwingApplicationContext; +import fr.ird.observe.client.ui.util.UIHelper; import org.nuiton.jaxx.runtime.spi.UIHandler; import javax.swing.JSplitPane; @@ -48,6 +49,7 @@ public class ObserveMainUIHandler implements UIHandler<ObserveMainUI> { @Override public void afterInit(ObserveMainUI ui) { + UIHelper.addApplicationIcon(ui); ui.getInitializer().initialize(); } ===================================== client-core/src/main/java/fr/ird/observe/client/ui/admin/AdminUILauncher.java ===================================== @@ -144,7 +144,7 @@ public class AdminUILauncher extends WizardUILancher<AdminStep, AdminUIModel, Ad JDialog dialog = new JDialog(); dialog.setSize(1024, 780); - + UIHelper.addApplicationIcon(dialog); if (icon != null) { dialog.setIconImage(icon.getImage()); } ===================================== client-core/src/main/java/fr/ird/observe/client/ui/storage/RemoteUILauncher.java ===================================== @@ -24,8 +24,8 @@ package fr.ird.observe.client.ui.storage; import fr.ird.observe.client.constants.DbMode; import fr.ird.observe.client.ui.storage.tabs.SecurityModel; import fr.ird.observe.client.ui.util.UIHelper; -import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.nuiton.jaxx.runtime.JAXXContext; import java.awt.Window; @@ -88,6 +88,7 @@ public abstract class RemoteUILauncher extends StorageUILauncher { model.setSteps(steps.toArray(new StorageStep[0])); ui.setSize(800, 600); + UIHelper.addApplicationIcon(ui); } @Override ===================================== client-core/src/main/java/fr/ird/observe/client/ui/util/UIHelper.java ===================================== @@ -65,6 +65,7 @@ import java.awt.Color; import java.awt.Component; import java.awt.Container; import java.awt.Toolkit; +import java.awt.Window; import java.awt.datatransfer.Clipboard; import java.awt.datatransfer.StringSelection; import java.awt.event.ComponentAdapter; @@ -108,6 +109,11 @@ public class UIHelper extends SwingUtil { /** Logger */ static private final Logger log = LogManager.getLogger(UIHelper.class); + + public static void addApplicationIcon(Window window) { + window.setIconImage(createImageIcon("logo-small.png").getImage()); + } + public static void displayInfo(String text) { ObserveMainUI ui = ObserveSwingApplicationContext.get().getMainUI(); ===================================== client-core/src/main/java/fr/ird/observe/client/validation/ObserveSwingValidator.java ===================================== @@ -24,8 +24,8 @@ package fr.ird.observe.client.validation; import com.opensymphony.xwork2.ActionContext; import com.opensymphony.xwork2.util.ValueStack; import fr.ird.observe.client.ObserveSwingApplicationContext; -import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.nuiton.jaxx.validator.swing.SwingValidator; import org.nuiton.validator.NuitonValidatorFactory; import org.nuiton.validator.NuitonValidatorProvider; @@ -46,7 +46,6 @@ import java.util.Objects; */ public class ObserveSwingValidator<B> extends SwingValidator<B> { - /** Logger */ private static final Logger log = LogManager.getLogger(ObserveSwingValidator.class); /** un etat pour initialiser la stack une unique fois la stack */ @@ -108,9 +107,7 @@ public class ObserveSwingValidator<B> extends SwingValidator<B> { if (dataContext == null) { // aucun context de validation enregistré - if (log.isDebugEnabled()) { - log.debug("No validation context registred, try in application context..."); - } + log.debug("No validation context registred, try in application context..."); ObserveSwingApplicationContext rootContext = ObserveSwingApplicationContext.get(); Objects.requireNonNull(rootContext, "Pas de context applicatif trouve."); dataContext = rootContext.getValidationContext(); @@ -123,8 +120,9 @@ public class ObserveSwingValidator<B> extends SwingValidator<B> { } public static void reloadDataContext(ClientValidationContext validationContext, boolean strict) { + ClientValidationContext oldValidationContext = null; if (validationContext != ObserveSwingValidator.validationContext) { - + oldValidationContext = ObserveSwingValidator.validationContext; // keep this validation context ObserveSwingValidator.validationContext = validationContext; setInit(false); @@ -135,8 +133,7 @@ public class ObserveSwingValidator<B> extends SwingValidator<B> { if (strict) { throw new IllegalStateException( - "pas de context xworks enregistré... utiliser la methode " + - ActionContext.class.getName() + "#setContext(context)"); + String.format("pas de context xworks enregistré... utiliser la methode %s#setContext(context)", ActionContext.class.getName())); } valueStack = XWork2ValidatorUtil.getSharedValueStack(); @@ -147,12 +144,14 @@ public class ObserveSwingValidator<B> extends SwingValidator<B> { valueStack = context.getValueStack(); } - if (log.isDebugEnabled()) { - log.debug("Enregistrement du context de validation [" + validationContext + "] dans la valueStack de " + - "validation (" + valueStack + ')'); - } + log.debug(String.format("Enregistrement du context de validation [%s] dans la valueStack de validation (%s)", validationContext, valueStack)); - valueStack.push(validationContext); + if (oldValidationContext != null&& valueStack.getRoot().contains(oldValidationContext)) { + valueStack.getRoot().remove(oldValidationContext); + } + if (!valueStack.getRoot().contains(validationContext)) { + valueStack.push(validationContext); + } } public static ClientValidationContext getValidationContext() { ===================================== dto/src/main/java/fr/ird/observe/validation/validators/AbstractSpeciesFieldDtoValidator.java ===================================== @@ -72,6 +72,7 @@ public abstract class AbstractSpeciesFieldDtoValidator extends FieldValidatorSup /** le ratio a appliquer sur les bornes définies dans le référentiel */ private Float ratio; private String speciesField = "species"; + private Bound bound; private String getSpeciesField() { return speciesField; @@ -101,6 +102,10 @@ public abstract class AbstractSpeciesFieldDtoValidator extends FieldValidatorSup protected abstract Float getBoundMax(SpeciesDto referentiel); + public Bound getBound() { + return bound; + } + private boolean shouldValidate(Object object) throws ValidationException { Boolean enable = (Boolean) getFieldValue("validationLengthWeightEnable", object); @@ -170,7 +175,6 @@ public abstract class AbstractSpeciesFieldDtoValidator extends FieldValidatorSup log.debug("data to validate : " + data); } - //noinspection unchecked SpeciesReference speciesRef = (SpeciesReference) getFieldValue(speciesFieldName, object); if (speciesRef == null) { @@ -185,7 +189,7 @@ public abstract class AbstractSpeciesFieldDtoValidator extends FieldValidatorSup SpeciesDto speciesDto = (SpeciesDto) stack.findValue("getSpecies(\"" + speciesRef.getId() + "\")"); - Bound bound = getBound(speciesDto); + bound = getBound(speciesDto); if (log.isDebugEnabled()) { log.debug("Species Bound to validate : " + bound); @@ -209,13 +213,7 @@ public abstract class AbstractSpeciesFieldDtoValidator extends FieldValidatorSup if (!valid) { - stack.push(bound); - - try { - addFieldError(fieldName, object); - } finally { - stack.pop(); - } + ValidatorUtil.addFieldError(this, stack, fieldName, object); } } ===================================== dto/src/main/java/fr/ird/observe/validation/validators/ActivitySeineObservedSystemValidator.java ===================================== @@ -45,6 +45,12 @@ import java.util.Set; */ public class ActivitySeineObservedSystemValidator extends FieldValidatorSupport { + private Set<String> observedSystemLabels; + + public Set<String> getObservedSystemLabels() { + return observedSystemLabels; + } + @Override public void validate(Object object) throws ValidationException { @@ -89,8 +95,9 @@ public class ActivitySeineObservedSystemValidator extends FieldValidatorSupport } if (!labels.isEmpty()) { // there is some missing system observed - stack.set("observedSystemLabels", labels); - addFieldError(getFieldName(), object); + this.observedSystemLabels = labels; + + ValidatorUtil.addFieldError(this, stack, getFieldName(), object); } } } @@ -99,4 +106,6 @@ public class ActivitySeineObservedSystemValidator extends FieldValidatorSupport public String getValidatorType() { return "activitySeine_observedSystem"; } + + } ===================================== dto/src/main/java/fr/ird/observe/validation/validators/ActivitySimpleSpeedDtoValidator.java ===================================== @@ -73,6 +73,7 @@ import static io.ultreia.java4all.i18n.I18n.n; * @author Tony Chemit - dev(a)tchemit.fr * @since 1.0 */ +@SuppressWarnings("unused") public class ActivitySimpleSpeedDtoValidator extends FieldValidatorSupport { /** Logger. */ @@ -81,6 +82,7 @@ public class ActivitySimpleSpeedDtoValidator extends FieldValidatorSupport { private boolean enable; private Float speed; + private Float computedSpeed; /** * Construit un point à partir de l'entité donnée. @@ -122,6 +124,10 @@ public class ActivitySimpleSpeedDtoValidator extends FieldValidatorSupport { this.enable = enable; } + public Float getComputedSpeed() { + return computedSpeed; + } + @Override public void validate(Object object) throws ValidationException { @@ -224,13 +230,13 @@ public class ActivitySimpleSpeedDtoValidator extends FieldValidatorSupport { if (!b) { - stack.set("foundSpeed", computedSpeed); + this.computedSpeed = computedSpeed; if (getDefaultMessage().isEmpty()) { - setDefaultMessage(n("observe.validation.activity.speed.bound") + "##${foundSpeed}##${speed}"); + setDefaultMessage(n("observe.validation.activity.speed.bound") + "##${computedSpeed}##${speed}"); } // vitesse trop grande - addFieldError(getFieldName(), object); + ValidatorUtil.addFieldError(this, stack, getFieldName(), object); } } ===================================== dto/src/main/java/fr/ird/observe/validation/validators/ActivitySpeedDtoValidator.java ===================================== @@ -69,17 +69,14 @@ import static io.ultreia.java4all.i18n.I18n.n; * @author Tony Chemit - dev(a)tchemit.fr * @since 1.0 */ +@SuppressWarnings("unused") public class ActivitySpeedDtoValidator extends FieldValidatorSupport { private static final Logger LOG = LogManager.getLogger(ActivitySimpleSpeedDtoValidator.class); private CollectionFieldExpressionValidator delegate; - private boolean enable; - private Float speed; - private String invalidActivity; - public Float getSpeed() { return speed; } @@ -96,10 +93,6 @@ public class ActivitySpeedDtoValidator extends FieldValidatorSupport { this.enable = enable; } - public String getInvalidActivity() { - return invalidActivity; - } - private String decorate(ActivitySeineStubDto activitySeine) { DecoratorService decoratorService = (DecoratorService) stack.findValue("decoratorService"); return decoratorService.getDecoratorByType(ActivitySeineStubDto.class).toString(activitySeine); @@ -114,6 +107,17 @@ public class ActivitySpeedDtoValidator extends FieldValidatorSupport { if (delegate == null) { delegate = new CollectionFieldExpressionValidator() { + + private String invalidActivity; + private Float computedSpeed; + + @Override + public void validateWhenNotSkip(Object object) throws ValidationException { + invalidActivity = null; + computedSpeed = null; + super.validateWhenNotSkip(object); + } + @Override protected boolean validateOneEntry(Object object) { @@ -151,38 +155,33 @@ public class ActivitySpeedDtoValidator extends FieldValidatorSupport { boolean valid = computedSpeed <= speed; if (!valid) { - stack.set("foundSpeed", computedSpeed); - - invalidActivity = decorate(currentActivity); + this.computedSpeed = computedSpeed; + this.invalidActivity = decorate(currentActivity); LOG.debug(String.format("Speed from %s to %s is %s which is more thant authorized one %s", decorate(previousActivity), invalidActivity, computedSpeed, speed)); } return valid; } - @Override - public String getMessage(Object object) { - boolean pop = false; - if (!stack.getRoot().contains(ActivitySpeedDtoValidator.this)) { - stack.push(ActivitySpeedDtoValidator.this); - pop = true; - } - try { - return super.getMessage(object); - } finally { - if (pop) { - stack.pop(); - } - } - } - @Override protected void addFieldError(String propertyName, Object object) { if (getDefaultMessage().isEmpty()) { - setDefaultMessage(n("observe.validation.activity.speed.bound.inter") + "##${speed}##${invalidActivity}##${foundSpeed}"); + setDefaultMessage(n("observe.validation.activity.speed.bound.inter") + "##${speed}##${invalidActivity}##${computedSpeed}"); } - super.addFieldError(propertyName, object); + ValidatorUtil.addFieldError(this, stack, propertyName, object); + } + + public String getInvalidActivity() { + return invalidActivity; } + + public float getComputedSpeed() { + return computedSpeed; + } + public float getSpeed() { + return ActivitySpeedDtoValidator.this.getSpeed(); + } + }; delegate.setCollectionFieldName(RouteDto.PROPERTY_ACTIVITY_SEINE); delegate.setMode(CollectionFieldExpressionValidator.Mode.ALL); @@ -226,8 +225,6 @@ public class ActivitySpeedDtoValidator extends FieldValidatorSupport { throw new ValidationException("le parametre speed est obligatoire"); } - invalidActivity = null; - getDelegate((RouteDto) object).validate(object); } ===================================== dto/src/main/java/fr/ird/observe/validation/validators/NonTargetCatchObservedSystemValidator.java ===================================== @@ -34,16 +34,24 @@ import fr.ird.observe.dto.referential.seine.ObservedSystemReference; import fr.ird.observe.validation.SeineBycatchObservedSystemConfig; import java.util.Collection; -import java.util.LinkedList; +import java.util.LinkedHashSet; import java.util.List; +import java.util.Set; /** * Created by tchemit on 03/05/2018. * * @author Tony Chemit - dev(a)tchemit.fr */ +@SuppressWarnings("unused") public class NonTargetCatchObservedSystemValidator extends FieldValidatorSupport { + private Set<String> observedSystemLabels; + + public Set<String> getObservedSystemLabels() { + return observedSystemLabels; + } + @Override public void validate(Object object) throws ValidationException { @@ -72,16 +80,16 @@ public class NonTargetCatchObservedSystemValidator extends FieldValidatorSupport DecoratorService decoratorService = (DecoratorService) stack.findValue("decoratorService"); ImmutableMap<String, ObservedSystemReference> map = Maps.uniqueIndex(observedSystems, ObservedSystemReference::getId); ReferentialReferenceDecorator<ObservedSystemReference> decorator = decoratorService.getReferentialReferenceDecorator(ObservedSystemReference.class); - List<String> labels = new LinkedList<>(); + Set<String> labels = new LinkedHashSet<>(); for (String observedSystemId : requiredObservedSystemBySpeciesId) { ObservedSystemReference ref = map.get(observedSystemId); log.debug("Required observed system id: " + observedSystemId); log.debug("Required observed system: " + ref); labels.add(decorator.toString(ref)); } - stack.set("observedSystemLabels", labels); + this.observedSystemLabels = labels; - addFieldError(getFieldName(), object); + ValidatorUtil.addFieldError(this, stack, getFieldName(), object); } } } ===================================== dto/src/main/java/fr/ird/observe/validation/validators/SetLonglineUniqueHomeIdDtoValidator.java ===================================== @@ -38,8 +38,15 @@ import java.util.Optional; * @author Tony Chemit - dev(a)tchemit.fr * @since 3.9 */ +@SuppressWarnings("unused") public class SetLonglineUniqueHomeIdDtoValidator extends FieldValidatorSupport { + private String duplicatedActivity; + + public String getDuplicatedActivity() { + return duplicatedActivity; + } + @Override public void validate(Object object) { @@ -57,14 +64,14 @@ public class SetLonglineUniqueHomeIdDtoValidator extends FieldValidatorSupport { if (sameHomeIdSetLonglineOptional.isPresent()) { - ActivityLonglineReference activityLonglineRef = sameHomeIdSetLonglineOptional.get().getActivityLongline(); + ActivityLonglineReference activity = sameHomeIdSetLonglineOptional.get().getActivityLongline(); DecoratorService decoratorService = (DecoratorService) stack.findValue("decoratorService"); DataReferenceDecorator<ActivityLonglineReference> decorator = decoratorService.getDataReferenceDecorator(ActivityLonglineReference.class); - stack.set("duplicatedActivity", decorator.toString(activityLonglineRef)); + duplicatedActivity = decorator.toString(activity); - addFieldError(getFieldName(), object); + ValidatorUtil.addFieldError(this, stack, getFieldName(), object); } } ===================================== dto/src/main/java/fr/ird/observe/validation/validators/SetLonglineUniqueNumberDtoValidator.java ===================================== @@ -38,8 +38,14 @@ import java.util.Optional; * @author Tony Chemit - dev(a)tchemit.fr * @since 3.9 */ +@SuppressWarnings("unused") public class SetLonglineUniqueNumberDtoValidator extends FieldValidatorSupport { + private String duplicatedActivity; + + public String getDuplicatedActivity() { + return duplicatedActivity; + } @Override public void validate(Object object) { @@ -55,15 +61,13 @@ public class SetLonglineUniqueNumberDtoValidator extends FieldValidatorSupport { if (sameNumberSetLonglineOptional.isPresent()) { - ActivityLonglineReference activityLonglineRef = sameNumberSetLonglineOptional.get().getActivityLongline(); + ActivityLonglineReference activity = sameNumberSetLonglineOptional.get().getActivityLongline(); DecoratorService decoratorService = (DecoratorService) stack.findValue("decoratorService"); DataReferenceDecorator<ActivityLonglineReference> decorator = decoratorService.getDataReferenceDecorator(ActivityLonglineReference.class); - stack.set("duplicatedActivity", decorator.toString(activityLonglineRef)); - - addFieldError(getFieldName(), object); - + duplicatedActivity = decorator.toString(activity); + ValidatorUtil.addFieldError(this, stack, getFieldName(), object); } } ===================================== persistence/src/main/resources/db/migration/7.4/03_rename_referential-H2.sql ===================================== @@ -43,5 +43,5 @@ CREATE INDEX idx_observe_longline_catch_stomachFullness ON observe_longline.catc DROP TABLE observe_longline.Healthness; DROP TABLE observe_longline.StomacFullness; -UPDATE observe_common.LASTUPDATEDATE SET TYPE = REPLACE(TYPE, 'referentiel.longline.Healthness', 'referential.longline.HealthStatus'); -UPDATE observe_common.LASTUPDATEDATE SET TYPE = REPLACE(TYPE, 'referentiel.longline.StomacFullness', 'referential.longline.StomachFullness'); \ No newline at end of file +UPDATE observe_common.LASTUPDATEDATE SET TYPE = REPLACE(TYPE, 'referentiel.longline.Healthness', 'referentiel.longline.HealthStatus'); +UPDATE observe_common.LASTUPDATEDATE SET TYPE = REPLACE(TYPE, 'referentiel.longline.StomacFullness', 'referentiel.longline.StomachFullness'); \ No newline at end of file ===================================== pom.xml ===================================== @@ -155,7 +155,7 @@ <maven.build.timestamp.format>dd/MM/yyyy HH:mm z</maven.build.timestamp.format> <buildDate>${maven.build.timestamp}</buildDate> - <observeToolkitVersion>3.7.26</observeToolkitVersion> + <observeToolkitVersion>3.7.27</observeToolkitVersion>  <lib.version.nuiton.validation>3.1</lib.version.nuiton.validation>  ===================================== test/src/main/resources/db/7.5/dataForTestLongline.sql.gz ===================================== Binary files a/test/src/main/resources/db/7.5/dataForTestLongline.sql.gz and b/test/src/main/resources/db/7.5/dataForTestLongline.sql.gz differ ===================================== test/src/main/resources/db/7.5/dataForTestSeine.sql.gz ===================================== Binary files a/test/src/main/resources/db/7.5/dataForTestSeine.sql.gz and b/test/src/main/resources/db/7.5/dataForTestSeine.sql.gz differ ===================================== test/src/main/resources/db/7.5/referentiel.sql.gz ===================================== Binary files a/test/src/main/resources/db/7.5/referentiel.sql.gz and b/test/src/main/resources/db/7.5/referentiel.sql.gz differ View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/9c0d817d9eaa988bcaf33518… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/9c0d817d9eaa988bcaf33518… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-7.x] 2 commits: Correction de la migration 7.4.0 - Closes #1458
by Tony CHEMIT 29 Mar '20

29 Mar '20

Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: b1965e55 by tchemit at 2020-03-29T13:00:06+02:00 Correction de la migration 7.4.0 - Closes #1458 - - - - - 9c0d817d by tchemit at 2020-03-29T13:26:13+02:00 Ajouter l'icone de l'application lors du lancement de l'application en mode autre - Closes #1459 - - - - - 6 changed files: - client-core/src/main/java/fr/ird/observe/client/ui/ObserveMainUI.jcss - client-core/src/main/java/fr/ird/observe/client/ui/ObserveMainUIHandler.java - client-core/src/main/java/fr/ird/observe/client/ui/admin/AdminUILauncher.java - client-core/src/main/java/fr/ird/observe/client/ui/storage/RemoteUILauncher.java - client-core/src/main/java/fr/ird/observe/client/ui/util/UIHelper.java - persistence/src/main/resources/db/migration/7.4/03_rename_referential-H2.sql Changes: ===================================== client-core/src/main/java/fr/ird/observe/client/ui/ObserveMainUI.jcss ===================================== @@ -34,7 +34,6 @@ JSplitPane { #mainFrame { defaultCloseOperation: "do_nothing_on_close"; - iconImage: {SwingUtil.createImageIcon("logo.png").getImage()}; } #menu { ===================================== client-core/src/main/java/fr/ird/observe/client/ui/ObserveMainUIHandler.java ===================================== @@ -22,6 +22,7 @@ package fr.ird.observe.client.ui; import fr.ird.observe.client.ObserveSwingApplicationContext; +import fr.ird.observe.client.ui.util.UIHelper; import org.nuiton.jaxx.runtime.spi.UIHandler; import javax.swing.JSplitPane; @@ -48,6 +49,7 @@ public class ObserveMainUIHandler implements UIHandler<ObserveMainUI> { @Override public void afterInit(ObserveMainUI ui) { + UIHelper.addApplicationIcon(ui); ui.getInitializer().initialize(); } ===================================== client-core/src/main/java/fr/ird/observe/client/ui/admin/AdminUILauncher.java ===================================== @@ -144,7 +144,7 @@ public class AdminUILauncher extends WizardUILancher<AdminStep, AdminUIModel, Ad JDialog dialog = new JDialog(); dialog.setSize(1024, 780); - + UIHelper.addApplicationIcon(dialog); if (icon != null) { dialog.setIconImage(icon.getImage()); } ===================================== client-core/src/main/java/fr/ird/observe/client/ui/storage/RemoteUILauncher.java ===================================== @@ -24,8 +24,8 @@ package fr.ird.observe.client.ui.storage; import fr.ird.observe.client.constants.DbMode; import fr.ird.observe.client.ui.storage.tabs.SecurityModel; import fr.ird.observe.client.ui.util.UIHelper; -import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.nuiton.jaxx.runtime.JAXXContext; import java.awt.Window; @@ -88,6 +88,7 @@ public abstract class RemoteUILauncher extends StorageUILauncher { model.setSteps(steps.toArray(new StorageStep[0])); ui.setSize(800, 600); + UIHelper.addApplicationIcon(ui); } @Override ===================================== client-core/src/main/java/fr/ird/observe/client/ui/util/UIHelper.java ===================================== @@ -65,6 +65,7 @@ import java.awt.Color; import java.awt.Component; import java.awt.Container; import java.awt.Toolkit; +import java.awt.Window; import java.awt.datatransfer.Clipboard; import java.awt.datatransfer.StringSelection; import java.awt.event.ComponentAdapter; @@ -108,6 +109,11 @@ public class UIHelper extends SwingUtil { /** Logger */ static private final Logger log = LogManager.getLogger(UIHelper.class); + + public static void addApplicationIcon(Window window) { + window.setIconImage(createImageIcon("logo-small.png").getImage()); + } + public static void displayInfo(String text) { ObserveMainUI ui = ObserveSwingApplicationContext.get().getMainUI(); ===================================== persistence/src/main/resources/db/migration/7.4/03_rename_referential-H2.sql ===================================== @@ -43,5 +43,5 @@ CREATE INDEX idx_observe_longline_catch_stomachFullness ON observe_longline.catc DROP TABLE observe_longline.Healthness; DROP TABLE observe_longline.StomacFullness; -UPDATE observe_common.LASTUPDATEDATE SET TYPE = REPLACE(TYPE, 'referentiel.longline.Healthness', 'referential.longline.HealthStatus'); -UPDATE observe_common.LASTUPDATEDATE SET TYPE = REPLACE(TYPE, 'referentiel.longline.StomacFullness', 'referential.longline.StomachFullness'); \ No newline at end of file +UPDATE observe_common.LASTUPDATEDATE SET TYPE = REPLACE(TYPE, 'referentiel.longline.Healthness', 'referentiel.longline.HealthStatus'); +UPDATE observe_common.LASTUPDATEDATE SET TYPE = REPLACE(TYPE, 'referentiel.longline.StomacFullness', 'referentiel.longline.StomachFullness'); \ No newline at end of file View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/0b0ed7273ecffbc847bce149… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/0b0ed7273ecffbc847bce149… You're receiving this email because of your account on gitlab.com.

1 0