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

[Git][ultreiaio/ird-observe] Pushed new tag v7.5.0
by Tony CHEMIT April 1, 2020

April 1, 2020

Tony CHEMIT pushed new tag v7.5.0 at ultreiaio / ird-observe -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/tree/v7.5.0 You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][release/7.5.0] [jgitflow-maven-plugin]updating poms for branch'release/7.5.0' with non-snapshot versions[skip ci]
by Tony CHEMIT April 1, 2020

April 1, 2020

Tony CHEMIT pushed to branch release/7.5.0 at ultreiaio / ird-observe Commits: df6fad63 by tchemit at 2020-04-01T11:51:20+02:00 [jgitflow-maven-plugin]updating poms for branch'release/7.5.0' with non-snapshot versions[skip ci] - - - - - 16 changed files: - client-configuration/pom.xml - client-core/pom.xml - client-runner/pom.xml - dto/pom.xml - observe-i18n/pom.xml - observe/pom.xml - persistence/pom.xml - pom.xml - server-configuration/pom.xml - server-core/pom.xml - server-runner/pom.xml - services-client/pom.xml - services-local/pom.xml - services/pom.xml - test/pom.xml - validation/pom.xml Changes: ===================================== client-configuration/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.5.0-SNAPSHOT</version> + <version>7.5.0</version> </parent> <artifactId>client-configuration</artifactId> ===================================== client-core/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.5.0-SNAPSHOT</version> + <version>7.5.0</version> </parent> <artifactId>client-core</artifactId> ===================================== client-runner/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.5.0-SNAPSHOT</version> + <version>7.5.0</version> </parent> <artifactId>client-runner</artifactId> ===================================== dto/pom.xml ===================================== @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.5.0-SNAPSHOT</version> + <version>7.5.0</version> </parent> <artifactId>dto</artifactId> ===================================== observe-i18n/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.5.0-SNAPSHOT</version> + <version>7.5.0</version> </parent> <artifactId>observe-i18n</artifactId> ===================================== observe/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.5.0-SNAPSHOT</version> + <version>7.5.0</version> </parent> <artifactId>observe</artifactId> ===================================== persistence/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.5.0-SNAPSHOT</version> + <version>7.5.0</version> </parent> <artifactId>persistence</artifactId> ===================================== pom.xml ===================================== @@ -31,7 +31,7 @@ <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.5.0-SNAPSHOT</version> + <version>7.5.0</version> <packaging>pom</packaging> <name>ObServe :: Pom</name> ===================================== server-configuration/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.5.0-SNAPSHOT</version> + <version>7.5.0</version> </parent> <artifactId>server-configuration</artifactId> ===================================== server-core/pom.xml ===================================== @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.5.0-SNAPSHOT</version> + <version>7.5.0</version> </parent> <artifactId>server-core</artifactId> ===================================== server-runner/pom.xml ===================================== @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.5.0-SNAPSHOT</version> + <version>7.5.0</version> </parent> <artifactId>server-runner</artifactId> ===================================== services-client/pom.xml ===================================== @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.5.0-SNAPSHOT</version> + <version>7.5.0</version> </parent> <artifactId>services-client</artifactId> ===================================== services-local/pom.xml ===================================== @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.5.0-SNAPSHOT</version> + <version>7.5.0</version> </parent> <artifactId>services-local</artifactId> ===================================== services/pom.xml ===================================== @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.5.0-SNAPSHOT</version> + <version>7.5.0</version> </parent> <artifactId>services</artifactId> ===================================== test/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.5.0-SNAPSHOT</version> + <version>7.5.0</version> </parent> <artifactId>test</artifactId> ===================================== validation/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.5.0-SNAPSHOT</version> + <version>7.5.0</version> </parent> <artifactId>validation</artifactId> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/df6fad63317f6656fd097283d… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/df6fad63317f6656fd097283d… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][master-7.x] 14 commits: [jgitflow-maven-plugin]updating poms for 7.4.1-SNAPSHOT development[skip ci]
by Tony CHEMIT April 1, 2020

April 1, 2020

Tony CHEMIT pushed to branch master-7.x at ultreiaio / ird-observe Commits: 816abce3 by tchemit at 2020-03-26T11:13:57+01:00 [jgitflow-maven-plugin]updating poms for 7.4.1-SNAPSHOT development[skip ci] - - - - - 93c5e573 by tchemit at 2020-03-26T11:26:55+01:00 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts[skip ci] - - - - - 06acaba1 by tchemit at 2020-03-26T11:26:55+01:00 [jgitflow-maven-plugin]merging 'master-7.x' into 'develop-7.x' - - - - - 3ce0b147 by tchemit at 2020-03-26T11:26:56+01:00 [jgitflow-maven-plugin]Updating develop poms back to pre merge state[skip ci] - - - - - 952c8da4 by tchemit at 2020-03-27T17:32:14+01:00 Mauvais affichage d'une marée dans l'arbre de navigation - Closes #1457 - - - - - eb802bb7 by tchemit at 2020-03-27T17:32:28+01:00 move to version 7.5.0 - - - - - 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 - - - - - 0a0d2335 by tchemit at 2020-03-31T14:03:45+02:00 [REFERENTIEL BALISES] Ajout d'un champ 'technology' - Closes #1460 - - - - - 24c70bef by tchemit at 2020-04-01T11:14:00+02:00 Erreur sur changement de caractéristique d'équipement de type de donnée différent - Closes #1437 - - - - - df6fad63 by tchemit at 2020-04-01T11:51:20+02:00 [jgitflow-maven-plugin]updating poms for branch'release/7.5.0' with non-snapshot versions[skip ci] - - - - - 6f27425f by tchemit at 2020-04-01T11:57:42+02:00 [jgitflow-maven-plugin]merging 'release/7.5.0' into 'master-7.x' - - - - - 30 changed files: - client-configuration/pom.xml - client-core/pom.xml - 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/content/ref/seine/TransmittingBuoyTypeUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/content/data/seine/FloatingObjectTransmittingBuoyOperationUIModel.java → client-core/src/main/java/fr/ird/observe/client/ui/content/ref/seine/TransmittingBuoyTypeUI.jcss - client-core/src/main/java/fr/ird/observe/client/ui/content/table/GearUseFeatureMeasurementCellEditor.java - client-core/src/main/java/fr/ird/observe/client/ui/content/table/GearUseFeatureMeasurementCellRenderer.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 - client-runner/pom.xml - dto/pom.xml - dto/src/main/i18n/getters/java.getter - dto/src/main/java/fr/ird/observe/binder/data/seine/TransmittingBuoyDtoReferenceBinder.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/adabdcceef0af7b10874b075… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/adabdcceef0af7b10874b075… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-7.x] 5 commits: [jgitflow-maven-plugin]updating poms for branch'release/7.5.0' with non-snapshot versions[skip ci]
by Tony CHEMIT April 1, 2020

April 1, 2020

Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: df6fad63 by tchemit at 2020-04-01T11:51:20+02:00 [jgitflow-maven-plugin]updating poms for branch'release/7.5.0' with non-snapshot versions[skip ci] - - - - - 6f27425f by tchemit at 2020-04-01T11:57:42+02:00 [jgitflow-maven-plugin]merging 'release/7.5.0' into 'master-7.x' - - - - - a16952c8 by tchemit at 2020-04-01T11:57:45+02:00 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts[skip ci] - - - - - ea1dddca by tchemit at 2020-04-01T11:57:46+02:00 [jgitflow-maven-plugin]merging 'master-7.x' into 'develop-7.x' - - - - - 59b76914 by tchemit at 2020-04-01T11:57:46+02:00 [jgitflow-maven-plugin]Updating develop poms back to pre merge state[skip ci] - - - - - 0 changed files: Changes: View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/31b08b24e10056fcfa6ccc10… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/31b08b24e10056fcfa6ccc10… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-7.x] [jgitflow-maven-plugin]updating poms for 7.5.1-SNAPSHOT development[skip ci]
by Tony CHEMIT April 1, 2020

April 1, 2020

Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: 31b08b24 by tchemit at 2020-04-01T11:49:30+02:00 [jgitflow-maven-plugin]updating poms for 7.5.1-SNAPSHOT development[skip ci] - - - - - 16 changed files: - client-configuration/pom.xml - client-core/pom.xml - client-runner/pom.xml - dto/pom.xml - observe-i18n/pom.xml - observe/pom.xml - persistence/pom.xml - pom.xml - server-configuration/pom.xml - server-core/pom.xml - server-runner/pom.xml - services-client/pom.xml - services-local/pom.xml - services/pom.xml - test/pom.xml - validation/pom.xml Changes: ===================================== client-configuration/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.5.0-SNAPSHOT</version> + <version>7.5.1-SNAPSHOT</version> </parent> <artifactId>client-configuration</artifactId> ===================================== client-core/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.5.0-SNAPSHOT</version> + <version>7.5.1-SNAPSHOT</version> </parent> <artifactId>client-core</artifactId> ===================================== client-runner/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.5.0-SNAPSHOT</version> + <version>7.5.1-SNAPSHOT</version> </parent> <artifactId>client-runner</artifactId> ===================================== dto/pom.xml ===================================== @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.5.0-SNAPSHOT</version> + <version>7.5.1-SNAPSHOT</version> </parent> <artifactId>dto</artifactId> ===================================== observe-i18n/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.5.0-SNAPSHOT</version> + <version>7.5.1-SNAPSHOT</version> </parent> <artifactId>observe-i18n</artifactId> ===================================== observe/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.5.0-SNAPSHOT</version> + <version>7.5.1-SNAPSHOT</version> </parent> <artifactId>observe</artifactId> ===================================== persistence/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.5.0-SNAPSHOT</version> + <version>7.5.1-SNAPSHOT</version> </parent> <artifactId>persistence</artifactId> ===================================== pom.xml ===================================== @@ -31,7 +31,7 @@ <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.5.0-SNAPSHOT</version> + <version>7.5.1-SNAPSHOT</version> <packaging>pom</packaging> <name>ObServe :: Pom</name> ===================================== server-configuration/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.5.0-SNAPSHOT</version> + <version>7.5.1-SNAPSHOT</version> </parent> <artifactId>server-configuration</artifactId> ===================================== server-core/pom.xml ===================================== @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.5.0-SNAPSHOT</version> + <version>7.5.1-SNAPSHOT</version> </parent> <artifactId>server-core</artifactId> ===================================== server-runner/pom.xml ===================================== @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.5.0-SNAPSHOT</version> + <version>7.5.1-SNAPSHOT</version> </parent> <artifactId>server-runner</artifactId> ===================================== services-client/pom.xml ===================================== @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.5.0-SNAPSHOT</version> + <version>7.5.1-SNAPSHOT</version> </parent> <artifactId>services-client</artifactId> ===================================== services-local/pom.xml ===================================== @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.5.0-SNAPSHOT</version> + <version>7.5.1-SNAPSHOT</version> </parent> <artifactId>services-local</artifactId> ===================================== services/pom.xml ===================================== @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.5.0-SNAPSHOT</version> + <version>7.5.1-SNAPSHOT</version> </parent> <artifactId>services</artifactId> ===================================== test/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.5.0-SNAPSHOT</version> + <version>7.5.1-SNAPSHOT</version> </parent> <artifactId>test</artifactId> ===================================== validation/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.5.0-SNAPSHOT</version> + <version>7.5.1-SNAPSHOT</version> </parent> <artifactId>validation</artifactId> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/31b08b24e10056fcfa6ccc10a… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/31b08b24e10056fcfa6ccc10a… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe] Pushed new branch release/7.5.0
by Tony CHEMIT April 1, 2020

April 1, 2020

Tony CHEMIT pushed new branch release/7.5.0 at ultreiaio / ird-observe -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/tree/release/7.5.0 You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Erreur sur changement de caractéristique d'équipement de type de donnée différent - Closes #1437
by Tony CHEMIT April 1, 2020

April 1, 2020

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: d3e61f87 by tchemit at 2020-04-01T11:18:20+02:00 Erreur sur changement de caractéristique d'équipement de type de donnée différent - Closes #1437 - - - - - 3 changed files: - client-datasource-editor-common/src/main/java/fr/ird/observe/client/datasource/editor/content/data/GearUseFeatureMeasurementCellEditor.java - client-datasource-editor-common/src/main/java/fr/ird/observe/client/datasource/editor/content/data/GearUseFeatureMeasurementCellRenderer.java - dto/src/main/java/fr/ird/observe/dto/referential/common/GearCaracteristicTypeAware.java Changes: ===================================== client-datasource-editor-common/src/main/java/fr/ird/observe/client/datasource/editor/content/data/GearUseFeatureMeasurementCellEditor.java ===================================== @@ -133,7 +133,7 @@ public class GearUseFeatureMeasurementCellEditor implements TableCellEditor { GearCaracteristicTypeReference gearCaracteristicType = caracteristicRef.getGearCaracteristicType(); Map<String, TableCellEditor> editors = getEditorsByGearCaracteristicId(table); editor = editors.get(gearCaracteristicType.getId()); - value = gearCaracteristicType.getTypeValue(value); + value = gearCaracteristicType.getOptionalTypeValue(value).orElse(null); } return editor.getTableCellEditorComponent(table, value, isSelected, row, column); } ===================================== client-datasource-editor-common/src/main/java/fr/ird/observe/client/datasource/editor/content/data/GearUseFeatureMeasurementCellRenderer.java ===================================== @@ -82,7 +82,7 @@ public class GearUseFeatureMeasurementCellRenderer implements TableCellRenderer } else { GearCaracteristicTypeReference gearCaracteristicType = caracteristicRef.getGearCaracteristicType(); tableCellRenderer = renderersByCaracteristicTypeId.get(gearCaracteristicType.getId()); - value = gearCaracteristicType.getTypeValue(value); + value = gearCaracteristicType.getOptionalTypeValue(value).orElse(null); } return tableCellRenderer.getTableCellRendererComponent(table, value, isSelected, hasFocus, row, column); } ===================================== dto/src/main/java/fr/ird/observe/dto/referential/common/GearCaracteristicTypeAware.java ===================================== @@ -26,7 +26,10 @@ import com.google.common.collect.ImmutableSet; import fr.ird.observe.dto.DtoAndReferenceAware; import fr.ird.observe.dto.ProtectedIds; import fr.ird.observe.dto.reference.DtoReferenceAware; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import java.util.Optional; import java.util.Set; /** @@ -35,6 +38,8 @@ import java.util.Set; */ public interface GearCaracteristicTypeAware extends DtoReferenceAware, DtoAndReferenceAware { + Logger log = LogManager.getLogger(GearCaracteristicTypeAware.class); + Set<String> INTEGER_IDS = ImmutableSet.of(ProtectedIds.COMMON_GEAR_CARACTERISTIC_TYPE_INTEGER_UNSIGNED, ProtectedIds.COMMON_GEAR_CARACTERISTIC_TYPE_INTEGER_SIGNED); Set<String> FLOAT_IDS = ImmutableSet.of(ProtectedIds.COMMON_GEAR_CARACTERISTIC_TYPE_FLOAT_UNSIGNED, ProtectedIds.COMMON_GEAR_CARACTERISTIC_TYPE_FLOAT_SIGNED); Set<String> BOOLEAN_IDS = ImmutableSet.of(ProtectedIds.COMMON_GEAR_CARACTERISTIC_TYPE_BOOLEAN); @@ -63,4 +68,13 @@ public interface GearCaracteristicTypeAware extends DtoReferenceAware, DtoAndRef } return value; } + + default Optional<Object> getOptionalTypeValue( Object value) { + try { + return Optional.ofNullable(getTypeValue( value)); + } catch (Exception e) { + log.error(String.format("Could not get editor value from: %s", value), e); + return Optional.empty(); + } + } } View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/d3e61f870af3a0e57f6cad814… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/d3e61f870af3a0e57f6cad814… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-7.x] Erreur sur changement de caractéristique d'équipement de type de donnée différent - Closes #1437
by Tony CHEMIT April 1, 2020

April 1, 2020

Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: 24c70bef by tchemit at 2020-04-01T11:14:00+02:00 Erreur sur changement de caractéristique d'équipement de type de donnée différent - Closes #1437 - - - - - 3 changed files: - client-core/src/main/java/fr/ird/observe/client/ui/content/table/GearUseFeatureMeasurementCellEditor.java - client-core/src/main/java/fr/ird/observe/client/ui/content/table/GearUseFeatureMeasurementCellRenderer.java - dto/src/main/java/fr/ird/observe/dto/referential/GearCaracteristicTypeHelper.java Changes: ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/table/GearUseFeatureMeasurementCellEditor.java ===================================== @@ -159,7 +159,7 @@ public class GearUseFeatureMeasurementCellEditor implements TableCellEditor { Map<String, TableCellEditor> editors = getEditorsByGearCaracteristicId(table); editor = editors.get(gearCaracteristicTypeId); - value = GearCaracteristicTypeHelper.getTypeValue(gearCaracteristicTypeId, value); + value = GearCaracteristicTypeHelper.getOptionalTypeValue(gearCaracteristicTypeId, value).orElse(null); } ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/table/GearUseFeatureMeasurementCellRenderer.java ===================================== @@ -93,7 +93,7 @@ public class GearUseFeatureMeasurementCellRenderer implements TableCellRenderer tableCellRenderer = renderersByCaracteristicTypeId.get(gearCaracteristicTypeId); - value = GearCaracteristicTypeHelper.getTypeValue(gearCaracteristicTypeId, value); + value = GearCaracteristicTypeHelper.getOptionalTypeValue(gearCaracteristicTypeId, value).orElse(null); } ===================================== dto/src/main/java/fr/ird/observe/dto/referential/GearCaracteristicTypeHelper.java ===================================== @@ -23,11 +23,16 @@ package fr.ird.observe.dto.referential; */ import com.google.common.collect.Sets; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import java.util.Optional; import java.util.Set; public class GearCaracteristicTypeHelper extends GeneratedGearCaracteristicTypeHelper { + private static final Logger log = LogManager.getLogger(GearCaracteristicTypeHelper.class); + private static final Set<String> INTEGER_IDS = Sets.newHashSet( "fr.ird.observe.entities.referentiel.GearCaracteristicType#1239832686123#0.3", "fr.ird.observe.entities.referentiel.GearCaracteristicType#1239832686123#0.5" @@ -67,6 +72,14 @@ public class GearCaracteristicTypeHelper extends GeneratedGearCaracteristicTypeH return FLOAT_IDS.contains(gearCaracteristicTypeId); } + public static Optional<Object> getOptionalTypeValue(String gearCaracteristicTypeId, Object value) { + try { + return Optional.ofNullable(getTypeValue(gearCaracteristicTypeId, value)); + } catch (Exception e) { + log.error(String.format("Could not get editor value from: %s", value), e); + return Optional.empty(); + } + } public static Object getTypeValue(String gearCaracteristicTypeId, Object value) { View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/24c70befbebc8a52911c1f44e… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/24c70befbebc8a52911c1f44e… You're receiving this email because of your account on gitlab.com.

1 0

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

March 31, 2020

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 March 31, 2020

March 31, 2020

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