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

[Git][ultreiaio/ird-observe][develop-9] 24 commits: realign ll service names
by Tony CHEMIT 05 Aug '19

05 Aug '19

Tony CHEMIT pushed to branch develop-9 at ultreiaio / ird-observe Commits: b909b0c3 by tchemit at 2019-08-05T21:39:40Z realign ll service names - - - - - 48bb8ae8 by tchemit at 2019-08-05T22:21:00Z realign validation context - - - - - d5cccecc by tchemit at 2019-08-05T23:01:31Z [CARTE] Symboles de cartes pour V8 et V9 - Refactor code - See #1343 - - - - - 1d262997 by tchemit at 2019-08-05T23:03:54Z Réorganisation des données d’observation PS - Réorganisation des captures et échantillons de cible et bycatch observés - See #1254 - - - - - 5bdcbfde by tchemit at 2019-08-05T23:03:54Z Move to new version 9.0-alpha-1 - - - - - 8088b494 by tchemit at 2019-08-05T23:03:54Z Réorganisation des données d’observation PS - Re localisation dans la hiérarchie - Closes #1252 - - - - - d25f7cb8 by tchemit at 2019-08-05T23:17:48Z Module 2 (first flush) - - - - - cad6b51b by tchemit at 2019-08-05T23:17:48Z [PS] Contenu des onglets spécifiques observations et logbooks et le formulaire marée - See #1300 - - - - - 6489108b by tchemit at 2019-08-05T23:17:49Z Module 2 - second flush - - - - - d92db324 by tchemit at 2019-08-05T23:19:02Z Report from v8 for ps logbook model - - - - - 19c78eac by tchemit at 2019-08-05T23:19:02Z Choix de nouvelles couleurs pour les symboles de la carte LL - Closes #1293 - - - - - 7a1bb8bf by tchemit at 2019-08-05T23:19:02Z [CARTE] Symboles de cartes pour V8 et V9 - Realign for Ps model - See #1343 - - - - - fab56bd2 by tchemit at 2019-08-05T23:19:02Z Consolidation des champs techniques en base - Realing on v9 - See #1353 - - - - - 0d179456 by tchemit at 2019-08-05T23:19:03Z Insertion des lots de débarquements - See #1259 - - - - - 6f7554af by tchemit at 2019-08-05T23:19:03Z Insertion du plan de cuves - See #1260 - - - - - fbc204f7 by tchemit at 2019-08-05T23:19:04Z Insertion de l’échantillonnage au port - See #1261 - - - - - a7f90ea5 by tchemit at 2019-08-05T23:19:04Z Création de nouvelles icônes de navigation - Pass for v9 - See #1358 - - - - - 00a9ad19 by tchemit at 2019-08-05T23:19:04Z First realign i18n after develop merge - - - - - 4a5e3330 by tchemit at 2019-08-05T23:23:25Z Realign Seine model (no more any Seine in any Seine data - - - - - 85081080 by tchemit at 2019-08-05T23:23:25Z optimize i18n - - - - - c61738de by tchemit at 2019-08-05T23:25:08Z Use new ServicesProvider (everything is now generated) (report on v9) - - - - - 277f7826 by tchemit at 2019-08-05T23:26:59Z Normalize seine services names - - - - - a9815afd by tchemit at 2019-08-05T23:26:59Z Align logbook referential - See #1332 - - - - - c21f2f94 by tchemit at 2019-08-05T23:38:43Z realign after big rebase from develop - - - - - 30 changed files: - .mvn/pom.gitflow.develop - .mvn/pom.gitflow.master - client-configuration/.mvn/pom.gitflow.develop - client-configuration/.mvn/pom.gitflow.master - client-configuration/pom.xml - client-configuration/src/main/config/Client.ini - client-configuration/src/main/i18n/getters/config.getter - client-configuration/src/main/i18n/getters/java.getter - client-core/.mvn/pom.gitflow.develop - client-core/.mvn/pom.gitflow.master - client-core/pom.xml - client-core/src/license/THIRD-PARTY.properties - client-core/src/main/dcp-presets/ps/logbook/01-deployment-preset.yml - client-core/src/main/dcp-presets/ps/logbook/02-removal-preset.yml - client-core/src/main/dcp-presets/ps/logbook/03-update-preset.yml - client-core/src/main/dcp-presets/ps/logbook/04-abandonned-preset.yml - 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/navigation/RouteCloseCallback.java - client-core/src/main/java/fr/ird/observe/client/ui/ObserveKeyStrokes.java - 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/ObserveMainUIInitializer.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ll/ChooseRelatedObservedActivityUIAction.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ll/GenerateTripLonglineHomeIdUIAction.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ll/SelectTransshipmentLandingLonglineUIAction.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ll/delete/DeleteActivityLonglineObsUIAction.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ll/delete/DeleteActivityUIAction.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ll/delete/DeleteSampleLonglineLogbookUIAction.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/1c2e6c0db08191db7ae67b7838… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/1c2e6c0db08191db7ae67b7838… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 2 commits: realign ll service names
by Tony CHEMIT 05 Aug '19

05 Aug '19

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: b909b0c3 by tchemit at 2019-08-05T21:39:40Z realign ll service names - - - - - 48bb8ae8 by tchemit at 2019-08-05T22:21:00Z realign validation context - - - - - 30 changed files: - client-core/src/main/java/fr/ird/observe/client/db/ObserveSwingDataSource.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ll/ChooseRelatedObservedActivityUIAction.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ll/GenerateTripLonglineHomeIdUIAction.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ll/delete/DeleteActivityLonglineObsUIAction.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ll/delete/DeleteActivityUIAction.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ll/delete/DeleteSampleLonglineLogbookUIAction.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ll/delete/DeleteSetLonglineLogbookUIAction.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ll/delete/DeleteSetLonglineObsUIAction.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ll/delete/DeleteTripLonglineLandingUIAction.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ll/delete/DeleteTripLonglineUIAction.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ll/delete/DeleteTripSampleUIAction.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ll/move/MoveMultipleActivityLonglineObsUIAction.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ll/move/MoveMultipleActivityUIAction.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ll/move/MoveMultipleTripLonglineLandingUIAction.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ll/move/MoveMultipleTripLonglineUIAction.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ll/move/MoveMultipleTripSampleUIAction.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ll/move/MoveSingleActivityLonglineObsUIAction.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ll/move/MoveSingleActivityLonglineSampleLogbookUIAction.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ll/move/MoveSingleActivityUIAction.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ll/move/MoveSingleTripLonglineLandingUIAction.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ll/move/MoveSingleTripLonglineUIAction.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ll/move/MoveSingleTripSampleUIAction.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ll/save/CopyValuesAndSaveSetLonglineLogbookUIAction.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ll/save/SaveActivityLonglineLogbookSampleUIAction.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ll/save/SaveActivityLonglineObsUIAction.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ll/save/SaveActivityUIAction.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ll/save/SaveLonglineDetailCompositionObsUIAction.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ll/save/SaveLonglineGlobalCompositionLogbookUIAction.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ll/save/SaveLonglineGlobalCompositionObsUIAction.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ll/save/SaveSetLonglineLogbookUIAction.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/b4d562570850fa628747ad3a13… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/b4d562570850fa628747ad3a13… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] update toolkit version
by Tony CHEMIT 05 Aug '19

05 Aug '19

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: b4d56257 by tchemit at 2019-08-04T23:24:57Z update toolkit version - - - - - 1 changed file: - pom.xml Changes: ===================================== pom.xml ===================================== @@ -159,7 +159,7 @@ <maven.build.timestamp.format>dd/MM/yyyy HH:mm z</maven.build.timestamp.format> <buildDate>${maven.build.timestamp}</buildDate> - <observeToolkitVersion>4.16-SNAPSHOT</observeToolkitVersion> + <observeToolkitVersion>4.16</observeToolkitVersion> <lib.version.nuiton.validation>3.1</lib.version.nuiton.validation>  <lib.version.h2>1.4.196</lib.version.h2> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/b4d562570850fa628747ad3a134… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/b4d562570850fa628747ad3a134… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-9] 34 commits: Realign LL model - See #1332
by Tony CHEMIT 05 Aug '19

05 Aug '19

Tony CHEMIT pushed to branch develop-9 at ultreiaio / ird-observe Commits: a79209c2 by tchemit at 2019-08-04T14:21:17Z Realign LL model - See #1332 - - - - - 42865344 by tchemit at 2019-08-04T14:21:19Z update changelog [skip ci] - - - - - fe790840 by tchemit at 2019-08-04T14:21:19Z when sanitize is not ok, let's just continue - - - - - 781fcc31 by tchemit at 2019-08-04T14:21:19Z [UI][REFERENTIEL] L'icône 'voir toutes les utilisations de ce référentiel' ne fonctionne pas - Closes #1370 - - - - - b32ca653 by tchemit at 2019-08-04T15:27:37Z [CARTO] Petits ajustement sur la carte - Closes #1368 - - - - - f25d6134 by tchemit at 2019-08-04T15:27:39Z [SERVEUR] observe-server.conf / observeweb.host - Closes #1369 - - - - - 864e14da by tchemit at 2019-08-04T23:12:22Z Missing some fields on ShipOwner form - - - - - 68ea268f by tchemit at 2019-08-04T23:15:05Z Missing some labels on form - - - - - 9b9e8247 by tchemit at 2019-08-04T23:15:06Z Ajout d'une méthode pour récupérer les clef naturels sur un référentiel - - - - - 8815c15f by tchemit at 2019-08-04T23:15:06Z [UI][REFERENTIEL] Icône 'Toutes les clés métier de ce référentiel' - Closes #1371 - - - - - 896b08bb by tchemit at 2019-08-04T23:19:35Z update changelog [skip ci] - - - - - b4d56257 by tchemit at 2019-08-04T23:24:57Z update toolkit version - - - - - 8948074a by tchemit at 2019-08-04T23:43:36Z [CARTE] Symboles de cartes pour V8 et V9 - Refactor code - See #1343 - - - - - d9b69833 by tchemit at 2019-08-05T14:53:17Z Réorganisation des données d’observation PS - Réorganisation des captures et échantillons de cible et bycatch observés - See #1254 - - - - - 3dcc52d1 by tchemit at 2019-08-05T14:53:17Z Move to new version 9.0-alpha-1 - - - - - 705f602a by tchemit at 2019-08-05T14:53:17Z Réorganisation des données d’observation PS - Re localisation dans la hiérarchie - Closes #1252 - - - - - 346edae1 by tchemit at 2019-08-05T18:05:07Z Module 2 (first flush) - - - - - 10db143c by tchemit at 2019-08-05T18:08:20Z [PS] Contenu des onglets spécifiques observations et logbooks et le formulaire marée - See #1300 - - - - - d6b2ae79 by tchemit at 2019-08-05T18:09:14Z Module 2 - second flush - - - - - c1d5b5d2 by tchemit at 2019-08-05T18:09:14Z Report from v8 for ps logbook model - - - - - 47d182c7 by tchemit at 2019-08-05T18:09:14Z Choix de nouvelles couleurs pour les symboles de la carte LL - Closes #1293 - - - - - c0699049 by tchemit at 2019-08-05T18:10:12Z [CARTE] Symboles de cartes pour V8 et V9 - Realign for Ps model - See #1343 - - - - - 747f36af by tchemit at 2019-08-05T18:10:12Z Consolidation des champs techniques en base - Realing on v9 - See #1353 - - - - - 5dda78d9 by tchemit at 2019-08-05T18:13:45Z Insertion des lots de débarquements - See #1259 - - - - - 312eafc3 by tchemit at 2019-08-05T18:14:00Z Insertion du plan de cuves - See #1260 - - - - - 52d7a4c0 by tchemit at 2019-08-05T18:14:25Z Insertion de l’échantillonnage au port - See #1261 - - - - - b1b52cf1 by tchemit at 2019-08-05T18:14:25Z Création de nouvelles icônes de navigation - Pass for v9 - See #1358 - - - - - 16c35153 by tchemit at 2019-08-05T18:16:11Z First realign i18n after develop merge - - - - - 49bda8c2 by tchemit at 2019-08-05T18:24:43Z Realign Seine model (no more any Seine in any Seine data - - - - - 7daa8b63 by tchemit at 2019-08-05T18:24:43Z optimize i18n - - - - - c53e72bf by tchemit at 2019-08-05T18:26:28Z Use new ServicesProvider (everything is now generated) (report on v9) - - - - - 958fce54 by tchemit at 2019-08-05T18:27:14Z Normalize seine services names - - - - - 91722d53 by tchemit at 2019-08-05T18:31:03Z Align logbook referential - See #1332 - - - - - 1c2e6c0d by tchemit at 2019-08-05T21:08:40Z realign after big rebase from develop - - - - - 30 changed files: - .mvn/gitlab-cache/milestones/370039-issues.json - .mvn/gitlab-cache/milestones/532584-issues.json - .mvn/gitlab-cache/milestones/595831-issues.json - .mvn/gitlab-cache/milestones/647608-issues.json - .mvn/gitlab-cache/milestones/921497-issues.json - .mvn/gitlab-cache/milestones/921497.json - .mvn/gitlab-cache/milestones/925832-issues.json - .mvn/gitlab-cache/milestones/925832.json - + .mvn/gitlab-cache/milestones/958566-artifacts.json - + .mvn/gitlab-cache/milestones/958566-issues.json - + .mvn/gitlab-cache/milestones/958566.json - + .mvn/gitlab-cache/milestones/959266-issues.json - + .mvn/gitlab-cache/milestones/959266.json - .mvn/pom.gitflow.develop - .mvn/pom.gitflow.master - CHANGELOG.md - client-configuration/.mvn/pom.gitflow.develop - client-configuration/.mvn/pom.gitflow.master - client-configuration/pom.xml - client-configuration/src/main/config/Client.ini - client-configuration/src/main/i18n/getters/config.getter - client-configuration/src/main/i18n/getters/java.getter - client-core/.mvn/pom.gitflow.develop - client-core/.mvn/pom.gitflow.master - client-core/pom.xml - client-core/src/license/THIRD-PARTY.properties - client-core/src/main/dcp-presets/ps/logbook/01-deployment-preset.yml - client-core/src/main/dcp-presets/ps/logbook/02-removal-preset.yml - client-core/src/main/dcp-presets/ps/logbook/03-update-preset.yml - client-core/src/main/dcp-presets/ps/logbook/04-abandonned-preset.yml The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/c896939558437b208e140c084a… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/c896939558437b208e140c084a… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] update changelog [skip ci]
by Tony CHEMIT 04 Aug '19

04 Aug '19

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 896b08bb by tchemit at 2019-08-04T23:19:35Z update changelog [skip ci] - - - - - 5 changed files: - .mvn/gitlab-cache/milestones/921497-issues.json - .mvn/gitlab-cache/milestones/921497.json - + .mvn/gitlab-cache/milestones/959266-issues.json - + .mvn/gitlab-cache/milestones/959266.json - CHANGELOG.md Changes: ===================================== .mvn/gitlab-cache/milestones/921497-issues.json ===================================== @@ -17,8 +17,9 @@ "groupId": 0, "title": "8.0-RC-4", "description": "", + "dueDate": "Aug 5, 2019 2:00:00 AM", "startDate": "Jul 3, 2019 2:00:00 AM", - "state": "active" + "state": "closed" }, "assignees": [ { @@ -46,7 +47,7 @@ "_external": false, "_avatarUrl": "https://secure.gravatar.com/avatar/b4ae117bd93e10d96298fa4d885208ea?s\u003d…" }, - "userNotesCount": 1, + "userNotesCount": 2, "upVotes": 0, "downVotes": 0, "confidential": false, @@ -54,9 +55,10 @@ "timeEstimate": 0, "totalTimeSpent": 0 }, - "state": "opened", - "updatedAt": "Jul 29, 2019 4:35:28 PM", + "state": "closed", + "updatedAt": "Aug 3, 2019 8:27:32 PM", "createdAt": "Jul 29, 2019 3:31:02 PM", + "closedAt": "Aug 3, 2019 8:27:32 PM", "webUrl": "https://gitlab.com/ultreiaio/ird-observe/issues/1372" }, { @@ -76,8 +78,9 @@ "groupId": 0, "title": "8.0-RC-4", "description": "", + "dueDate": "Aug 5, 2019 2:00:00 AM", "startDate": "Jul 3, 2019 2:00:00 AM", - "state": "active" + "state": "closed" }, "assignees": [ { @@ -138,8 +141,9 @@ "groupId": 0, "title": "8.0-RC-4", "description": "", + "dueDate": "Aug 5, 2019 2:00:00 AM", "startDate": "Jul 3, 2019 2:00:00 AM", - "state": "active" + "state": "closed" }, "assignees": [ { @@ -200,8 +204,9 @@ "groupId": 0, "title": "8.0-RC-4", "description": "", + "dueDate": "Aug 5, 2019 2:00:00 AM", "startDate": "Jul 3, 2019 2:00:00 AM", - "state": "active" + "state": "closed" }, "assignees": [ { @@ -237,9 +242,10 @@ "timeEstimate": 0, "totalTimeSpent": 0 }, - "state": "opened", - "updatedAt": "Jul 29, 2019 3:10:40 PM", + "state": "closed", + "updatedAt": "Aug 3, 2019 8:26:36 PM", "createdAt": "Jul 29, 2019 3:10:40 PM", + "closedAt": "Aug 3, 2019 8:26:36 PM", "webUrl": "https://gitlab.com/ultreiaio/ird-observe/issues/1370" }, { @@ -261,8 +267,9 @@ "groupId": 0, "title": "8.0-RC-4", "description": "", + "dueDate": "Aug 5, 2019 2:00:00 AM", "startDate": "Jul 3, 2019 2:00:00 AM", - "state": "active" + "state": "closed" }, "assignees": [ { @@ -320,8 +327,9 @@ "groupId": 0, "title": "8.0-RC-4", "description": "", + "dueDate": "Aug 5, 2019 2:00:00 AM", "startDate": "Jul 3, 2019 2:00:00 AM", - "state": "active" + "state": "closed" }, "assignees": [ { @@ -383,8 +391,9 @@ "groupId": 0, "title": "8.0-RC-4", "description": "", + "dueDate": "Aug 5, 2019 2:00:00 AM", "startDate": "Jul 3, 2019 2:00:00 AM", - "state": "active" + "state": "closed" }, "assignees": [ { @@ -444,8 +453,9 @@ "groupId": 0, "title": "8.0-RC-4", "description": "", + "dueDate": "Aug 5, 2019 2:00:00 AM", "startDate": "Jul 3, 2019 2:00:00 AM", - "state": "active" + "state": "closed" }, "assignees": [ { @@ -473,7 +483,7 @@ "_external": false, "_avatarUrl": "https://secure.gravatar.com/avatar/b4ae117bd93e10d96298fa4d885208ea?s\u003d…" }, - "userNotesCount": 0, + "userNotesCount": 1, "upVotes": 0, "downVotes": 0, "confidential": false, @@ -481,9 +491,10 @@ "timeEstimate": 0, "totalTimeSpent": 0 }, - "state": "opened", - "updatedAt": "Jul 29, 2019 3:17:42 PM", + "state": "closed", + "updatedAt": "Aug 5, 2019 1:16:49 AM", "createdAt": "Jul 29, 2019 3:17:42 PM", + "closedAt": "Aug 5, 2019 1:15:20 AM", "webUrl": "https://gitlab.com/ultreiaio/ird-observe/issues/1371" }, { @@ -494,6 +505,7 @@ "description": "Le fichier observe-server.conf demande le paramètre observeweb.host, qui doit contenir l\u0027adresse (http ou https) du serveur.\n\nSi cette adresse est indiquée incorrectement, le test de connexion dans le gestionnaire connexions indique que la connexion est valide, mais la connexion échoue ensuite lors d\u0027une tentative de connexion réelle.\n\nSerait-il possible de se passer de ce paramètre ?\n\nSinon, serait-il possible que le test de connexion invalide le profil si jamais le observeweb.host n\u0027est pas correct ?", "labels": [ "Bas", + "Evolution", "IRD-2018-01-V8" ], "milestone": { @@ -503,8 +515,9 @@ "groupId": 0, "title": "8.0-RC-4", "description": "", + "dueDate": "Aug 5, 2019 2:00:00 AM", "startDate": "Jul 3, 2019 2:00:00 AM", - "state": "active" + "state": "closed" }, "assignees": [ { @@ -532,7 +545,7 @@ "_external": false, "_avatarUrl": "https://secure.gravatar.com/avatar/b4ae117bd93e10d96298fa4d885208ea?s\u003d…" }, - "userNotesCount": 0, + "userNotesCount": 1, "upVotes": 0, "downVotes": 0, "confidential": false, @@ -540,9 +553,10 @@ "timeEstimate": 0, "totalTimeSpent": 0 }, - "state": "opened", - "updatedAt": "Jul 29, 2019 1:05:44 PM", + "state": "closed", + "updatedAt": "Aug 4, 2019 4:48:52 PM", "createdAt": "Jul 29, 2019 1:05:44 PM", + "closedAt": "Aug 4, 2019 4:48:52 PM", "webUrl": "https://gitlab.com/ultreiaio/ird-observe/issues/1369" }, { @@ -563,8 +577,9 @@ "groupId": 0, "title": "8.0-RC-4", "description": "", + "dueDate": "Aug 5, 2019 2:00:00 AM", "startDate": "Jul 3, 2019 2:00:00 AM", - "state": "active" + "state": "closed" }, "assignees": [ { @@ -624,8 +639,9 @@ "groupId": 0, "title": "8.0-RC-4", "description": "", + "dueDate": "Aug 5, 2019 2:00:00 AM", "startDate": "Jul 3, 2019 2:00:00 AM", - "state": "active" + "state": "closed" }, "assignees": [ { @@ -686,8 +702,9 @@ "groupId": 0, "title": "8.0-RC-4", "description": "", + "dueDate": "Aug 5, 2019 2:00:00 AM", "startDate": "Jul 3, 2019 2:00:00 AM", - "state": "active" + "state": "closed" }, "assignees": [ { @@ -729,66 +746,6 @@ "closedAt": "Jul 16, 2019 6:42:45 PM", "webUrl": "https://gitlab.com/ultreiaio/ird-observe/issues/1349" }, - { - "id": 18519309, - "iid": 1237, - "projectId": 2722779, - "title": "Rafraichissement de la page \u0027A propos\u0027", - "description": "Supprimer les logos d\u0027ObServe et de l\u0027IRD\n\nMettre :\n* Nouveau logo IRD : ![logo-ird-2016](/uploads/f9d9b1214417dc9c6ec941b495e8bedc/logo-ird-2016.png)\n* Logo Ob7 : ![logo_obs7_rvb_300dpi](/uploads/a084234f58b04482878041c358acf18d/logo_obs7_rvb_300dpi.png)\n* Logo FEAMP (financement UE) : ![Logo_l_Europe_s_engage_FEAMP](/uploads/4c462e26a581404d97d0b52fbc125f1f/Logo_l_Europe_s_engage_FEAMP.png)\n* Logo SFA (en attente d\u0027un logo avec transparence) : ![logo_sfa_high_resolution](/uploads/fe872d782e73a3c158f0ed42771df3a3/logo_sfa_high_resolution.jpg)\n* Logo CRO (en attente d\u0027un logo avec transparence) : ![logo_CRO_Couleur_haute_résolution](/uploads/4d30fda473961d4ad022eda7bbea69bc/logo_CRO_Couleur_haute_résolution.jpeg)\n\nNouveau texte :\n\nObServe\n\nSystème informatique de gestion de données d\u0027observations embarquées de pêche à la senne et à la palangre.\n\nCe projet a été initiée par l\u0027IRD en 2009. Les contributeurs financiers sont : \n* Institut de Recherche pour le Développement (IRD)\n* Fond Européen pour les Affaires Maritimes et la Pêche (FEAMP)\n* Seychelles Fishing Authority (SFA)\n* AZTI Tecnalia\n* Orthongel\n\nIl est réalisé par les sociétés Code Lutin et Ultreia.io depuis 2009.\n \nPour plus d\u0027informations, veuillez visiter le site du projet.", - "labels": [ - "Bas", - "Evolution", - "À facturer" - ], - "milestone": { - "id": 921497, - "iid": 146, - "projectId": 2722779, - "groupId": 0, - "title": "8.0-RC-4", - "description": "", - "startDate": "Jul 3, 2019 2:00:00 AM", - "state": "active" - }, - "assignees": [ - { - "_id": 1111318, - "_username": "pcauquil", - "_name": "Pascal Cauquil", - "_state": "active", - "_external": false, - "_avatarUrl": "https://secure.gravatar.com/avatar/b4ae117bd93e10d96298fa4d885208ea?s\u003d…" - } - ], - "assignee": { - "_id": 1111318, - "_username": "pcauquil", - "_name": "Pascal Cauquil", - "_state": "active", - "_external": false, - "_avatarUrl": "https://secure.gravatar.com/avatar/b4ae117bd93e10d96298fa4d885208ea?s\u003d…" - }, - "author": { - "_id": 1111318, - "_username": "pcauquil", - "_name": "Pascal Cauquil", - "_state": "active", - "_external": false, - "_avatarUrl": "https://secure.gravatar.com/avatar/b4ae117bd93e10d96298fa4d885208ea?s\u003d…" - }, - "userNotesCount": 2, - "upVotes": 0, - "downVotes": 0, - "confidential": false, - "timeStats": { - "timeEstimate": 0, - "totalTimeSpent": 0 - }, - "state": "opened", - "updatedAt": "Jul 2, 2019 9:41:47 AM", - "createdAt": "Feb 22, 2019 4:32:32 PM", - "webUrl": "https://gitlab.com/ultreiaio/ird-observe/issues/1237" - }, { "id": 23199140, "iid": 1368, @@ -806,8 +763,9 @@ "groupId": 0, "title": "8.0-RC-4", "description": "", + "dueDate": "Aug 5, 2019 2:00:00 AM", "startDate": "Jul 3, 2019 2:00:00 AM", - "state": "active" + "state": "closed" }, "assignees": [ { @@ -843,9 +801,10 @@ "timeEstimate": 0, "totalTimeSpent": 0 }, - "state": "opened", - "updatedAt": "Jul 29, 2019 4:37:01 PM", + "state": "closed", + "updatedAt": "Aug 4, 2019 4:21:49 PM", "createdAt": "Jul 26, 2019 3:50:33 PM", + "closedAt": "Aug 4, 2019 4:21:49 PM", "webUrl": "https://gitlab.com/ultreiaio/ird-observe/issues/1368" }, { @@ -865,8 +824,9 @@ "groupId": 0, "title": "8.0-RC-4", "description": "", + "dueDate": "Aug 5, 2019 2:00:00 AM", "startDate": "Jul 3, 2019 2:00:00 AM", - "state": "active" + "state": "closed" }, "assignees": [ { @@ -926,8 +886,9 @@ "groupId": 0, "title": "8.0-RC-4", "description": "", + "dueDate": "Aug 5, 2019 2:00:00 AM", "startDate": "Jul 3, 2019 2:00:00 AM", - "state": "active" + "state": "closed" }, "assignees": [ { @@ -985,8 +946,9 @@ "groupId": 0, "title": "8.0-RC-4", "description": "", + "dueDate": "Aug 5, 2019 2:00:00 AM", "startDate": "Jul 3, 2019 2:00:00 AM", - "state": "active" + "state": "closed" }, "assignees": [ { @@ -1022,68 +984,10 @@ "timeEstimate": 0, "totalTimeSpent": 0 }, - "state": "opened", - "updatedAt": "Aug 2, 2019 4:54:07 PM", + "state": "closed", + "updatedAt": "Aug 5, 2019 1:17:09 AM", "createdAt": "Jun 12, 2019 3:44:04 PM", + "closedAt": "Aug 5, 2019 1:17:09 AM", "webUrl": "https://gitlab.com/ultreiaio/ird-observe/issues/1332" - }, - { - "id": 21224725, - "iid": 1299, - "projectId": 2722779, - "title": "[V8][V9] Pour l\u0027algorithme d\u0027appariement d\u0027activités (LL comme PS), décider du comportement vis-à-vis de l\u0027absence d\u0027heures sur les activités (cas très fréquent sur les logbooks)", - "description": "[V8][V9] Pour l\u0027algorithme d\u0027appariement d\u0027activités LL/PS, décider du comportement vis-à-vis de l\u0027absence d\u0027heures sur les activités (cas très fréquent sur les logbooks)", - "labels": [ - "Evolution", - "IRD-2018-01-V8" - ], - "milestone": { - "id": 921497, - "iid": 146, - "projectId": 2722779, - "groupId": 0, - "title": "8.0-RC-4", - "description": "", - "startDate": "Jul 3, 2019 2:00:00 AM", - "state": "active" - }, - "assignees": [ - { - "_id": 166231, - "_username": "tchemit", - "_name": "Tony CHEMIT", - "_state": "active", - "_external": false, - "_avatarUrl": "https://secure.gravatar.com/avatar/2a915aa9a1df35c8b609ff2f750d5dac?s\u003d…" - } - ], - "assignee": { - "_id": 166231, - "_username": "tchemit", - "_name": "Tony CHEMIT", - "_state": "active", - "_external": false, - "_avatarUrl": "https://secure.gravatar.com/avatar/2a915aa9a1df35c8b609ff2f750d5dac?s\u003d…" - }, - "author": { - "_id": 1111318, - "_username": "pcauquil", - "_name": "Pascal Cauquil", - "_state": "active", - "_external": false, - "_avatarUrl": "https://secure.gravatar.com/avatar/b4ae117bd93e10d96298fa4d885208ea?s\u003d…" - }, - "userNotesCount": 2, - "upVotes": 0, - "downVotes": 0, - "confidential": false, - "timeStats": { - "timeEstimate": 0, - "totalTimeSpent": 0 - }, - "state": "opened", - "updatedAt": "Jul 19, 2019 3:46:23 PM", - "createdAt": "May 23, 2019 4:23:51 PM", - "webUrl": "https://gitlab.com/ultreiaio/ird-observe/issues/1299" } ] \ No newline at end of file ===================================== .mvn/gitlab-cache/milestones/921497.json ===================================== @@ -5,6 +5,7 @@ "groupId": 0, "title": "8.0-RC-4", "description": "", + "dueDate": "Aug 5, 2019 2:00:00 AM", "startDate": "Jul 3, 2019 2:00:00 AM", - "state": "active" + "state": "closed" } \ No newline at end of file ===================================== .mvn/gitlab-cache/milestones/959266-issues.json ===================================== @@ -0,0 +1,119 @@ +[ + { + "id": 18519309, + "iid": 1237, + "projectId": 2722779, + "title": "Rafraichissement de la page \u0027A propos\u0027", + "description": "Supprimer les logos d\u0027ObServe et de l\u0027IRD\n\nMettre :\n* Nouveau logo IRD : ![logo-ird-2016](/uploads/f9d9b1214417dc9c6ec941b495e8bedc/logo-ird-2016.png)\n* Logo Ob7 : ![logo_obs7_rvb_300dpi](/uploads/a084234f58b04482878041c358acf18d/logo_obs7_rvb_300dpi.png)\n* Logo FEAMP (financement UE) : ![Logo_l_Europe_s_engage_FEAMP](/uploads/4c462e26a581404d97d0b52fbc125f1f/Logo_l_Europe_s_engage_FEAMP.png)\n* Logo SFA (en attente d\u0027un logo avec transparence) : ![logo_sfa_high_resolution](/uploads/fe872d782e73a3c158f0ed42771df3a3/logo_sfa_high_resolution.jpg)\n* Logo CRO (en attente d\u0027un logo avec transparence) : ![logo_CRO_Couleur_haute_résolution](/uploads/4d30fda473961d4ad022eda7bbea69bc/logo_CRO_Couleur_haute_résolution.jpeg)\n\nNouveau texte :\n\nObServe\n\nSystème informatique de gestion de données d\u0027observations embarquées de pêche à la senne et à la palangre.\n\nCe projet a été initiée par l\u0027IRD en 2009. Les contributeurs financiers sont : \n* Institut de Recherche pour le Développement (IRD)\n* Fond Européen pour les Affaires Maritimes et la Pêche (FEAMP)\n* Seychelles Fishing Authority (SFA)\n* AZTI Tecnalia\n* Orthongel\n\nIl est réalisé par les sociétés Code Lutin et Ultreia.io depuis 2009.\n \nPour plus d\u0027informations, veuillez visiter le site du projet.", + "labels": [ + "Bas", + "Evolution", + "À facturer" + ], + "milestone": { + "id": 959266, + "iid": 149, + "projectId": 2722779, + "groupId": 0, + "title": "8.0", + "description": "", + "state": "active" + }, + "assignees": [ + { + "_id": 1111318, + "_username": "pcauquil", + "_name": "Pascal Cauquil", + "_state": "active", + "_external": false, + "_avatarUrl": "https://secure.gravatar.com/avatar/b4ae117bd93e10d96298fa4d885208ea?s\u003d…" + } + ], + "assignee": { + "_id": 1111318, + "_username": "pcauquil", + "_name": "Pascal Cauquil", + "_state": "active", + "_external": false, + "_avatarUrl": "https://secure.gravatar.com/avatar/b4ae117bd93e10d96298fa4d885208ea?s\u003d…" + }, + "author": { + "_id": 1111318, + "_username": "pcauquil", + "_name": "Pascal Cauquil", + "_state": "active", + "_external": false, + "_avatarUrl": "https://secure.gravatar.com/avatar/b4ae117bd93e10d96298fa4d885208ea?s\u003d…" + }, + "userNotesCount": 2, + "upVotes": 0, + "downVotes": 0, + "confidential": false, + "timeStats": { + "timeEstimate": 0, + "totalTimeSpent": 0 + }, + "state": "opened", + "updatedAt": "Aug 3, 2019 8:44:15 PM", + "createdAt": "Feb 22, 2019 4:32:32 PM", + "webUrl": "https://gitlab.com/ultreiaio/ird-observe/issues/1237" + }, + { + "id": 21224725, + "iid": 1299, + "projectId": 2722779, + "title": "[V8][V9] Pour l\u0027algorithme d\u0027appariement d\u0027activités (LL comme PS), décider du comportement vis-à-vis de l\u0027absence d\u0027heures sur les activités (cas très fréquent sur les logbooks)", + "description": "[V8][V9] Pour l\u0027algorithme d\u0027appariement d\u0027activités LL/PS, décider du comportement vis-à-vis de l\u0027absence d\u0027heures sur les activités (cas très fréquent sur les logbooks)", + "labels": [ + "Evolution", + "IRD-2018-01-V8" + ], + "milestone": { + "id": 959266, + "iid": 149, + "projectId": 2722779, + "groupId": 0, + "title": "8.0", + "description": "", + "state": "active" + }, + "assignees": [ + { + "_id": 166231, + "_username": "tchemit", + "_name": "Tony CHEMIT", + "_state": "active", + "_external": false, + "_avatarUrl": "https://secure.gravatar.com/avatar/2a915aa9a1df35c8b609ff2f750d5dac?s\u003d…" + } + ], + "assignee": { + "_id": 166231, + "_username": "tchemit", + "_name": "Tony CHEMIT", + "_state": "active", + "_external": false, + "_avatarUrl": "https://secure.gravatar.com/avatar/2a915aa9a1df35c8b609ff2f750d5dac?s\u003d…" + }, + "author": { + "_id": 1111318, + "_username": "pcauquil", + "_name": "Pascal Cauquil", + "_state": "active", + "_external": false, + "_avatarUrl": "https://secure.gravatar.com/avatar/b4ae117bd93e10d96298fa4d885208ea?s\u003d…" + }, + "userNotesCount": 2, + "upVotes": 0, + "downVotes": 0, + "confidential": false, + "timeStats": { + "timeEstimate": 0, + "totalTimeSpent": 0 + }, + "state": "opened", + "updatedAt": "Aug 3, 2019 8:44:15 PM", + "createdAt": "May 23, 2019 4:23:51 PM", + "webUrl": "https://gitlab.com/ultreiaio/ird-observe/issues/1299" + } +] \ No newline at end of file ===================================== .mvn/gitlab-cache/milestones/959266.json ===================================== @@ -0,0 +1,9 @@ +{ + "id": 959266, + "iid": 149, + "projectId": 2722779, + "groupId": 0, + "title": "8.0", + "description": "", + "state": "active" +} \ No newline at end of file ===================================== CHANGELOG.md ===================================== @@ -1,7 +1,30 @@ # ObServe changelog * Author [Tony Chemit](mailto:dev@tchemit.fr) - * Last generated at 2019-08-03 13:38. + * Last generated at 2019-08-05 01:18. + +## Version [8.0-RC-4](https://gitlab.com/ultreiaio/ird-observe/milestones/146) + +**Closed at 2019-08-05.** + +### Download +* [Application (observe-8.0-RC-4.zip)](http://repo1.maven.org/maven2/fr/ird/observe/observe…) +* [Serveur (observe-8.0-RC-4.war)](http://repo1.maven.org/maven2/fr/ird/observe/observe…) + +### Issues + * [[Anomalie 1359]](https://gitlab.com/ultreiaio/ird-observe/issues/1359) **Impossible de créer une activité LL logbook** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Anomalie 1361]](https://gitlab.com/ultreiaio/ird-observe/issues/1361) **Impossible de supprimer une activité LL** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Anomalie 1362]](https://gitlab.com/ultreiaio/ird-observe/issues/1362) **[LL] Activité logbook : petits ajustements** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Anomalie 1370]](https://gitlab.com/ultreiaio/ird-observe/issues/1370) **[UI][REFERENTIEL] L'icône 'voir toutes les utilisations de ce référentiel' ne fonctionne pas** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Anomalie 1371]](https://gitlab.com/ultreiaio/ird-observe/issues/1371) **[UI][REFERENTIEL] Icône 'Toutes les clés métier de ce référentiel'** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Anomalie 1372]](https://gitlab.com/ultreiaio/ird-observe/issues/1372) **[UI][REFERENTIEL] [Mode Serveur] La suppression de tous les référentiels ne fonctionne pas** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Evolution 1349]](https://gitlab.com/ultreiaio/ird-observe/issues/1349) **Renommer champs vessel.iattcid et vessel.ctoiid** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Evolution 1358]](https://gitlab.com/ultreiaio/ird-observe/issues/1358) **Création de nouvelles icônes de navigation** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Evolution 1360]](https://gitlab.com/ultreiaio/ird-observe/issues/1360) **Assouplir un contrôle de saisie** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Evolution 1365]](https://gitlab.com/ultreiaio/ird-observe/issues/1365) **[LL][LOGBOOKS] Plage de taille d'un échantillon** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Evolution 1366]](https://gitlab.com/ultreiaio/ird-observe/issues/1366) **[LL][LOGBOOKS] Echantillons, ajouter l'unité °** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Evolution 1368]](https://gitlab.com/ultreiaio/ird-observe/issues/1368) **[CARTO] Petits ajustement sur la carte** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Evolution 1369]](https://gitlab.com/ultreiaio/ird-observe/issues/1369) **[SERVEUR] observe-server.conf / observeweb.host** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) ## Version [8.0-RC-3](https://gitlab.com/ultreiaio/ird-observe/milestones/143) View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/896b08bb3ce5cc15cc0be25c72b… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/896b08bb3ce5cc15cc0be25c72b… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 4 commits: Missing some fields on ShipOwner form
by Tony CHEMIT 04 Aug '19

04 Aug '19

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 864e14da by tchemit at 2019-08-04T23:12:22Z Missing some fields on ShipOwner form - - - - - 68ea268f by tchemit at 2019-08-04T23:15:05Z Missing some labels on form - - - - - 9b9e8247 by tchemit at 2019-08-04T23:15:06Z Ajout d'une méthode pour récupérer les clef naturels sur un référentiel - - - - - 8815c15f by tchemit at 2019-08-04T23:15:06Z [UI][REFERENTIEL] Icône 'Toutes les clés métier de ce référentiel' - Closes #1371 - - - - - 30 changed files: - client-core/src/main/i18n/getters/jaxx.getter - client-core/src/main/java/fr/ird/observe/client/ui/actions/content/api/ref/ShowReferentialUniqueKeyUIAction.java - client-core/src/main/java/fr/ird/observe/client/ui/content/api/ref/ContentReferenceUIHandler.java - client-core/src/main/java/fr/ird/observe/client/ui/content/api/ref/ContentReferenceUIModel.java - client-core/src/main/java/fr/ird/observe/client/ui/content/ref/common/CountryUIModel.java - client-core/src/main/java/fr/ird/observe/client/ui/content/ref/common/FpaZoneUIModel.java - client-core/src/main/java/fr/ird/observe/client/ui/content/ref/common/GearCaracteristicUIModel.java - client-core/src/main/java/fr/ird/observe/client/ui/content/ref/common/GearUIModel.java - client-core/src/main/java/fr/ird/observe/client/ui/content/ref/common/HarbourUIModel.java - client-core/src/main/java/fr/ird/observe/client/ui/content/ref/common/LengthLengthParameterUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/content/ref/common/LengthLengthParameterUIModel.java - client-core/src/main/java/fr/ird/observe/client/ui/content/ref/common/LengthWeightParameterUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/content/ref/common/LengthWeightParameterUIModel.java - client-core/src/main/java/fr/ird/observe/client/ui/content/ref/common/OrganismUIModel.java - client-core/src/main/java/fr/ird/observe/client/ui/content/ref/common/PersonUIModel.java - client-core/src/main/java/fr/ird/observe/client/ui/content/ref/common/ProgramUIModel.java - client-core/src/main/java/fr/ird/observe/client/ui/content/ref/common/ShipOwnerUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/content/ref/common/ShipOwnerUIModel.java - client-core/src/main/java/fr/ird/observe/client/ui/content/ref/common/SpeciesUIModel.java - client-core/src/main/java/fr/ird/observe/client/ui/content/ref/common/VesselSizeCategoryUIModel.java - client-core/src/main/java/fr/ird/observe/client/ui/content/ref/common/VesselUIModel.java - client-core/src/main/java/fr/ird/observe/client/ui/content/ref/common/WindUIModel.java - client-core/src/main/java/fr/ird/observe/client/ui/content/ref/ll/observation/MaturityStatusUIModel.java - client-core/src/main/java/fr/ird/observe/client/ui/content/ref/ll/observation/SensorBrandUIModel.java - client-core/src/main/java/fr/ird/observe/client/ui/content/ref/ps/common/SpeciesFateUIModel.java - client-core/src/main/java/fr/ird/observe/client/ui/content/ref/ps/common/VesselActivityUIModel.java - client-core/src/main/java/fr/ird/observe/client/ui/content/ref/ps/observation/ObjectMaterialUIModel.java - client-core/src/main/java/fr/ird/observe/client/ui/content/ref/ps/observation/ObservedSystemUIModel.java - client-core/src/main/java/fr/ird/observe/client/ui/content/ref/ps/observation/WeightCategoryUIModel.java - dto/src/main/models/Observe-01-referential-common.model The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/f25d6134cc6706063ec854a199… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/f25d6134cc6706063ec854a199… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 2 commits: [CARTO] Petits ajustement sur la carte - Closes #1368
by Tony CHEMIT 04 Aug '19

04 Aug '19

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: b32ca653 by tchemit at 2019-08-04T15:27:37Z [CARTO] Petits ajustement sur la carte - Closes #1368 - - - - - f25d6134 by tchemit at 2019-08-04T15:27:39Z [SERVEUR] observe-server.conf / observeweb.host - Closes #1369 - - - - - 6 changed files: - client-core/src/main/map/ps-style.xml - 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 - server-configuration/src/main/config/Server.ini - server-core/src/main/java/fr/ird/observe/server/controller/v1/DataSourceServiceRestApi.java Changes: ===================================== client-core/src/main/map/ps-style.xml ===================================== @@ -138,7 +138,7 @@ <CssParameter name="stroke-width">1</CssParameter> </Stroke> </Mark> - <Size>8</Size> + <Size>4</Size> </Graphic> </PointSymbolizer> </Rule> @@ -183,7 +183,7 @@ <PointSymbolizer> <Graphic> <Mark> - <WellKnownName>ttf://Serif#U+2B1F</WellKnownName> + <WellKnownName>ttf://Serif#U+002B</WellKnownName> <Fill> <CssParameter name="fill">#00FF00</CssParameter> </Fill> @@ -192,7 +192,7 @@ <CssParameter name="stroke-width">1</CssParameter> </Stroke> </Mark> - <Size>16</Size> + <Size>12</Size> </Graphic> </PointSymbolizer> </Rule> ===================================== observe-i18n/src/main/i18n/translations/observe_en_GB.properties ===================================== @@ -673,13 +673,13 @@ observe.constant.StorageStep.ROLES=Security observe.constant.StorageStep.ROLES.description=Apply security on database roles observe.constant.StorageStep.SELECT_DATA=Data selection observe.constant.StorageStep.SELECT_DATA.description=Select data to export in backup -observe.constant.TripMapPointType.llActivityLogbook=Logbook - Activity (Other) +observe.constant.TripMapPointType.llActivityLogbook=Logbook - Other activity observe.constant.TripMapPointType.llActivityLogbookInHarbour=Logbook - At Harbour observe.constant.TripMapPointType.llActivityLogbookWithHaulingEnd=Logbook - Hauling end observe.constant.TripMapPointType.llActivityLogbookWithHaulingStart=Logbook - Hauling start observe.constant.TripMapPointType.llActivityLogbookWithSettingEnd=Logbook - Setting end observe.constant.TripMapPointType.llActivityLogbookWithSettingStart=Logbook - Setting start -observe.constant.TripMapPointType.llActivityObs=Observation - Activity (Other) +observe.constant.TripMapPointType.llActivityObs=Observation - Other activity observe.constant.TripMapPointType.llActivityObsInHarbour=Observation - At Harbour observe.constant.TripMapPointType.llActivityObsWithHaulingEnd=Observation - Hauling end observe.constant.TripMapPointType.llActivityObsWithHaulingStart=Observation - Hauling start @@ -687,7 +687,7 @@ observe.constant.TripMapPointType.llActivityObsWithSettingEnd=Observation - Sett observe.constant.TripMapPointType.llActivityObsWithSettingStart=Observation - Setting start observe.constant.TripMapPointType.llTripDepartureHarbour=Harbour departure observe.constant.TripMapPointType.llTripLandingHarbour=Harbour landing -observe.constant.TripMapPointType.psActivityObs=Activity (Other) +observe.constant.TripMapPointType.psActivityObs=Other activity observe.constant.TripMapPointType.psActivityObsInHarbour=In harbour observe.constant.TripMapPointType.psActivityObsWithFreeSchoolType=Free School type observe.constant.TripMapPointType.psActivityObsWithObjectSchoolType=Object School type @@ -723,7 +723,7 @@ observe.content.map.legend.logbook.setting=Logbook - setting observe.content.map.legend.obs.hauling=Observation - Hauling observe.content.map.legend.obs.setting=Observation - setting observe.content.map.legend.setting=setting -observe.content.map.legend.tripBetweenTwoDays=Trip between two days +observe.content.map.legend.tripBetweenTwoDays=Night trip observe.content.map.legend.tripDay=Day trip observe.content.map.miles=miles observe.content.map.north=North ===================================== observe-i18n/src/main/i18n/translations/observe_es_ES.properties ===================================== @@ -673,13 +673,13 @@ observe.constant.StorageStep.ROLES=Seguridad observe.constant.StorageStep.ROLES.description=Configuración de la seguridad observe.constant.StorageStep.SELECT_DATA=Selección de datos observe.constant.StorageStep.SELECT_DATA.description=Seleccionar los datos a exportar en la copia de seguridad -observe.constant.TripMapPointType.llActivityLogbook=Logbook - Actividad (Other) \#TODO +observe.constant.TripMapPointType.llActivityLogbook=Logbook - Otro Actividad observe.constant.TripMapPointType.llActivityLogbookInHarbour=Logbook - En el puerto observe.constant.TripMapPointType.llActivityLogbookWithHaulingEnd=Logbook - Fin de arrastre observe.constant.TripMapPointType.llActivityLogbookWithHaulingStart=Logbook - Inicio de arrastre observe.constant.TripMapPointType.llActivityLogbookWithSettingEnd=Logbook - Fin de calada observe.constant.TripMapPointType.llActivityLogbookWithSettingStart=Logbook - Inicio de calada -observe.constant.TripMapPointType.llActivityObs=Observation - Actividad (Other) \#TODO +observe.constant.TripMapPointType.llActivityObs=Observation - Otro Actividad observe.constant.TripMapPointType.llActivityObsInHarbour=Observation - En el puerto observe.constant.TripMapPointType.llActivityObsWithHaulingEnd=Observation - Fin de arrastre observe.constant.TripMapPointType.llActivityObsWithHaulingStart=Observation - Inicio de arrastre @@ -687,7 +687,7 @@ observe.constant.TripMapPointType.llActivityObsWithSettingEnd=Observation - Fin observe.constant.TripMapPointType.llActivityObsWithSettingStart=Observation - Inicio de calada observe.constant.TripMapPointType.llTripDepartureHarbour=Puerto de salida observe.constant.TripMapPointType.llTripLandingHarbour=Puerto de llegada -observe.constant.TripMapPointType.psActivityObs=Actividad (Other) \#TODO +observe.constant.TripMapPointType.psActivityObs=Otro Actividad observe.constant.TripMapPointType.psActivityObsInHarbour=En puerto observe.constant.TripMapPointType.psActivityObsWithFreeSchoolType=Banco libre observe.constant.TripMapPointType.psActivityObsWithObjectSchoolType=Banco a objeto @@ -723,7 +723,7 @@ observe.content.map.legend.logbook.setting=Logbook - Calada observe.content.map.legend.obs.hauling=Observation - Arrastre observe.content.map.legend.obs.setting=Observation - Calada observe.content.map.legend.setting=Calada -observe.content.map.legend.tripBetweenTwoDays=Trayecto entre dos días +observe.content.map.legend.tripBetweenTwoDays=Trayecto del noche observe.content.map.legend.tripDay=Trayecto del día observe.content.map.miles=milles observe.content.map.north=Norte ===================================== observe-i18n/src/main/i18n/translations/observe_fr_FR.properties ===================================== @@ -673,13 +673,13 @@ observe.constant.StorageStep.ROLES=Sécurité observe.constant.StorageStep.ROLES.description=Mise en place de la sécurité observe.constant.StorageStep.SELECT_DATA=Sélection données observe.constant.StorageStep.SELECT_DATA.description=Sélectionner les données à exporter dans la sauvegarde -observe.constant.TripMapPointType.llActivityLogbook=Livre de bord - Activité (autre) +observe.constant.TripMapPointType.llActivityLogbook=Livre de bord - Autre Activité observe.constant.TripMapPointType.llActivityLogbookInHarbour=Livre de bord - Au port observe.constant.TripMapPointType.llActivityLogbookWithHaulingEnd=Livre de bord - Fin de virage observe.constant.TripMapPointType.llActivityLogbookWithHaulingStart=Livre de bord - Début de virage observe.constant.TripMapPointType.llActivityLogbookWithSettingEnd=Livre de bord - Fin de filage observe.constant.TripMapPointType.llActivityLogbookWithSettingStart=Livre de bord - Début de filage -observe.constant.TripMapPointType.llActivityObs=Observation - Activité (autre) +observe.constant.TripMapPointType.llActivityObs=Observation - autre activité observe.constant.TripMapPointType.llActivityObsInHarbour=Observation - Au port observe.constant.TripMapPointType.llActivityObsWithHaulingEnd=Observation - Fin de virage observe.constant.TripMapPointType.llActivityObsWithHaulingStart=Observation - Début de virage @@ -687,7 +687,7 @@ observe.constant.TripMapPointType.llActivityObsWithSettingEnd=Observation - Fin observe.constant.TripMapPointType.llActivityObsWithSettingStart=Observation - Début de filage observe.constant.TripMapPointType.llTripDepartureHarbour=Port de départ observe.constant.TripMapPointType.llTripLandingHarbour=Port d'arrivée -observe.constant.TripMapPointType.psActivityObs=Activité (autre) +observe.constant.TripMapPointType.psActivityObs=Autre activité observe.constant.TripMapPointType.psActivityObsInHarbour=Au port observe.constant.TripMapPointType.psActivityObsWithFreeSchoolType=Banc libre observe.constant.TripMapPointType.psActivityObsWithObjectSchoolType=Banc objet @@ -723,8 +723,8 @@ observe.content.map.legend.logbook.setting=Livre de bord - Filage observe.content.map.legend.obs.hauling=Observation - Virage observe.content.map.legend.obs.setting=Observation - Filage observe.content.map.legend.setting=Filage -observe.content.map.legend.tripBetweenTwoDays=Trajet entre deux jours -observe.content.map.legend.tripDay=Trajet d'une journée +observe.content.map.legend.tripBetweenTwoDays=Trajet de nuit +observe.content.map.legend.tripDay=Trajet de jour observe.content.map.miles=milles observe.content.map.north=Nord observe.content.map.showLogbook=Voir les données Livre de bord ===================================== server-configuration/src/main/config/Server.ini ===================================== @@ -28,20 +28,6 @@ type = string defaultValue = changeme final = true -[option host] -description = observeweb.host.description -key = observeweb.host -type = url -defaultValue = http://localhost:8080 -final = true - -[option apiUrl] -description = observeweb.apiUrl.description -key = observeweb.apiUrl -type = url -defaultValue = ${observeweb.host}/${observeweb.contextPath}/api/v1 -final = true - [option modelVersion] description = observe.model.version key = observeweb.model.version ===================================== server-core/src/main/java/fr/ird/observe/server/controller/v1/DataSourceServiceRestApi.java ===================================== @@ -44,6 +44,7 @@ import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; import java.io.File; +import java.net.URL; import java.util.LinkedHashSet; import java.util.Optional; import java.util.Set; @@ -71,7 +72,7 @@ public class DataSourceServiceRestApi extends GeneratedDataSourceServiceRestApi ObserveDataSourceConnection observeDataSourceConnection = getAnonymousService(dataSourceConfigurationTopia).create(dataSourceConfigurationTopia, dataSourceCreateConfiguration); String authenticationToken = registerDataSourceConfiguration(dataSourceConfigurationTopia, observeDataSourceConnection); - return createDataSourceConnection(observeDataSourceConnection, authenticationToken); + return createDataSourceConnection(((ObserveDataSourceConnectionRest)dataSourceConfiguration).getServerUrl(), observeDataSourceConnection, authenticationToken); } @@ -83,7 +84,7 @@ public class DataSourceServiceRestApi extends GeneratedDataSourceServiceRestApi ObserveDataSourceConnection observeDataSourceConnection = getAnonymousService(dataSourceConfigurationTopia).open(dataSourceConfigurationTopia); String authenticationToken = registerDataSourceConfiguration(dataSourceConfigurationTopia, observeDataSourceConnection); - return createDataSourceConnection(observeDataSourceConnection, authenticationToken); + return createDataSourceConnection(((ObserveDataSourceConfigurationRest)dataSourceConfiguration).getServerUrl(),observeDataSourceConnection, authenticationToken); } @@ -155,10 +156,10 @@ public class DataSourceServiceRestApi extends GeneratedDataSourceServiceRestApi } - protected ObserveDataSourceConnectionRest createDataSourceConnection(ObserveDataSourceConnection observeDataSourceConnection, String authenticationToken) { + protected ObserveDataSourceConnectionRest createDataSourceConnection(URL serverUrl, ObserveDataSourceConnection observeDataSourceConnection, String authenticationToken) { return new ObserveDataSourceConnectionRest( - getApplicationConfiguration().getApiUrl(), + serverUrl, authenticationToken, observeDataSourceConnection.canReadReferential(), observeDataSourceConnection.canWriteReferential(), View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/699b0511028de38f9ccd78bd8d… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/699b0511028de38f9ccd78bd8d… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] [SERVEUR] observe-server.conf / observeweb.host - Closes #1369
by Tony CHEMIT 04 Aug '19

04 Aug '19

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 699b0511 by tchemit at 2019-08-04T14:48:45Z [SERVEUR] observe-server.conf / observeweb.host - Closes #1369 - - - - - 2 changed files: - server-configuration/src/main/config/Server.ini - server-core/src/main/java/fr/ird/observe/server/controller/v1/DataSourceServiceRestApi.java Changes: ===================================== server-configuration/src/main/config/Server.ini ===================================== @@ -28,20 +28,6 @@ type = string defaultValue = changeme final = true -[option host] -description = observeweb.host.description -key = observeweb.host -type = url -defaultValue = http://localhost:8080 -final = true - -[option apiUrl] -description = observeweb.apiUrl.description -key = observeweb.apiUrl -type = url -defaultValue = ${observeweb.host}/${observeweb.contextPath}/api/v1 -final = true - [option modelVersion] description = observe.model.version key = observeweb.model.version ===================================== server-core/src/main/java/fr/ird/observe/server/controller/v1/DataSourceServiceRestApi.java ===================================== @@ -44,6 +44,7 @@ import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; import java.io.File; +import java.net.URL; import java.util.LinkedHashSet; import java.util.Optional; import java.util.Set; @@ -71,7 +72,7 @@ public class DataSourceServiceRestApi extends GeneratedDataSourceServiceRestApi ObserveDataSourceConnection observeDataSourceConnection = getAnonymousService(dataSourceConfigurationTopia).create(dataSourceConfigurationTopia, dataSourceCreateConfiguration); String authenticationToken = registerDataSourceConfiguration(dataSourceConfigurationTopia, observeDataSourceConnection); - return createDataSourceConnection(observeDataSourceConnection, authenticationToken); + return createDataSourceConnection(((ObserveDataSourceConnectionRest)dataSourceConfiguration).getServerUrl(), observeDataSourceConnection, authenticationToken); } @@ -83,7 +84,7 @@ public class DataSourceServiceRestApi extends GeneratedDataSourceServiceRestApi ObserveDataSourceConnection observeDataSourceConnection = getAnonymousService(dataSourceConfigurationTopia).open(dataSourceConfigurationTopia); String authenticationToken = registerDataSourceConfiguration(dataSourceConfigurationTopia, observeDataSourceConnection); - return createDataSourceConnection(observeDataSourceConnection, authenticationToken); + return createDataSourceConnection(((ObserveDataSourceConfigurationRest)dataSourceConfiguration).getServerUrl(),observeDataSourceConnection, authenticationToken); } @@ -155,10 +156,10 @@ public class DataSourceServiceRestApi extends GeneratedDataSourceServiceRestApi } - protected ObserveDataSourceConnectionRest createDataSourceConnection(ObserveDataSourceConnection observeDataSourceConnection, String authenticationToken) { + protected ObserveDataSourceConnectionRest createDataSourceConnection(URL serverUrl, ObserveDataSourceConnection observeDataSourceConnection, String authenticationToken) { return new ObserveDataSourceConnectionRest( - getApplicationConfiguration().getApiUrl(), + serverUrl, authenticationToken, observeDataSourceConnection.canReadReferential(), observeDataSourceConnection.canWriteReferential(), View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/699b0511028de38f9ccd78bd8da… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/699b0511028de38f9ccd78bd8da… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 5 commits: Realign LL model - See #1332
by Tony CHEMIT 04 Aug '19

04 Aug '19

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: a79209c2 by tchemit at 2019-08-04T14:21:17Z Realign LL model - See #1332 - - - - - 42865344 by tchemit at 2019-08-04T14:21:19Z update changelog [skip ci] - - - - - fe790840 by tchemit at 2019-08-04T14:21:19Z when sanitize is not ok, let's just continue - - - - - 781fcc31 by tchemit at 2019-08-04T14:21:19Z [UI][REFERENTIEL] L'icône 'voir toutes les utilisations de ce référentiel' ne fonctionne pas - Closes #1370 - - - - - e4fc487d by tchemit at 2019-08-04T14:21:19Z [CARTO] Petits ajustement sur la carte - Closes #1368 - - - - - 13 changed files: - .mvn/gitlab-cache/milestones/370039-issues.json - .mvn/gitlab-cache/milestones/532584-issues.json - .mvn/gitlab-cache/milestones/595831-issues.json - .mvn/gitlab-cache/milestones/647608-issues.json - .mvn/gitlab-cache/milestones/921497-issues.json - .mvn/gitlab-cache/milestones/921497.json - .mvn/gitlab-cache/milestones/925832-issues.json - .mvn/gitlab-cache/milestones/925832.json - + .mvn/gitlab-cache/milestones/958566-artifacts.json - + .mvn/gitlab-cache/milestones/958566-issues.json - + .mvn/gitlab-cache/milestones/958566.json - CHANGELOG.md - client-core/src/main/i18n/getters/java.getter The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/e77468af641db3f78aebcd3a09… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/e77468af641db3f78aebcd3a09… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 2 commits: when sanitize is not ok, let's just continue
by Tony CHEMIT 03 Aug '19

03 Aug '19

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: acb996e9 by tchemit at 2019-08-03T15:30:55Z when sanitize is not ok, let's just continue - - - - - e77468af by tchemit at 2019-08-03T18:26:21Z [UI][REFERENTIEL] L'icône 'voir toutes les utilisations de ce référentiel' ne fonctionne pas - Closes #1370 - - - - - 17 changed files: - client-core/src/main/java/fr/ird/observe/client/ObserveSwingApplicationContext.java - client-core/src/main/java/fr/ird/observe/client/ui/content/ref/usage/UsageUIHandlerSupport.java - dto/src/main/i18n/getters/eugene.getter - dto/src/main/i18n/getters/java.getter - dto/src/main/java/fr/ird/observe/dto/decoration/DecoratorService.java - dto/src/main/java/fr/ird/observe/dto/decoration/ObserveI18nLabelsBuilder.java - dto/src/main/java/fr/ird/observe/dto/decoration/decorators/NonTargetLengthDecorator.java - dto/src/main/java/fr/ird/observe/spi/DtoModelClasses.java - dto/src/main/models/Observe-20-data-ps-observation.model - dto/src/main/models/Observe-25-data-ps.model - dto/src/main/models/Observe-35-data-ll.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 - + services-client/src/main/java/fr/ird/observe/services/client/usage/UsageServiceClient.java - services-local/src/main/java/fr/ird/observe/services/local/service/usage/UsageServiceLocal.java - test/src/main/resources/fixtures/global.properties Changes: ===================================== client-core/src/main/java/fr/ird/observe/client/ObserveSwingApplicationContext.java ===================================== @@ -358,16 +358,20 @@ public class ObserveSwingApplicationContext extends DefaultApplicationContext im } public void sanitizeIds(ProgressModel progressModel, DtoModelNavigationAggregateModel navigationSelectModel) { - for (DtoModelNavigationModel<?> navigationModel : navigationSelectModel.getModels()) { - for (DtoModelNavigationNode node : navigationModel.getNodesWithIds()) { - if (node.isEnabled()) { - ImmutableSet<String> safeIds = ObserveSwingDataSource.MAIN.getNavigationService().retainExistingIds(ImmutableSet.of(node.getId())); - if (safeIds.isEmpty()) { - node.setId(null); + try { + for (DtoModelNavigationModel<?> navigationModel : navigationSelectModel.getModels()) { + for (DtoModelNavigationNode node : navigationModel.getNodesWithIds()) { + if (node.isEnabled()) { + ImmutableSet<String> safeIds = ObserveSwingDataSource.MAIN.getNavigationService().retainExistingIds(ImmutableSet.of(node.getId())); + if (safeIds.isEmpty()) { + node.setId(null); + } } + progressModel.incrementsCurrentStep(); } - progressModel.incrementsCurrentStep(); } + } catch (Exception e) { + log.error("Could not sanitizeIds", e); } } ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/ref/usage/UsageUIHandlerSupport.java ===================================== @@ -165,7 +165,7 @@ public abstract class UsageUIHandlerSupport<D extends ReferentialDto, R extends long count = result.getCount().get(dtoType); DtoUsageCountRequest<D> request = result.getRequest(); - SingletonSupplier<Collection<RR>> factory = SingletonSupplier.of(() -> usageService.find(request, dtoType)); + SingletonSupplier<Collection<RR>> factory = SingletonSupplier.of(() -> usageService.find(request, referenceType)); DtoUsageUIModel<T, RR> model = new DtoUsageUIModel<>(dtoType, referenceType, count, factory); ===================================== dto/src/main/i18n/getters/eugene.getter ===================================== @@ -1,4 +1,5 @@ observe.data.ll.common.GearUseFeatures.type +observe.data.ll.common.GearUseFeaturesMeasurement.type observe.data.ll.common.Trip.type observe.data.ll.landing.Landing.type observe.data.ll.landing.LandingPart.type @@ -27,6 +28,7 @@ observe.data.ll.observation.SizeMeasure.type observe.data.ll.observation.Tdr.type observe.data.ll.observation.WeightMeasure.type observe.data.ps.common.GearUseFeatures.type +observe.data.ps.common.GearUseFeaturesMeasurement.type observe.data.ps.common.Trip.type observe.data.ps.observation.Activity.type observe.data.ps.observation.FloatingObject.type ===================================== dto/src/main/i18n/getters/java.getter ===================================== @@ -40,8 +40,8 @@ observe.data.Data.traceCutOff observe.data.Data.vessel observe.data.Data.weightMeasureMethod observe.data.ll.logbook.Set.type -observe.data.ll.logbook.SetLonglineDetailComposition.type -observe.data.ll.logbook.SetLonglineGlobalComposition.type +observe.data.ll.logbook.SetDetailComposition.type +observe.data.ll.logbook.SetGlobalComposition.type observe.data.ll.observation.Set.type observe.data.ps.observation.Set.type observe.referential.I18nReferential.label ===================================== dto/src/main/java/fr/ird/observe/dto/decoration/DecoratorService.java ===================================== @@ -27,6 +27,8 @@ import fr.ird.observe.dto.ObserveModelInitializer; import fr.ird.observe.dto.ObserveModelInitializerRunner; import fr.ird.observe.dto.data.DataDto; import fr.ird.observe.dto.data.ll.common.GearUseFeaturesDto; +import fr.ird.observe.dto.data.ll.common.GearUseFeaturesMeasurementDto; +import fr.ird.observe.dto.data.ll.common.GearUseFeaturesMeasurementReference; import fr.ird.observe.dto.data.ll.common.GearUseFeaturesReference; import fr.ird.observe.dto.data.ll.common.TripReference; import fr.ird.observe.dto.data.ll.landing.LandingDto; @@ -327,8 +329,8 @@ public class DecoratorService extends DecoratorProvider { @Override public void initLlObservationActivityDto() { registerDataAndDataReferenceDecorator(ActivityDto.class, ActivityReference.class, - "${timeStamp}$td/%1$tm/%1$tY %1$tH:%1$tM##${VesselActivity/label}$s", - "${timeStamp}$td/%1$tm/%1$tY %1$tH:%1$tM##${VesselActivityLabel}$s", + "${timeStamp}$td/%1$tm/%1$tY %1$tH:%1$tM##${vesselActivity/label}$s", + "${timeStamp}$td/%1$tm/%1$tY %1$tH:%1$tM##${vesselActivityLabel}$s", " - "); registerObserveDecorator(TripActivityDto.class, "${timeStamp}$td/%1$tm/%1$tY %1$tH:%1$t", " - "); @@ -337,8 +339,8 @@ public class DecoratorService extends DecoratorProvider { @Override public void initLlLogbookActivityDto() { registerDataAndDataReferenceDecorator(fr.ird.observe.dto.data.ll.logbook.ActivityDto.class, fr.ird.observe.dto.data.ll.logbook.ActivityReference.class, - "${startTimeStamp}$td/%1$tm/%1$tY %1$tH:%1$tM##${VesselActivity/label}$s", - "${startTimeStamp}$td/%1$tm/%1$tY %1$tH:%1$tM##${VesselActivityLabel}$s", + "${startTimeStamp}$td/%1$tm/%1$tY %1$tH:%1$tM##${vesselActivity/label}$s", + "${startTimeStamp}$td/%1$tm/%1$tY %1$tH:%1$tM##${vesselActivityLabel}$s", " - "); } @@ -470,6 +472,8 @@ public class DecoratorService extends DecoratorProvider { @Override public void initLlCommonGearUseFeaturesMeasurementDto() { + registerDataAndDataReferenceDecorator(GearUseFeaturesMeasurementDto.class, GearUseFeaturesMeasurementReference.class, "${gearCaracteristic/label}$s##${measurementValue}$s", + "${gearCaracteristicLabel}$s##${measurementValue}$s"); } @Override @@ -551,8 +555,8 @@ public class DecoratorService extends DecoratorProvider { @Override public void initLlObservationSizeMeasureDto() { - registerDataAndDataReferenceDecorator(SizeMeasureDto.class, SizeMeasureReference.class, "${sizeType/label}$s##${size}$s", - "${sizeTypeLabel}$s##${size}$s"); + registerDataAndDataReferenceDecorator(SizeMeasureDto.class, SizeMeasureReference.class, "${sizeMeasureType/label}$s##${size}$s", + "${sizeMeasureTypeLabel}$s##${size}$s"); } @Override @@ -1013,6 +1017,8 @@ public class DecoratorService extends DecoratorProvider { @Override public void initPsCommonGearUseFeaturesMeasurementDto() { + registerDataAndDataReferenceDecorator(fr.ird.observe.dto.data.ps.common.GearUseFeaturesMeasurementDto.class, fr.ird.observe.dto.data.ps.common.GearUseFeaturesMeasurementReference.class, "${gearCaracteristic/label}$s##${measurementValue}$s", + "${gearCaracteristicLabel}$s##${measurementValue}$s"); } @Override @@ -1037,7 +1043,7 @@ public class DecoratorService extends DecoratorProvider { public void initPsObservationNonTargetLengthDto() { registerDecorator(new NonTargetLengthDecorator()); - registerDataReferenceDecorator(NonTargetLengthReference.class, "${speciesLabel}$s##${length}$f##${sexLabel}$s"); + registerDataReferenceDecorator(NonTargetLengthReference.class, "${speciesLabel}$s##${length}$s##${sexLabel}$s"); } @Override ===================================== dto/src/main/java/fr/ird/observe/dto/decoration/ObserveI18nLabelsBuilder.java ===================================== @@ -92,8 +92,8 @@ public class ObserveI18nLabelsBuilder extends BeanPropertyI18nKeyProducerSupport n("observe.referential.Referential.uri"); n("observe.referential.Referential.needComment"); n("observe.referential.Referential.validityDateRange"); - n("observe.data.ll.logbook.SetLonglineGlobalComposition.type"); - n("observe.data.ll.logbook.SetLonglineDetailComposition.type"); + n("observe.data.ll.logbook.SetGlobalComposition.type"); + n("observe.data.ll.logbook.SetDetailComposition.type"); n("observe.referential.WithFormula.equation"); n("observe.referential.WithFormula.coefficients"); ===================================== dto/src/main/java/fr/ird/observe/dto/decoration/decorators/NonTargetLengthDecorator.java ===================================== @@ -36,7 +36,7 @@ public class NonTargetLengthDecorator extends ObserveDecorator<NonTargetLengthDt public NonTargetLengthDecorator() throws IllegalArgumentException, NullPointerException { super(NonTargetLengthDto.class, - "${species/scientificLabel}$s##${length}$f##${sex}$s" + "${species/scientificLabel}$s##${length}$s##${sex}$s" ); } ===================================== dto/src/main/java/fr/ird/observe/spi/DtoModelClasses.java ===================================== @@ -158,8 +158,6 @@ import fr.ird.observe.dto.referential.ps.observation.WeightCategoryDto; public class DtoModelClasses { public static final ImmutableSet<Class<? extends DataDto>> ENTITY_DATA_WITH_NO_BINDER_TYPES = ImmutableSet.<Class<? extends DataDto>>builder() - .add(fr.ird.observe.dto.data.ps.common.GearUseFeaturesMeasurementDto.class) - .add(GearUseFeaturesMeasurementDto.class) .add(NonTargetSampleDto.class) .add(TargetSampleDto.class) .build(); ===================================== dto/src/main/models/Observe-20-data-ps-observation.model ===================================== @@ -104,7 +104,7 @@ data.ps.observation.NonTargetSample > data.Commentable | form=data.ps.observatio nonTargetLength + {*} data.ps.observation.NonTargetLength | ordered speciesFate {*:*} fr.ird.observe.dto.referential.ps.common.SpeciesFateReference -data.ps.observation.ObjectObservedSpecies > data.Data | references=speciesLabel,speciesStatusLabel +data.ps.observation.ObjectObservedSpecies > data.Data | references=speciesLabel,speciesStatusLabel,count count + {*:1} Integer statut + {*:1} Integer speciesStatus {*:1} fr.ird.observe.dto.referential.ps.observation.SpeciesStatusReference ===================================== dto/src/main/models/Observe-25-data-ps.model ===================================== @@ -1,6 +1,6 @@ package fr.ird.observe.dto.data.ps.common | form=self -data.ps.common.GearUseFeaturesMeasurement > data.Data +data.ps.common.GearUseFeaturesMeasurement > data.Data | references=measurementValue,gearCaracteristicLabel measurementValue + {*:1} String gearCaracteristic {*:1} fr.ird.observe.dto.referential.common.GearCaracteristicReference ===================================== dto/src/main/models/Observe-35-data-ll.model ===================================== @@ -6,7 +6,7 @@ usedInTrip + {*:1} Boolean gearUseFeaturesMeasurement + {*} data.ll.common.GearUseFeaturesMeasurement | ordered gear {*:1} fr.ird.observe.dto.referential.common.GearReference -data.ll.common.GearUseFeaturesMeasurement > data.Data +data.ll.common.GearUseFeaturesMeasurement > data.Data | references=measurementValue,gearCaracteristicLabel measurementValue + {*:1} String gearCaracteristic {*:1} fr.ird.observe.dto.referential.common.GearCaracteristicReference ===================================== observe-i18n/src/main/i18n/translations/observe_en_GB.properties ===================================== @@ -813,6 +813,7 @@ observe.data.ll.common.GearUseFeatures.title=Gears observe.data.ll.common.GearUseFeatures.type=Gear uses features observe.data.ll.common.GearUseFeatures.types=Gear uses features observe.data.ll.common.GearUseFeatures.usedInTrip=Used in trip +observe.data.ll.common.GearUseFeaturesMeasurement.type=Measurement type observe.data.ll.common.GearUseFeaturesMeasurementLongline.title=Gear uses feature measurements observe.data.ll.common.Trip.activityObs=Activity observe.data.ll.common.Trip.availableData=Available data @@ -1227,6 +1228,7 @@ observe.data.ll.logbook.Set.type=Set observe.data.ll.logbook.Set.types=Sets observe.data.ll.logbook.Set.weightedSnap=Weighted snap observe.data.ll.logbook.Set.weightedSwivel=Weighted swivel +observe.data.ll.logbook.SetDetailComposition.type=Detailed composition observe.data.ll.logbook.SetGlobalComposition.availableMitigationType=Available mitigations observe.data.ll.logbook.SetGlobalComposition.baitsComposition=Baits composition observe.data.ll.logbook.SetGlobalComposition.baitsCompositionProportionSum=Baits composition proportion sum @@ -1244,17 +1246,9 @@ observe.data.ll.logbook.SetGlobalComposition.hooksCompositionTab=Hooks observe.data.ll.logbook.SetGlobalComposition.mitigationTypeTab=Mitigation observe.data.ll.logbook.SetGlobalComposition.selectedMitigationType=Selected mitigations observe.data.ll.logbook.SetGlobalComposition.title=Global composition +observe.data.ll.logbook.SetGlobalComposition.type=Global composition observe.data.ll.logbook.SetLogbook.action.goToOpen.short=Logbook - Open set observe.data.ll.logbook.SetLogbook.action.goToOpen.tip=Go to open set (Logbook) -observe.data.ll.logbook.SetLonglineDetailComposition.type=Detailed composition -observe.data.ll.logbook.SetLonglineGlobalComposition.availableMitigationType=Available mitigations -observe.data.ll.logbook.SetLonglineGlobalComposition.baitsCompositionTab=Baits -observe.data.ll.logbook.SetLonglineGlobalComposition.branchlinesCompositionTab=Branchlines -observe.data.ll.logbook.SetLonglineGlobalComposition.floatlinesCompositionTab=Floatlines -observe.data.ll.logbook.SetLonglineGlobalComposition.hooksCompositionTab=Hooks -observe.data.ll.logbook.SetLonglineGlobalComposition.mitigationTypeTab=Mitigation -observe.data.ll.logbook.SetLonglineGlobalComposition.selectedMitigationType=Selected mitigations -observe.data.ll.logbook.SetLonglineGlobalComposition.type=Global composition observe.data.ll.logbook.TripSampleList.action.close.tip=Close the opened sample observe.data.ll.logbook.TripSampleList.action.create=Next sample observe.data.ll.logbook.TripSampleList.action.create.tip=create next sample @@ -1798,6 +1792,7 @@ observe.data.ps.common.GearUseFeatures.type=Gear uses features observe.data.ps.common.GearUseFeatures.types=Gear uses features observe.data.ps.common.GearUseFeatures.usedInTrip=Used in trip observe.data.ps.common.GearUseFeaturesMeasurement.title=Gear uses feature measurements +observe.data.ps.common.GearUseFeaturesMeasurement.type=Measurement type observe.data.ps.common.Trip.action.close.tip=Close the opened maree observe.data.ps.common.Trip.action.closeAndCreate=Next trip observe.data.ps.common.Trip.action.closeAndCreate.tip=close current trip and create a new one ===================================== observe-i18n/src/main/i18n/translations/observe_es_ES.properties ===================================== @@ -813,6 +813,7 @@ observe.data.ll.common.GearUseFeatures.title=Equipos observe.data.ll.common.GearUseFeatures.type=Equipamiento observe.data.ll.common.GearUseFeatures.types=Equipamientos observe.data.ll.common.GearUseFeatures.usedInTrip=Utilizado en la marea +observe.data.ll.common.GearUseFeaturesMeasurement.type=Tipo observe.data.ll.common.GearUseFeaturesMeasurementLongline.title=Medidas observe.data.ll.common.Trip.activityObs=Actividad observe.data.ll.common.Trip.availableData=Données disponibles @@ -1227,6 +1228,7 @@ observe.data.ll.logbook.Set.type=Operación de pesca observe.data.ll.logbook.Set.types=Operaciones de pesca observe.data.ll.logbook.Set.weightedSnap=Snap lesté observe.data.ll.logbook.Set.weightedSwivel=Émerillon lesté +observe.data.ll.logbook.SetDetailComposition.type=Composición detallada observe.data.ll.logbook.SetGlobalComposition.availableMitigationType=Atenuaciónes disponibles observe.data.ll.logbook.SetGlobalComposition.baitsComposition=Cebo observe.data.ll.logbook.SetGlobalComposition.baitsCompositionProportionSum=Suma de los proporciónes de cebo (%) @@ -1244,17 +1246,9 @@ observe.data.ll.logbook.SetGlobalComposition.hooksCompositionTab=Anzuelos observe.data.ll.logbook.SetGlobalComposition.mitigationTypeTab=Atenuaciónes observe.data.ll.logbook.SetGlobalComposition.selectedMitigationType=Atenuaciónes seleccionadas observe.data.ll.logbook.SetGlobalComposition.title=Composición global del palangre +observe.data.ll.logbook.SetGlobalComposition.type=Composición global observe.data.ll.logbook.SetLogbook.action.goToOpen.short=Logbook - Open set \#TODO observe.data.ll.logbook.SetLogbook.action.goToOpen.tip=Go to open set (Logbook) \#TODO -observe.data.ll.logbook.SetLonglineDetailComposition.type=Composición detallada -observe.data.ll.logbook.SetLonglineGlobalComposition.availableMitigationType=Atenuaciónes disponibles -observe.data.ll.logbook.SetLonglineGlobalComposition.baitsCompositionTab=Cebos -observe.data.ll.logbook.SetLonglineGlobalComposition.branchlinesCompositionTab=Arponcillos -observe.data.ll.logbook.SetLonglineGlobalComposition.floatlinesCompositionTab=Orinques -observe.data.ll.logbook.SetLonglineGlobalComposition.hooksCompositionTab=Anzuelos -observe.data.ll.logbook.SetLonglineGlobalComposition.mitigationTypeTab=Atenuaciónes -observe.data.ll.logbook.SetLonglineGlobalComposition.selectedMitigationType=Atenuaciónes seleccionadas -observe.data.ll.logbook.SetLonglineGlobalComposition.type=Composición global observe.data.ll.logbook.TripSampleList.action.close.tip=Close the opened sample observe.data.ll.logbook.TripSampleList.action.create=Next sample observe.data.ll.logbook.TripSampleList.action.create.tip=Create next sample @@ -1798,6 +1792,7 @@ observe.data.ps.common.GearUseFeatures.type=Equipamiento observe.data.ps.common.GearUseFeatures.types=Equipamientos observe.data.ps.common.GearUseFeatures.usedInTrip=Utilizado en la marea observe.data.ps.common.GearUseFeaturesMeasurement.title=Medidas +observe.data.ps.common.GearUseFeaturesMeasurement.type=Tipo observe.data.ps.common.Trip.action.close.tip=Cierre de la marea abierta observe.data.ps.common.Trip.action.closeAndCreate=Marea siguiente observe.data.ps.common.Trip.action.closeAndCreate.tip=Cierre de la marea actual y creación de una nueva ===================================== observe-i18n/src/main/i18n/translations/observe_fr_FR.properties ===================================== @@ -813,6 +813,7 @@ observe.data.ll.common.GearUseFeatures.title=Équipements observe.data.ll.common.GearUseFeatures.type=Équipement observe.data.ll.common.GearUseFeatures.types=Équipements observe.data.ll.common.GearUseFeatures.usedInTrip=Utilisé dans la marée +observe.data.ll.common.GearUseFeaturesMeasurement.type=Type de mesure observe.data.ll.common.GearUseFeaturesMeasurementLongline.title=Mesures observe.data.ll.common.Trip.activityObs=Activité observe.data.ll.common.Trip.availableData=Données disponibles @@ -1227,6 +1228,7 @@ observe.data.ll.logbook.Set.type=Opération de pêche observe.data.ll.logbook.Set.types=Opérations de pêche observe.data.ll.logbook.Set.weightedSnap=Snap lesté observe.data.ll.logbook.Set.weightedSwivel=Émerillon lesté +observe.data.ll.logbook.SetDetailComposition.type=Composition détaillée observe.data.ll.logbook.SetGlobalComposition.availableMitigationType=Atténuations disponibles observe.data.ll.logbook.SetGlobalComposition.baitsComposition=Appâts observe.data.ll.logbook.SetGlobalComposition.baitsCompositionProportionSum=Somme des proportions d'appâts (%) @@ -1244,17 +1246,9 @@ observe.data.ll.logbook.SetGlobalComposition.hooksCompositionTab=Hameçons observe.data.ll.logbook.SetGlobalComposition.mitigationTypeTab=Atténuations observe.data.ll.logbook.SetGlobalComposition.selectedMitigationType=Atténuations sélectionnées observe.data.ll.logbook.SetGlobalComposition.title=Composition globale de la palangre +observe.data.ll.logbook.SetGlobalComposition.type=Composition globale observe.data.ll.logbook.SetLogbook.action.goToOpen.short=Livre de bord - Calée ouverte observe.data.ll.logbook.SetLogbook.action.goToOpen.tip=Accéder à la calée ouverte (Livre de bord) -observe.data.ll.logbook.SetLonglineDetailComposition.type=Composition détaillée -observe.data.ll.logbook.SetLonglineGlobalComposition.availableMitigationType=Atténuations disponibles -observe.data.ll.logbook.SetLonglineGlobalComposition.baitsCompositionTab=Appâts -observe.data.ll.logbook.SetLonglineGlobalComposition.branchlinesCompositionTab=Avançons -observe.data.ll.logbook.SetLonglineGlobalComposition.floatlinesCompositionTab=Orins -observe.data.ll.logbook.SetLonglineGlobalComposition.hooksCompositionTab=Hameçons -observe.data.ll.logbook.SetLonglineGlobalComposition.mitigationTypeTab=Atténuations -observe.data.ll.logbook.SetLonglineGlobalComposition.selectedMitigationType=Atténuations sélectionnées -observe.data.ll.logbook.SetLonglineGlobalComposition.type=Composition globale observe.data.ll.logbook.TripSampleList.action.close.tip=Clôturer l'échantillon ouverte observe.data.ll.logbook.TripSampleList.action.create=Échantillon suivant observe.data.ll.logbook.TripSampleList.action.create.tip=Créer l’échantillon suivant @@ -1798,6 +1792,7 @@ observe.data.ps.common.GearUseFeatures.type=Équipement observe.data.ps.common.GearUseFeatures.types=Équipements observe.data.ps.common.GearUseFeatures.usedInTrip=Utilisé dans la marée observe.data.ps.common.GearUseFeaturesMeasurement.title=Mesures +observe.data.ps.common.GearUseFeaturesMeasurement.type=Type de mesure observe.data.ps.common.Trip.action.close.tip=Clôturer la marée ouverte observe.data.ps.common.Trip.action.closeAndCreate=Marée suivante observe.data.ps.common.Trip.action.closeAndCreate.tip=Clôturer la marée courante et en créer une nouvelle ===================================== services-client/src/main/java/fr/ird/observe/services/client/usage/UsageServiceClient.java ===================================== @@ -0,0 +1,47 @@ +package fr.ird.observe.services.client.usage; + +/*- + * #%L + * ObServe :: Services client implementation + * %% + * Copyright (C) 2008 - 2019 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% + */ + +import com.google.common.collect.ImmutableSet; +import fr.ird.observe.dto.IdDto; +import fr.ird.observe.dto.reference.DtoReference; +import fr.ird.observe.dto.referential.ReferentialDto; +import fr.ird.observe.services.service.usage.DtoUsageCountRequest; +import org.apache.http.HttpStatus; + +import java.util.concurrent.TimeUnit; + +public class UsageServiceClient extends GeneratedUsageServiceClient { + + @Override + public <D extends ReferentialDto, T extends IdDto, R extends DtoReference<T, R>> ImmutableSet<R> find(DtoUsageCountRequest<D> request, Class<R> targetType) { + return executeRequest(create("find") + .addParameter("request", gson().toJson(request)) + .addParameter("targetType", targetType) + .addAuthToken() + .useMultiPartForm() + .setTimeout(TimeUnit.MINUTES, 1) + .post(), HttpStatus.SC_OK).toImmutableSet(targetType); + } + +} ===================================== services-local/src/main/java/fr/ird/observe/services/local/service/usage/UsageServiceLocal.java ===================================== @@ -43,7 +43,7 @@ import fr.ird.observe.services.service.usage.UsageService; import fr.ird.observe.spi.DbModelHelper; import fr.ird.observe.spi.DtoModelHelper; import fr.ird.observe.spi.context.DataEntityContext; -import fr.ird.observe.spi.context.DtoEntityContext; +import fr.ird.observe.spi.context.ReferenceEntityContext; import fr.ird.observe.spi.context.ReferentialEntityContext; import fr.ird.observe.spi.map.ImmutableTypedMap; import org.nuiton.topia.persistence.TopiaEntity; @@ -75,12 +75,12 @@ public class UsageServiceLocal extends ObserveServiceLocal implements UsageServi } @Override - public <D extends ReferentialDto, T extends IdDto, R extends DtoReference<T, R>> ImmutableSet<R> find(DtoUsageCountRequest<D> request, Class<T> targetType) { + public <D extends ReferentialDto, T extends IdDto, R extends DtoReference<T, R>> ImmutableSet<R> find(DtoUsageCountRequest<D> request, Class<R> targetType) { ObserveReferentialEntity entity = loadEntity(request.getDtoType(), request.getId()); TopiaUsageSupport topiaUsageSupport = serviceContext.getTopiaPersistenceContext().getTopiaUsageSupport(); - DtoEntityContext<T, R, ObserveEntity> entityContext = DbModelHelper.fromDto(targetType); + ReferenceEntityContext<T, R, ObserveEntity> entityContext = DbModelHelper.fromReference(targetType); Class<ObserveEntity> entityType = entityContext.toEntityType(); List<ObserveEntity> compositions = topiaUsageSupport.findReverseComposition(entity, entityType); ===================================== test/src/main/resources/fixtures/global.properties ===================================== @@ -31,7 +31,7 @@ SET_SEINE_ID=fr.ird.data.ps.observation.Set#1359573677233#0.016313003525718517 GEAR_USE_FEATURES_SEINE_ID=fr.ird.data.ps.common.GearUseFeatures#1440486230661#0.42614931015885216 GEAR_USE_FEATURES_SEINE_ID_1=fr.ird.data.ps.common.GearUseFeatures#1440486230661#0.42614931015885216 SPECIES_GROUP_ID=fr.ird.referential.common.SpeciesGroup#1239832683689#0.7120116158620075 -REFERENCE_DATA_COUNT=44 +REFERENCE_DATA_COUNT=46 DATA_FORM_COUNT=59 VALIDATORS_COUNT=87 VALIDATOR_CREATE_DATA_COUNT=7 View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/7e15a83e094f7c832cb39910a8… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/7e15a83e094f7c832cb39910a8… You're receiving this email because of your account on gitlab.com.

1 0