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

[Git][ultreiaio/ird-observe][develop-7.x] [jgitflow-maven-plugin]updating poms for 7.0.1-SNAPSHOT development[skip ci]
by Tony CHEMIT 26 Nov '18

26 Nov '18

Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: 075bfed9 by tchemit at 2018-11-26T12:23:20Z [jgitflow-maven-plugin]updating poms for 7.0.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.0.0-SNAPSHOT</version> + <version>7.0.1-SNAPSHOT</version> </parent> <artifactId>client-configuration</artifactId> ===================================== client-core/pom.xml ===================================== @@ -20,14 +20,13 @@ <http://www.gnu.org/licenses/gpl-3.0.html>. #L% --> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0.0-SNAPSHOT</version> + <version>7.0.1-SNAPSHOT</version> </parent> <artifactId>client-core</artifactId> ===================================== client-runner/pom.xml ===================================== @@ -20,14 +20,13 @@ <http://www.gnu.org/licenses/gpl-3.0.html>. #L% --> -<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0.0-SNAPSHOT</version> + <version>7.0.1-SNAPSHOT</version> </parent> <artifactId>client-runner</artifactId> @@ -203,7 +202,7 @@ <phase>generate-resources</phase> <configuration> <target> - <copy failonerror="true" overwrite="true" file="../CHANGELOG.md" tofile="${project.build.outputDirectory}/META-INF/${applicationName}-CHANGELOG.md"/> + <copy failonerror="true" overwrite="true" file="../CHANGELOG.md" tofile="${project.build.outputDirectory}/META-INF/${applicationName}-CHANGELOG.md" /> </target> </configuration> <goals> @@ -244,8 +243,8 @@ <phase>integration-test</phase> <configuration> <target> - <copy failonerror="true" overwrite="true" file="${project.build.directory}/${project.build.finalName}.jar" tofile="${project.build.directory}/${applicationJarName}.jar"/> - <copy failonerror="true" overwrite="true" file="${project.build.directory}/${project.build.finalName}.exe" tofile="${project.build.directory}/${applicationJarName}.exe"/> + <copy failonerror="true" overwrite="true" file="${project.build.directory}/${project.build.finalName}.jar" tofile="${project.build.directory}/${applicationJarName}.jar" /> + <copy failonerror="true" overwrite="true" file="${project.build.directory}/${project.build.finalName}.exe" tofile="${project.build.directory}/${applicationJarName}.exe" /> </target> </configuration> <goals> ===================================== dto/pom.xml ===================================== @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0.0-SNAPSHOT</version> + <version>7.0.1-SNAPSHOT</version> </parent> <artifactId>dto</artifactId> ===================================== observe-i18n/pom.xml ===================================== @@ -20,14 +20,13 @@ <http://www.gnu.org/licenses/gpl-3.0.html>. #L% --> -<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0.0-SNAPSHOT</version> + <version>7.0.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.0.0-SNAPSHOT</version> + <version>7.0.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.0.0-SNAPSHOT</version> + <version>7.0.1-SNAPSHOT</version> </parent> <artifactId>persistence</artifactId> ===================================== pom.xml ===================================== @@ -31,7 +31,7 @@ <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0.0-SNAPSHOT</version> + <version>7.0.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.0.0-SNAPSHOT</version> + <version>7.0.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.0.0-SNAPSHOT</version> + <version>7.0.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.0.0-SNAPSHOT</version> + <version>7.0.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.0.0-SNAPSHOT</version> + <version>7.0.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.0.0-SNAPSHOT</version> + <version>7.0.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.0.0-SNAPSHOT</version> + <version>7.0.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.0.0-SNAPSHOT</version> + <version>7.0.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.0.0-SNAPSHOT</version> + <version>7.0.1-SNAPSHOT</version> </parent> <artifactId>validation</artifactId> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/075bfed9fea6da021f385db1d96… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/075bfed9fea6da021f385db1d96… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe] Pushed new branch release/7.0.0
by Tony CHEMIT 26 Nov '18

26 Nov '18

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

1 0

[Git][ultreiaio/ird-observe][develop-7.x] update license header
by Tony CHEMIT 26 Nov '18

26 Nov '18

Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: e42f8ae6 by tchemit at 2018-11-26T12:20:21Z update license header - - - - - 12 changed files: - client-core/src/main/i18n/templates/about_es_ES.ftl - client-core/src/main/i18n/templates/dataSourceConnectionReport_es_ES.ftl - client-core/src/main/i18n/templates/dataSourceInformation_es_ES.ftl - client-core/src/main/i18n/templates/dataSourcePolicy_es_ES.ftl - client-core/src/main/i18n/templates/dataSourceSelectModeResume_es_ES.ftl - client-core/src/main/i18n/templates/initStorage_es_ES.ftl - client-core/src/main/i18n/templates/storageModelDataSourceConfiguration_es_ES.ftl - client-core/src/main/i18n/templates/validationReport_es_ES.ftl - client-core/src/main/java/fr/ird/observe/client/ui/actions/main/menu/config/TranslateAction.java - 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/table/ContentTableUIModel.java - persistence/src/main/resources/db/migration/6.1/09_fill_object_material-common.sql Changes: ===================================== client-core/src/main/i18n/templates/about_es_ES.ftl ===================================== @@ -8,12 +8,10 @@ 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>. @@ -53,4 +51,4 @@ </dl> </body> -</html> \ No newline at end of file +</html> ===================================== client-core/src/main/i18n/templates/dataSourceConnectionReport_es_ES.ftl ===================================== @@ -377,4 +377,4 @@ </ul> </#if> </body> -</html> \ No newline at end of file +</html> ===================================== client-core/src/main/i18n/templates/dataSourceInformation_es_ES.ftl ===================================== @@ -75,4 +75,4 @@ v ${connection.version} </#if> </body> -</html> \ No newline at end of file +</html> ===================================== client-core/src/main/i18n/templates/dataSourcePolicy_es_ES.ftl ===================================== @@ -50,4 +50,4 @@ Permisos: v ${version} </body> -</html> \ No newline at end of file +</html> ===================================== client-core/src/main/i18n/templates/dataSourceSelectModeResume_es_ES.ftl ===================================== @@ -58,4 +58,4 @@ No es necesario. </#if> </body> -</html> \ No newline at end of file +</html> ===================================== client-core/src/main/i18n/templates/initStorage_es_ES.ftl ===================================== @@ -8,12 +8,10 @@ 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>. @@ -39,4 +37,4 @@ Ahora puede: </ul> </body> -</html> \ No newline at end of file +</html> ===================================== client-core/src/main/i18n/templates/storageModelDataSourceConfiguration_es_ES.ftl ===================================== @@ -73,4 +73,4 @@ <#else> NINGÚN MODELO DE ALMACENAMIENTO </#if> -</#macro> \ No newline at end of file +</#macro> ===================================== client-core/src/main/i18n/templates/validationReport_es_ES.ftl ===================================== @@ -1,6 +1,6 @@ <#-- #%L - ObServe :: Información al cliente + ObServe :: Client core %% Copyright (C) 2008 - 2018 IRD, Code Lutin, Ultreia.io %% @@ -58,4 +58,4 @@ </table> </#list> </body> -</html> \ No newline at end of file +</html> ===================================== client-core/src/main/java/fr/ird/observe/client/ui/actions/main/menu/config/TranslateAction.java ===================================== @@ -10,12 +10,12 @@ package fr.ird.observe.client.ui.actions.main.menu.config; * 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>. ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/seine/FloatingObjectUIHandler.java ===================================== @@ -8,12 +8,12 @@ * 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>. ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/table/ContentTableUIModel.java ===================================== @@ -8,12 +8,12 @@ * 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>. ===================================== persistence/src/main/resources/db/migration/6.1/09_fill_object_material-common.sql ===================================== @@ -98,4 +98,4 @@ INSERT INTO observe_seine.objectmaterial (topiaid, topiaversion, topiacreatedate INSERT INTO observe_seine.objectmaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, code, legacycode, standardcode, parent, status, needcomment, uri, objectmaterialtype, biodegradable, nonentangling, label1, label2, label3, label4, label5, label6, label7, label8, childrenmultiselectable, childselectionmandatory, validation) VALUES ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.80',0, '2018-11-12','2018-11-12 17:27:06.06232','6-3','8',null, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.77',0, false, null, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0', null, true, 'Tuna seiner (or skiff)','Thonier (ou skiff)','Atunero (oó panga)',null, null, null, null, null, false, false, null); INSERT INTO observe_seine.objectmaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, code, legacycode, standardcode, parent, status, needcomment, uri, objectmaterialtype, biodegradable, nonentangling, label1, label2, label3, label4, label5, label6, label7, label8, childrenmultiselectable, childselectionmandatory, validation) VALUES ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.81',0, '2018-11-12','2018-11-12 17:27:06.06232','6-4','9',null, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.77',0, false, null, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0', null, true, 'Supply','Bateau d’appui','Macicero',null, null, null, null, null, false, false, null); INSERT INTO observe_seine.objectmaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, code, legacycode, standardcode, parent, status, needcomment, uri, objectmaterialtype, biodegradable, nonentangling, label1, label2, label3, label4, label5, label6, label7, label8, childrenmultiselectable, childselectionmandatory, validation) VALUES ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.82',0, '2018-11-12','2018-11-12 17:27:06.06232','6-5','5*, 6*, 21*',null, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.77',0, false, null, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0', null, null, 'Tagged','Balisé','Marcado',null, null, null, null, null, false, false, null); -INSERT INTO observe_seine.objectmaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, code, legacycode, standardcode, parent, status, needcomment, uri, objectmaterialtype, biodegradable, nonentangling, label1, label2, label3, label4, label5, label6, label7, label8, childrenmultiselectable, childselectionmandatory, validation) VALUES ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.100',0, '2018-11-12','2018-11-12 17:27:06.06232','6-6','16',null, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.77',0, true, null, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0', null, null, ' Raft or buoy drifting','Radeau ou bouée en dérive','Parilla o buoy a la deriva',null, null, null, null, null, false, false, null); \ No newline at end of file +INSERT INTO observe_seine.objectmaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, code, legacycode, standardcode, parent, status, needcomment, uri, objectmaterialtype, biodegradable, nonentangling, label1, label2, label3, label4, label5, label6, label7, label8, childrenmultiselectable, childselectionmandatory, validation) VALUES ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.100',0, '2018-11-12','2018-11-12 17:27:06.06232','6-6','16',null, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.77',0, true, null, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0', null, null, ' Raft or buoy drifting','Radeau ou bouée en dérive','Parilla o buoy a la deriva',null, null, null, null, null, false, false, null); View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/e42f8ae6043ad755ea6be08e9f4… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/e42f8ae6043ad755ea6be08e9f4… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] update changelog
by Tony CHEMIT 26 Nov '18

26 Nov '18

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 73960aff by tchemit at 2018-11-26T12:14:18Z update changelog - - - - - 5 changed files: - .mvn/gitlab-cache/milestones/532657-issues.json - .mvn/gitlab-cache/milestones/681916-artifacts.json - .mvn/gitlab-cache/milestones/681916-issues.json - .mvn/gitlab-cache/milestones/681916.json - CHANGELOG.md Changes: ===================================== .mvn/gitlab-cache/milestones/532657-issues.json ===================================== @@ -159,7 +159,9 @@ "title": "En mode de compatibilité \"référentiels obsolètes\", les rendre utilisable en saisie", "description": "Depuis la V7, en mode de compatibilité \"référentiels obsolètes\", on peut clôturer l\u0027élément récalcitrant faisant appel à un référentiel obsolète, ce qui permet de continuer à travailler.\n\nToutefois les éléments désactivés restent indisponibles en saisie. Par exemple sur les systèmes observés, si on retire 6-Epave balisée des systèmes sélectionnés, 6-Epave balisée ne réapparait pas (même en grisé) dans la liste des systèmes disponibles. De même dans les listes déroulantes les éléments désactivés n\u0027apparaissent pas.\n\nÉtant donné que ce mode est utilisé par les administrateurs de données on pense qu\u0027il faudrait, dans ce nouveau mode, rendre de plus les éléments obsolètes disponibles en saisie. A la condition indispensable qu\u0027ils apparaissent en grisé dans les listes de choix, pour maintenir la distinction.\n\nOn pense que ce mode doit aller au bout du concept et permettre de travailler avec les entrées obsolètes.", "labels": [ - "Evolution" + "Evolution", + "IRD-2018-01-V8", + "À facturer" ], "milestone": { "id": 532657, @@ -197,7 +199,7 @@ "_avatarUrl": "https://secure.gravatar.com/avatar/b4ae117bd93e10d96298fa4d885208ea?s\u003d…" }, "state": "opened", - "updatedAt": "Oct 22, 2018 3:17:43 PM", + "updatedAt": "Nov 12, 2018 10:41:12 AM", "createdAt": "Oct 22, 2018 12:01:54 PM" }, { @@ -491,8 +493,8 @@ "_canCreateTeam": false, "_avatarUrl": "https://secure.gravatar.com/avatar/b4ae117bd93e10d96298fa4d885208ea?s\u003d…" }, - "state": "opened", - "updatedAt": "Oct 23, 2018 1:40:59 PM", + "state": "closed", + "updatedAt": "Nov 19, 2018 10:25:50 AM", "createdAt": "Oct 5, 2018 9:34:12 PM" }, { @@ -885,8 +887,8 @@ "_canCreateTeam": false, "_avatarUrl": "https://secure.gravatar.com/avatar/b4ae117bd93e10d96298fa4d885208ea?s\u003d…" }, - "state": "opened", - "updatedAt": "Oct 23, 2018 5:33:42 PM", + "state": "closed", + "updatedAt": "Nov 19, 2018 11:56:50 AM", "createdAt": "Oct 5, 2018 7:43:10 PM" }, { @@ -1496,16 +1498,16 @@ "state": "active" }, "assignee": { - "_id": 1111318, - "_username": "pcauquil", - "_name": "Pascal Cauquil", + "_id": 166231, + "_username": "tchemit", + "_name": "Tony CHEMIT", "_state": "active", "_darkScheme": false, "_isAdmin": false, "_canCreateGroup": false, "_canCreateProject": false, "_canCreateTeam": false, - "_avatarUrl": "https://secure.gravatar.com/avatar/b4ae117bd93e10d96298fa4d885208ea?s\u003d…" + "_avatarUrl": "https://secure.gravatar.com/avatar/2a915aa9a1df35c8b609ff2f750d5dac?s\u003d…" }, "author": { "_id": 166231, @@ -1520,7 +1522,7 @@ "_avatarUrl": "https://secure.gravatar.com/avatar/2a915aa9a1df35c8b609ff2f750d5dac?s\u003d…" }, "state": "opened", - "updatedAt": "Oct 8, 2018 12:08:30 PM", + "updatedAt": "Nov 16, 2018 3:13:41 PM", "createdAt": "Mar 27, 2018 3:49:17 PM" }, { @@ -1666,8 +1668,8 @@ "_canCreateTeam": false, "_avatarUrl": "https://secure.gravatar.com/avatar/2a915aa9a1df35c8b609ff2f750d5dac?s\u003d…" }, - "state": "opened", - "updatedAt": "Oct 7, 2018 6:00:54 PM", + "state": "closed", + "updatedAt": "Nov 23, 2018 4:41:46 PM", "createdAt": "Mar 27, 2018 1:27:27 PM" }, { ===================================== .mvn/gitlab-cache/milestones/681916-artifacts.json ===================================== @@ -1,12 +1,12 @@ [ { "name": "Application", - "filename": "observe-7.0.0-SNAPSHOT.zip", - "url": "https://ultreia.io/release/observe-7.0.0-SNAPSHOT.zip" + "filename": "observe-7.0.0.zip", + "url": "https://ultreia.io/release/observe-7.0.0.zip" }, { "name": "Serveur", - "filename": "observe-7.0.0-SNAPSHOT.war", - "url": "https://ultreia.io/release/observe-7.0.0-SNAPSHOT.war" + "filename": "observe-7.0.0.war", + "url": "https://ultreia.io/release/observe-7.0.0.war" } ] \ No newline at end of file ===================================== .mvn/gitlab-cache/milestones/681916-issues.json ===================================== The diff for this file was not included because it is too large. ===================================== .mvn/gitlab-cache/milestones/681916.json ===================================== @@ -5,7 +5,7 @@ "groupId": 0, "title": "7.0.0", "description": "", - "dueDate": "Nov 15, 2018 1:00:00 AM", + "dueDate": "Nov 26, 2018 1:00:00 AM", "startDate": "Oct 22, 2018 2:00:00 AM", "state": "closed" } \ No newline at end of file ===================================== CHANGELOG.md ===================================== @@ -1,7 +1,7 @@ # ObServe changelog * Author [Tony Chemit](mailto:dev@tchemit.fr) - * Last generated at 2018-11-11 21:07. + * Last generated at 2018-11-26 13:13. ## Version [8.0-alpha-3](https://gitlab.com/ultreiaio/ird-observe/milestones/114) Première partie du troisième lot du contrat IRD-2018-01-V8.
contient les nouveaux écrans, mais aucune des fonctionnalités avancées. @@ -76,15 +76,24 @@ Premier lot du contrat IRD-2018-01-V8 ## Version [7.0.0](https://gitlab.com/ultreiaio/ird-observe/milestones/130) -**Closed at 2018-11-15.** +**Closed at 2018-11-26.** ### Download -* [Application (observe-7.0.0-SNAPSHOT.zip)](https://ultreia.io/release/observe-7.0.0-SNAPSHOT.zip) -* [Serveur (observe-7.0.0-SNAPSHOT.war)](https://ultreia.io/release/observe-7.0.0-SNAPSHOT.war) +* [Application (observe-7.0.0.zip)](https://ultreia.io/release/observe-7.0.0.zip) +* [Serveur (observe-7.0.0.war)](https://ultreia.io/release/observe-7.0.0.war) ### Issues * [[Anomalie 1163]](https://gitlab.com/ultreiaio/ird-observe/issues/1163) **Le script postgresql/update.bat ne démarre pas** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) * [[Anomalie 1168]](https://gitlab.com/ultreiaio/ird-observe/issues/1168) **[FOB] Les valeurs des caractéristiques/matériaux désactivés ne sont pas affichées** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Anomalie 1169]](https://gitlab.com/ultreiaio/ird-observe/issues/1169) **[FOB] Affichage bizarre** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Anomalie 1174]](https://gitlab.com/ultreiaio/ird-observe/issues/1174) **[PS] Libération faune accessoire -> Exception** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Anomalie 1179]](https://gitlab.com/ultreiaio/ird-observe/issues/1179) **[SYNCHRO AVANCEE MAREE] La recopie de marées échoue** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Anomalie 1180]](https://gitlab.com/ultreiaio/ird-observe/issues/1180) **Le démarrage du service web 7.0.0 provoque cette erreur sous Tomcat** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Evolution 1170]](https://gitlab.com/ultreiaio/ird-observe/issues/1170) **Mise à jour des objectmaterial** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Evolution 1171]](https://gitlab.com/ultreiaio/ird-observe/issues/1171) **Après insertion de #1170** (Thanks to Pascal Cauquil) (Reported by Pascal Cauquil) + * [[Evolution 1173]](https://gitlab.com/ultreiaio/ird-observe/issues/1173) **Spanish translations** (Thanks to Tony CHEMIT) (Reported by Loures Ramos Alonso) + * [[Evolution 1175]](https://gitlab.com/ultreiaio/ird-observe/issues/1175) **[PS][FOB] Permettre NULL sur les propriétés biodegradable et nonentangling, ainsi que sur les déductions** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Evolution 1176]](https://gitlab.com/ultreiaio/ird-observe/issues/1176) **Propriétés biodegradable et nonEntangling non présentes sur l'éditeur de ObjectMaterial** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) * [[Tâche 1160]](https://gitlab.com/ultreiaio/ird-observe/issues/1160) **Translate application** (Thanks to Pascal Cauquil) (Reported by Tony CHEMIT) * [[Tâche 1161]](https://gitlab.com/ultreiaio/ird-observe/issues/1161) **Versions à migrer** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/73960aff944badaa662b56c3eaf… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/73960aff944badaa662b56c3eaf… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] [PS] Libération faune accessoire -> Exception - Closes #1174 (bis)
by Tony CHEMIT 23 Nov '18

23 Nov '18

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: f96d4e7d by tchemit at 2018-11-23T15:27:03Z [PS] Libération faune accessoire -> Exception - Closes #1174 (bis) - - - - - 3 changed files: - client-core/src/main/java/fr/ird/observe/client/ui/actions/content/api/data/table/SaveTableDataUIAction.java - client-core/src/main/java/fr/ird/observe/client/ui/content/api/ContentUIHandler.java - client-core/src/main/java/fr/ird/observe/client/ui/content/api/ContentUIModel.java Changes: ===================================== client-core/src/main/java/fr/ird/observe/client/ui/actions/content/api/data/table/SaveTableDataUIAction.java ===================================== @@ -26,6 +26,7 @@ import fr.ird.observe.client.ui.ObserveKeyStrokes; import fr.ird.observe.client.ui.ObserveMainUI; import fr.ird.observe.client.ui.actions.content.api.AbstractContentUIAction; import fr.ird.observe.client.ui.content.api.ContentUI; +import fr.ird.observe.client.ui.content.api.data.table.ContentTableModel; import fr.ird.observe.client.ui.content.api.data.table.ContentTableUI; import fr.ird.observe.client.ui.content.api.data.table.ContentTableUIModel; import fr.ird.observe.client.ui.util.UIHelper; @@ -65,7 +66,16 @@ public class SaveTableDataUIAction<D extends DataDto, C extends DataDto, U exten } private boolean doSave(U ui, D bean) { - List<C> objets = ui.getTableModel().getData(); + + ContentTableUIModel<D, C> model = ui.getModel(); + ContentTableModel<D, C> tableModel = ui.getTableModel(); + if (model.isModified() || model.isCanSaveRow()) { + + // flush modified line to model + tableModel.updateRowFromEditBean(); + } + + List<C> objets = tableModel.getData(); boolean canContinue; try { canContinue = ui.getHandler().prepareSave(bean, objets); ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/api/ContentUIHandler.java ===================================== @@ -185,7 +185,7 @@ public abstract class ContentUIHandler implements ObserveSe if (model.isCreatingMode()) { // on peut quitter le mode creation si le modele est non modifie et valide - if (!(model.isEnabled() && model.isEditing() && (model.isModified() || !model.isValid()))) { + if (!(model.isEnabled() && model.isEditing() && (model.isGlobalModified() || !model.isValid()))) { if (model.isEditing()) { ui.stopEdit(); } @@ -196,7 +196,7 @@ public abstract class ContentUIHandler implements ObserveSe } else { // on peut quiiter le mode mise a jour si le modele est non modifie - if (!(model.isEnabled() && model.isEditing() && model.isModified())) { + if (!(model.isEnabled() && model.isEditing() && model.isGlobalModified())) { if (model.isEditing()) { ui.stopEdit(); } ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/api/ContentUIModel.java ===================================== @@ -213,6 +213,10 @@ public abstract class ContentUIModel extends AbstractSerializableBean { return modified; } + public boolean isGlobalModified() { + return isModified(); + } + public void setModified(boolean modified) { this.modified = modified; firePropertyChange(PROPERTY_MODIFIED, modified); View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/f96d4e7d8d8f778d71ac1cb21c7… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/f96d4e7d8d8f778d71ac1cb21c7… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 7 commits: [PS][FOB] Permettre NULL sur les propriétés biodegradable et nonentangling,…
by Tony CHEMIT 23 Nov '18

23 Nov '18

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 068dcddc by tchemit at 2018-11-23T14:56:05Z [PS][FOB] Permettre NULL sur les propriétés biodegradable et nonentangling, ainsi que sur les déductions - Closes #1175 - - - - - 4cf0d0ed by tchemit at 2018-11-23T15:09:13Z [PS][FOB] Permettre NULL sur les propriétés biodegradable et nonentangling, ainsi que sur les déductions - Closes #1175 (test) - - - - - c9dcbb03 by tchemit at 2018-11-23T15:14:33Z Propriétés biodegradable et nonEntangling non présentes sur l'éditeur de ObjectMaterial - Closes #1176 - - - - - 7eac880c by tchemit at 2018-11-23T15:15:20Z optimize i18n - - - - - 5c684f5e by Pascal Cauquil at 2018-11-23T15:15:26Z Matériau objet 2-2-4-2 'Net', passage de biodegradable de NULL à FALSE (c'était un oubli) - - - - - c5c6423d by tchemit at 2018-11-23T15:15:35Z Question calculs biodégradable, nonentangling et type simplifié à l'arrivée et au départ - Closes #1177 - - - - - 43b37bf4 by tchemit at 2018-11-23T15:25:16Z [PS] Libération faune accessoire -> Exception - Closes #1174 - - - - - 21 changed files: - client-core/src/main/i18n/getters/java.getter - client-core/src/main/i18n/getters/jaxx.getter - client-core/src/main/java/fr/ird/observe/client/ui/content/api/data/table/ContentTableUIModel.java - client-core/src/main/java/fr/ird/observe/client/ui/content/ref/seine/ObjectMaterialUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/content/ref/seine/ObjectMaterialUI.jcss - dto/src/main/models/Observe-02-referential-seine.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/ObjectMaterialEntityDtoBinder.java - persistence/src/main/models/Observe-02-referential-seine.model - persistence/src/main/resources/db/migration/6.1/02_add_object_material-common.sql - persistence/src/main/resources/db/migration/6.1/09_fill_object_material-common.sql - services/src/main/java/fr/ird/observe/services/service/actions/consolidate/dcp/ConsolidateFloatingObjectResultBuilder.java - services/src/main/java/fr/ird/observe/services/service/actions/consolidate/dcp/FloatingObjectConsolidateEngine.java - test/src/main/resources/db/7.4/dataForTestLongline.sql.gz - test/src/main/resources/db/7.4/dataForTestSeine.sql.gz - test/src/main/resources/db/7.4/empty_h2.sql.gz - test/src/main/resources/db/7.4/empty_pg.sql.gz - test/src/main/resources/db/7.4/referentiel.sql.gz - test/src/main/resources/fixtures/validate-service-referential.properties Changes: ===================================== client-core/src/main/i18n/getters/java.getter ===================================== @@ -0,0 +1,1035 @@ +aboutframe.changelog +observe.action.about +observe.action.about.tip +observe.action.admin.cancel +observe.action.admin.close +observe.action.apply +observe.action.back.to.list +observe.action.back.to.list.tip +observe.action.cancel +observe.action.cancel.remote.tip +observe.action.cancel.server.tip +observe.action.change.storage +observe.action.change.storage.tip +observe.action.choose.activity.sample.message +observe.action.choose.activity.sample.title +observe.action.choose.db.dump +observe.action.choose.db.dump.description +observe.action.choose.db.dump.directory +observe.action.choose.landing.tripLongline.message +observe.action.choose.landing.tripLongline.title +observe.action.choose.program.message +observe.action.choose.program.title +observe.action.choose.reportFile +observe.action.choose.reportFile.description +observe.action.choose.route.message +observe.action.choose.route.title +observe.action.choose.tripLongline.message +observe.action.choose.tripLongline.sample.message +observe.action.choose.tripLongline.sample.title +observe.action.choose.tripLongline.title +observe.action.choose.tripSeine.message +observe.action.choose.tripSeine.title +observe.action.close.open +observe.action.close.open.tip +observe.action.close.storage +observe.action.close.storage.tip +observe.action.config.export.required.write.data +observe.action.configuration +observe.action.configuration.tip +observe.action.configure +observe.action.connexions +observe.action.connexions.tip +observe.action.copyFloatingObjectPartToLeft +observe.action.copyFloatingObjectPartToLeft.tip +observe.action.copyFloatingObjectPartToRight +observe.action.copyFloatingObjectPartToRight.tip +observe.action.create +observe.action.delete +observe.action.delete.floatingObject.tip +observe.action.delete.remote.tip +observe.action.delete.server.tip +observe.action.delete.set.tip +observe.action.delete.tip +observe.action.detail +observe.action.exit +observe.action.exit.tip +observe.action.floatingObjectPresets +observe.action.floatingObjectPresets.tip +observe.action.goDown +observe.action.goDown.tip +observe.action.goUp +observe.action.goUp.tip +observe.action.goto.referentiel.common.tip +observe.action.goto.referentiel.longline.tip +observe.action.goto.referentiel.seine.tip +observe.action.info.storage +observe.action.info.storage.tip +observe.action.load.from.file +observe.action.load.from.file.tip +observe.action.locale.es +observe.action.locale.es.tip +observe.action.locale.fr +observe.action.locale.fr.tip +observe.action.locale.uk +observe.action.locale.uk.tip +observe.action.modify +observe.action.move.to.activity +observe.action.move.to.trip +observe.action.open.screen +observe.action.presets.create +observe.action.presets.create.tip +observe.action.quit +observe.action.quit.tip +observe.action.reload.application +observe.action.reload.storage +observe.action.reload.storage.tip +observe.action.reload.ui +observe.action.reloadDefaultConfiguration +observe.action.reloadDefaultConfiguration.tip +observe.action.reloadResources +observe.action.reloadResources.tip +observe.action.reset +observe.action.reset.remote.tip +observe.action.reset.server.tip +observe.action.restart.application +observe.action.restart.application.tip +observe.action.save +observe.action.save.remote.tip +observe.action.save.server.tip +observe.action.save.tip +observe.action.save.to.file +observe.action.save.to.file.tip +observe.action.selectNode +observe.action.selectNode.tip +observe.action.show.technical.informations.tip +observe.action.show.usages.tip +observe.action.showConfig.title +observe.action.site +observe.action.site.tip +observe.action.start.h2.web.server +observe.action.start.h2.web.server.tip +observe.action.start.server.mode +observe.action.start.server.mode.tip +observe.action.stop.h2.web.server +observe.action.stop.h2.web.server.tip +observe.action.stop.server.mode +observe.action.stop.server.mode.tip +observe.action.storage.applyAction +observe.action.test.remote +observe.action.test.remote.tip +observe.action.test.server +observe.action.test.server.tip +observe.action.toFullScreen +observe.action.toFullScreen.tip +observe.action.toWindowScreen +observe.action.toWindowScreen.tip +observe.action.translate +observe.action.translate.tip +observe.actions.consolidate +observe.actions.consolidate.description +observe.actions.consolidate.message.activity +observe.actions.consolidate.message.noChanges +observe.actions.consolidate.message.operation.done +observe.actions.consolidate.message.save.changes +observe.actions.consolidate.message.trip +observe.actions.consolidate.start.trip +observe.actions.consolidate.title +observe.actions.consolidate.title.tip +observe.actions.exportData +observe.actions.exportData.description +observe.actions.exportData.message.add.missing.referential +observe.actions.exportData.message.add.missing.referentials2 +observe.actions.exportData.message.not.possible +observe.actions.exportData.message.operation.needFix +observe.actions.exportData.message.prepare.data +observe.actions.exportData.table.exist.label +observe.actions.exportData.table.exist.label.tip +observe.actions.exportData.table.program.label +observe.actions.exportData.table.program.label.tip +observe.actions.exportData.table.selected +observe.actions.exportData.table.selected.tip +observe.actions.exportData.table.trip.label +observe.actions.exportData.table.trip.label.tip +observe.actions.exportData.title +observe.actions.exportData.title.tip +observe.actions.longline.pairing +observe.actions.longline.pairing.description +observe.actions.longline.pairing.tip +observe.actions.longline.pairing.title +observe.actions.operation.message.canceled +observe.actions.operation.message.done +observe.actions.operation.message.failed +observe.actions.operation.message.needFix +observe.actions.operation.message.running +observe.actions.operation.message.successed +observe.actions.report +observe.actions.report.description +observe.actions.report.title +observe.actions.report.title.tip +observe.actions.saveLocal +observe.actions.saveLocal.description +observe.actions.synchro.data +observe.actions.synchro.data.description +observe.actions.synchro.data.message.data.loaded +observe.actions.synchro.data.prepare.copyToTask +observe.actions.synchro.data.prepare.deleteTask +observe.actions.synchro.data.result.delete.trip +observe.actions.synchro.data.result.export.trip +observe.actions.synchro.data.result.import.trip +observe.actions.synchro.data.task.copyToLeft +observe.actions.synchro.data.task.copyToRight +observe.actions.synchro.data.task.deleteFromLeft +observe.actions.synchro.data.task.deleteFromRight +observe.actions.synchro.data.title +observe.actions.synchro.data.title.tip +observe.actions.synchro.launch.operation +observe.actions.synchro.prepare.operation +observe.actions.synchro.referential +observe.actions.synchro.referential.action.copyToLeft.tip +observe.actions.synchro.referential.action.copyToRight.tip +observe.actions.synchro.referential.action.deleteFromLeft.tip +observe.actions.synchro.referential.action.deleteFromRight.tip +observe.actions.synchro.referential.action.desactivateFromLeft.tip +observe.actions.synchro.referential.action.desactivateFromLeftWithReplacement.tip +observe.actions.synchro.referential.action.desactivateFromRight.tip +observe.actions.synchro.referential.action.desactivateFromRightWithReplacement.tip +observe.actions.synchro.referential.action.revertFromLeft.tip +observe.actions.synchro.referential.action.revertFromRight.tip +observe.actions.synchro.referential.action.skipFromLeft.tip +observe.actions.synchro.referential.action.skipFromRight.tip +observe.actions.synchro.referential.description +observe.actions.synchro.referential.legacy +observe.actions.synchro.referential.legacy.description +observe.actions.synchro.referential.legacy.launch.operation +observe.actions.synchro.referential.legacy.tip +observe.actions.synchro.referential.message.apply.done +observe.actions.synchro.referential.message.build.diff +observe.actions.synchro.referential.message.need.save.for.synchro.operation +observe.actions.synchro.referential.message.need.save.for.validation.operation +observe.actions.synchro.referential.message.no.local.modification +observe.actions.synchro.referential.message.ref.is.updtodate +observe.actions.synchro.referential.message.referential.leftData.loaded +observe.actions.synchro.referential.message.referential.rightData.loaded +observe.actions.synchro.referential.message.referentiel.was.added +observe.actions.synchro.referential.message.referentiel.was.modified +observe.actions.synchro.referential.message.referentiel.was.removed +observe.actions.synchro.referential.message.referentiel.was.replaced +observe.actions.synchro.referential.message.saveLocal.skip +observe.actions.synchro.referential.message.synchro.local.modification +observe.actions.synchro.referential.replaceBefore.message +observe.actions.synchro.referential.replaceBeforeDelete.title +observe.actions.synchro.referential.replaceBeforeDesactivate.title +observe.actions.synchro.referential.task.addToLeft +observe.actions.synchro.referential.task.addToRight +observe.actions.synchro.referential.task.deleteFromLeft +observe.actions.synchro.referential.task.deleteFromRight +observe.actions.synchro.referential.task.desactivateFromLeft +observe.actions.synchro.referential.task.desactivateFromRight +observe.actions.synchro.referential.task.desactivateWithReplaceFromLeft +observe.actions.synchro.referential.task.desactivateWithReplaceFromLeftWithReplacement +observe.actions.synchro.referential.task.desactivateWithReplaceFromRight +observe.actions.synchro.referential.task.desactivateWithReplaceFromRightWithReplacement +observe.actions.synchro.referential.task.prepare +observe.actions.synchro.referential.task.revertFromLeft +observe.actions.synchro.referential.task.revertFromRight +observe.actions.synchro.referential.task.skipFromLeft +observe.actions.synchro.referential.task.skipFromRight +observe.actions.synchro.referential.task.updateToLeft +observe.actions.synchro.referential.task.updateToRight +observe.actions.synchro.referential.title +observe.actions.synchro.referential.title.tip +observe.actions.synchro.referential.withMode +observe.actions.validate +observe.actions.validate.choose.report.directory +observe.actions.validate.continue.with.no.save.report +observe.actions.validate.description +observe.actions.validate.message.detected +observe.actions.validate.message.no.validation.detected +observe.actions.validate.message.not.save.report +observe.actions.validate.message.nothing.to.do +observe.actions.validate.message.operation.done +observe.actions.validate.message.operation.needFix +observe.actions.validate.message.prepare.validators +observe.actions.validate.message.save.report +observe.actions.validate.message.use.storage +observe.actions.validate.message.validate.trip +observe.actions.validate.save +observe.actions.validate.save.reportFile +observe.actions.validate.selected.validators +observe.actions.validate.title +observe.actions.validate.title.choose.report.directory +observe.actions.validate.title.tip +observe.actions.validate.validator.field.header +observe.actions.validate.validator.field.header.tip +observe.actions.validate.validator.message.header +observe.actions.validate.validator.message.header.tip +observe.actions.validate.validator.scope.header +observe.actions.validate.validator.scope.header.tip +observe.admin.resume.no.operation.done +observe.admin.resume.operation.canceled +observe.admin.resume.operation.done +observe.admin.resume.operation.failed +observe.admin.resume.operation.need.fix +observe.admin.resume.operation.not.started +observe.admin.resume.operation.running +observe.backup.done +observe.backup.start +observe.choice.cancel +observe.choice.confirm.delete +observe.choice.confirm.insert +observe.choice.confirm.replace +observe.choice.continue +observe.choice.createLocalStorage +observe.choice.doNotSave +observe.choice.doNothing +observe.choice.loadLastAutomaticBackup +observe.choice.quit +observe.choice.replace +observe.choice.save +observe.choice.useRemoteStorage +observe.common.ActivityDto.action.delete.tip +observe.common.ActivityDto.action.goToOpen.short +observe.common.ActivityDto.action.goToOpen.tip +observe.common.ActivityLogbookDto.action.goToOpen.short +observe.common.ActivityLogbookDto.action.goToOpen.tip +observe.common.ActivityLonglineLogbookDto.action.addSample +observe.common.ActivityLonglineLogbookDto.action.addSample.tip +observe.common.ActivityLonglineLogbookDto.action.addSet +observe.common.ActivityLonglineLogbookDto.action.addSet.tip +observe.common.ActivityLonglineLogbookDto.action.chooseRelatedObservedActivity +observe.common.ActivityLonglineLogbookDto.action.chooseRelatedObservedActivity.message +observe.common.ActivityLonglineLogbookDto.action.chooseRelatedObservedActivity.title +observe.common.ActivityLonglineLogbookDto.action.moves +observe.common.ActivityLonglineLogbookDto.action.moves.tip +observe.common.ActivityLonglineLogbookDto.message.not.open +observe.common.ActivityLonglineLogbookDto.relatedObservedActivity +observe.common.ActivityLonglineObsDto.action.addSet +observe.common.ActivityLonglineObsDto.action.addSet.tip +observe.common.ActivityLonglineObsDto.action.moves +observe.common.ActivityLonglineObsDto.action.moves.tip +observe.common.ActivityLonglineObsDto.message.not.open +observe.common.ActivityObsDto.action.goToOpen.short +observe.common.ActivityObsDto.action.goToOpen.tip +observe.common.ActivitySeineDto.action.addFloatingObject +observe.common.ActivitySeineDto.action.addFloatingObject.tip +observe.common.ActivitySeineDto.action.addSet +observe.common.ActivitySeineDto.action.addSet.tip +observe.common.ActivitySeineDto.action.moves +observe.common.ActivitySeineDto.action.moves.tip +observe.common.ActivitySeineDto.error.no.activity.6 +observe.common.ActivitySeineDto.message.not.open +observe.common.ActivitySeineDto.vesselActivitySeine.comment +observe.common.BaitsCompositionLogbookDto.table.baitSettingStatus +observe.common.BaitsCompositionLogbookDto.table.baitSettingStatus.tip +observe.common.BaitsCompositionLogbookDto.table.baitType +observe.common.BaitsCompositionLogbookDto.table.baitType.tip +observe.common.BaitsCompositionLogbookDto.table.individualSize +observe.common.BaitsCompositionLogbookDto.table.individualSize.tip +observe.common.BaitsCompositionLogbookDto.table.individualWeight +observe.common.BaitsCompositionLogbookDto.table.individualWeight.tip +observe.common.BaitsCompositionLogbookDto.table.proportion +observe.common.BaitsCompositionLogbookDto.table.proportion.tip +observe.common.BaitsCompositionObsDto.table.baitSettingStatus +observe.common.BaitsCompositionObsDto.table.baitSettingStatus.tip +observe.common.BaitsCompositionObsDto.table.baitType +observe.common.BaitsCompositionObsDto.table.baitType.tip +observe.common.BaitsCompositionObsDto.table.individualSize +observe.common.BaitsCompositionObsDto.table.individualSize.tip +observe.common.BaitsCompositionObsDto.table.individualWeight +observe.common.BaitsCompositionObsDto.table.individualWeight.tip +observe.common.BaitsCompositionObsDto.table.proportion +observe.common.BaitsCompositionObsDto.table.proportion.tip +observe.common.BranchlineObsDto.message.modified +observe.common.BranchlineObsDto.message.modified.but.invalid +observe.common.BranchlinesCompositionLogbookDto.table.length +observe.common.BranchlinesCompositionLogbookDto.table.length.tip +observe.common.BranchlinesCompositionLogbookDto.table.proportion +observe.common.BranchlinesCompositionLogbookDto.table.proportion.tip +observe.common.BranchlinesCompositionLogbookDto.table.topType +observe.common.BranchlinesCompositionLogbookDto.table.topType.tip +observe.common.BranchlinesCompositionLogbookDto.table.tracelineLength +observe.common.BranchlinesCompositionLogbookDto.table.tracelineLength.tip +observe.common.BranchlinesCompositionLogbookDto.table.tracelineType +observe.common.BranchlinesCompositionLogbookDto.table.tracelineType.tip +observe.common.BranchlinesCompositionObsDto.table.length +observe.common.BranchlinesCompositionObsDto.table.length.tip +observe.common.BranchlinesCompositionObsDto.table.proportion +observe.common.BranchlinesCompositionObsDto.table.proportion.tip +observe.common.BranchlinesCompositionObsDto.table.topType +observe.common.BranchlinesCompositionObsDto.table.topType.tip +observe.common.BranchlinesCompositionObsDto.table.tracelineLength +observe.common.BranchlinesCompositionObsDto.table.tracelineLength.tip +observe.common.BranchlinesCompositionObsDto.table.tracelineType +observe.common.BranchlinesCompositionObsDto.table.tracelineType.tip +observe.common.CatchLonglineLogbookDto.table.acquisitionMode +observe.common.CatchLonglineLogbookDto.table.acquisitionMode.tip +observe.common.CatchLonglineLogbookDto.table.catchFateLongline +observe.common.CatchLonglineLogbookDto.table.catchFateLongline.tip +observe.common.CatchLonglineLogbookDto.table.catchHealthness +observe.common.CatchLonglineLogbookDto.table.catchHealthness.tip +observe.common.CatchLonglineLogbookDto.table.comment +observe.common.CatchLonglineLogbookDto.table.comment.tip +observe.common.CatchLonglineLogbookDto.table.count +observe.common.CatchLonglineLogbookDto.table.count.tip +observe.common.CatchLonglineLogbookDto.table.countDepredated +observe.common.CatchLonglineLogbookDto.table.countDepredated.tip +observe.common.CatchLonglineLogbookDto.table.depredated +observe.common.CatchLonglineLogbookDto.table.depredated.tip +observe.common.CatchLonglineLogbookDto.table.discardHealthness +observe.common.CatchLonglineLogbookDto.table.discardHealthness.tip +observe.common.CatchLonglineLogbookDto.table.speciesCatch +observe.common.CatchLonglineLogbookDto.table.speciesCatch.tip +observe.common.CatchLonglineObsDto.table.acquisitionMode +observe.common.CatchLonglineObsDto.table.acquisitionMode.tip +observe.common.CatchLonglineObsDto.table.basketHaulingId +observe.common.CatchLonglineObsDto.table.basketHaulingId.tip +observe.common.CatchLonglineObsDto.table.branchlineHaulingId +observe.common.CatchLonglineObsDto.table.branchlineHaulingId.tip +observe.common.CatchLonglineObsDto.table.catchFateLongline +observe.common.CatchLonglineObsDto.table.catchFateLongline.tip +observe.common.CatchLonglineObsDto.table.catchHealthness +observe.common.CatchLonglineObsDto.table.catchHealthness.tip +observe.common.CatchLonglineObsDto.table.comment +observe.common.CatchLonglineObsDto.table.comment.tip +observe.common.CatchLonglineObsDto.table.count +observe.common.CatchLonglineObsDto.table.count.tip +observe.common.CatchLonglineObsDto.table.depredated +observe.common.CatchLonglineObsDto.table.depredated.tip +observe.common.CatchLonglineObsDto.table.discardHealthness +observe.common.CatchLonglineObsDto.table.discardHealthness.tip +observe.common.CatchLonglineObsDto.table.sectionHaulingId +observe.common.CatchLonglineObsDto.table.sectionHaulingId.tip +observe.common.CatchLonglineObsDto.table.speciesCatch +observe.common.CatchLonglineObsDto.table.speciesCatch.tip +observe.common.DataDto.action.reset +observe.common.DataDto.action.reset.tip +observe.common.DataDto.type +observe.common.Dto.label.usage.data.title +observe.common.Dto.label.usage.referential.title +observe.common.Dto.lastUpdateDate +observe.common.Dto.message.cantWriteData +observe.common.Dto.technicalInformations +observe.common.Dto.topiaCreateDate +observe.common.Dto.topiaId +observe.common.Dto.topiaVersion +observe.common.EncounterObsDto.table.count +observe.common.EncounterObsDto.table.count.tip +observe.common.EncounterObsDto.table.distance +observe.common.EncounterObsDto.table.distance.tip +observe.common.EncounterObsDto.table.encounterType +observe.common.EncounterObsDto.table.encounterType.tip +observe.common.EncounterObsDto.table.species +observe.common.EncounterObsDto.table.species.tip +observe.common.FloatingObjectDto.is.a.reference +observe.common.FloatingObjectDto.not.a.reference +observe.common.FloatingObjectDto.notComputed +observe.common.FloatingObjectDto.table.type +observe.common.FloatingObjectReference.action.add +observe.common.FloatingObjectReference.action.add.tip +observe.common.FloatingObjectReference.action.edit +observe.common.FloatingObjectReference.action.edit.tip +observe.common.FloatingObjectReference.action.remove +observe.common.FloatingObjectReference.action.remove.tip +observe.common.FloatingObjectReference.action.select +observe.common.FloatingObjectReference.choose.title +observe.common.FloatingObjectReference.delete.message +observe.common.FloatingObjectReference.delete.title +observe.common.FloatlinesCompositionLogbookDto.table.length +observe.common.FloatlinesCompositionLogbookDto.table.length.tip +observe.common.FloatlinesCompositionLogbookDto.table.lineType +observe.common.FloatlinesCompositionLogbookDto.table.lineType.tip +observe.common.FloatlinesCompositionLogbookDto.table.proportion +observe.common.FloatlinesCompositionLogbookDto.table.proportion.tip +observe.common.FloatlinesCompositionObsDto.table.length +observe.common.FloatlinesCompositionObsDto.table.length.tip +observe.common.FloatlinesCompositionObsDto.table.lineType +observe.common.FloatlinesCompositionObsDto.table.lineType.tip +observe.common.FloatlinesCompositionObsDto.table.proportion +observe.common.FloatlinesCompositionObsDto.table.proportion.tip +observe.common.GearUseFeatures.delete +observe.common.GearUseFeaturesLonglineDto.table.comment +observe.common.GearUseFeaturesLonglineDto.table.comment.tip +observe.common.GearUseFeaturesLonglineDto.table.gear +observe.common.GearUseFeaturesLonglineDto.table.gear.tip +observe.common.GearUseFeaturesLonglineDto.table.gearCaracteristic +observe.common.GearUseFeaturesLonglineDto.table.gearCaracteristic.tip +observe.common.GearUseFeaturesLonglineDto.table.number +observe.common.GearUseFeaturesLonglineDto.table.number.tip +observe.common.GearUseFeaturesLonglineDto.table.usedInTrip +observe.common.GearUseFeaturesLonglineDto.table.usedInTrip.tip +observe.common.GearUseFeaturesLonglineDto.table.value +observe.common.GearUseFeaturesLonglineDto.table.value.tip +observe.common.GearUseFeaturesSeineDto.table.comment +observe.common.GearUseFeaturesSeineDto.table.comment.tip +observe.common.GearUseFeaturesSeineDto.table.gear +observe.common.GearUseFeaturesSeineDto.table.gear.tip +observe.common.GearUseFeaturesSeineDto.table.gearCaracteristic +observe.common.GearUseFeaturesSeineDto.table.gearCaracteristic.tip +observe.common.GearUseFeaturesSeineDto.table.number +observe.common.GearUseFeaturesSeineDto.table.number.tip +observe.common.GearUseFeaturesSeineDto.table.usedInTrip +observe.common.GearUseFeaturesSeineDto.table.usedInTrip.tip +observe.common.GearUseFeaturesSeineDto.table.value +observe.common.GearUseFeaturesSeineDto.table.value.tip +observe.common.HooksCompositionLogbookDto.table.hookOffset +observe.common.HooksCompositionLogbookDto.table.hookOffset.tip +observe.common.HooksCompositionLogbookDto.table.hookSize +observe.common.HooksCompositionLogbookDto.table.hookSize.tip +observe.common.HooksCompositionLogbookDto.table.hookType +observe.common.HooksCompositionLogbookDto.table.hookType.tip +observe.common.HooksCompositionLogbookDto.table.proportion +observe.common.HooksCompositionLogbookDto.table.proportion.tip +observe.common.HooksCompositionObsDto.table.hookOffset +observe.common.HooksCompositionObsDto.table.hookOffset.tip +observe.common.HooksCompositionObsDto.table.hookSize +observe.common.HooksCompositionObsDto.table.hookSize.tip +observe.common.HooksCompositionObsDto.table.hookType +observe.common.HooksCompositionObsDto.table.hookType.tip +observe.common.HooksCompositionObsDto.table.proportion +observe.common.HooksCompositionObsDto.table.proportion.tip +observe.common.LandingPartLogbookDto.table.count +observe.common.LandingPartLogbookDto.table.count.tip +observe.common.LandingPartLogbookDto.table.species +observe.common.LandingPartLogbookDto.table.species.tip +observe.common.LandingPartLogbookDto.table.weight +observe.common.LandingPartLogbookDto.table.weight.tip +observe.common.LandingPartLogbookDto.table.weightCategoryMax +observe.common.LandingPartLogbookDto.table.weightCategoryMax.tip +observe.common.LandingPartLogbookDto.table.weightCategoryMin +observe.common.LandingPartLogbookDto.table.weightCategoryMin.tip +observe.common.LonglineDetailCompositionObsDto.action.deleteAllSections +observe.common.LonglineDetailCompositionObsDto.action.deleteAllSections.tip +observe.common.LonglineDetailCompositionObsDto.action.generateAllSections +observe.common.LonglineDetailCompositionObsDto.action.generateAllSections.tip +observe.common.LonglineDetailCompositionObsDto.basket.cant.delete.message +observe.common.LonglineDetailCompositionObsDto.basket.cant.delete.title +observe.common.LonglineDetailCompositionObsDto.basket.invalid.nextFloatline1Length +observe.common.LonglineDetailCompositionObsDto.basketsTable.floatline1Length +observe.common.LonglineDetailCompositionObsDto.basketsTable.floatline1Length.tip +observe.common.LonglineDetailCompositionObsDto.basketsTable.floatline2Length +observe.common.LonglineDetailCompositionObsDto.basketsTable.floatline2Length.tip +observe.common.LonglineDetailCompositionObsDto.basketsTable.haulingIdentifier +observe.common.LonglineDetailCompositionObsDto.basketsTable.haulingIdentifier.tip +observe.common.LonglineDetailCompositionObsDto.basketsTable.settingIdentifier +observe.common.LonglineDetailCompositionObsDto.basketsTable.settingIdentifier.tip +observe.common.LonglineDetailCompositionObsDto.branchLine.cant.delete.message +observe.common.LonglineDetailCompositionObsDto.branchLine.cant.delete.title +observe.common.LonglineDetailCompositionObsDto.branchlinesTable.branchlineLength +observe.common.LonglineDetailCompositionObsDto.branchlinesTable.branchlineLength.tip +observe.common.LonglineDetailCompositionObsDto.branchlinesTable.haulingIdentifier +observe.common.LonglineDetailCompositionObsDto.branchlinesTable.haulingIdentifier.tip +observe.common.LonglineDetailCompositionObsDto.branchlinesTable.settingIdentifier +observe.common.LonglineDetailCompositionObsDto.branchlinesTable.settingIdentifier.tip +observe.common.LonglineDetailCompositionObsDto.branchlinesTable.tracelineLength +observe.common.LonglineDetailCompositionObsDto.branchlinesTable.tracelineLength.tip +observe.common.LonglineDetailCompositionObsDto.firstTemplate.template.notCompilant.basketCount +observe.common.LonglineDetailCompositionObsDto.section.cant.delete.message +observe.common.LonglineDetailCompositionObsDto.section.cant.delete.title +observe.common.LonglineDetailCompositionObsDto.section.delete.message +observe.common.LonglineDetailCompositionObsDto.sectionTemplate.delete +observe.common.LonglineDetailCompositionObsDto.sectionTemplatesTable.identifier +observe.common.LonglineDetailCompositionObsDto.sectionTemplatesTable.identifier.tip +observe.common.LonglineDetailCompositionObsDto.sectionTemplatesTable.value +observe.common.LonglineDetailCompositionObsDto.sectionTemplatesTable.value.tip +observe.common.LonglineDetailCompositionObsDto.sectionsTable.haulingIdentifier +observe.common.LonglineDetailCompositionObsDto.sectionsTable.haulingIdentifier.tip +observe.common.LonglineDetailCompositionObsDto.sectionsTable.settingIdentifier +observe.common.LonglineDetailCompositionObsDto.sectionsTable.settingIdentifier.tip +observe.common.LonglineDetailCompositionObsDto.sectionsTable.template +observe.common.LonglineDetailCompositionObsDto.sectionsTable.template.tip +observe.common.LonglineDetailCompositionObsDto.title.section.cant.use.firstTemplate +observe.common.NonTargetCatchDto.catchWeightComputed.computed.tip +observe.common.NonTargetCatchDto.catchWeightComputed.observed.tip +observe.common.NonTargetCatchDto.meanLengthComputed.computed.tip +observe.common.NonTargetCatchDto.meanLengthComputed.observed.tip +observe.common.NonTargetCatchDto.meanWeightComputed.computed.tip +observe.common.NonTargetCatchDto.meanWeightComputed.observed.tip +observe.common.NonTargetCatchDto.message.table.will.delete.nonTargetSample +observe.common.NonTargetCatchDto.table.catchWeight +observe.common.NonTargetCatchDto.table.catchWeight.tip +observe.common.NonTargetCatchDto.table.comment +observe.common.NonTargetCatchDto.table.comment.tip +observe.common.NonTargetCatchDto.table.meanLength +observe.common.NonTargetCatchDto.table.meanLength.tip +observe.common.NonTargetCatchDto.table.meanWeight +observe.common.NonTargetCatchDto.table.meanWeight.tip +observe.common.NonTargetCatchDto.table.reasonForDiscard +observe.common.NonTargetCatchDto.table.reasonForDiscard.tip +observe.common.NonTargetCatchDto.table.speciesFate +observe.common.NonTargetCatchDto.table.speciesFate.tip +observe.common.NonTargetCatchDto.table.speciesFaune +observe.common.NonTargetCatchDto.table.speciesFaune.tip +observe.common.NonTargetCatchDto.table.totalCount +observe.common.NonTargetCatchDto.table.totalCount.tip +observe.common.NonTargetCatchDto.table.well +observe.common.NonTargetCatchDto.table.well.tip +observe.common.NonTargetCatchDto.totalCountComputed.computed.tip +observe.common.NonTargetCatchDto.totalCountComputed.observed.tip +observe.common.NonTargetCatchReleaseDto.table.comment +observe.common.NonTargetCatchReleaseDto.table.comment.tip +observe.common.NonTargetCatchReleaseDto.table.conformity +observe.common.NonTargetCatchReleaseDto.table.conformity.tip +observe.common.NonTargetCatchReleaseDto.table.length +observe.common.NonTargetCatchReleaseDto.table.length.tip +observe.common.NonTargetCatchReleaseDto.table.releasingTime +observe.common.NonTargetCatchReleaseDto.table.releasingTime.tip +observe.common.NonTargetCatchReleaseDto.table.sex +observe.common.NonTargetCatchReleaseDto.table.sex.tip +observe.common.NonTargetCatchReleaseDto.table.species +observe.common.NonTargetCatchReleaseDto.table.species.tip +observe.common.NonTargetCatchReleaseDto.table.speciesGroupReleaseMode +observe.common.NonTargetCatchReleaseDto.table.speciesGroupReleaseMode.tip +observe.common.NonTargetLengthDto.speciesFate +observe.common.NonTargetLengthDto.table.count +observe.common.NonTargetLengthDto.table.count.tip +observe.common.NonTargetLengthDto.table.gender +observe.common.NonTargetLengthDto.table.gender.tip +observe.common.NonTargetLengthDto.table.length +observe.common.NonTargetLengthDto.table.length.tip +observe.common.NonTargetLengthDto.table.meanWeight +observe.common.NonTargetLengthDto.table.meanWeight.tip +observe.common.NonTargetLengthDto.table.nonTargetSpecies +observe.common.NonTargetLengthDto.table.nonTargetSpecies.tip +observe.common.NonTargetLengthDto.table.picturesReferences +observe.common.NonTargetLengthDto.table.picturesReferences.tip +observe.common.NonTargetLengthDto.table.sizeMeasureType +observe.common.NonTargetLengthDto.table.sizeMeasureType.tip +observe.common.ObjectObservedSpeciesDto.table.count +observe.common.ObjectObservedSpeciesDto.table.count.tip +observe.common.ObjectObservedSpeciesDto.table.speciesFaune +observe.common.ObjectObservedSpeciesDto.table.speciesFaune.tip +observe.common.ObjectObservedSpeciesDto.table.speciesStatus +observe.common.ObjectObservedSpeciesDto.table.speciesStatus.tip +observe.common.OpenableDto.action.reopen +observe.common.OpenableDto.action.reopen.tip +observe.common.ProgramDto.action.goToOpen.short +observe.common.ProgramDto.action.goToOpen.tip +observe.common.ReferentialDto.action.showUniqueKeys.tip +observe.common.ReferentialDto.obsolete +observe.common.ReferentialDto.type +observe.common.RouteDto.action.delete.tip +observe.common.RouteDto.action.goToOpen.short +observe.common.RouteDto.action.goToOpen.tip +observe.common.RouteDto.action.moves +observe.common.RouteDto.action.moves.tip +observe.common.RouteDto.choice.create.fin.veille.activity +observe.common.RouteDto.choice.not.create.fin.veille.activity.and.continue +observe.common.RouteDto.message.need.fin.veille.activity +observe.common.RouteDto.message.not.open +observe.common.SamplePartLogbookDto.table.count +observe.common.SamplePartLogbookDto.table.count.tip +observe.common.SamplePartLogbookDto.table.length +observe.common.SamplePartLogbookDto.table.length.tip +observe.common.SamplePartLogbookDto.table.sex +observe.common.SamplePartLogbookDto.table.sex.tip +observe.common.SamplePartLogbookDto.table.sizeMeasureType +observe.common.SamplePartLogbookDto.table.sizeMeasureType.tip +observe.common.SamplePartLogbookDto.table.species +observe.common.SamplePartLogbookDto.table.species.tip +observe.common.SamplePartLogbookDto.table.weight +observe.common.SamplePartLogbookDto.table.weight.tip +observe.common.SamplePartLogbookDto.table.weightMeasureType +observe.common.SamplePartLogbookDto.table.weightMeasureType.tip +observe.common.SchoolEstimateDto.table.meanWeight +observe.common.SchoolEstimateDto.table.meanWeight.tip +observe.common.SchoolEstimateDto.table.speciesThon +observe.common.SchoolEstimateDto.table.speciesThon.tip +observe.common.SchoolEstimateDto.table.weight +observe.common.SchoolEstimateDto.table.weight.tip +observe.common.SensorUsedObsDto.action.exportData +observe.common.SensorUsedObsDto.action.importData +observe.common.SensorUsedObsDto.choose.title.exportData +observe.common.SensorUsedObsDto.choose.title.importData +observe.common.SensorUsedObsDto.delete.data.message +observe.common.SensorUsedObsDto.message.data.exported +observe.common.SensorUsedObsDto.replace.data.message +observe.common.SensorUsedObsDto.table.data +observe.common.SensorUsedObsDto.table.data.tip +observe.common.SensorUsedObsDto.table.dataLocation +observe.common.SensorUsedObsDto.table.dataLocation.tip +observe.common.SensorUsedObsDto.table.sensorBrand +observe.common.SensorUsedObsDto.table.sensorBrand.tip +observe.common.SensorUsedObsDto.table.sensorDataFormat +observe.common.SensorUsedObsDto.table.sensorDataFormat.tip +observe.common.SensorUsedObsDto.table.sensorSerialNo +observe.common.SensorUsedObsDto.table.sensorSerialNo.tip +observe.common.SensorUsedObsDto.table.sensorType +observe.common.SensorUsedObsDto.table.sensorType.tip +observe.common.SetLonglineLogbookDto.action.copyValuesAndSave +observe.common.SetSeineDto.message.no.nonTargetCatchRelease +observe.common.SetSeineDto.message.no.nonTargetDiscarded +observe.common.SetSeineDto.message.no.targetCatch +observe.common.SetSeineDto.message.no.targetDiscarded +observe.common.SetSeineDto.schoolType.not.fill +observe.common.SizeMeasureObsDto.delete.message +observe.common.SizeMeasureObsDto.table.size +observe.common.SizeMeasureObsDto.table.size.tip +observe.common.SizeMeasureObsDto.table.sizeMeasureType +observe.common.SizeMeasureObsDto.table.sizeMeasureType.tip +observe.common.TargetCatchDto.message.table.will.delete.targetLength +observe.common.TargetCatchDto.table.comment +observe.common.TargetCatchDto.table.comment.tip +observe.common.TargetCatchDto.table.speciesThon +observe.common.TargetCatchDto.table.speciesThon.tip +observe.common.TargetCatchDto.table.weight +observe.common.TargetCatchDto.table.weight.tip +observe.common.TargetCatchDto.table.weightCategory +observe.common.TargetCatchDto.table.weightCategory.tip +observe.common.TargetCatchDto.table.well +observe.common.TargetCatchDto.table.well.tip +observe.common.TargetDiscardDto.message.table.will.delete.targetLength +observe.common.TargetDiscardDto.table.broughtOnDeck +observe.common.TargetDiscardDto.table.broughtOnDeck.tip +observe.common.TargetDiscardDto.table.comment +observe.common.TargetDiscardDto.table.comment.tip +observe.common.TargetDiscardDto.table.reasonForDiscard +observe.common.TargetDiscardDto.table.reasonForDiscard.tip +observe.common.TargetDiscardDto.table.species.tip +observe.common.TargetDiscardDto.table.speciesThon +observe.common.TargetDiscardDto.table.weight +observe.common.TargetDiscardDto.table.weight.tip +observe.common.TargetDiscardDto.table.weightCategory +observe.common.TargetDiscardDto.table.weightCategory.tip +observe.common.TargetLengthDto.table.count +observe.common.TargetLengthDto.table.count.tip +observe.common.TargetLengthDto.table.length +observe.common.TargetLengthDto.table.length.tip +observe.common.TargetLengthDto.table.meanWeight +observe.common.TargetLengthDto.table.meanWeight.tip +observe.common.TargetLengthDto.table.sex +observe.common.TargetLengthDto.table.sex.tip +observe.common.TargetLengthDto.table.sizeMeasureType +observe.common.TargetLengthDto.table.sizeMeasureType.tip +observe.common.TargetLengthDto.table.speciesThon +observe.common.TargetLengthDto.table.speciesThon.tip +observe.common.TargetLengthDto.table.totalWeight +observe.common.TargetLengthDto.table.totalWeight.tip +observe.common.TdrObsDto.action.exportData +observe.common.TdrObsDto.action.importData +observe.common.TdrObsDto.choose.title.exportData +observe.common.TdrObsDto.choose.title.importData +observe.common.TdrObsDto.delete.data.message +observe.common.TdrObsDto.replace.data.message +observe.common.TdrObsDto.table.data +observe.common.TdrObsDto.table.data.tip +observe.common.TdrObsDto.table.homeId +observe.common.TdrObsDto.table.homeId.tip +observe.common.TdrObsDto.table.sensorBrand +observe.common.TdrObsDto.table.sensorBrand.tip +observe.common.TdrObsDto.table.serialNo +observe.common.TdrObsDto.table.serialNo.tip +observe.common.TripDto.action.delete.tip +observe.common.TripDto.action.goToOpen.short +observe.common.TripDto.action.goToOpen.tip +observe.common.TripDto.action.moves +observe.common.TripDto.action.moves.tip +observe.common.TripLonglineDto.message.not.open +observe.common.TripLonglineLandingLogbookDto.action.delete.tip +observe.common.TripLonglineLandingLogbookDto.action.goToOpen.short +observe.common.TripLonglineLandingLogbookDto.action.goToOpen.tip +observe.common.TripLonglineLandingLogbookDto.action.move +observe.common.TripLonglineLandingLogbookDto.action.move.tip +observe.common.TripLonglineLandingLogbookDto.action.moves +observe.common.TripLonglineLandingLogbookDto.action.moves.tip +observe.common.TripLonglineLandingLogbookDto.action.selectTransshipment +observe.common.TripLonglineLandingLogbookDto.message.not.open +observe.common.TripLonglineSampleLogbookDto.action.delete.tip +observe.common.TripLonglineSampleLogbookDto.action.goToOpen.short +observe.common.TripLonglineSampleLogbookDto.action.goToOpen.tip +observe.common.TripLonglineSampleLogbookDto.action.moves +observe.common.TripLonglineSampleLogbookDto.action.moves.tip +observe.common.TripLonglineSampleLogbookDto.message.not.open +observe.common.TripSeineDto.message.not.open +observe.common.WeightMeasureObsDto.delete.message +observe.common.WeightMeasureObsDto.table.weight +observe.common.WeightMeasureObsDto.table.weight.tip +observe.common.WeightMeasureObsDto.table.weightMeasureType +observe.common.WeightMeasureObsDto.table.weightMeasureType.tip +observe.common.action.moveBottom +observe.common.action.moveBottom.tip +observe.common.action.moveDown +observe.common.action.moveDown.tip +observe.common.action.moveTop +observe.common.action.moveTop.tip +observe.common.action.moveUp +observe.common.action.moveUp.tip +observe.common.action.selectFirst.tip +observe.common.action.selectLast.tip +observe.common.action.selectNext.tip +observe.common.action.selectPrevious.tip +observe.common.boolean.false +observe.common.boolean.null +observe.common.boolean.true +observe.common.data +observe.common.exist.on.remote +observe.common.saveFile.overwrite +observe.common.saveFile.overwrite.cancel +observe.common.saveFile.overwrite.ok +observe.common.saveFile.overwrite.title +observe.common.storage.not.valid +observe.common.whenArriving +observe.common.whenLeaving +observe.config.category.application +observe.config.category.application.description +observe.config.category.expert +observe.config.category.expert.description +observe.config.category.observation +observe.config.category.observation.description +observe.config.category.speciesList.longline +observe.config.category.speciesList.longline.description +observe.config.category.speciesList.seine +observe.config.category.speciesList.seine.description +observe.config.category.technical +observe.config.category.technical.description +observe.config.category.ui +observe.config.category.ui.description +observe.constant.ObserveModelType.EMPTY +observe.constant.ObserveModelType.EMPTY.description +observe.constant.ObserveModelType.LL +observe.constant.ObserveModelType.LL.description +observe.constant.ObserveModelType.PS +observe.constant.ObserveModelType.PS.description +observe.constant.ObserveModelType.REF +observe.constant.ObserveModelType.REF.description +observe.content.map.action.exportPng +observe.content.map.action.exportPng.tip +observe.content.map.action.zoomIt +observe.content.map.action.zoomIt.tip +observe.content.map.action.zoomMoins +observe.content.map.action.zoomMoins.tip +observe.content.map.action.zoomPlus +observe.content.map.action.zoomPlus.tip +observe.content.map.east +observe.content.map.export.chooseFile.ok +observe.content.map.export.chooseFile.png +observe.content.map.export.chooseFile.title +observe.content.map.export.success +observe.content.map.legend.logbook.hauling +observe.content.map.legend.logbook.setting +observe.content.map.legend.obs.hauling +observe.content.map.legend.obs.setting +observe.content.map.legend.tripBetweenTwoDays +observe.content.map.legend.tripDay +observe.content.map.miles +observe.content.map.north +observe.content.map.south +observe.content.map.west +observe.converter.error.float.format +observe.converter.error.no.convertor +observe.converter.error.noValue +observe.entity.message.creating +observe.entity.message.reading +observe.entity.message.updating +observe.error.can.not.create.directory +observe.error.storage.could.not.backup.unsane.local.db +observe.error.storage.could.not.load.local.db +observe.generateHtml.error +observe.init.local.db.detected +observe.init.local.db.error +observe.init.no.initial.dump.detected +observe.init.no.local.db.detected +observe.init.storage.done +observe.menu.navigation.action.move.activityLongline +observe.menu.navigation.action.move.activitySeine +observe.menu.navigation.action.move.route +observe.menu.navigation.action.move.sample +observe.menu.navigation.action.move.sample.choice +observe.menu.navigation.action.move.sample.choice.title +observe.menu.navigation.action.move.tripLongline +observe.menu.navigation.action.move.tripSeine +observe.menu.navigation.action.noAction +observe.message.db.closed +observe.message.db.loaded +observe.message.db.loading +observe.message.db.none.loaded +observe.message.db.none.loaded.tip +observe.message.delete +observe.message.delete.directory +observe.message.delete.new +observe.message.goto.site +observe.message.help.usage +observe.message.loaded.tip +observe.message.no.local.db.found +observe.message.no.report.selected +observe.message.no.usage.for.entity +observe.message.quit.invalid.edit +observe.message.quit.valid.edit +observe.message.reload.i18n +observe.message.select.report +observe.message.server.info +observe.message.show.usage.for.delete +observe.message.show.usage.for.desactivated +observe.message.show.usage.for.missingReferentials2 +observe.message.show.usages +observe.message.table.editBean.modified +observe.message.table.editBean.modified.but.invalid +observe.message.warning.will.be.delete +observe.runner.config.loaded +observe.runner.context.loaded +observe.runner.copy.default.map.file +observe.runner.copy.default.report.file +observe.runner.copy.default.ui.file +observe.runner.create.directory +observe.runner.exists.directory +observe.runner.i18n.loaded +observe.runner.init +observe.runner.load.database +observe.runner.loaded +observe.runner.loading.ui.configuration +observe.runner.quit.withno.ui +observe.runner.start +observe.runner.ui.loaded +observe.runner.user.directories.loaded +observe.security.referentiel +observe.security.referentiel.tip +observe.security.role +observe.security.role.tip +observe.security.technicien +observe.security.technicien.tip +observe.security.unused +observe.security.unused.tip +observe.security.utilisateur +observe.security.utilisateur.tip +observe.selection.no.trips.selected +observe.selection.selected.trips +observe.storage.action.cancel +observe.storage.config.exportSource.storage +observe.storage.config.exportTarget.storage +observe.storage.config.left.storage +observe.storage.config.referentiel.storage +observe.storage.config.right.storage +observe.storage.config.source.storage +observe.storage.error.badUrl +observe.storage.error.dbVersionMismatch +observe.storage.error.rest.database.unknownForUser +observe.storage.error.rest.password.bad +observe.storage.error.rest.password.required +observe.storage.error.rest.user.required +observe.storage.error.rest.user.unknown +observe.storage.error.serverVersionMismatch +observe.storage.error.serverVersionModelMismatch +observe.storage.internalDump.last.modified +observe.storage.internalDump.not.exist +observe.storage.label.data.import.db +observe.storage.label.db.to.create +observe.storage.label.db.to.update +observe.storage.label.db.to.update.security +observe.storage.label.import.data +observe.storage.label.import.data.remote +observe.storage.label.import.data.server +observe.storage.label.import.referentiel +observe.storage.label.import.referentiel.remote +observe.storage.label.import.referentiel.server +observe.storage.label.local +observe.storage.label.reference.import.db +observe.storage.label.remote +observe.storage.label.server +observe.storage.locale.db +observe.storage.message.closed +observe.storage.message.closing +observe.storage.message.created +observe.storage.message.creating +observe.storage.message.destroyed +observe.storage.message.destroying +observe.storage.message.opened +observe.storage.message.opening +observe.storage.migrate.askUser.message +observe.storage.migrate.askUser.title +observe.storage.migrate.not.possible.before.version.3.0.message +observe.storage.migrate.not.possible.before.version.3.0.title +observe.storage.presets.delete.message +observe.storage.presets.delete.title +observe.storage.remote.configuration.name +observe.storage.remote.configuration.save.title +observe.storage.remote.db +observe.storage.remote.login +observe.storage.remote.password +observe.storage.remote.url +observe.storage.remote.useSll +observe.storage.remoteConfiguration.presets.save +observe.storage.report.can.migrate +observe.storage.report.can.not.migrate +observe.storage.required.rw.on.data +observe.storage.server.dataBase +observe.storage.server.dataBase.name +observe.storage.server.db +observe.storage.server.default.dataBase +observe.storage.server.sessionExpire +observe.storage.server.sessionExpire.change +observe.storage.server.sessionExpire.close +observe.storage.server.sessionExpire.reload +observe.storage.server.sessionExpire.title +observe.storage.serverConfiguration.presets.save +observe.storage.step.label +observe.title.about +observe.title.can.not.delete.referentiel +observe.title.can.not.export.data2 +observe.title.can.not.export.obstuna +observe.title.choose.db.dump +observe.title.choose.db.dump.directory +observe.title.choose.reportFile +observe.title.confirmReplace +observe.title.connect.existingDB +observe.title.connect.remoteDB +observe.title.connect.serverDB +observe.title.create.local.db +observe.title.delete +observe.title.error.dialog +observe.title.import.localDB +observe.title.load.remote.db +observe.title.need.confirm +observe.title.need.confirm.to.desactivate.referentiel +observe.title.no.local.db.found +observe.title.reload.i18n +observe.title.save.localDB +observe.title.save.remoteDB +observe.title.show.usage +observe.title.storage.info +observe.title.unique.key +observe.title.welcome.admin +observe.tree.action.configure.tip +observe.ui.tree.gearUseFeatures +observe.ui.tree.longline.catch +observe.ui.tree.longline.encounter +observe.ui.tree.longline.logbook.activity.list +observe.ui.tree.longline.logbook.activity.unsaved +observe.ui.tree.longline.logbook.landing.list +observe.ui.tree.longline.logbook.sample.list +observe.ui.tree.longline.logbook.sample.unsaved +observe.ui.tree.longline.logbook.set.unsaved +observe.ui.tree.longline.obs.activity.list +observe.ui.tree.longline.obs.activity.unsaved +observe.ui.tree.longline.obs.set.unsaved +observe.ui.tree.longline.obs.tdr +observe.ui.tree.longline.sample +observe.ui.tree.longline.sensorUsed +observe.ui.tree.longline.setDetailComposition +observe.ui.tree.longline.setGlobalComposition +observe.ui.tree.longline.trip.unsaved +observe.ui.tree.referential.common +observe.ui.tree.referential.longline +observe.ui.tree.referential.seine +observe.ui.tree.seine.activity.list +observe.ui.tree.seine.activity.unsaved +observe.ui.tree.seine.discardedTargetCatch +observe.ui.tree.seine.discardedTargetSample +observe.ui.tree.seine.floatingObject.unsaved +observe.ui.tree.seine.keptTargetCatch +observe.ui.tree.seine.keptTargetSample +observe.ui.tree.seine.nonTargetCatch +observe.ui.tree.seine.nonTargetCatchRelease +observe.ui.tree.seine.nonTargetSample +observe.ui.tree.seine.objectObservedSpecies +observe.ui.tree.seine.objectOperation +observe.ui.tree.seine.objectSchoolEstimate +observe.ui.tree.seine.route.list +observe.ui.tree.seine.route.unsaved +observe.ui.tree.seine.schoolEstimate +observe.ui.tree.seine.set.unsaved +observe.ui.tree.seine.trip.unsaved +observe.validator.field.tip +observe.validator.message.tip +observe.validator.scope.tip +observe.warning.nimbus.landf +observe.warning.no.ui ===================================== client-core/src/main/i18n/getters/jaxx.getter ===================================== @@ -465,9 +465,11 @@ observe.common.NonTargetSampleDto.action.create.tip observe.common.NonTargetSampleDto.action.resetPicturesReferences.tip observe.common.NonTargetSampleDto.message.cantAdd observe.common.NonTargetSampleDto.title +observe.common.ObjectMaterialDto.biodegradable observe.common.ObjectMaterialDto.childSelectionMandatory observe.common.ObjectMaterialDto.childrenMultiSelectable observe.common.ObjectMaterialDto.legacyCodeStandardCode +observe.common.ObjectMaterialDto.nonEntangling observe.common.ObjectMaterialDto.objectMaterialType observe.common.ObjectMaterialDto.parentCode observe.common.ObjectMaterialDto.validation ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/api/data/table/ContentTableUIModel.java ===================================== @@ -8,12 +8,12 @@ * 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>. @@ -248,6 +248,10 @@ public abstract class ContentTableUIModel<D extends DataDto, C extends DataDto> selectionModel.setSelectionInterval(selectedRow, selectedRow); } + public boolean isGlobalModified() { + return super.isGlobalModified() || getTableModel().isModified() || isCanSaveRow(); + } + /** * Le modèle de sélection pour un tableau. * ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/ref/seine/ObjectMaterialUI.jaxx ===================================== @@ -30,7 +30,8 @@ fr.ird.observe.dto.referential.seine.ObjectMaterialDto fr.ird.observe.dto.referential.seine.ObjectMaterialReference fr.ird.observe.dto.referential.seine.ObjectMaterialTypeReference - + fr.ird.observe.client.ui.util.BooleanEditor + org.nuiton.jaxx.widgets.select.BeanFilterableComboBox static fr.ird.observe.client.ui.util.UIHelper.getStringValue @@ -111,8 +112,26 @@ </cell> </row> +  + <row> + <cell anchor="west"> + <JLabel id='biodegradableLabel'/> + </cell> + <cell anchor='east' weightx="1" fill="both"> + <BooleanEditor id='biodegradable'/> + </cell> + </row> +  + <row> + <cell anchor="west"> + <JLabel id='nonEntanglingLabel'/> + </cell> + <cell anchor='east' weightx="1" fill="both"> + <BooleanEditor id='nonEntangling'/> + </cell> + </row> +  -  <row> <cell anchor='west' columns="2"> <JLabel id='validationInformation'/> ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/ref/seine/ObjectMaterialUI.jcss ===================================== @@ -57,3 +57,11 @@ #childSelectionMandatory { selected:{bean.isChildSelectionMandatory()}; } + +#nonEntangling { + booleanValue:{bean.getNonEntangling()}; +} + +#biodegradable { + booleanValue:{bean.getBiodegradable()}; +} ===================================== dto/src/main/models/Observe-02-referential-seine.model ===================================== @@ -9,8 +9,8 @@ referential.seine.NonTargetCatchReleasingTime > referential.I18nReferential referential.seine.ObjectMaterial > referential.I18nReferential | references=code,label,uri,parentId,objectMaterialTypeId,validation,biodegradable,nonEntangling legacyCode + {*:1} String standardCode + {*:1} String -biodegradable + {*:1} boolean -nonEntangling + {*:1} boolean +biodegradable + {*:1} Boolean +nonEntangling + {*:1} Boolean childrenMultiSelectable + {*:1} boolean childSelectionMandatory + {*:1} boolean parent {*:0..1} fr.ird.observe.dto.referential.seine.ObjectMaterialReference ===================================== observe-i18n/src/main/i18n/translations/observe_en_GB.properties ===================================== @@ -197,10 +197,10 @@ observe.actions.exportData.title.tip=Export datas to Obstuna observe.actions.longline.pairing=Longline activities pairing observe.actions.longline.pairing.config=Pairing configuration observe.actions.longline.pairing.description=Longline activities pairing +observe.actions.longline.pairing.message.operation.done=Pairing operation done in %1$s. observe.actions.longline.pairing.tip=Longline activities pairing observe.actions.longline.pairing.title=Longline activities pairing observe.actions.longline.pairing.title.tip=Longline activities pairing -observe.actions.longline.pairing.message.operation.done=Pairing operation done in %1$s. observe.actions.operation.configuration=Configuration of operations observe.actions.operation.message.canceled=Operation <%1$s> canceled. observe.actions.operation.message.done=Operation done at %1$td/%1$tm/%1$tY à %1$tH\:%1$tM\:%1$tS @@ -1564,10 +1564,12 @@ observe.common.NonTargetSampleDto.action.resetPicturesReferences.tip=Reset observe.common.NonTargetSampleDto.comment=Non target sample comment observe.common.NonTargetSampleDto.message.cantAdd=<html><body>Can not add non target samples(no rejected non target catch)</body></html> observe.common.NonTargetSampleDto.title=Non target sample +observe.common.ObjectMaterialDto.biodegradable=Biodegradable observe.common.ObjectMaterialDto.childSelectionMandatory=child selection mandatory observe.common.ObjectMaterialDto.childrenMultiSelectable=children multi selectable observe.common.ObjectMaterialDto.legacyCode=Legacy code observe.common.ObjectMaterialDto.legacyCodeStandardCode=Legacy code / Standard code +observe.common.ObjectMaterialDto.nonEntangling=Non entangling observe.common.ObjectMaterialDto.objectMaterialType=Type observe.common.ObjectMaterialDto.parent=Parent observe.common.ObjectMaterialDto.parentCode=Parent ===================================== observe-i18n/src/main/i18n/translations/observe_es_ES.properties ===================================== @@ -197,6 +197,7 @@ observe.actions.exportData.title.tip=Exportar los datos de usuario a obstuna observe.actions.longline.pairing=Longline activities pairing \#TODO observe.actions.longline.pairing.config=Pairing configuration \#TODO observe.actions.longline.pairing.description=Longline activities pairing \#TODO +observe.actions.longline.pairing.message.operation.done=Pairing operation done in %1$s. \#TODO observe.actions.longline.pairing.tip=Longline activities pairing \#TODO observe.actions.longline.pairing.title=Longline activities pairing \#TODO observe.actions.longline.pairing.title.tip=Longline activities pairing \#TODO @@ -1561,12 +1562,14 @@ observe.common.NonTargetSampleDto.action.create=Insertar este muestreo observe.common.NonTargetSampleDto.action.create.tip=Insertar muestreo de fauna asociada observe.common.NonTargetSampleDto.action.resetPicturesReferences.tip=Reiniciar observe.common.NonTargetSampleDto.comment=Comentarios de muestreo de otras especies -observe.common.NonTargetSampleDto.message.cantAdd=Imposible añadir los muestreos (no hay descartes de fauna -observe.common.NonTargetSampleDto.title=Muestreo fauna asociada +observe.common.NonTargetSampleDto.message.cantAdd=<html><body>Imposible añadir los muestreos de fauna accesoria(no hay descartes de fauna)</body></html> +observe.common.NonTargetSampleDto.title=Muestreo fauna accesoria +observe.common.ObjectMaterialDto.biodegradable=Biodegradable observe.common.ObjectMaterialDto.childSelectionMandatory=Sélection d'un fils obligatoire \#TODO observe.common.ObjectMaterialDto.childrenMultiSelectable=Sélection multiple des fils \#TODO observe.common.ObjectMaterialDto.legacyCode=Ancien code \#TODO observe.common.ObjectMaterialDto.legacyCodeStandardCode=Ancien code / Code standard \#TODO +observe.common.ObjectMaterialDto.nonEntangling=No enmallante observe.common.ObjectMaterialDto.objectMaterialType=Type \#TODO observe.common.ObjectMaterialDto.parent=Parent \#TODO observe.common.ObjectMaterialDto.parentCode=Parent \#TODO @@ -2582,7 +2585,6 @@ observe.common.no.unit=No unit \#TODO observe.common.nocode=codigo ausente observe.common.none=Ninguno observe.common.ocean=Océano -observe.actions.longline.pairing.message.operation.done=Pairing operation done in %1$s. #TODO observe.common.operation.resume=Resumen de operaciones observe.common.program=Programa observe.common.resume=Resumen de la configuración ===================================== observe-i18n/src/main/i18n/translations/observe_fr_FR.properties ===================================== @@ -197,6 +197,7 @@ observe.actions.exportData.title.tip=Exporter les données utilisateurs vers obs observe.actions.longline.pairing=Appairement des activités palangre observe.actions.longline.pairing.config=Configuration de l'appairement observe.actions.longline.pairing.description=Appairement des activités palangre +observe.actions.longline.pairing.message.operation.done=Opération terminées en %1$s. observe.actions.longline.pairing.tip=Appairement des activités palangre observe.actions.longline.pairing.title=Appairement des activités palangre observe.actions.longline.pairing.title.tip=Appairement des activités palangre @@ -1563,10 +1564,12 @@ observe.common.NonTargetSampleDto.action.resetPicturesReferences.tip=Réinitiali observe.common.NonTargetSampleDto.comment=Commentaire de l’échantillonnage faune observe.common.NonTargetSampleDto.message.cantAdd=<html><body>Impossible d'ajouter des échantillons(pas de rejet faune)</body></html> observe.common.NonTargetSampleDto.title=Échantillons espèces accessoires +observe.common.ObjectMaterialDto.biodegradable=Biodégradable observe.common.ObjectMaterialDto.childSelectionMandatory=Sélection d'un fils obligatoire observe.common.ObjectMaterialDto.childrenMultiSelectable=Sélection multiple des fils observe.common.ObjectMaterialDto.legacyCode=Ancien code observe.common.ObjectMaterialDto.legacyCodeStandardCode=Ancien code / Code standard +observe.common.ObjectMaterialDto.nonEntangling=Non maillant observe.common.ObjectMaterialDto.objectMaterialType=Type observe.common.ObjectMaterialDto.parent=Parent observe.common.ObjectMaterialDto.parentCode=Parent @@ -2581,7 +2584,6 @@ observe.common.lengthWeightFormula=Relation Poids observe.common.no.unit=Pas d'unité observe.common.nocode=code absent observe.common.none=Aucun -observe.actions.longline.pairing.message.operation.done=Opération terminées en %1$s. observe.common.ocean=Océan observe.common.operation.resume=Résumé des opérations observe.common.program=Programme ===================================== persistence/src/main/java/fr/ird/observe/binder/referential/seine/ObjectMaterialEntityDtoBinder.java ===================================== @@ -50,6 +50,8 @@ public class ObjectMaterialEntityDtoBinder extends ReferentialEntityDtoBinderSup entity.setValidation(dto.getValidation()); entity.setChildrenMultiSelectable(dto.isChildrenMultiSelectable()); entity.setChildSelectionMandatory(dto.isChildSelectionMandatory()); + entity.setBiodegradable(dto.getBiodegradable()); + entity.setNonEntangling(dto.getNonEntangling()); } @Override @@ -65,6 +67,8 @@ public class ObjectMaterialEntityDtoBinder extends ReferentialEntityDtoBinderSup dto.setValidation(entity.getValidation()); dto.setChildrenMultiSelectable(entity.isChildrenMultiSelectable()); dto.setChildSelectionMandatory(entity.isChildSelectionMandatory()); + dto.setBiodegradable(entity.getBiodegradable()); + dto.setNonEntangling(entity.getNonEntangling()); } ===================================== persistence/src/main/models/Observe-02-referential-seine.model ===================================== @@ -15,8 +15,8 @@ referentiel.seine.NonTargetCatchReleasingTime > referentiel.I18nReferentialEntit referentiel.seine.ObjectMaterial > referentiel.I18nReferentialEntity | entity legacyCode + {*:1} String | hibernateAttributeType=text standardCode + {*:1} String -biodegradable + {*:1} boolean | notNull -nonEntangling + {*:1} boolean | notNull +biodegradable + {*:1} Boolean +nonEntangling + {*:1} Boolean childrenMultiSelectable + {*:1} boolean | notNull childSelectionMandatory + {*:1} boolean | notNull parent {*:0..1} referentiel.seine.ObjectMaterial ===================================== persistence/src/main/resources/db/migration/6.1/02_add_object_material-common.sql ===================================== @@ -30,7 +30,7 @@ INSERT INTO observe_seine.objectMaterialType(topiaid, topiaversion, topiacreated INSERT INTO observe_seine.objectMaterialType(topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, code, label1, label2) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#3', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, '4', 'Text', 'Texte'); UPDATE observe_seine.objectMaterialType set label3 = label2 || ' TODO'; -CREATE TABLE observe_seine.objectMaterial( topiaid VARCHAR(255) NOT NULL,topiaversion BIGINT NOT NULL, topiacreatedate DATE, lastupdatedate TIMESTAMP NOT NULL, code VARCHAR(255) NOT NULL, legacyCode VARCHAR(1024), standardCode VARCHAR(255), parent VARCHAR(255), status INTEGER DEFAULT 1, needComment BOOLEAN DEFAULT false, uri VARCHAR(255), objectMaterialType VARCHAR(255), biodegradable BOOLEAN DEFAULT false, nonEntangling BOOLEAN DEFAULT false, label1 VARCHAR(255), label2 VARCHAR(255), label3 VARCHAR(255),label4 VARCHAR(255),label5 VARCHAR(255),label6 VARCHAR(255),label7 VARCHAR(255),label8 VARCHAR(255), selectable boolean ,childrenMultiSelectable boolean,childSelectionMandatory boolean, validation VARCHAR(255)); +CREATE TABLE observe_seine.objectMaterial( topiaid VARCHAR(255) NOT NULL,topiaversion BIGINT NOT NULL, topiacreatedate DATE, lastupdatedate TIMESTAMP NOT NULL, code VARCHAR(255) NOT NULL, legacyCode VARCHAR(1024), standardCode VARCHAR(255), parent VARCHAR(255), status INTEGER DEFAULT 1, needComment BOOLEAN DEFAULT false, uri VARCHAR(255), objectMaterialType VARCHAR(255), biodegradable BOOLEAN, nonEntangling BOOLEAN, label1 VARCHAR(255), label2 VARCHAR(255), label3 VARCHAR(255),label4 VARCHAR(255),label5 VARCHAR(255),label6 VARCHAR(255),label7 VARCHAR(255),label8 VARCHAR(255), selectable boolean ,childrenMultiSelectable boolean,childSelectionMandatory boolean, validation VARCHAR(255)); ALTER TABLE observe_seine.objectMaterial ADD CONSTRAINT PK_OBJECT_MATERIAL PRIMARY KEY(topiaid); ALTER TABLE observe_seine.objectMaterial ADD CONSTRAINT FK_OBJECT_MATERIAL_PARENT FOREIGN KEY (parent) REFERENCES observe_seine.objectMaterial(topiaid); ALTER TABLE observe_seine.objectMaterial ADD CONSTRAINT FK_OBJECT_MATERIAL_OBJECT_MATERIAL_TYPE FOREIGN KEY (objectMaterialType) REFERENCES observe_seine.objectMaterialType(topiaid); ===================================== persistence/src/main/resources/db/migration/6.1/09_fill_object_material-common.sql ===================================== The diff for this file was not included because it is too large. ===================================== services/src/main/java/fr/ird/observe/services/service/actions/consolidate/dcp/ConsolidateFloatingObjectResultBuilder.java ===================================== @@ -70,20 +70,20 @@ public class ConsolidateFloatingObjectResultBuilder { } case FloatingObjectDto.PROPERTY_COMPUTED_WHEN_LEAVING_BIODEGRADABLE: { - FloatingObjectModification element = new FloatingObjectModification(dcp.getId(), modifiedProperty, dcp.getComputedWhenArrivingBiodegradable()); + FloatingObjectModification element = new FloatingObjectModification(dcp.getId(), modifiedProperty, dcp.getComputedWhenLeavingBiodegradable()); modificationsBuilder.add(element); break; } case FloatingObjectDto.PROPERTY_COMPUTED_WHEN_LEAVING_NON_ENTANGLING: { - FloatingObjectModification element = new FloatingObjectModification(dcp.getId(), FloatingObjectDto.PROPERTY_COMPUTED_WHEN_LEAVING_NON_ENTANGLING, dcp.getComputedWhenLeavingNonEntangling()); + FloatingObjectModification element = new FloatingObjectModification(dcp.getId(), modifiedProperty, dcp.getComputedWhenLeavingNonEntangling()); modificationsBuilder.add(element); break; } case FloatingObjectDto.PROPERTY_COMPUTED_WHEN_LEAVING_SIMPLIFIED_OBJECT_TYPE: { - FloatingObjectModification element = new FloatingObjectModification(dcp.getId(), FloatingObjectDto.PROPERTY_COMPUTED_WHEN_LEAVING_SIMPLIFIED_OBJECT_TYPE, dcp.getComputedWhenLeavingSimplifiedObjectType()); + FloatingObjectModification element = new FloatingObjectModification(dcp.getId(), modifiedProperty, dcp.getComputedWhenLeavingSimplifiedObjectType()); modificationsBuilder.add(element); break; } ===================================== services/src/main/java/fr/ird/observe/services/service/actions/consolidate/dcp/FloatingObjectConsolidateEngine.java ===================================== @@ -122,15 +122,20 @@ public class FloatingObjectConsolidateEngine { } private DcpComputedValue computeDcpBiodegradable0(Set<FloatingObjectPartDto> FloatingObjectPartDtos) { - DcpComputedValue result = DcpComputedValue.UNKNOWN; - if (!FloatingObjectPartDtos.isEmpty()) { - result = DcpComputedValue.TRUE; - for (FloatingObjectPartDto FloatingObjectPartDto : FloatingObjectPartDtos) { - if (!FloatingObjectPartDto.getObjectMaterial().isBiodegradable()) { - result = DcpComputedValue.FALSE; - break; - } + if (FloatingObjectPartDtos.isEmpty()) { + return null; + } + DcpComputedValue result = DcpComputedValue.UNKNOWN; + for (FloatingObjectPartDto FloatingObjectPartDto : FloatingObjectPartDtos) { + Boolean biodegradable = FloatingObjectPartDto.getObjectMaterial().getBiodegradable(); + if (biodegradable==null) { + continue; + } + if (!biodegradable) { + result = DcpComputedValue.FALSE; + break; } + result = DcpComputedValue.TRUE; } return result; } @@ -144,15 +149,20 @@ public class FloatingObjectConsolidateEngine { } private DcpComputedValue computeDcpNonEntangling0(Set<FloatingObjectPartDto> FloatingObjectPartDtos) { + if (FloatingObjectPartDtos.isEmpty()) { + return null; + } DcpComputedValue result = DcpComputedValue.UNKNOWN; - if (!FloatingObjectPartDtos.isEmpty()) { - result = DcpComputedValue.TRUE; - for (FloatingObjectPartDto FloatingObjectPartDto : FloatingObjectPartDtos) { - if (!FloatingObjectPartDto.getObjectMaterial().isNonEntangling()) { - result = DcpComputedValue.FALSE; - break; - } + for (FloatingObjectPartDto FloatingObjectPartDto : FloatingObjectPartDtos) { + Boolean nonEntangling = FloatingObjectPartDto.getObjectMaterial().getNonEntangling(); + if (nonEntangling==null) { + continue; + } + if (!nonEntangling) { + result = DcpComputedValue.FALSE; + break; } + result = DcpComputedValue.TRUE; } return result; } ===================================== test/src/main/resources/db/7.4/dataForTestLongline.sql.gz ===================================== The diff for this file was not included because it is too large. ===================================== test/src/main/resources/db/7.4/dataForTestSeine.sql.gz ===================================== The diff for this file was not included because it is too large. ===================================== test/src/main/resources/db/7.4/empty_h2.sql.gz ===================================== @@ -113,7 +113,7 @@ create table OBSERVE_SEINE.nonTargetCatchReleaseStatus (topiaId varchar(255) not create table OBSERVE_SEINE.nonTargetCatchReleasingTime (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp, lastUpdateDate timestamp not null, code varchar(255), uri varchar(255), needComment boolean not null, status integer, label1 varchar(255), label2 varchar(255), label3 varchar(255), label4 varchar(255), label5 varchar(255), label6 varchar(255), label7 varchar(255), label8 varchar(255), primary key (topiaId)); create table OBSERVE_SEINE.nonTargetLength (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp, lastUpdateDate timestamp not null, length numeric, isLengthComputed boolean, picturesReferences varchar(255), weight numeric, isWeightComputed boolean, count integer, acquisitionMode integer, tagNumber varchar(255), species varchar(255), sex varchar(255), speciesFate varchar(255), sizeMeasureType varchar(255), weightMeasureMethod varchar(255), lengthMeasureMethod varchar(255), nonTargetSample varchar(255), nonTargetSample_idx integer, primary key (topiaId)); create table OBSERVE_SEINE.nonTargetSample (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp, lastUpdateDate timestamp not null, comment varchar(2147483647), set varchar(255), primary key (topiaId)); -create table OBSERVE_SEINE.objectMaterial (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp, lastUpdateDate timestamp not null, code varchar(255), uri varchar(255), needComment boolean not null, status integer, label1 varchar(255), label2 varchar(255), label3 varchar(255), label4 varchar(255), label5 varchar(255), label6 varchar(255), label7 varchar(255), label8 varchar(255), legacyCode varchar(2147483647), standardCode varchar(255), biodegradable boolean not null, nonEntangling boolean not null, childrenMultiSelectable boolean not null, childSelectionMandatory boolean not null, parent varchar(255), objectMaterialType varchar(255), validation varchar(255), primary key (topiaId)); +create table OBSERVE_SEINE.objectMaterial (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp, lastUpdateDate timestamp not null, code varchar(255), uri varchar(255), needComment boolean not null, status integer, label1 varchar(255), label2 varchar(255), label3 varchar(255), label4 varchar(255), label5 varchar(255), label6 varchar(255), label7 varchar(255), label8 varchar(255), legacyCode varchar(2147483647), standardCode varchar(255), biodegradable boolean, nonEntangling boolean, childrenMultiSelectable boolean not null, childSelectionMandatory boolean not null, parent varchar(255), objectMaterialType varchar(255), validation varchar(255), primary key (topiaId)); create table OBSERVE_SEINE.objectMaterialType (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp, lastUpdateDate timestamp not null, code varchar(255), uri varchar(255), needComment boolean not null, status integer, label1 varchar(255), label2 varchar(255), label3 varchar(255), label4 varchar(255), label5 varchar(255), label6 varchar(255), label7 varchar(255), label8 varchar(255), primary key (topiaId)); create table OBSERVE_SEINE.objectObservedSpecies (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp, lastUpdateDate timestamp not null, count integer, statut integer, species varchar(255), speciesStatus varchar(255), floatingObject varchar(255), primary key (topiaId)); create table OBSERVE_SEINE.objectOperation (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp, lastUpdateDate timestamp not null, code varchar(255), uri varchar(255), needComment boolean not null, status integer, label1 varchar(255), label2 varchar(255), label3 varchar(255), label4 varchar(255), label5 varchar(255), label6 varchar(255), label7 varchar(255), label8 varchar(255), whenArriving boolean not null, whenLeaving boolean not null, primary key (topiaId)); ===================================== test/src/main/resources/db/7.4/empty_pg.sql.gz ===================================== @@ -113,7 +113,7 @@ create table OBSERVE_SEINE.nonTargetCatchReleaseStatus (topiaId varchar(255) not create table OBSERVE_SEINE.nonTargetCatchReleasingTime (topiaId varchar(255) not null, topiaVersion int8 not null, topiaCreateDate timestamp, lastUpdateDate timestamp not null, code varchar(255), uri varchar(255), needComment boolean not null, status int4, label1 varchar(255), label2 varchar(255), label3 varchar(255), label4 varchar(255), label5 varchar(255), label6 varchar(255), label7 varchar(255), label8 varchar(255), primary key (topiaId)); create table OBSERVE_SEINE.nonTargetLength (topiaId varchar(255) not null, topiaVersion int8 not null, topiaCreateDate timestamp, lastUpdateDate timestamp not null, length numeric, isLengthComputed boolean, picturesReferences varchar(255), weight numeric, isWeightComputed boolean, count int4, acquisitionMode int4, tagNumber varchar(255), species varchar(255), sex varchar(255), speciesFate varchar(255), sizeMeasureType varchar(255), weightMeasureMethod varchar(255), lengthMeasureMethod varchar(255), nonTargetSample varchar(255), nonTargetSample_idx int4, primary key (topiaId)); create table OBSERVE_SEINE.nonTargetSample (topiaId varchar(255) not null, topiaVersion int8 not null, topiaCreateDate timestamp, lastUpdateDate timestamp not null, comment text, set varchar(255), primary key (topiaId)); -create table OBSERVE_SEINE.objectMaterial (topiaId varchar(255) not null, topiaVersion int8 not null, topiaCreateDate timestamp, lastUpdateDate timestamp not null, code varchar(255), uri varchar(255), needComment boolean not null, status int4, label1 varchar(255), label2 varchar(255), label3 varchar(255), label4 varchar(255), label5 varchar(255), label6 varchar(255), label7 varchar(255), label8 varchar(255), legacyCode text, standardCode varchar(255), biodegradable boolean not null, nonEntangling boolean not null, childrenMultiSelectable boolean not null, childSelectionMandatory boolean not null, parent varchar(255), objectMaterialType varchar(255), validation varchar(255), primary key (topiaId)); +create table OBSERVE_SEINE.objectMaterial (topiaId varchar(255) not null, topiaVersion int8 not null, topiaCreateDate timestamp, lastUpdateDate timestamp not null, code varchar(255), uri varchar(255), needComment boolean not null, status int4, label1 varchar(255), label2 varchar(255), label3 varchar(255), label4 varchar(255), label5 varchar(255), label6 varchar(255), label7 varchar(255), label8 varchar(255), legacyCode text, standardCode varchar(255), biodegradable boolean, nonEntangling boolean, childrenMultiSelectable boolean not null, childSelectionMandatory boolean not null, parent varchar(255), objectMaterialType varchar(255), validation varchar(255), primary key (topiaId)); create table OBSERVE_SEINE.objectMaterialType (topiaId varchar(255) not null, topiaVersion int8 not null, topiaCreateDate timestamp, lastUpdateDate timestamp not null, code varchar(255), uri varchar(255), needComment boolean not null, status int4, label1 varchar(255), label2 varchar(255), label3 varchar(255), label4 varchar(255), label5 varchar(255), label6 varchar(255), label7 varchar(255), label8 varchar(255), primary key (topiaId)); create table OBSERVE_SEINE.objectObservedSpecies (topiaId varchar(255) not null, topiaVersion int8 not null, topiaCreateDate timestamp, lastUpdateDate timestamp not null, count int4, statut int4, species varchar(255), speciesStatus varchar(255), floatingObject varchar(255), primary key (topiaId)); create table OBSERVE_SEINE.objectOperation (topiaId varchar(255) not null, topiaVersion int8 not null, topiaCreateDate timestamp, lastUpdateDate timestamp not null, code varchar(255), uri varchar(255), needComment boolean not null, status int4, label1 varchar(255), label2 varchar(255), label3 varchar(255), label4 varchar(255), label5 varchar(255), label6 varchar(255), label7 varchar(255), label8 varchar(255), whenArriving boolean not null, whenLeaving boolean not null, primary key (topiaId)); ===================================== test/src/main/resources/db/7.4/referentiel.sql.gz ===================================== The diff for this file was not included because it is too large. ===================================== test/src/main/resources/fixtures/validate-service-referential.properties ===================================== @@ -80,7 +80,7 @@ SpeciesFateDto=3 WindDto=1 SpeciesStatusDto=3 VesselActivityLonglineDto=1 -ObjectMaterialDto=11 +ObjectMaterialDto=10 LineTypeDto=3 ProgramDto=9 BaitTypeDto=3 View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/38e2d6e690791143f2ff5358dd… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/38e2d6e690791143f2ff5358dd… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Nouvelle action « Apparier les activités logbook/observations » - See #908
by Tony CHEMIT 23 Nov '18

23 Nov '18

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 38e2d6e6 by tchemit at 2018-11-23T14:50:15Z Nouvelle action « Apparier les activités logbook/observations » - See #908 - - - - - 30 changed files: - client-configuration/src/main/java/fr/ird/observe/client/configuration/ClientConfig.java - client-core/src/main/i18n/getters/java-enumeration.getter - 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/ObserveCommon.jcss - client-core/src/main/java/fr/ird/observe/client/ui/ObserveMainUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/ObserveMainUI.jcss - client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/longline/ChooseRelatedObservedActivityUIAction.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/longline/delete/DeleteSampleLonglineLogbookUIAction.java - + client-core/src/main/java/fr/ird/observe/client/ui/actions/main/menu/admin/LaunchActivityLonglinePairingAction.java - client-core/src/main/java/fr/ird/observe/client/ui/admin/AdminStep.java - client-core/src/main/java/fr/ird/observe/client/ui/admin/AdminTabUIHandler.java - client-core/src/main/java/fr/ird/observe/client/ui/admin/AdminUIHandler.java - client-core/src/main/java/fr/ird/observe/client/ui/admin/AdminUIModel.java - client-core/src/main/java/fr/ird/observe/client/ui/admin/config/ConfigModel.java - client-core/src/main/java/fr/ird/observe/client/ui/admin/config/SelectDataModel.java - + client-core/src/main/java/fr/ird/observe/client/ui/admin/longline/pairing/ActivityLonglinePairingConfigUI.jaxx - + client-core/src/main/java/fr/ird/observe/client/ui/admin/longline/pairing/ActivityLonglinePairingConfigUI.jcss - + client-core/src/main/java/fr/ird/observe/client/ui/admin/longline/pairing/ActivityLonglinePairingModel.java - + client-core/src/main/java/fr/ird/observe/client/ui/admin/longline/pairing/ActivityLonglinePairingUI.jaxx - + client-core/src/main/java/fr/ird/observe/client/ui/admin/longline/pairing/ActivityLonglinePairingUI.jcss - + client-core/src/main/java/fr/ird/observe/client/ui/admin/longline/pairing/ActivityLonglinePairingUIHandler.java - + client-core/src/main/java/fr/ird/observe/client/ui/admin/longline/pairing/tree/ActivityLonglinePairingTreeTable.java - + client-core/src/main/java/fr/ird/observe/client/ui/admin/longline/pairing/tree/ActivityLonglinePairingTreeTableModel.java - + client-core/src/main/java/fr/ird/observe/client/ui/admin/longline/pairing/tree/node/ActivityLonglinePairingActivityNode.java - + client-core/src/main/java/fr/ird/observe/client/ui/admin/longline/pairing/tree/node/ActivityLonglinePairingNodeSupport.java - + client-core/src/main/java/fr/ird/observe/client/ui/admin/longline/pairing/tree/node/ActivityLonglinePairingProgramNode.java - + client-core/src/main/java/fr/ird/observe/client/ui/admin/longline/pairing/tree/node/ActivityLonglinePairingRootNode.java - + client-core/src/main/java/fr/ird/observe/client/ui/admin/longline/pairing/tree/node/ActivityLonglinePairingTripNode.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/38e2d6e690791143f2ff5358dd2… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/38e2d6e690791143f2ff5358dd2… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-7.x] 2 commits: Question calculs biodégradable, nonentangling et type simplifié à l'arrivée et…
by Tony CHEMIT 23 Nov '18

23 Nov '18

Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: ba747f4c by tchemit at 2018-11-23T12:32:45Z Question calculs biodégradable, nonentangling et type simplifié à l'arrivée et au départ - Closes #1177 - - - - - e73b7d6d by tchemit at 2018-11-23T12:32:45Z [PS] Libération faune accessoire -> Exception - Closes #1174 - - - - - 6 changed files: - client-core/src/main/java/fr/ird/observe/client/ui/content/ContentUIHandler.java - client-core/src/main/java/fr/ird/observe/client/ui/content/ContentUIModel.java - client-core/src/main/java/fr/ird/observe/client/ui/content/table/ContentTableUIHandler.java - client-core/src/main/java/fr/ird/observe/client/ui/content/table/ContentTableUIModel.java - services/src/main/java/fr/ird/observe/services/service/actions/consolidate/dcp/ConsolidateFloatingObjectResultBuilder.java - services/src/main/java/fr/ird/observe/services/service/actions/consolidate/dcp/FloatingObjectConsolidateEngine.java Changes: ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/ContentUIHandler.java ===================================== @@ -179,7 +179,7 @@ public abstract class ContentUIHandler<E extends IdDto, U extends ContentUI<E, U if (model.isCreatingMode()) { // on peut quitter le mode creation si le modele est non modifie et valide - if (!(model.isEnabled() && model.isEditing() && (model.isModified() || !model.isValid()))) { + if (!(model.isEnabled() && model.isEditing() && (model.isGlobalModified() || !model.isValid()))) { if (model.isEditing()) { ui.stopEdit(); } @@ -189,8 +189,8 @@ public abstract class ContentUIHandler<E extends IdDto, U extends ContentUI<E, U } } else { - // on peut quiiter le mode mise a jour si le modele est non modifie - if (!(model.isEnabled() && model.isEditing() && model.isModified())) { + // on peut quitter le mode mise a jour si le modele est non modifie + if (!(model.isEnabled() && model.isEditing() && model.isGlobalModified())) { if (model.isEditing()) { ui.stopEdit(); } ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/ContentUIModel.java ===================================== @@ -230,6 +230,9 @@ public abstract class ContentUIModel<E extends IdDto> extends AbstractSerializab return modified; } + public boolean isGlobalModified() { + return isModified(); + } public void setModified(boolean modified) { Object oldValue = this.modified; this.modified = modified; ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/table/ContentTableUIHandler.java ===================================== @@ -40,8 +40,8 @@ import fr.ird.observe.dto.data.seine.ActivitySeineDto; import fr.ird.observe.dto.data.seine.TargetCatchDto; import fr.ird.observe.dto.referential.SpeciesReference; import fr.ird.observe.dto.referential.seine.WeightCategoryReference; -import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.nuiton.validator.NuitonValidatorScope; import javax.swing.JButton; @@ -331,6 +331,12 @@ public abstract class ContentTableUIHandler<E extends IdDto, D extends IdDto, U U ui = getUi(); + if (getModel().isModified() || getModel().isCanSaveRow()) { + + // flush modified line to model + getTableModel().updateRowFromEditBean(); + } + List<D> objets = ui.getTableModel().getData(); boolean canContinue; ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/table/ContentTableUIModel.java ===================================== @@ -6,15 +6,15 @@ * %% * 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 + * 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 + * + * 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% @@ -25,8 +25,8 @@ import fr.ird.observe.client.ObserveSwingTechnicalException; import fr.ird.observe.client.ui.content.ContentUIModel; import fr.ird.observe.dto.IdDto; import org.apache.commons.lang3.reflect.ConstructorUtils; -import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.nuiton.util.beans.BinderModelBuilder; import javax.swing.DefaultListSelectionModel; @@ -165,6 +165,10 @@ public abstract class ContentTableUIModel<E extends IdDto, D extends IdDto> exte } } + public boolean isGlobalModified() { + return super.isGlobalModified() || getTableModel().isModified() || isCanSaveRow(); + } + public boolean isCanSaveRow() { return canSaveRow; } ===================================== services/src/main/java/fr/ird/observe/services/service/actions/consolidate/dcp/ConsolidateFloatingObjectResultBuilder.java ===================================== @@ -70,20 +70,20 @@ public class ConsolidateFloatingObjectResultBuilder { } case FloatingObjectDto.PROPERTY_COMPUTED_WHEN_LEAVING_BIODEGRADABLE: { - FloatingObjectModification element = new FloatingObjectModification(dcp.getId(), modifiedProperty, dcp.getComputedWhenArrivingBiodegradable()); + FloatingObjectModification element = new FloatingObjectModification(dcp.getId(), modifiedProperty, dcp.getComputedWhenLeavingBiodegradable()); modificationsBuilder.add(element); break; } case FloatingObjectDto.PROPERTY_COMPUTED_WHEN_LEAVING_NON_ENTANGLING: { - FloatingObjectModification element = new FloatingObjectModification(dcp.getId(), FloatingObjectDto.PROPERTY_COMPUTED_WHEN_LEAVING_NON_ENTANGLING, dcp.getComputedWhenLeavingNonEntangling()); + FloatingObjectModification element = new FloatingObjectModification(dcp.getId(), modifiedProperty, dcp.getComputedWhenLeavingNonEntangling()); modificationsBuilder.add(element); break; } case FloatingObjectDto.PROPERTY_COMPUTED_WHEN_LEAVING_SIMPLIFIED_OBJECT_TYPE: { - FloatingObjectModification element = new FloatingObjectModification(dcp.getId(), FloatingObjectDto.PROPERTY_COMPUTED_WHEN_LEAVING_SIMPLIFIED_OBJECT_TYPE, dcp.getComputedWhenLeavingSimplifiedObjectType()); + FloatingObjectModification element = new FloatingObjectModification(dcp.getId(), modifiedProperty, dcp.getComputedWhenLeavingSimplifiedObjectType()); modificationsBuilder.add(element); break; } ===================================== services/src/main/java/fr/ird/observe/services/service/actions/consolidate/dcp/FloatingObjectConsolidateEngine.java ===================================== @@ -122,19 +122,20 @@ public class FloatingObjectConsolidateEngine { } private DcpComputedValue computeDcpBiodegradable0(Set<FloatingObjectPartDto> FloatingObjectPartDtos) { - DcpComputedValue result = DcpComputedValue.UNKNOWN; - if (!FloatingObjectPartDtos.isEmpty()) { - for (FloatingObjectPartDto FloatingObjectPartDto : FloatingObjectPartDtos) { - Boolean biodegradable = FloatingObjectPartDto.getObjectMaterial().getBiodegradable(); - if (biodegradable==null) { - continue; - } - if (!biodegradable) { - result = DcpComputedValue.FALSE; - break; - } - result = DcpComputedValue.TRUE; + if (FloatingObjectPartDtos.isEmpty()) { + return null; + } + DcpComputedValue result = DcpComputedValue.UNKNOWN; + for (FloatingObjectPartDto FloatingObjectPartDto : FloatingObjectPartDtos) { + Boolean biodegradable = FloatingObjectPartDto.getObjectMaterial().getBiodegradable(); + if (biodegradable==null) { + continue; + } + if (!biodegradable) { + result = DcpComputedValue.FALSE; + break; } + result = DcpComputedValue.TRUE; } return result; } @@ -148,19 +149,20 @@ public class FloatingObjectConsolidateEngine { } private DcpComputedValue computeDcpNonEntangling0(Set<FloatingObjectPartDto> FloatingObjectPartDtos) { + if (FloatingObjectPartDtos.isEmpty()) { + return null; + } DcpComputedValue result = DcpComputedValue.UNKNOWN; - if (!FloatingObjectPartDtos.isEmpty()) { - for (FloatingObjectPartDto FloatingObjectPartDto : FloatingObjectPartDtos) { - Boolean nonEntangling = FloatingObjectPartDto.getObjectMaterial().getNonEntangling(); - if (nonEntangling==null) { - continue; - } - if (!nonEntangling) { - result = DcpComputedValue.FALSE; - break; - } - result = DcpComputedValue.TRUE; + for (FloatingObjectPartDto FloatingObjectPartDto : FloatingObjectPartDtos) { + Boolean nonEntangling = FloatingObjectPartDto.getObjectMaterial().getNonEntangling(); + if (nonEntangling==null) { + continue; + } + if (!nonEntangling) { + result = DcpComputedValue.FALSE; + break; } + result = DcpComputedValue.TRUE; } return result; } View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/6598bbc95d923fab443751f72f… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/6598bbc95d923fab443751f72f… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-7.x] Matériau objet 2-2-4-2 'Net', passage de biodegradable de NULL à FALSE (c'était un oubli)
by Pascal Cauquil 21 Nov '18

21 Nov '18

Pascal Cauquil pushed to branch develop-7.x at ultreiaio / ird-observe Commits: 6598bbc9 by Pascal Cauquil at 2018-11-21T17:23:15Z Matériau objet 2-2-4-2 'Net', passage de biodegradable de NULL à FALSE (c'était un oubli) - - - - - 1 changed file: - persistence/src/main/resources/db/migration/6.1/09_fill_object_material-common.sql Changes: ===================================== persistence/src/main/resources/db/migration/6.1/09_fill_object_material-common.sql ===================================== @@ -80,7 +80,7 @@ INSERT INTO observe_seine.objectmaterial (topiaid, topiaversion, topiacreatedate INSERT INTO observe_seine.objectmaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, code, legacycode, standardcode, parent, status, needcomment, uri, objectmaterialtype, biodegradable, nonentangling, label1, label2, label3, label4, label5, label6, label7, label8, childrenmultiselectable, childselectionmandatory, validation) VALUES ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.62',0, '2018-11-12','2018-11-12 17:27:06.06232','2-2-3','17',null, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.59',1, false, null, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0', false, true, 'Metallic object','Objet métallique','Objeto de metal',null, null, null, null, null, false, false, null); INSERT INTO observe_seine.objectmaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, code, legacycode, standardcode, parent, status, needcomment, uri, objectmaterialtype, biodegradable, nonentangling, label1, label2, label3, label4, label5, label6, label7, label8, childrenmultiselectable, childselectionmandatory, validation) VALUES ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.63',0, '2018-11-12','2018-11-12 17:27:06.06232','2-2-4',null, 'FALOG','fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.59',1, false, null, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0', null, null, 'FALOG (fishing ALOG)','FALOG (ALOG pêche)','FALOG (ALOG pesca)',null, null, null, null, null, true, false, null); INSERT INTO observe_seine.objectmaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, code, legacycode, standardcode, parent, status, needcomment, uri, objectmaterialtype, biodegradable, nonentangling, label1, label2, label3, label4, label5, label6, label7, label8, childrenmultiselectable, childselectionmandatory, validation) VALUES ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.64',0, '2018-11-12','2018-11-12 17:27:06.06232','2-2-4-1','11',null, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.63',1, false, null, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0', null, true, 'Rope, cable','Cordage, câble','Cuerda, cable',null, null, null, null, null, false, false, null); -INSERT INTO observe_seine.objectmaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, code, legacycode, standardcode, parent, status, needcomment, uri, objectmaterialtype, biodegradable, nonentangling, label1, label2, label3, label4, label5, label6, label7, label8, childrenmultiselectable, childselectionmandatory, validation) VALUES ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.65',0, '2018-11-12','2018-11-12 17:27:06.06232','2-2-4-2','12',null, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.63',1, false, null, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0', null, null, 'Net, piece of net','Filet, morceau de filet','Red, pedazo de red',null, null, null, null, null, false, false, null); +INSERT INTO observe_seine.objectmaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, code, legacycode, standardcode, parent, status, needcomment, uri, objectmaterialtype, biodegradable, nonentangling, label1, label2, label3, label4, label5, label6, label7, label8, childrenmultiselectable, childselectionmandatory, validation) VALUES ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.65',0, '2018-11-12','2018-11-12 17:27:06.06232','2-2-4-2','12',null, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.63',1, false, null, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0', false, null, 'Net, piece of net','Filet, morceau de filet','Red, pedazo de red',null, null, null, null, null, false, false, null); INSERT INTO observe_seine.objectmaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, code, legacycode, standardcode, parent, status, needcomment, uri, objectmaterialtype, biodegradable, nonentangling, label1, label2, label3, label4, label5, label6, label7, label8, childrenmultiselectable, childselectionmandatory, validation) VALUES ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.66',0, '2018-11-12','2018-11-12 17:27:06.06232','2-2-4-3',null, null, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.63',1, false, null, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0', false, true, 'Inert plastic buoy','Bouée plastique inerte','Boya de plástico inerte',null, null, null, null, null, false, false, null); INSERT INTO observe_seine.objectmaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, code, legacycode, standardcode, parent, status, needcomment, uri, objectmaterialtype, biodegradable, nonentangling, label1, label2, label3, label4, label5, label6, label7, label8, childrenmultiselectable, childselectionmandatory, validation) VALUES ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.67',0, '2018-11-12','2018-11-12 17:27:06.06232','2-2-5',null, 'HALOG','fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.59',1, false, null, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0', null, null, 'HALOG (not fishing ALOG)','HALOG (ALOG non pêche)','HALOG (HALOG no pesca)',null, null, null, null, null, true, false, null); INSERT INTO observe_seine.objectmaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, code, legacycode, standardcode, parent, status, needcomment, uri, objectmaterialtype, biodegradable, nonentangling, label1, label2, label3, label4, label5, label6, label7, label8, childrenmultiselectable, childselectionmandatory, validation) VALUES ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.68',0, '2018-11-12','2018-11-12 17:27:06.06232','4',null, null, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#1.3',1, false, null, null, null, null, 'Other properties','Autres propriétés','Otras propiedades',null, null, null, null, null, true, false, null); View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/6598bbc95d923fab443751f72f2… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/6598bbc95d923fab443751f72f2… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-7.x] 2 commits: [PS][FOB] Permettre NULL sur les propriétés biodegradable et nonentangling,…
by Tony CHEMIT 21 Nov '18

21 Nov '18

Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: 42ebd1c5 by tchemit at 2018-11-21T12:24:38Z [PS][FOB] Permettre NULL sur les propriétés biodegradable et nonentangling, ainsi que sur les déductions - Closes #1175 (test) - - - - - 50ab4210 by tchemit at 2018-11-21T12:24:45Z Propriétés biodegradable et nonEntangling non présentes sur l'éditeur de ObjectMaterial - Closes #1176 - - - - - 12 changed files: - client-core/src/main/i18n/getters/jaxx.getter - client-core/src/main/java/fr/ird/observe/client/ui/content/ref/seine/ObjectMaterialUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/content/ref/seine/ObjectMaterialUI.jcss - 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 - services-local/src/test/java/fr/ird/observe/services/local/service/actions/validate/ValidateServiceLocalTest.java - test/src/main/resources/db/7.0/dataForTestLongline.sql.gz - test/src/main/resources/db/7.0/dataForTestSeine.sql.gz - test/src/main/resources/db/7.0/empty_h2.sql.gz - test/src/main/resources/db/7.0/empty_pg.sql.gz - test/src/main/resources/db/7.0/referentiel.sql.gz Changes: ===================================== client-core/src/main/i18n/getters/jaxx.getter ===================================== @@ -356,9 +356,11 @@ observe.common.NonTargetSampleDto.action.create.tip observe.common.NonTargetSampleDto.action.resetPicturesReferences.tip observe.common.NonTargetSampleDto.message.cantAdd observe.common.NonTargetSampleDto.title +observe.common.ObjectMaterialDto.biodegradable observe.common.ObjectMaterialDto.childSelectionMandatory observe.common.ObjectMaterialDto.childrenMultiSelectable observe.common.ObjectMaterialDto.legacyCodeStandardCode +observe.common.ObjectMaterialDto.nonEntangling observe.common.ObjectMaterialDto.objectMaterialType observe.common.ObjectMaterialDto.parentCode observe.common.ObjectMaterialDto.validation ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/ref/seine/ObjectMaterialUI.jaxx ===================================== @@ -30,7 +30,8 @@ fr.ird.observe.dto.referential.seine.ObjectMaterialDto fr.ird.observe.dto.referential.seine.ObjectMaterialReference fr.ird.observe.dto.referential.seine.ObjectMaterialTypeReference - + fr.ird.observe.client.ui.util.BooleanEditor + org.nuiton.jaxx.widgets.select.BeanFilterableComboBox static fr.ird.observe.client.ui.util.UIHelper.getStringValue @@ -114,8 +115,26 @@ </cell> </row> +  + <row> + <cell anchor="west"> + <JLabel id='biodegradableLabel'/> + </cell> + <cell anchor='east' weightx="1" fill="both"> + <BooleanEditor id='biodegradable'/> + </cell> + </row> +  + <row> + <cell anchor="west"> + <JLabel id='nonEntanglingLabel'/> + </cell> + <cell anchor='east' weightx="1" fill="both"> + <BooleanEditor id='nonEntangling'/> + </cell> + </row> +  -  <row> <cell anchor='west' columns="2"> <JLabel id='validationInformation'/> ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/ref/seine/ObjectMaterialUI.jcss ===================================== @@ -57,3 +57,11 @@ #childSelectionMandatory { selected:{bean.isChildSelectionMandatory()}; } + +#nonEntangling { + booleanValue:{bean.getNonEntangling()}; +} + +#biodegradable { + booleanValue:{bean.getBiodegradable()}; +} ===================================== observe-i18n/src/main/i18n/translations/observe_en_GB.properties ===================================== @@ -949,10 +949,12 @@ observe.common.NonTargetSampleDto.action.create.tip=Insert this non target sampl observe.common.NonTargetSampleDto.action.resetPicturesReferences.tip=Reset observe.common.NonTargetSampleDto.message.cantAdd=<html><body>Can not add non target samples(no rejected non target catch)</body></html> observe.common.NonTargetSampleDto.title=Non target sample +observe.common.ObjectMaterialDto.biodegradable=Biodegradable observe.common.ObjectMaterialDto.childSelectionMandatory=child selection mandatory observe.common.ObjectMaterialDto.childrenMultiSelectable=children multi selectable observe.common.ObjectMaterialDto.legacyCode=Legacy code observe.common.ObjectMaterialDto.legacyCodeStandardCode=Legacy code / Standard code +observe.common.ObjectMaterialDto.nonEntangling=Non entangling observe.common.ObjectMaterialDto.objectMaterialType=Type observe.common.ObjectMaterialDto.parent=Parent observe.common.ObjectMaterialDto.parentCode=Parent ===================================== observe-i18n/src/main/i18n/translations/observe_es_ES.properties ===================================== @@ -949,10 +949,12 @@ observe.common.NonTargetSampleDto.action.create.tip=Insertar el muestreo de faun observe.common.NonTargetSampleDto.action.resetPicturesReferences.tip=Reiniciar observe.common.NonTargetSampleDto.message.cantAdd=<html><body>Imposible añadir los muestreos de fauna accesoria(no hay descartes de fauna)</body></html> observe.common.NonTargetSampleDto.title=Muestreo fauna accesoria +observe.common.ObjectMaterialDto.biodegradable=Biodegradable observe.common.ObjectMaterialDto.childSelectionMandatory=Obligatorio seleccionar un campo observe.common.ObjectMaterialDto.childrenMultiSelectable=Selección múltiple da campos observe.common.ObjectMaterialDto.legacyCode=Código antiguo observe.common.ObjectMaterialDto.legacyCodeStandardCode=Código antiguo / Código estándar +observe.common.ObjectMaterialDto.nonEntangling=No enmallante observe.common.ObjectMaterialDto.objectMaterialType=Tipo observe.common.ObjectMaterialDto.parent=Componente asociado observe.common.ObjectMaterialDto.parentCode=Código de componente asociado ===================================== observe-i18n/src/main/i18n/translations/observe_fr_FR.properties ===================================== @@ -949,10 +949,12 @@ observe.common.NonTargetSampleDto.action.create.tip=Insérer cet échantillon d' observe.common.NonTargetSampleDto.action.resetPicturesReferences.tip=Réinitialiser observe.common.NonTargetSampleDto.message.cantAdd=<html><body>Impossible d'ajouter des échantillons(pas de rejet faune)</body></html> observe.common.NonTargetSampleDto.title=Échantillons espèces accessoires +observe.common.ObjectMaterialDto.biodegradable=Biodégradable observe.common.ObjectMaterialDto.childSelectionMandatory=Sélection d'un fils obligatoire observe.common.ObjectMaterialDto.childrenMultiSelectable=Sélection multiple des fils observe.common.ObjectMaterialDto.legacyCode=Ancien code observe.common.ObjectMaterialDto.legacyCodeStandardCode=Ancien code / Code standard +observe.common.ObjectMaterialDto.nonEntangling=Non maillant observe.common.ObjectMaterialDto.objectMaterialType=Type observe.common.ObjectMaterialDto.parent=Parent observe.common.ObjectMaterialDto.parentCode=Parent ===================================== services-local/src/test/java/fr/ird/observe/services/local/service/actions/validate/ValidateServiceLocalTest.java ===================================== @@ -183,7 +183,7 @@ public class ValidateServiceLocalTest extends ServiceLocalTestSupport { assertValidateResult(result, GearCaracteristicTypeDto.class, 2); assertValidateResult(result, ObjectOperationDto.class, 2); assertValidateResult(result, SpeciesListDto.class, 2); - assertValidateResult(result, ObjectMaterialDto.class, 11); + assertValidateResult(result, ObjectMaterialDto.class, 10); assertValidateResult(result, TransmittingBuoyOperationDto.class, 3); assertValidateResult(result, HookPositionDto.class, 1); assertValidateResult(result, FpaZoneDto.class, 5); ===================================== test/src/main/resources/db/7.0/dataForTestLongline.sql.gz ===================================== The diff for this file was not included because it is too large. ===================================== test/src/main/resources/db/7.0/dataForTestSeine.sql.gz ===================================== The diff for this file was not included because it is too large. ===================================== test/src/main/resources/db/7.0/empty_h2.sql.gz ===================================== @@ -89,7 +89,7 @@ create table OBSERVE_SEINE.nonTargetCatchReleaseStatus (topiaId varchar(255) not create table OBSERVE_SEINE.nonTargetCatchReleasingTime (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp, lastUpdateDate timestamp not null, code varchar(255), uri varchar(255), needComment boolean not null, status integer, label1 varchar(255), label2 varchar(255), label3 varchar(255), label4 varchar(255), label5 varchar(255), label6 varchar(255), label7 varchar(255), label8 varchar(255), primary key (topiaId)); create table OBSERVE_SEINE.nonTargetLength (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp, lastUpdateDate timestamp not null, length numeric, isLengthComputed boolean, picturesReferences varchar(255), weight numeric, isWeightComputed boolean, count integer, acquisitionMode integer, tagNumber varchar(255), species varchar(255), sex varchar(255), speciesFate varchar(255), sizeMeasureType varchar(255), nonTargetSample varchar(255), nonTargetSample_idx integer, primary key (topiaId)); create table OBSERVE_SEINE.nonTargetSample (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp, lastUpdateDate timestamp not null, comment varchar(2147483647), set varchar(255), primary key (topiaId)); -create table OBSERVE_SEINE.objectMaterial (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp, lastUpdateDate timestamp not null, code varchar(255), uri varchar(255), needComment boolean not null, status integer, label1 varchar(255), label2 varchar(255), label3 varchar(255), label4 varchar(255), label5 varchar(255), label6 varchar(255), label7 varchar(255), label8 varchar(255), legacyCode varchar(2147483647), standardCode varchar(255), biodegradable boolean not null, nonEntangling boolean not null, childrenMultiSelectable boolean not null, childSelectionMandatory boolean not null, parent varchar(255), objectMaterialType varchar(255), validation varchar(255), primary key (topiaId)); +create table OBSERVE_SEINE.objectMaterial (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp, lastUpdateDate timestamp not null, code varchar(255), uri varchar(255), needComment boolean not null, status integer, label1 varchar(255), label2 varchar(255), label3 varchar(255), label4 varchar(255), label5 varchar(255), label6 varchar(255), label7 varchar(255), label8 varchar(255), legacyCode varchar(2147483647), standardCode varchar(255), biodegradable boolean, nonEntangling boolean, childrenMultiSelectable boolean not null, childSelectionMandatory boolean not null, parent varchar(255), objectMaterialType varchar(255), validation varchar(255), primary key (topiaId)); create table OBSERVE_SEINE.objectMaterialType (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp, lastUpdateDate timestamp not null, code varchar(255), uri varchar(255), needComment boolean not null, status integer, label1 varchar(255), label2 varchar(255), label3 varchar(255), label4 varchar(255), label5 varchar(255), label6 varchar(255), label7 varchar(255), label8 varchar(255), primary key (topiaId)); create table OBSERVE_SEINE.objectObservedSpecies (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp, lastUpdateDate timestamp not null, count integer, statut integer, species varchar(255), speciesStatus varchar(255), floatingObject varchar(255), primary key (topiaId)); create table OBSERVE_SEINE.objectOperation (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp, lastUpdateDate timestamp not null, code varchar(255), uri varchar(255), needComment boolean not null, status integer, label1 varchar(255), label2 varchar(255), label3 varchar(255), label4 varchar(255), label5 varchar(255), label6 varchar(255), label7 varchar(255), label8 varchar(255), whenArriving boolean not null, whenLeaving boolean not null, primary key (topiaId)); ===================================== test/src/main/resources/db/7.0/empty_pg.sql.gz ===================================== @@ -89,7 +89,7 @@ create table OBSERVE_SEINE.nonTargetCatchReleaseStatus (topiaId varchar(255) not create table OBSERVE_SEINE.nonTargetCatchReleasingTime (topiaId varchar(255) not null, topiaVersion int8 not null, topiaCreateDate timestamp, lastUpdateDate timestamp not null, code varchar(255), uri varchar(255), needComment boolean not null, status int4, label1 varchar(255), label2 varchar(255), label3 varchar(255), label4 varchar(255), label5 varchar(255), label6 varchar(255), label7 varchar(255), label8 varchar(255), primary key (topiaId)); create table OBSERVE_SEINE.nonTargetLength (topiaId varchar(255) not null, topiaVersion int8 not null, topiaCreateDate timestamp, lastUpdateDate timestamp not null, length numeric, isLengthComputed boolean, picturesReferences varchar(255), weight numeric, isWeightComputed boolean, count int4, acquisitionMode int4, tagNumber varchar(255), species varchar(255), sex varchar(255), speciesFate varchar(255), sizeMeasureType varchar(255), nonTargetSample varchar(255), nonTargetSample_idx int4, primary key (topiaId)); create table OBSERVE_SEINE.nonTargetSample (topiaId varchar(255) not null, topiaVersion int8 not null, topiaCreateDate timestamp, lastUpdateDate timestamp not null, comment text, set varchar(255), primary key (topiaId)); -create table OBSERVE_SEINE.objectMaterial (topiaId varchar(255) not null, topiaVersion int8 not null, topiaCreateDate timestamp, lastUpdateDate timestamp not null, code varchar(255), uri varchar(255), needComment boolean not null, status int4, label1 varchar(255), label2 varchar(255), label3 varchar(255), label4 varchar(255), label5 varchar(255), label6 varchar(255), label7 varchar(255), label8 varchar(255), legacyCode text, standardCode varchar(255), biodegradable boolean not null, nonEntangling boolean not null, childrenMultiSelectable boolean not null, childSelectionMandatory boolean not null, parent varchar(255), objectMaterialType varchar(255), validation varchar(255), primary key (topiaId)); +create table OBSERVE_SEINE.objectMaterial (topiaId varchar(255) not null, topiaVersion int8 not null, topiaCreateDate timestamp, lastUpdateDate timestamp not null, code varchar(255), uri varchar(255), needComment boolean not null, status int4, label1 varchar(255), label2 varchar(255), label3 varchar(255), label4 varchar(255), label5 varchar(255), label6 varchar(255), label7 varchar(255), label8 varchar(255), legacyCode text, standardCode varchar(255), biodegradable boolean, nonEntangling boolean, childrenMultiSelectable boolean not null, childSelectionMandatory boolean not null, parent varchar(255), objectMaterialType varchar(255), validation varchar(255), primary key (topiaId)); create table OBSERVE_SEINE.objectMaterialType (topiaId varchar(255) not null, topiaVersion int8 not null, topiaCreateDate timestamp, lastUpdateDate timestamp not null, code varchar(255), uri varchar(255), needComment boolean not null, status int4, label1 varchar(255), label2 varchar(255), label3 varchar(255), label4 varchar(255), label5 varchar(255), label6 varchar(255), label7 varchar(255), label8 varchar(255), primary key (topiaId)); create table OBSERVE_SEINE.objectObservedSpecies (topiaId varchar(255) not null, topiaVersion int8 not null, topiaCreateDate timestamp, lastUpdateDate timestamp not null, count int4, statut int4, species varchar(255), speciesStatus varchar(255), floatingObject varchar(255), primary key (topiaId)); create table OBSERVE_SEINE.objectOperation (topiaId varchar(255) not null, topiaVersion int8 not null, topiaCreateDate timestamp, lastUpdateDate timestamp not null, code varchar(255), uri varchar(255), needComment boolean not null, status int4, label1 varchar(255), label2 varchar(255), label3 varchar(255), label4 varchar(255), label5 varchar(255), label6 varchar(255), label7 varchar(255), label8 varchar(255), whenArriving boolean not null, whenLeaving boolean not null, primary key (topiaId)); ===================================== test/src/main/resources/db/7.0/referentiel.sql.gz ===================================== The diff for this file was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/e4f6bfc0fc8098bb955c3bf63d… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/e4f6bfc0fc8098bb955c3bf63d… You're receiving this email because of your account on gitlab.com.

1 0