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

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

16 Sep '18

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: c724c467 by Tony CHEMIT at 2018-09-16T15:16:55Z update changelog - - - - - 4 changed files: - + .mvn/gitlab-cache/milestones/644883-artifacts.json - .mvn/gitlab-cache/milestones/644883-issues.json - .mvn/gitlab-cache/milestones/644883.json - CHANGELOG.md Changes: ===================================== .mvn/gitlab-cache/milestones/644883-artifacts.json ===================================== @@ -0,0 +1,12 @@ +[ + { + "name": "Application", + "filename": "observe-7.0-RC-19.zip", + "url": "https://ultreia.io/release/observe-7.0-RC-19.zip" + }, + { + "name": "Serveur", + "filename": "observe-7.0-RC-19.war", + "url": "https://ultreia.io/release/observe-7.0-RC-19.war" + } +] \ No newline at end of file ===================================== .mvn/gitlab-cache/milestones/644883-issues.json ===================================== @@ -1 +1,52 @@ -[] \ No newline at end of file +[ + { + "id": 13673624, + "iid": 1038, + "projectId": 2722779, + "title": "[PS] Ajout de racourcis clavier sur le formulaire des systèmes observés", + "description": "Idéalement, on nous demande des racourcis clavier supplémentaires sur les flêches \u003c- et -\u003e du formaulaire PS systèmes observés :\n\n![image](/uploads/236e6a93607d63560815a257519b7a32/image.png)\n\nEffectivement cela pourrait pas mal fluidifier l\u0027ajout d\u0027éléments.", + "labels": [ + "Bas", + "Contrat Code Lutin-2016", + "Evolution" + ], + "milestone": { + "id": 644883, + "iid": 122, + "projectId": 2722779, + "groupId": 0, + "title": "7.0-RC-19", + "description": "", + "dueDate": "Sep 16, 2018 2:00:00 AM", + "startDate": "Sep 14, 2018 2:00:00 AM", + "state": "closed" + }, + "assignee": { + "_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/2a915aa9a1df35c8b609ff2f750d5dac?s\u003d…" + }, + "author": { + "_id": 1111318, + "_username": "pcauquil", + "_name": "Pascal Cauquil", + "_state": "active", + "_darkScheme": false, + "_isAdmin": false, + "_canCreateGroup": false, + "_canCreateProject": false, + "_canCreateTeam": false, + "_avatarUrl": "https://secure.gravatar.com/avatar/b4ae117bd93e10d96298fa4d885208ea?s\u003d…" + }, + "state": "closed", + "updatedAt": "Sep 16, 2018 5:10:02 PM", + "createdAt": "Aug 24, 2018 12:25:25 PM" + } +] \ No newline at end of file ===================================== .mvn/gitlab-cache/milestones/644883.json ===================================== @@ -4,5 +4,8 @@ "projectId": 2722779, "groupId": 0, "title": "7.0-RC-19", - "state": "active" + "description": "", + "dueDate": "Sep 16, 2018 2:00:00 AM", + "startDate": "Sep 14, 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-09-15 13:57. + * Last generated at 2018-09-16 17:15. ## 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. @@ -67,6 +67,14 @@ Premier lot du contrat IRD-2018-01-V8 * [[Evolution 922]](https://gitlab.com/ultreiaio/ird-observe/issues/922) **Ajoute le référentiel observe_common.DataQuality sur les données existantes** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) * [[Evolution 950]](https://gitlab.com/ultreiaio/ird-observe/issues/950) **Renommage de la classe seine.WeightCategory en seine.WeightCategorySeine** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) +## Version [7.0-RC-19](https://gitlab.com/ultreiaio/ird-observe/milestones/122) + +**Closed at 2018-09-16.** + + +### Issues + * [[Evolution 1038]](https://gitlab.com/ultreiaio/ird-observe/issues/1038) **[PS] Ajout de racourcis clavier sur le formulaire des systèmes observés** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + ## Version [7.0-RC-18](https://gitlab.com/ultreiaio/ird-observe/milestones/121) **Closed at 2018-09-12.** View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/c724c46710f42f65d74c4162a3c… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/c724c46710f42f65d74c4162a3c… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][release/7.0-RC-19] update changelog
by Tony CHEMIT 16 Sep '18

16 Sep '18

Tony CHEMIT pushed to branch release/7.0-RC-19 at ultreiaio / ird-observe Commits: 09ef469d by Tony CHEMIT at 2018-09-16T15:12:41Z update changelog - - - - - 4 changed files: - + .mvn/gitlab-cache/milestones/644883-artifacts.json - + .mvn/gitlab-cache/milestones/644883-issues.json - + .mvn/gitlab-cache/milestones/644883.json - CHANGELOG.md Changes: ===================================== .mvn/gitlab-cache/milestones/644883-artifacts.json ===================================== @@ -0,0 +1,12 @@ +[ + { + "name": "Application", + "filename": "observe-7.0-RC-19.zip", + "url": "https://ultreia.io/release/observe-7.0-RC-19.zip" + }, + { + "name": "Serveur", + "filename": "observe-7.0-RC-19.war", + "url": "https://ultreia.io/release/observe-7.0-RC-19.war" + } +] \ No newline at end of file ===================================== .mvn/gitlab-cache/milestones/644883-issues.json ===================================== @@ -0,0 +1,52 @@ +[ + { + "id": 13673624, + "iid": 1038, + "projectId": 2722779, + "title": "[PS] Ajout de racourcis clavier sur le formulaire des systèmes observés", + "description": "Idéalement, on nous demande des racourcis clavier supplémentaires sur les flêches \u003c- et -\u003e du formaulaire PS systèmes observés :\n\n![image](/uploads/236e6a93607d63560815a257519b7a32/image.png)\n\nEffectivement cela pourrait pas mal fluidifier l\u0027ajout d\u0027éléments.", + "labels": [ + "Bas", + "Contrat Code Lutin-2016", + "Evolution" + ], + "milestone": { + "id": 644883, + "iid": 122, + "projectId": 2722779, + "groupId": 0, + "title": "7.0-RC-19", + "description": "", + "dueDate": "Sep 16, 2018 12:00:00 AM", + "startDate": "Sep 14, 2018 12:00:00 AM", + "state": "closed" + }, + "assignee": { + "_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/2a915aa9a1df35c8b609ff2f750d5dac?s\u003d…" + }, + "author": { + "_id": 1111318, + "_username": "pcauquil", + "_name": "Pascal Cauquil", + "_state": "active", + "_darkScheme": false, + "_isAdmin": false, + "_canCreateGroup": false, + "_canCreateProject": false, + "_canCreateTeam": false, + "_avatarUrl": "https://secure.gravatar.com/avatar/b4ae117bd93e10d96298fa4d885208ea?s\u003d…" + }, + "state": "closed", + "updatedAt": "Sep 16, 2018 3:10:02 PM", + "createdAt": "Aug 24, 2018 10:25:25 AM" + } +] \ No newline at end of file ===================================== .mvn/gitlab-cache/milestones/644883.json ===================================== @@ -0,0 +1,11 @@ +{ + "id": 644883, + "iid": 122, + "projectId": 2722779, + "groupId": 0, + "title": "7.0-RC-19", + "description": "", + "dueDate": "Sep 16, 2018 12:00:00 AM", + "startDate": "Sep 14, 2018 12: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-09-12 17:47. + * Last generated at 2018-09-16 15:11. ## Version [8.0-alpha-2](https://gitlab.com/ultreiaio/ird-observe/milestones/113) Second lot du contrat IRD-2018-01-V8 @@ -48,6 +48,17 @@ Premier lot du contrat IRD-2018-01-V8 * [[Evolution 922]](https://gitlab.com/ultreiaio/ird-observe/issues/922) **Ajoute le référentiel observe_common.DataQuality sur les données existantes** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) * [[Evolution 950]](https://gitlab.com/ultreiaio/ird-observe/issues/950) **Renommage de la classe seine.WeightCategory en seine.WeightCategorySeine** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) +## Version [7.0-RC-19](https://gitlab.com/ultreiaio/ird-observe/milestones/122) + +**Closed at 2018-09-16.** + +### Download +* [Application (observe-7.0-RC-19.zip)](https://ultreia.io/release/observe-7.0-RC-19.zip) +* [Serveur (observe-7.0-RC-19.war)](https://ultreia.io/release/observe-7.0-RC-19.war) + +### Issues + * [[Evolution 1038]](https://gitlab.com/ultreiaio/ird-observe/issues/1038) **[PS] Ajout de racourcis clavier sur le formulaire des systèmes observés** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + ## Version [7.0-RC-18](https://gitlab.com/ultreiaio/ird-observe/milestones/121) **Closed at 2018-09-12.** View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/09ef469d16a15e57d7419447570… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/09ef469d16a15e57d7419447570… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-7.x] [jgitflow-maven-plugin]updating poms for 7.0-RC-20-SNAPSHOT development[skip ci]
by Tony CHEMIT 16 Sep '18

16 Sep '18

Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: db24745f by Tony CHEMIT at 2018-09-16T14:55:57Z [jgitflow-maven-plugin]updating poms for 7.0-RC-20-SNAPSHOT development[skip ci] - - - - - 13 changed files: - client-configuration/pom.xml - client/pom.xml - dto/pom.xml - observe/pom.xml - persistence/pom.xml - pom.xml - server-configuration/pom.xml - server/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-RC-19-SNAPSHOT</version> + <version>7.0-RC-20-SNAPSHOT</version> </parent> <artifactId>client-configuration</artifactId> ===================================== client/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0-RC-19-SNAPSHOT</version> + <version>7.0-RC-20-SNAPSHOT</version> </parent> <artifactId>client</artifactId> ===================================== dto/pom.xml ===================================== @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0-RC-19-SNAPSHOT</version> + <version>7.0-RC-20-SNAPSHOT</version> </parent> <artifactId>dto</artifactId> ===================================== observe/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0-RC-19-SNAPSHOT</version> + <version>7.0-RC-20-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-RC-19-SNAPSHOT</version> + <version>7.0-RC-20-SNAPSHOT</version> </parent> <artifactId>persistence</artifactId> ===================================== pom.xml ===================================== @@ -31,7 +31,7 @@ <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0-RC-19-SNAPSHOT</version> + <version>7.0-RC-20-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-RC-19-SNAPSHOT</version> + <version>7.0-RC-20-SNAPSHOT</version> </parent> <artifactId>server-configuration</artifactId> ===================================== server/pom.xml ===================================== @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0-RC-19-SNAPSHOT</version> + <version>7.0-RC-20-SNAPSHOT</version> </parent> <artifactId>server</artifactId> ===================================== services-client/pom.xml ===================================== @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0-RC-19-SNAPSHOT</version> + <version>7.0-RC-20-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-RC-19-SNAPSHOT</version> + <version>7.0-RC-20-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-RC-19-SNAPSHOT</version> + <version>7.0-RC-20-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-RC-19-SNAPSHOT</version> + <version>7.0-RC-20-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-RC-19-SNAPSHOT</version> + <version>7.0-RC-20-SNAPSHOT</version> </parent> <artifactId>validation</artifactId> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/db24745f3f6e6e6fae73ffe6072… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/db24745f3f6e6e6fae73ffe6072… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe] Pushed new branch release/7.0-RC-19
by Tony CHEMIT 16 Sep '18

16 Sep '18

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

1 0

[Git][ultreiaio/ird-observe][develop] 3 commits: [PS] Ajout de racourcis clavier sur le formulaire des systèmes observés - Closes #1038
by Tony CHEMIT 16 Sep '18

16 Sep '18

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: cf146502 by Tony CHEMIT at 2018-09-16T14:21:40Z [PS] Ajout de racourcis clavier sur le formulaire des systèmes observés - Closes #1038 - - - - - 1f0d6d6c by Tony CHEMIT at 2018-09-16T14:21:55Z Amélioration du calcul des droits d'un écran (reste encore à en dégager les messages, ce n'est pas le bon endroit pour faire cela...) - - - - - b994c201 by Tony CHEMIT at 2018-09-16T14:55:20Z Improve log levels (to see migration progress) - - - - - 30 changed files: - client-configuration/src/main/resources/log4j2.xml - client-configuration/src/main/resources/observe-log4j2.xml - client/src/main/java/fr/ird/observe/client/ui/content/ContentUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/ContentUIModel.java - client/src/main/java/fr/ird/observe/client/ui/content/data/longline/GearUseFeaturesLonglineUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/data/longline/TripLonglineUI.jaxx - client/src/main/java/fr/ird/observe/client/ui/content/data/longline/TripLonglineUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/ActivityLonglineLogbookSampleUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/ActivityLonglineLogbookUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/BaitsCompositionLogbookUIModel.java - client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/BranchlinesCompositionLogbookUIModel.java - client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/CatchLonglineLogbookUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/FloatlinesCompositionLogbookUIModel.java - client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/HooksCompositionLogbookUIModel.java - client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/LandingPartLogbookUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/LandingPartLogbookUIModel.java - client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/LonglineGlobalCompositionLogbookUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/SamplePartLogbookUI.jcss - client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/SamplePartLogbookUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/SamplePartLogbookUIModel.java - client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/SetLonglineLogbookUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/TripLonglineLandingLogbookUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/TripLonglineSampleLogbookUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/data/longline/obs/ActivityLonglineObsUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/data/longline/obs/BaitsCompositionObsUIModel.java - client/src/main/java/fr/ird/observe/client/ui/content/data/longline/obs/BranchlineObsUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/data/longline/obs/BranchlineObsUIModel.java - client/src/main/java/fr/ird/observe/client/ui/content/data/longline/obs/BranchlinesCompositionObsUIModel.java - client/src/main/java/fr/ird/observe/client/ui/content/data/longline/obs/CatchLonglineObsUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/data/longline/obs/EncounterObsUIHandler.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/5c543d620fe7e7870ac1470067… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/5c543d620fe7e7870ac1470067… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-7.x] reset default size measure type should not be focusable
by Tony CHEMIT 16 Sep '18

16 Sep '18

Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: aa485583 by Tony CHEMIT at 2018-09-16T14:38:18Z reset default size measure type should not be focusable - - - - - 1 changed file: - client/src/main/java/fr/ird/observe/client/ui/content/data/seine/AbstractSampleUI.jcss Changes: ===================================== client/src/main/java/fr/ird/observe/client/ui/content/data/seine/AbstractSampleUI.jcss ===================================== @@ -87,6 +87,7 @@ JToolBar { actionIcon:combobox-reset2; toolTipText:"observe.common.Sample.action.resetDefaultSizeMeasureType.tip"; enabled:{model.getDefaultSizeMeasureType() != null}; + focusable:false; } #length { View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/aa48558398d385d457290db32a1… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/aa48558398d385d457290db32a1… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-7.x] 2 commits: Remove very bad files...
by Tony CHEMIT 16 Sep '18

16 Sep '18

Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: cb74f6ad by Tony CHEMIT at 2018-09-16T14:32:14Z Remove very bad files... - - - - - f46a0c7e by Tony CHEMIT at 2018-09-16T14:32:30Z Improve log levels (to see migration progress) - - - - - 6 changed files: - client-configuration/src/main/resources/log4j2.xml - client-configuration/src/main/resources/observe-log4j2.xml - − dto/src/main/java/fr/ird/observe/dto/decoration/decorators/GearCaracteristicDtoDecorator.java~ - − dto/src/main/java/fr/ird/observe/dto/decoration/decorators/GeatCaracteristicReferenceDecorator.java~ - server-configuration/src/main/resources/log4j2.xml - server-configuration/src/main/resources/observeweb-log4j2.xml Changes: ===================================== client-configuration/src/main/resources/log4j2.xml ===================================== @@ -49,6 +49,10 @@ <AppenderRef ref="console"/> <AppenderRef ref="File"/> </Logger> + <Logger name="org.nuiton.topia" level="info" additivity="false"> + <AppenderRef ref="console"/> + <AppenderRef ref="File"/> + </Logger> <Logger name="fr.ird.observe.client.validators" level="warn" additivity="false"> <AppenderRef ref="console"/> <AppenderRef ref="File"/> ===================================== client-configuration/src/main/resources/observe-log4j2.xml ===================================== @@ -49,6 +49,10 @@ <AppenderRef ref="console"/> <AppenderRef ref="File"/> </Logger> + <Logger name="org.nuiton.topia" level="info" additivity="false"> + <AppenderRef ref="console"/> + <AppenderRef ref="File"/> + </Logger> <Logger name="fr.ird.observe.client.validators" level="warn" additivity="false"> <AppenderRef ref="console"/> <AppenderRef ref="File"/> ===================================== dto/src/main/java/fr/ird/observe/dto/decoration/decorators/GearCaracteristicDtoDecorator.java~ deleted ===================================== @@ -1,51 +0,0 @@ -package fr.ird.observe.dto.decoration.decorators; - -<<<<<<< HEAD -======= -/*- - * #%L - * ObServe :: Dto - * %% - * Copyright (C) 2008 - 2018 IRD, Code Lutin, Ultreia.io - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. - * #L% - */ - ->>>>>>> refs/heads/master-7.x -import fr.ird.observe.dto.referential.GearCaracteristicDto; - -import static org.nuiton.i18n.I18n.t; - -/** - * Created by tchemit on 13/06/2018. - * - * @author Tony Chemit - dev(a)tchemit.fr - */ -public class GearCaracteristicDtoDecorator extends ObserveDecorator<GearCaracteristicDto> { - - public GearCaracteristicDtoDecorator(String libelle) { - super(GearCaracteristicDto.class, "${code}$s##${" + libelle + "}$s##${unit}$s", " "); - } - - @Override - protected Comparable<?> getDefaultNullValue(String token) { - Comparable<?> defaultNullValue = super.getDefaultNullValue(token); - if (defaultNullValue == null && token.equals(GearCaracteristicDto.PROPERTY_UNIT)) { - return t("observe.common.no.unit"); - } - return defaultNullValue; - } -} ===================================== dto/src/main/java/fr/ird/observe/dto/decoration/decorators/GeatCaracteristicReferenceDecorator.java~ deleted ===================================== @@ -1,51 +0,0 @@ -package fr.ird.observe.dto.decoration.decorators; - -<<<<<<< HEAD -======= -/*- - * #%L - * ObServe :: Dto - * %% - * Copyright (C) 2008 - 2018 IRD, Code Lutin, Ultreia.io - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. - * #L% - */ - ->>>>>>> refs/heads/master-7.x -import fr.ird.observe.dto.referential.GearCaracteristicDto; -import fr.ird.observe.dto.referential.GearCaracteristicReference; - -import static org.nuiton.i18n.I18n.t; - -/** - * Created by tchemit on 13/06/2018. - * - * @author Tony Chemit - dev(a)tchemit.fr - */ -public class GeatCaracteristicReferenceDecorator extends ReferentialReferenceDecorator<GearCaracteristicReference> { - public GeatCaracteristicReferenceDecorator( ) { - super(GearCaracteristicReference.class, "${code}$s##${label}$s##${unit}$s"); - } - - @Override - protected Comparable<?> getDefaultNullValue(String token) { - Comparable<?> defaultNullValue = super.getDefaultNullValue(token); - if (defaultNullValue == null && token.equals(GearCaracteristicDto.PROPERTY_UNIT)) { - return t("observe.common.no.unit"); - } - return defaultNullValue; - } -} ===================================== server-configuration/src/main/resources/log4j2.xml ===================================== @@ -34,6 +34,9 @@ <Logger name="org.nuiton" level="warn" additivity="false"> <AppenderRef ref="console"/> </Logger> + <Logger name="org.nuiton.topia" level="info" additivity="false"> + <AppenderRef ref="console"/> + </Logger> <Logger name="fr.ird.observe.client.validators" level="warn" additivity="false"> <AppenderRef ref="console"/> </Logger> ===================================== server-configuration/src/main/resources/observeweb-log4j2.xml ===================================== @@ -42,7 +42,11 @@ <AppenderRef ref="console"/> <AppenderRef ref="File"/> </Logger> - <Logger name="org.nuiton" level="info" additivity="false"> + <Logger name="org.nuiton" level="warn" additivity="false"> + <AppenderRef ref="console"/> + <AppenderRef ref="File"/> + </Logger> + <Logger name="org.nuiton.topia" level="info" additivity="false"> <AppenderRef ref="console"/> <AppenderRef ref="File"/> </Logger> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/80b457bdedef0d63d2646b8bd3… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/80b457bdedef0d63d2646b8bd3… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-7.x] [PS] Ajout de racourcis clavier sur le formulaire des systèmes observés - Closes #1038
by Tony CHEMIT 16 Sep '18

16 Sep '18

Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: 80b457bd by Tony CHEMIT at 2018-09-16T14:24:43Z [PS] Ajout de racourcis clavier sur le formulaire des systèmes observés - Closes #1038 - - - - - 1 changed file: - pom.xml Changes: ===================================== pom.xml ===================================== @@ -153,7 +153,7 @@ <buildDate>${maven.build.timestamp}</buildDate> <observeToolkitVersion>3.7.4</observeToolkitVersion> -  + <lib.version.java4all.jaxx>3.0-alpha-35</lib.version.java4all.jaxx> <lib.version.nuiton.validation>3.1</lib.version.nuiton.validation>  <xworkVersion>2.3.35</xworkVersion> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/80b457bdedef0d63d2646b8bd33… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/80b457bdedef0d63d2646b8bd33… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] fix api call only for seine model
by Tony CHEMIT 15 Sep '18

15 Sep '18

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 5c543d62 by Tony CHEMIT at 2018-09-15T13:19:24Z fix api call only for seine model - - - - - 1 changed file: - client/src/main/java/fr/ird/observe/client/ui/content/open/ContentOpenableUIHandler.java Changes: ===================================== client/src/main/java/fr/ird/observe/client/ui/content/open/ContentOpenableUIHandler.java ===================================== @@ -314,16 +314,18 @@ public abstract class ContentOpenableUIHandler<E extends DataDto, U extends Cont ObserveSwingApplicationContext applicationContext = ObserveSwingApplicationContext.get(); ClientValidationContext context = applicationContext.getValidationContext(); - TripSeineDto currentTripSeine = context.getCurrentTripSeine(); - if (currentTripSeine != null && currentTripSeine.isHistoricalData()) { + if (context.getDataContext().getSeine().getTrip().isEnabled()) { + TripSeineDto currentTripSeine = context.getCurrentTripSeine(); - if (log.isInfoEnabled()) { - log.info(prefix + "Using a historical fish trip " + currentTripSeine.getId()); - } - historicalData = true; - } + if (currentTripSeine != null && currentTripSeine.isHistoricalData()) { + if (log.isInfoEnabled()) { + log.info(prefix + "Using a historical fish trip " + currentTripSeine.getId()); + } + historicalData = true; + } + } } model.setHistoricalData(historicalData); View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/5c543d620fe7e7870ac1470067e… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/5c543d620fe7e7870ac1470067e… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] optimize dependencies
by Tony CHEMIT 15 Sep '18

15 Sep '18

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 22b0d643 by Tony CHEMIT at 2018-09-15T12:13:17Z optimize dependencies - - - - - 1 changed file: - client-configuration/pom.xml Changes: ===================================== client-configuration/pom.xml ===================================== @@ -79,10 +79,6 @@ <groupId>commons-beanutils</groupId> <artifactId>commons-beanutils</artifactId> </dependency> - <dependency> - <groupId>org.apache.commons</groupId> - <artifactId>commons-lang3</artifactId> - </dependency> <dependency> <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/22b0d6431164ca77aaac5df7eb3… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/22b0d6431164ca77aaac5df7eb3… You're receiving this email because of your account on gitlab.com.

1 0