July 2023 - Observe-commits - mailman.cloud.codelutin.com

[Git][ultreiaio/ird-observe][develop] 5 commits: Ajout via la migration
by Tony CHEMIT (＠tchemit) 24 Jul '23

24 Jul '23

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 1eb81a8b by Tony Chemit at 2023-07-24T17:32:39+02:00 Ajout via la migration - - - - - d501503a by Tony Chemit at 2023-07-24T17:32:46+02:00 Mise à jour des fixtures - - - - - f9db81d7 by Tony Chemit at 2023-07-24T17:54:18+02:00 Ajout dans l'api de méthodes pour lire et écrire une caractéristique de type date - - - - - d2a67dd3 by Tony Chemit at 2023-07-24T17:54:18+02:00 Adaptation des ui pour rendre et éditer des caractéristiques de type date - - - - - 5bd6877e by Tony Chemit at 2023-07-24T17:54:29+02:00 Merge branch 'feature/issue_2763' into develop Rajouter un type Date (simple et sans time zone) dans GearCharacteristicType - Closes #2763 - - - - - 11 changed files: - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/GearUseFeatureMeasurementCellEditor.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/GearUseFeatureMeasurementCellRenderer.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/GearUseFeaturesMeasurementsTableModelSupport.java - core/api/dto/src/main/java/fr/ird/observe/dto/ProtectedIdsCommon.java - core/api/dto/src/main/java/fr/ird/observe/dto/data/GearUseFeaturesMeasurementAware.java - core/api/dto/src/main/java/fr/ird/observe/dto/referential/common/GearCharacteristicTypeAware.java - core/persistence/migration/src/main/java/fr/ird/observe/spi/migration/v9/DataSourceMigrationForVersion_9_2.java - + core/persistence/migration/src/main/resources/db/migration/v9/9.2/10_issue-2763-common.sql - + core/persistence/migration/src/main/resources/db/migration/v9/9.2/10_issue-2763-tck-common.sql - core/persistence/test/src/test/resources/fixtures/persistence/table_count/referential.properties - model/src/main/resources/fixtures/global.properties Changes: ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/GearUseFeatureMeasurementCellEditor.java ===================================== @@ -26,13 +26,17 @@ import fr.ird.observe.client.util.table.JXTableUtil; import fr.ird.observe.dto.ProtectedIdsCommon; import fr.ird.observe.dto.referential.common.GearCharacteristicReference; import fr.ird.observe.dto.referential.common.GearCharacteristicTypeReference; +import io.ultreia.java4all.i18n.I18n; +import org.jdesktop.swingx.table.DatePickerCellEditor; import org.nuiton.jaxx.widgets.number.NumberCellEditor; import javax.swing.JTable; import javax.swing.event.CellEditorListener; import javax.swing.table.TableCellEditor; import java.awt.Component; +import java.text.SimpleDateFormat; import java.util.EventObject; +import java.util.Locale; import java.util.Map; import java.util.TreeMap; @@ -91,6 +95,8 @@ public class GearUseFeatureMeasurementCellEditor implements TableCellEditor { editorsByGearCharacteristicId.put(ProtectedIdsCommon.COMMON_GEAR_CHARACTERISTIC_TYPE_FLOAT_SIGNED, NumberCellEditor.newFloatColumnEditor(true)); editorsByGearCharacteristicId.put(ProtectedIdsCommon.COMMON_GEAR_CHARACTERISTIC_TYPE_INTEGER_UNSIGNED, JXTableUtil.newInteger4ColumnEditor(false)); editorsByGearCharacteristicId.put(ProtectedIdsCommon.COMMON_GEAR_CHARACTERISTIC_TYPE_FLOAT_UNSIGNED, NumberCellEditor.newFloatColumnEditor(false)); + boolean french = I18n.getDefaultLocale().equals(Locale.FRANCE); + editorsByGearCharacteristicId.put(ProtectedIdsCommon.COMMON_GEAR_CHARACTERISTIC_TYPE_DATE, new DatePickerCellEditor(new SimpleDateFormat(french ? "dd/MM/yyyy" : "yyyy-MM-dd"))); } return editorsByGearCharacteristicId; } ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/GearUseFeatureMeasurementCellRenderer.java ===================================== @@ -22,6 +22,7 @@ package fr.ird.observe.client.datasource.editor.api.content.data; * #L% */ +import fr.ird.observe.client.util.table.JXTableUtil; import fr.ird.observe.dto.ProtectedIdsCommon; import fr.ird.observe.dto.referential.common.GearCharacteristicReference; import fr.ird.observe.dto.referential.common.GearCharacteristicTypeReference; @@ -47,6 +48,7 @@ public class GearUseFeatureMeasurementCellRenderer implements TableCellRenderer this.renderersByCharacteristicTypeId = new TreeMap<>(); TableCellRenderer booleanRenderer = table.getDefaultRenderer(Boolean.class); renderersByCharacteristicTypeId.put(ProtectedIdsCommon.COMMON_GEAR_CHARACTERISTIC_TYPE_BOOLEAN, booleanRenderer); + renderersByCharacteristicTypeId.put(ProtectedIdsCommon.COMMON_GEAR_CHARACTERISTIC_TYPE_DATE, JXTableUtil.newDateTableCellRenderer()); } @Override ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/GearUseFeaturesMeasurementsTableModelSupport.java ===================================== @@ -46,6 +46,7 @@ import org.nuiton.jaxx.validator.swing.SwingValidator; import javax.swing.JScrollPane; import java.util.ArrayList; import java.util.List; +import java.util.Objects; /** * Created on 05/08/2021. @@ -165,7 +166,7 @@ public abstract class GearUseFeaturesMeasurementsTableModelSupport<E extends Bus return new ArrayList<>(); } GearDto gearDto = gearsById.get(gearId); - return GearUseFeaturesMeasurementAware.getDefaultGearUseFeaturesMeasurement(gearDto, this::createNewRow); + return GearUseFeaturesMeasurementAware.getDefaultGearUseFeaturesMeasurement(Objects.requireNonNull(gearDto), this::createNewRow); } } ===================================== core/api/dto/src/main/java/fr/ird/observe/dto/ProtectedIdsCommon.java ===================================== @@ -36,6 +36,7 @@ public interface ProtectedIdsCommon { String COMMON_GEAR_CHARACTERISTIC_TYPE_FLOAT_SIGNED = "fr.ird.referential.common.GearCharacteristicType#1239832686123#0.4"; String COMMON_GEAR_CHARACTERISTIC_TYPE_BOOLEAN = "fr.ird.referential.common.GearCharacteristicType#1239832686123#0.2"; String COMMON_GEAR_CHARACTERISTIC_TYPE_TEXT = "fr.ird.referential.common.GearCharacteristicType#1239832686123#0.1"; + String COMMON_GEAR_CHARACTERISTIC_TYPE_DATE = "fr.ird.referential.common.GearCharacteristicType#1464000000000#0.7"; String COMMON_OCEAN_ATLANTIC = "fr.ird.referential.common.Ocean#1239832686151#0.17595105505051245"; String COMMON_OCEAN_INDIAN = "fr.ird.referential.common.Ocean#1239832686152#0.8325731048817705"; } ===================================== core/api/dto/src/main/java/fr/ird/observe/dto/data/GearUseFeaturesMeasurementAware.java ===================================== @@ -27,6 +27,7 @@ import fr.ird.observe.dto.referential.common.GearDto; import io.ultreia.java4all.lang.Strings; import java.util.Comparator; +import java.util.Date; import java.util.List; import java.util.Objects; import java.util.function.Supplier; @@ -78,7 +79,11 @@ public interface GearUseFeaturesMeasurementAware extends InlineDataDto { if (aValue == null) { value = null; } else { - value = String.valueOf(aValue).trim(); + if (measure.getGearCharacteristic().getGearCharacteristicType().isDate()) { + value = String.valueOf(((Date)aValue).getTime()); + } else { + value = String.valueOf(aValue).trim(); + } if (value.isBlank()) { value = null; } ===================================== core/api/dto/src/main/java/fr/ird/observe/dto/referential/common/GearCharacteristicTypeAware.java ===================================== @@ -28,8 +28,10 @@ import fr.ird.observe.dto.reference.DtoReferenceAware; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import java.time.Instant; import java.util.Arrays; import java.util.Collections; +import java.util.Date; import java.util.LinkedHashSet; import java.util.Optional; import java.util.Set; @@ -58,6 +60,10 @@ public interface GearCharacteristicTypeAware extends DtoReferenceAware, DtoAndRe return FLOAT_IDS.contains(getTopiaId()); } + default boolean isDate() { + return ProtectedIdsCommon.COMMON_GEAR_CHARACTERISTIC_TYPE_DATE.equals(getTopiaId()); + } + default Object getTypeValue(Object value) { if (value != null && !value.toString().isEmpty()) { if (isBoolean()) { @@ -66,6 +72,8 @@ public interface GearCharacteristicTypeAware extends DtoReferenceAware, DtoAndRe value = Float.valueOf(value.toString()).intValue(); } else if (isFloat()) { value = Float.valueOf(value.toString()); + } else if (isDate()) { + value = Date.from(Instant.ofEpochMilli(Long.parseLong(value.toString()))); } } return value; ===================================== core/persistence/migration/src/main/java/fr/ird/observe/spi/migration/v9/DataSourceMigrationForVersion_9_2.java ===================================== @@ -70,6 +70,13 @@ public class DataSourceMigrationForVersion_9_2 extends ByMajorMigrationVersionRe executor.addScript("08", "issue-2497"); // See https://gitlab.com/ultreiaio/ird-observe/-/issues/2725 executor.addScript("09", "issue-2725"); + // See https://gitlab.com/ultreiaio/ird-observe/-/issues/2763 + if (withIds) { + executor.addScript("10", "issue-2763"); + if (isForTck()) { + executor.addScript("10", "issue-2763-tck"); + } + } } private void issue2714(MigrationVersionResourceExecutor executor) { ===================================== core/persistence/migration/src/main/resources/db/migration/v9/9.2/10_issue-2763-common.sql ===================================== @@ -0,0 +1,23 @@ +--- +-- #%L +-- ObServe Core :: Persistence :: Migration +-- %% +-- Copyright (C) 2008 - 2023 IRD, 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% +--- +INSERT INTO common.GearCharacteristicType (topiaId, topiaVersion, topiaCreateDate, lastUpdateDate, code, uri, homeid, needComment, status, label1, label2, label3, label4, label5, label6, label7, label8) VALUES ('fr.ird.referential.common.GearCharacteristicType#${REFERENTIAL_PREFIX}0.7', 0, ${CURRENT_DATE}, ${CURRENT_TIMESTAMP}, 'DATE', null, null, false, 1, 'Date', 'Date', 'Fecha', null, null, null, null, null); +UPDATE common.LastUpdateDate SET lastUpdateDate = ${CURRENT_TIMESTAMP} WHERE type ='fr.ird.observe.entities.referential.common.GearCharacteristicType'; ===================================== core/persistence/migration/src/main/resources/db/migration/v9/9.2/10_issue-2763-tck-common.sql ===================================== @@ -0,0 +1,23 @@ +--- +-- #%L +-- ObServe Core :: Persistence :: Migration +-- %% +-- Copyright (C) 2008 - 2023 IRD, 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% +--- +INSERT INTO common.GearCharacteristic (TOPIAID, TOPIAVERSION, TOPIACREATEDATE, LASTUPDATEDATE, CODE, URI, HOMEID, NEEDCOMMENT, STATUS, LABEL1, LABEL2, LABEL3, LABEL4, LABEL5, LABEL6, LABEL7, LABEL8, UNIT, GEARCHARACTERISTICTYPE) VALUES ('fr.ird.referential.common.GearCharacteristic#${REFERENTIAL_PREFIX}0.11', 0, ${CURRENT_DATE}, ${CURRENT_TIMESTAMP}, '1', null, null, false, 1, 'create date', 'Date de création', 'fecha', null, null, null, null, null, null, 'fr.ird.referential.common.GearCharacteristicType#1464000000000#0.7'); +UPDATE common.LastUpdateDate SET lastUpdateDate = ${CURRENT_TIMESTAMP} WHERE type ='fr.ird.observe.entities.referential.common.GearCharacteristic'; ===================================== core/persistence/test/src/test/resources/fixtures/persistence/table_count/referential.properties ===================================== @@ -23,8 +23,8 @@ common.country=91 common.dataQuality=5 common.fpaZone=45 common.gear=28 -common.gearCharacteristic=26 -common.gearCharacteristicType=6 +common.gearCharacteristic=27 +common.gearCharacteristicType=7 common.harbour=98 common.lastUpdateDate=158 common.lengthLengthParameter=1 ===================================== model/src/main/resources/fixtures/global.properties ===================================== @@ -25,4 +25,4 @@ REFERENCE_DATA_COUNT=68 ENTITIES_LIMIT_SIZE=100 # fr.ird.observe.services.service.referential.ReferentialService # fr.ird.observe.services.local.service.referential.DifferentialModelTest -REFERENTIAL_COUNT=4104 +REFERENTIAL_COUNT=4106 View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/dfadd9ccba799a5b9ca5d4ff… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/dfadd9ccba799a5b9ca5d4ff… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 5 commits: Ajout du champs ps_common.TransmittingBuoyType.regex
by Tony CHEMIT (＠tchemit) 24 Jul '23

24 Jul '23

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: cb43bdc0 by Tony Chemit at 2023-07-24T12:02:58+02:00 Ajout du champs ps_common.TransmittingBuoyType.regex - - - - - f931d13b by Tony Chemit at 2023-07-24T12:02:58+02:00 Mise à jour Mise à jour de la migration - - - - - 8eae2c7e by Tony Chemit at 2023-07-24T12:02:58+02:00 Mise à jour du formulaire du référentiel - - - - - e2923ae5 by Tony Chemit at 2023-07-24T12:02:58+02:00 Mise à jour de la documentation de l'API publique - - - - - dfadd9cc by Tony Chemit at 2023-07-24T12:03:08+02:00 Merge branch 'feature/issue_2725' into develop Contrôler la syntaxe des id balises par une expression régulière propre à chaque modèle de balise - Closes #2725 - - - - - 30 changed files: - client/datasource/editor/ps/src/main/i18n/getters/jaxx.getter - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/referential/common/TransmittingBuoyTypeUI.jaxx - + client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/referential/common/TransmittingBuoyTypeUI.jcss - core/api/dto-decoration/src/main/i18n/getters/labels.getter - core/api/dto-decoration/src/main/java/fr/ird/observe/dto/referential/ps/common/TransmittingBuoyTypeDtoDecoratorDefinition.java - core/api/dto-decoration/src/main/java/fr/ird/observe/dto/referential/ps/common/TransmittingBuoyTypeReferenceDecoratorDefinition.java - + core/api/dto/src/main/java/fr/ird/observe/dto/referential/ps/common/TransmittingBuoyTypeReference.java - + core/api/dto/src/test/java/fr/ird/observe/dto/referential/ps/common/TransmittingBuoyTypeReferenceTest.java - core/api/services/src/main/resources/META-INF/services/Observe/DifferentialMetaModel.json - core/api/validation/src/main/filtered-resources/META-INF/validators/validation.json - core/api/validation/src/main/i18n/getters/eugene.getter - core/api/validation/src/main/i18n/getters/validation-messages.getter - core/api/validation/src/main/resources/fr/ird/observe/dto/data/ps/logbook/TransmittingBuoyDto-create-error-validation.xml - core/api/validation/src/main/resources/fr/ird/observe/dto/data/ps/logbook/TransmittingBuoyDto-update-error-validation.xml - core/api/validation/src/main/resources/fr/ird/observe/dto/data/ps/observation/TransmittingBuoyDto-create-error-validation.xml - core/api/validation/src/main/resources/fr/ird/observe/dto/data/ps/observation/TransmittingBuoyDto-update-error-validation.xml - core/api/validation/src/main/resources/fr/ird/observe/dto/referential/ps/common/TransmittingBuoyTypeDto-create-error-validation.xml - core/api/validation/src/main/resources/fr/ird/observe/dto/referential/ps/common/TransmittingBuoyTypeDto-update-error-validation.xml - + core/api/validation/src/main/validation/fr/ird/observe/dto/data/ps/logbook/TransmittingBuoyDto-create-error-validation.xml - + core/api/validation/src/main/validation/fr/ird/observe/dto/data/ps/logbook/TransmittingBuoyDto-update-error-validation.xml - + core/api/validation/src/main/validation/fr/ird/observe/dto/data/ps/observation/TransmittingBuoyDto-create-error-validation.xml - + core/api/validation/src/main/validation/fr/ird/observe/dto/data/ps/observation/TransmittingBuoyDto-update-error-validation.xml - + core/api/validation/src/main/validation/fr/ird/observe/dto/referential/ps/common/TransmittingBuoyTypeDto-create-error-validation.xml - + core/api/validation/src/main/validation/fr/ird/observe/dto/referential/ps/common/TransmittingBuoyTypeDto-update-error-validation.xml - core/persistence/decoration/src/main/java/fr/ird/observe/entities/referential/ps/common/TransmittingBuoyTypeDecoratorDefinition.java - core/persistence/java/src/main/resources/META-INF/persistence/Observe/TopiaEntitySqlCopyPlanModel.json - core/persistence/java/src/main/resources/META-INF/persistence/Observe/TopiaEntitySqlModel.json - core/persistence/java/src/main/resources/META-INF/persistence/Observe/TopiaEntitySqlReplicatePlanModel.json - core/persistence/java/src/main/resources/fr/ird/observe/entities/referential/ps/common/TransmittingBuoyTypeImpl.hbm.xml - core/persistence/migration/src/main/java/fr/ird/observe/spi/migration/v9/DataSourceMigrationForVersion_9_2.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/e190facf632c03544d774316… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/e190facf632c03544d774316… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Fix persistence test API (dataSourceConfiguration is not remove at the end of a test...)
by Tony CHEMIT (＠tchemit) 24 Jul '23

24 Jul '23

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: e190facf by Tony Chemit at 2023-07-24T10:17:57+02:00 Fix persistence test API (dataSourceConfiguration is not remove at the end of a test...) - - - - - 1 changed file: - core/persistence/test/src/main/java/fr/ird/observe/persistence/test/PersistenceTestMethodResourceRead.java Changes: ===================================== core/persistence/test/src/main/java/fr/ird/observe/persistence/test/PersistenceTestMethodResourceRead.java ===================================== @@ -80,10 +80,10 @@ public class PersistenceTestMethodResourceRead extends PersistenceTestClassResou super.after(description); try { if (applicationContext != null && applicationContext.isOpen()) { - dataSourceConfiguration = null; applicationContext.close(); } } finally { + dataSourceConfiguration = null; applicationContext = null; } } View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/e190facf632c03544d7743161… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/e190facf632c03544d7743161… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 2 commits: Ajout sur les VesselActivity de la tag-value atLeastOneSelected (en mode...
by Tony CHEMIT (＠tchemit) 24 Jul '23

24 Jul '23

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 5f3b24c6 by Tony Chemit at 2023-07-24T07:45:56+02:00 Ajout sur les VesselActivity de la tag-value atLeastOneSelected (en mode warning pour le moment) et amélioration des formulaires - See #27498 - - - - - e3a16b03 by Tony Chemit at 2023-07-24T07:45:56+02:00 Simplification des scripts de migration (See #2449, See #2498) - - - - - 24 changed files: - client/datasource/editor/ll/src/main/i18n/getters/jaxx.getter - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/referential/common/VesselActivityUI.jaxx - client/datasource/editor/ps/src/main/i18n/getters/jaxx.getter - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/referential/common/VesselActivityUI.jaxx - core/api/dto-decoration/src/main/i18n/getters/labels.getter - core/api/validation/src/main/filtered-resources/META-INF/validators/validation.json - core/api/validation/src/main/i18n/getters/eugene.getter - core/api/validation/src/main/i18n/getters/validation-messages.getter - core/api/validation/src/main/resources/fr/ird/observe/dto/referential/ll/common/VesselActivityDto-create-warning-validation.xml - core/api/validation/src/main/resources/fr/ird/observe/dto/referential/ll/common/VesselActivityDto-update-warning-validation.xml - core/api/validation/src/main/resources/fr/ird/observe/dto/referential/ps/common/VesselActivityDto-create-warning-validation.xml - core/api/validation/src/main/resources/fr/ird/observe/dto/referential/ps/common/VesselActivityDto-update-warning-validation.xml - core/persistence/migration/src/main/java/fr/ird/observe/spi/migration/v9/DataSourceMigrationForVersion_9_2.java - − core/persistence/migration/src/main/resources/db/migration/v9/9.2/03_02_issue-2449-ll-common.sql - core/persistence/migration/src/main/resources/db/migration/v9/9.2/03_01_issue-2449-ps-common.sql → core/persistence/migration/src/main/resources/db/migration/v9/9.2/03_issue-2449-common.sql - − core/persistence/migration/src/main/resources/db/migration/v9/9.2/06_02_issue-2498-ll-common.sql - core/persistence/migration/src/main/resources/db/migration/v9/9.2/06_01_issue-2498-ps-common.sql → core/persistence/migration/src/main/resources/db/migration/v9/9.2/06_issue-2498-common.sql - core/persistence/resources/src/main/resources/fr/ird/observe/entities/referential/ll/common/VesselActivity/validation-create.json - core/persistence/resources/src/main/resources/fr/ird/observe/entities/referential/ll/common/VesselActivity/validation-update.json - core/persistence/resources/src/main/resources/fr/ird/observe/entities/referential/ps/common/VesselActivity/validation-create.json - core/persistence/resources/src/main/resources/fr/ird/observe/entities/referential/ps/common/VesselActivity/validation-update.json - core/services/i18n/src/main/i18n/translations/services_en_GB.properties - core/services/i18n/src/main/i18n/translations/services_es_ES.properties - core/services/i18n/src/main/i18n/translations/services_fr_FR.properties The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/6c974fd1e0bb6deff4262d26… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/6c974fd1e0bb6deff4262d26… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 3 commits: Add validation in warning for atLeastOneSelected (if tag-value starts with «:»)
by Tony CHEMIT (＠tchemit) 23 Jul '23

23 Jul '23

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: f46cc71d by Tony Chemit at 2023-07-23T20:19:30+02:00 Add validation in warning for atLeastOneSelected (if tag-value starts with «:») - - - - - 067f94d4 by Tony Chemit at 2023-07-23T20:37:38+02:00 Ajout sur les VesselActivity de la tag-value atLeastOneSelected (en mode warning pour le moment) et amélioration des formulaires - - - - - 6c974fd1 by Tony Chemit at 2023-07-23T20:37:38+02:00 Simplification des scripts de migration (See #2449, See #2498) - - - - - 30 changed files: - client/datasource/editor/ll/src/main/i18n/getters/jaxx.getter - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/referential/common/VesselActivityUI.jaxx - client/datasource/editor/ps/src/main/i18n/getters/jaxx.getter - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/referential/common/VesselActivityUI.jaxx - core/api/dto-decoration/src/main/i18n/getters/labels.getter - core/api/validation/src/main/filtered-resources/META-INF/validators/validation.json - core/api/validation/src/main/i18n/getters/eugene.getter - core/api/validation/src/main/i18n/getters/validation-messages.getter - core/api/validation/src/main/resources/fr/ird/observe/dto/referential/ll/common/VesselActivityDto-create-warning-validation.xml - core/api/validation/src/main/resources/fr/ird/observe/dto/referential/ll/common/VesselActivityDto-update-warning-validation.xml - core/api/validation/src/main/resources/fr/ird/observe/dto/referential/ps/common/VesselActivityDto-create-warning-validation.xml - core/api/validation/src/main/resources/fr/ird/observe/dto/referential/ps/common/VesselActivityDto-update-warning-validation.xml - core/persistence/migration/src/main/java/fr/ird/observe/spi/migration/v9/DataSourceMigrationForVersion_9_2.java - − core/persistence/migration/src/main/resources/db/migration/v9/9.2/03_02_issue-2449-ll-common.sql - core/persistence/migration/src/main/resources/db/migration/v9/9.2/03_01_issue-2449-ps-common.sql → core/persistence/migration/src/main/resources/db/migration/v9/9.2/03_issue-2449-common.sql - − core/persistence/migration/src/main/resources/db/migration/v9/9.2/06_02_issue-2498-ll-common.sql - core/persistence/migration/src/main/resources/db/migration/v9/9.2/06_01_issue-2498-ps-common.sql → core/persistence/migration/src/main/resources/db/migration/v9/9.2/06_issue-2498-common.sql - core/persistence/resources/src/main/resources/fr/ird/observe/entities/referential/ll/common/VesselActivity/validation-create.json - core/persistence/resources/src/main/resources/fr/ird/observe/entities/referential/ll/common/VesselActivity/validation-update.json - core/persistence/resources/src/main/resources/fr/ird/observe/entities/referential/ps/common/VesselActivity/validation-create.json - core/persistence/resources/src/main/resources/fr/ird/observe/entities/referential/ps/common/VesselActivity/validation-update.json - core/services/i18n/src/main/i18n/translations/services_en_GB.properties - core/services/i18n/src/main/i18n/translations/services_es_ES.properties - core/services/i18n/src/main/i18n/translations/services_fr_FR.properties - model/src/main/models/Observe/dto/class/atLeastOneSelected.properties - model/src/main/models/Observe/dto/class/i18nLabels.properties - server/runner/src/main/webResources/doc/api/public/referential/ll/common/VesselActivity/validation-create-warning.xml - server/runner/src/main/webResources/doc/api/public/referential/ll/common/VesselActivity/validation-create.json - server/runner/src/main/webResources/doc/api/public/referential/ll/common/VesselActivity/validation-update-warning.xml - server/runner/src/main/webResources/doc/api/public/referential/ll/common/VesselActivity/validation-update.json The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/8391793c99d36ebd55a9836e… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/8391793c99d36ebd55a9836e… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 12 commits: Add more method on TagValuesExtractor to get and augments class tag values
by Tony CHEMIT (＠tchemit) 23 Jul '23

23 Jul '23

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 03d7cfed by Tony Chemit at 2023-07-23T17:29:32+02:00 Add more method on TagValuesExtractor to get and augments class tag values - - - - - 55e40d00 by Tony Chemit at 2023-07-23T17:29:35+02:00 Reduce log level on TagValuesExtractor - - - - - 099bc55b by Tony Chemit at 2023-07-23T17:36:33+02:00 When atLeastOneSelected tag-value is used, then add the WithAtLeastOneSelected interface on the class (I love auto-generate code even in model!) - - - - - 7cc0bae3 by Tony Chemit at 2023-07-23T17:36:35+02:00 Augments i18nLabels tag-value when using atLeastOneSelected tag-value (we should do more of this, auto tag-value generation is magic!) - - - - - d0e88c4d by Tony Chemit at 2023-07-23T18:53:22+02:00 When inlineDataDtoProperties tag-value is used, then add the InlineDataDto interface on the class (I love auto-generate code even in model!) - - - - - b17b1f48 by Tony Chemit at 2023-07-23T18:53:26+02:00 In ConsolidateDtoModel do not any-longer check inlineDataDto (since the interface is added by the tag-value!) - - - - - 2d90f347 by Tony Chemit at 2023-07-23T18:53:36+02:00 Ajout des drapeaux observation et logbook sur ll_common.CatchFate et ps_common.SpeciesFate - - - - - aeebdad4 by Tony Chemit at 2023-07-23T18:53:36+02:00 Mise à jour de la migration - - - - - 8027fd1e by Tony Chemit at 2023-07-23T18:53:36+02:00 Mise à jour des formulaires des référentiels - - - - - b1629ca1 by Tony Chemit at 2023-07-23T18:53:36+02:00 Utilisation des nouveaux filtres dans les formulaires de capture - - - - - 47f75d46 by Tony Chemit at 2023-07-23T18:53:36+02:00 Mise à jour de la documentation de l'API publique - - - - - 8391793c by Tony Chemit at 2023-07-23T18:53:54+02:00 Merge branch 'feature/issue_2497' into develop Filtrage des devenirs pour les données observation et logbooks PS et LL - Closes #2497 - - - - - 30 changed files: - client/datasource/editor/ll/src/main/i18n/getters/jaxx.getter - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/SetCatchUIModelStates.java - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/observation/SetCatchUIModelStates.java - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/referential/common/CatchFateUI.jaxx - client/datasource/editor/ps/src/main/i18n/getters/jaxx.getter - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/logbook/ActivityCatchUIModelStates.java - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/observation/SetCatchUIModelStates.java - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/referential/common/SpeciesFateUI.jaxx - core/api/dto-decoration/src/main/i18n/getters/labels.getter - core/api/dto-decoration/src/main/resources/META-INF/i18n/Observe-labels.properties - core/api/services/src/main/resources/META-INF/services/Observe/DifferentialMetaModel.json - core/api/validation/src/main/filtered-resources/META-INF/validators/validation.json - core/api/validation/src/main/i18n/getters/eugene.getter - core/api/validation/src/main/i18n/getters/validation-messages.getter - core/api/validation/src/main/resources/fr/ird/observe/dto/referential/ll/common/CatchFateDto-create-error-validation.xml - core/api/validation/src/main/resources/fr/ird/observe/dto/referential/ll/common/CatchFateDto-update-error-validation.xml - core/api/validation/src/main/resources/fr/ird/observe/dto/referential/ps/common/SpeciesFateDto-create-error-validation.xml - core/api/validation/src/main/resources/fr/ird/observe/dto/referential/ps/common/SpeciesFateDto-update-error-validation.xml - core/persistence/java/src/main/resources/META-INF/persistence/Observe/TopiaEntitySqlCopyPlanModel.json - core/persistence/java/src/main/resources/META-INF/persistence/Observe/TopiaEntitySqlModel.json - core/persistence/java/src/main/resources/META-INF/persistence/Observe/TopiaEntitySqlReplicatePlanModel.json - core/persistence/java/src/main/resources/fr/ird/observe/entities/referential/ll/common/CatchFateImpl.hbm.xml - core/persistence/java/src/main/resources/fr/ird/observe/entities/referential/ps/common/SpeciesFateImpl.hbm.xml - core/persistence/migration/src/main/java/fr/ird/observe/spi/migration/v9/DataSourceMigrationForVersion_9_2.java - + core/persistence/migration/src/main/resources/db/migration/v9/9.2/08_issue-2497-common.sql - core/persistence/migration/src/main/resources/db/migration/v9/9.2/empty-schema-H2.sql - core/persistence/migration/src/main/resources/db/migration/v9/9.2/empty-schema-PG.sql - core/persistence/resources/src/main/resources/fr/ird/observe/entities/referential/ll/common/CatchFate/definition.json - core/persistence/resources/src/main/resources/fr/ird/observe/entities/referential/ll/common/CatchFate/validation-create.json - core/persistence/resources/src/main/resources/fr/ird/observe/entities/referential/ll/common/CatchFate/validation-update.json The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/f734014259c11465f252d428… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/f734014259c11465f252d428… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe] Deleted branch feature/issue_2497
by Tony CHEMIT (＠tchemit) 23 Jul '23

23 Jul '23

Tony CHEMIT deleted branch feature/issue_2497 at ultreiaio / ird-observe -- You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][feature/issue_2497] 11 commits: Add more method on TagValuesExtractor to get and augments class tag values
by Tony CHEMIT (＠tchemit) 23 Jul '23

23 Jul '23

Tony CHEMIT pushed to branch feature/issue_2497 at ultreiaio / ird-observe Commits: 03d7cfed by Tony Chemit at 2023-07-23T17:29:32+02:00 Add more method on TagValuesExtractor to get and augments class tag values - - - - - 55e40d00 by Tony Chemit at 2023-07-23T17:29:35+02:00 Reduce log level on TagValuesExtractor - - - - - 099bc55b by Tony Chemit at 2023-07-23T17:36:33+02:00 When atLeastOneSelected tag-value is used, then add the WithAtLeastOneSelected interface on the class (I love auto-generate code even in model!) - - - - - 7cc0bae3 by Tony Chemit at 2023-07-23T17:36:35+02:00 Augments i18nLabels tag-value when using atLeastOneSelected tag-value (we should do more of this, auto tag-value generation is magic!) - - - - - d0e88c4d by Tony Chemit at 2023-07-23T18:53:22+02:00 When inlineDataDtoProperties tag-value is used, then add the InlineDataDto interface on the class (I love auto-generate code even in model!) - - - - - b17b1f48 by Tony Chemit at 2023-07-23T18:53:26+02:00 In ConsolidateDtoModel do not any-longer check inlineDataDto (since the interface is added by the tag-value!) - - - - - 2d90f347 by Tony Chemit at 2023-07-23T18:53:36+02:00 Ajout des drapeaux observation et logbook sur ll_common.CatchFate et ps_common.SpeciesFate - - - - - aeebdad4 by Tony Chemit at 2023-07-23T18:53:36+02:00 Mise à jour de la migration - - - - - 8027fd1e by Tony Chemit at 2023-07-23T18:53:36+02:00 Mise à jour des formulaires des référentiels - - - - - b1629ca1 by Tony Chemit at 2023-07-23T18:53:36+02:00 Utilisation des nouveaux filtres dans les formulaires de capture - - - - - 47f75d46 by Tony Chemit at 2023-07-23T18:53:36+02:00 Mise à jour de la documentation de l'API publique - - - - - 30 changed files: - client/datasource/editor/ll/src/main/i18n/getters/jaxx.getter - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/SetCatchUIModelStates.java - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/observation/SetCatchUIModelStates.java - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/referential/common/CatchFateUI.jaxx - client/datasource/editor/ps/src/main/i18n/getters/jaxx.getter - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/logbook/ActivityCatchUIModelStates.java - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/observation/SetCatchUIModelStates.java - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/referential/common/SpeciesFateUI.jaxx - core/api/dto-decoration/src/main/i18n/getters/labels.getter - core/api/dto-decoration/src/main/resources/META-INF/i18n/Observe-labels.properties - core/api/services/src/main/resources/META-INF/services/Observe/DifferentialMetaModel.json - core/api/validation/src/main/filtered-resources/META-INF/validators/validation.json - core/api/validation/src/main/i18n/getters/eugene.getter - core/api/validation/src/main/i18n/getters/validation-messages.getter - core/api/validation/src/main/resources/fr/ird/observe/dto/referential/ll/common/CatchFateDto-create-error-validation.xml - core/api/validation/src/main/resources/fr/ird/observe/dto/referential/ll/common/CatchFateDto-update-error-validation.xml - core/api/validation/src/main/resources/fr/ird/observe/dto/referential/ps/common/SpeciesFateDto-create-error-validation.xml - core/api/validation/src/main/resources/fr/ird/observe/dto/referential/ps/common/SpeciesFateDto-update-error-validation.xml - core/persistence/java/src/main/resources/META-INF/persistence/Observe/TopiaEntitySqlCopyPlanModel.json - core/persistence/java/src/main/resources/META-INF/persistence/Observe/TopiaEntitySqlModel.json - core/persistence/java/src/main/resources/META-INF/persistence/Observe/TopiaEntitySqlReplicatePlanModel.json - core/persistence/java/src/main/resources/fr/ird/observe/entities/referential/ll/common/CatchFateImpl.hbm.xml - core/persistence/java/src/main/resources/fr/ird/observe/entities/referential/ps/common/SpeciesFateImpl.hbm.xml - core/persistence/migration/src/main/java/fr/ird/observe/spi/migration/v9/DataSourceMigrationForVersion_9_2.java - + core/persistence/migration/src/main/resources/db/migration/v9/9.2/08_issue-2497-common.sql - core/persistence/migration/src/main/resources/db/migration/v9/9.2/empty-schema-H2.sql - core/persistence/migration/src/main/resources/db/migration/v9/9.2/empty-schema-PG.sql - core/persistence/resources/src/main/resources/fr/ird/observe/entities/referential/ll/common/CatchFate/definition.json - core/persistence/resources/src/main/resources/fr/ird/observe/entities/referential/ll/common/CatchFate/validation-create.json - core/persistence/resources/src/main/resources/fr/ird/observe/entities/referential/ll/common/CatchFate/validation-update.json The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/1cf90bf4a0e6c972b414406f… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/1cf90bf4a0e6c972b414406f… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][feature/issue_2497] 12 commits: Fix missing i18n label on model
by Tony CHEMIT (＠tchemit) 23 Jul '23

23 Jul '23

Tony CHEMIT pushed to branch feature/issue_2497 at ultreiaio / ird-observe Commits: ab7cbb54 by Tony Chemit at 2023-07-23T12:53:51+02:00 Fix missing i18n label on model - - - - - f48749b3 by Tony Chemit at 2023-07-23T12:53:51+02:00 Fix GetReferentialIdsTest asset - - - - - b85dbdd6 by Tony Chemit at 2023-07-23T14:22:41+02:00 Fix Dao delete method generation (we have a weird reverse attribute, which then act as an entity but the attribute is just a primitive type...) → Really need to remove this Dao.delete method - - - - - a1637c74 by Tony Chemit at 2023-07-23T14:22:54+02:00 Mise en commun des labels observation,logbook, landing, localmarket - - - - - d8fe6cfe by Tony Chemit at 2023-07-23T14:22:55+02:00 Renommage des champs allowXXX en xXX (pour ps_common.WeightCategory et ps_common.ObservedSystem) - - - - - b06ac086 by Tony Chemit at 2023-07-23T14:22:55+02:00 Mise à jour de la migration - - - - - f7340142 by Tony Chemit at 2023-07-23T14:47:14+02:00 Merge branch 'feature/issue_2762' into develop Normalisation des drapeaux sur référentiels qui permettent de filtrer la liste des référentiels - Closes #2762 - - - - - 84e794ad by Tony Chemit at 2023-07-23T14:47:57+02:00 Ajout des drapeaux observation et logbook sur ll_common.CatchFate et ps_common.SpeciesFate - - - - - fa7595b0 by Tony Chemit at 2023-07-23T14:51:47+02:00 Mise à jour de la migration - - - - - 0db437ab by Tony Chemit at 2023-07-23T14:51:47+02:00 Mise à jour des formulaires des référentiels - - - - - 8cf0f381 by Tony Chemit at 2023-07-23T14:51:47+02:00 Utilisation des nouveaux filtres dans les formulaires de capture - - - - - 1cf90bf4 by Tony Chemit at 2023-07-23T14:51:47+02:00 Mise à jour de la documentation de l'API publique - - - - - 30 changed files: - client/core/src/main/java/fr/ird/observe/client/datasource/api/cache/ReferencesFilterHelper.java - client/datasource/editor/ll/src/main/i18n/getters/jaxx.getter - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/SetCatchUIModelStates.java - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/observation/SetCatchUIModelStates.java - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/referential/common/CatchFateUI.jaxx - client/datasource/editor/ps/src/main/i18n/getters/jaxx.getter - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/landing/TripLandingUIModelStates.java - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/logbook/ActivityCatchUIModelStates.java - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/logbook/ActivityUIModelStates.java - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/logbook/WellActivityUIModelStates.java - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/observation/ActivityUIModelStates.java - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/observation/SetCatchUIModelStates.java - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/referential/common/ObservedSystemUI.jaxx - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/referential/common/SpeciesFateUI.jaxx - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/referential/common/WeightCategoryUI.jaxx - core/api/dto-decoration/src/main/i18n/getters/labels.getter - core/api/dto-decoration/src/main/resources/META-INF/i18n/Observe-labels.properties - core/api/dto/src/main/i18n/getters/eugene.getter - core/api/dto/src/main/java/fr/ird/observe/dto/ObserveI18nLabelsBuilder.java - core/api/services/src/main/resources/META-INF/services/Observe/DifferentialMetaModel.json - core/api/validation/src/main/filtered-resources/META-INF/validators/validation.json - core/api/validation/src/main/i18n/getters/eugene.getter - core/api/validation/src/main/resources/fr/ird/observe/dto/referential/ll/common/CatchFateDto-create-error-validation.xml - core/api/validation/src/main/resources/fr/ird/observe/dto/referential/ll/common/CatchFateDto-update-error-validation.xml - core/api/validation/src/main/resources/fr/ird/observe/dto/referential/ps/common/ObservedSystemDto-create-error-validation.xml - core/api/validation/src/main/resources/fr/ird/observe/dto/referential/ps/common/ObservedSystemDto-update-error-validation.xml - core/api/validation/src/main/resources/fr/ird/observe/dto/referential/ps/common/SpeciesFateDto-create-error-validation.xml - core/api/validation/src/main/resources/fr/ird/observe/dto/referential/ps/common/SpeciesFateDto-update-error-validation.xml - core/api/validation/src/main/resources/fr/ird/observe/dto/referential/ps/common/WeightCategoryDto-create-error-validation.xml - core/api/validation/src/main/resources/fr/ird/observe/dto/referential/ps/common/WeightCategoryDto-update-error-validation.xml The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/7262ef1359235be924f18575… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/7262ef1359235be924f18575… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 7 commits: Fix missing i18n label on model
by Tony CHEMIT (＠tchemit) 23 Jul '23

23 Jul '23

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: ab7cbb54 by Tony Chemit at 2023-07-23T12:53:51+02:00 Fix missing i18n label on model - - - - - f48749b3 by Tony Chemit at 2023-07-23T12:53:51+02:00 Fix GetReferentialIdsTest asset - - - - - b85dbdd6 by Tony Chemit at 2023-07-23T14:22:41+02:00 Fix Dao delete method generation (we have a weird reverse attribute, which then act as an entity but the attribute is just a primitive type...) → Really need to remove this Dao.delete method - - - - - a1637c74 by Tony Chemit at 2023-07-23T14:22:54+02:00 Mise en commun des labels observation,logbook, landing, localmarket - - - - - d8fe6cfe by Tony Chemit at 2023-07-23T14:22:55+02:00 Renommage des champs allowXXX en xXX (pour ps_common.WeightCategory et ps_common.ObservedSystem) - - - - - b06ac086 by Tony Chemit at 2023-07-23T14:22:55+02:00 Mise à jour de la migration - - - - - f7340142 by Tony Chemit at 2023-07-23T14:47:14+02:00 Merge branch 'feature/issue_2762' into develop Normalisation des drapeaux sur référentiels qui permettent de filtrer la liste des référentiels - Closes #2762 - - - - - 30 changed files: - client/core/src/main/java/fr/ird/observe/client/datasource/api/cache/ReferencesFilterHelper.java - client/datasource/editor/ll/src/main/i18n/getters/jaxx.getter - client/datasource/editor/ps/src/main/i18n/getters/jaxx.getter - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/landing/TripLandingUIModelStates.java - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/logbook/ActivityCatchUIModelStates.java - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/logbook/ActivityUIModelStates.java - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/logbook/WellActivityUIModelStates.java - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/observation/ActivityUIModelStates.java - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/referential/common/ObservedSystemUI.jaxx - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/referential/common/WeightCategoryUI.jaxx - core/api/dto-decoration/src/main/i18n/getters/labels.getter - core/api/dto-decoration/src/main/resources/META-INF/i18n/Observe-labels.properties - core/api/dto/src/main/i18n/getters/eugene.getter - core/api/dto/src/main/java/fr/ird/observe/dto/ObserveI18nLabelsBuilder.java - core/api/services/src/main/resources/META-INF/services/Observe/DifferentialMetaModel.json - core/api/validation/src/main/filtered-resources/META-INF/validators/validation.json - core/api/validation/src/main/i18n/getters/eugene.getter - core/api/validation/src/main/resources/fr/ird/observe/dto/referential/ps/common/ObservedSystemDto-create-error-validation.xml - core/api/validation/src/main/resources/fr/ird/observe/dto/referential/ps/common/ObservedSystemDto-update-error-validation.xml - core/api/validation/src/main/resources/fr/ird/observe/dto/referential/ps/common/WeightCategoryDto-create-error-validation.xml - core/api/validation/src/main/resources/fr/ird/observe/dto/referential/ps/common/WeightCategoryDto-update-error-validation.xml - core/persistence/avdth/src/main/java/fr/ird/observe/persistence/avdth/referential/WeightCategoryExtractor.java - core/persistence/avdth/src/main/java/fr/ird/observe/persistence/avdth/referential/interceptors/ObservedSystemInterceptor.java - core/persistence/avdth/src/main/java/fr/ird/observe/persistence/avdth/referential/interceptors/WeightCategoryInterceptor.java - core/persistence/java/src/main/resources/META-INF/persistence/Observe/TopiaEntitySqlCopyPlanModel.json - core/persistence/java/src/main/resources/META-INF/persistence/Observe/TopiaEntitySqlModel.json - core/persistence/java/src/main/resources/META-INF/persistence/Observe/TopiaEntitySqlReplicatePlanModel.json - core/persistence/java/src/main/resources/fr/ird/observe/entities/referential/ps/common/ObservedSystemImpl.hbm.xml - core/persistence/java/src/main/resources/fr/ird/observe/entities/referential/ps/common/WeightCategoryImpl.hbm.xml - core/persistence/migration/src/main/java/fr/ird/observe/spi/migration/v9/DataSourceMigrationForVersion_9_2.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/6ba35dbb095910e3d5771b42… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/6ba35dbb095910e3d5771b42… You're receiving this email because of your account on gitlab.com.

1 0