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

[Git][ultreiaio/ird-observe][develop-7.x] 6 commits: fix deploy
by Tony CHEMIT 02 Jan '19

02 Jan '19

Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: d0851ef1 by tchemit at 2019-01-02T14:56:40Z fix deploy - - - - - ec5bb38b by tchemit at 2019-01-02T14:57:26Z [jgitflow-maven-plugin]updating poms for branch'release/7.0.1' with non-snapshot versions[skip ci] - - - - - 71c951c6 by tchemit at 2019-01-02T14:57:31Z [jgitflow-maven-plugin]merging 'release/7.0.1' into 'master-7.x' - - - - - 61227bb1 by tchemit at 2019-01-02T14:57:34Z [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts[skip ci] - - - - - de2a0164 by tchemit at 2019-01-02T14:57:34Z [jgitflow-maven-plugin]merging 'master-7.x' into 'develop-7.x' - - - - - 640d843d by tchemit at 2019-01-02T14:57:35Z [jgitflow-maven-plugin]Updating develop poms back to pre merge state[skip ci] - - - - - 1 changed file: - observe/pom.xml Changes: ===================================== observe/pom.xml ===================================== @@ -38,7 +38,7 @@ <properties>  -  + <maven.deploy.skip>false</maven.deploy.skip> <clientFile>client-runner-${project.version}.zip</clientFile> <serverFile>server-runner-${project.version}.war</serverFile> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/ee17bd148070a08c9aaca0d100… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/ee17bd148070a08c9aaca0d100… 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.2-SNAPSHOT development[skip ci]
by Tony CHEMIT 02 Jan '19

02 Jan '19

Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: ee17bd14 by tchemit at 2019-01-02T14:55:55Z [jgitflow-maven-plugin]updating poms for 7.0.2-SNAPSHOT development[skip ci] - - - - - 16 changed files: - client-configuration/pom.xml - client-core/pom.xml - client-runner/pom.xml - dto/pom.xml - observe-i18n/pom.xml - observe/pom.xml - persistence/pom.xml - pom.xml - server-configuration/pom.xml - server-core/pom.xml - server-runner/pom.xml - services-client/pom.xml - services-local/pom.xml - services/pom.xml - test/pom.xml - validation/pom.xml Changes: ===================================== client-configuration/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0.1-SNAPSHOT</version> + <version>7.0.2-SNAPSHOT</version> </parent> <artifactId>client-configuration</artifactId> ===================================== client-core/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0.1-SNAPSHOT</version> + <version>7.0.2-SNAPSHOT</version> </parent> <artifactId>client-core</artifactId> ===================================== client-runner/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0.1-SNAPSHOT</version> + <version>7.0.2-SNAPSHOT</version> </parent> <artifactId>client-runner</artifactId> ===================================== dto/pom.xml ===================================== @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0.1-SNAPSHOT</version> + <version>7.0.2-SNAPSHOT</version> </parent> <artifactId>dto</artifactId> ===================================== observe-i18n/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0.1-SNAPSHOT</version> + <version>7.0.2-SNAPSHOT</version> </parent> <artifactId>observe-i18n</artifactId> ===================================== observe/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0.1-SNAPSHOT</version> + <version>7.0.2-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.1-SNAPSHOT</version> + <version>7.0.2-SNAPSHOT</version> </parent> <artifactId>persistence</artifactId> ===================================== pom.xml ===================================== @@ -31,7 +31,7 @@ <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0.1-SNAPSHOT</version> + <version>7.0.2-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.1-SNAPSHOT</version> + <version>7.0.2-SNAPSHOT</version> </parent> <artifactId>server-configuration</artifactId> ===================================== server-core/pom.xml ===================================== @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0.1-SNAPSHOT</version> + <version>7.0.2-SNAPSHOT</version> </parent> <artifactId>server-core</artifactId> ===================================== server-runner/pom.xml ===================================== @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0.1-SNAPSHOT</version> + <version>7.0.2-SNAPSHOT</version> </parent> <artifactId>server-runner</artifactId> ===================================== services-client/pom.xml ===================================== @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0.1-SNAPSHOT</version> + <version>7.0.2-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.1-SNAPSHOT</version> + <version>7.0.2-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.1-SNAPSHOT</version> + <version>7.0.2-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.1-SNAPSHOT</version> + <version>7.0.2-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.1-SNAPSHOT</version> + <version>7.0.2-SNAPSHOT</version> </parent> <artifactId>validation</artifactId> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/ee17bd148070a08c9aaca0d1001… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/ee17bd148070a08c9aaca0d1001… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe] Pushed new branch release/7.0.1
by Tony CHEMIT 02 Jan '19

02 Jan '19

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

1 0

[Git][ultreiaio/ird-observe][develop] update changelog
by Tony CHEMIT 02 Jan '19

02 Jan '19

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 2ff1a144 by tchemit at 2019-01-02T14:53:14Z update changelog - - - - - 6 changed files: - .mvn/gitlab-cache/milestones/674086-issues.json - .mvn/gitlab-cache/milestones/674086.json - + .mvn/gitlab-cache/milestones/720842-artifacts.json - + .mvn/gitlab-cache/milestones/720842-issues.json - + .mvn/gitlab-cache/milestones/720842.json - CHANGELOG.md Changes: ===================================== .mvn/gitlab-cache/milestones/674086-issues.json ===================================== @@ -1 +1,593 @@ -[] \ No newline at end of file +[ + { + "id": 14713375, + "iid": 1119, + "projectId": 2722779, + "title": "Permettre ou faciliter la sélection du quadrant au clavier", + "description": "Permettre ou faciliter la sélection du quadrant au clavier. Il ne semble pas y avoir actuellement de raccourcis clavier vers les 4 boutons.", + "labels": [ + "Bas", + "Evolution", + "IRD-2018-01-V8", + "À facturer" + ], + "milestone": { + "id": 674086, + "iid": 128, + "projectId": 2722779, + "groupId": 0, + "title": "8.0-alpha-5", + "description": "", + "dueDate": "Nov 4, 2018 1:00:00 AM", + "startDate": "Oct 21, 2018 2:00:00 AM", + "state": "active" + }, + "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": "opened", + "updatedAt": "Oct 15, 2018 1:40:54 AM", + "createdAt": "Oct 5, 2018 12:08:41 PM" + }, + { + "id": 16573198, + "iid": 1185, + "projectId": 2722779, + "title": "[V8][DATA MODEL] Ajout de champs", + "description": "* Rajouter des homeid sur toutes les tables qui n\u0027en n\u0027ont pas. Cela facilitera le stockage des id des données historiques (dont nous traitons la migration) et les mises en correspondances.\n* Renommer observe_longline.activitylogbook.timestamp en starttimestamp et rajouter un endtimestamp (non obligatoire)", + "labels": [ + "Evolution", + "IRD-2018-01-V8", + "À facturer" + ], + "milestone": { + "id": 674086, + "iid": 128, + "projectId": 2722779, + "groupId": 0, + "title": "8.0-alpha-5", + "description": "", + "dueDate": "Nov 4, 2018 1:00:00 AM", + "startDate": "Oct 21, 2018 2:00:00 AM", + "state": "active" + }, + "assignee": { + "_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…" + }, + "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": "Dec 30, 2018 11:35:50 AM", + "createdAt": "Dec 11, 2018 1:51:50 PM" + }, + { + "id": 16239318, + "iid": 1182, + "projectId": 2722779, + "title": "Corrections dans le référentiel (requises pour migration FINSS)", + "description": "Corriger code pays :\r\n * Mauritanie : MOZ en MRT\r\n * Porto Rico : PT/PRT en PR/PRI\r\n\r\n```\r\nUPDATE observe_common.country SET iso2code \u003d \u0027MR\u0027, iso3code \u003d \u0027MRT\u0027 WHERE topiaid \u003d \u0027fr.ird.observe.entities.referentiel.Country#1464000000000#0.00054\u0027;\r\nUPDATE observe_common.country SET iso2code \u003d \u0027PR\u0027, iso3code \u003d \u0027PRI\u0027 WHERE topiaid \u003d \u0027fr.ird.observe.entities.referentiel.Country#1464000000000#0.00076\u0027;\r\n```\r\n\r\nTypes d\u0027activité bateau longline :\r\n```\r\nINSERT INTO observe_longline.vesselactivity(topiaid, topiaversion, topiacreatedate, code, status, \"uri\", label1, label2, label3, label4, label5, label6, label7, label8, needcomment, lastupdatedate) VALUES (\u0027fr.ird.observe.entities.referentiel.longline.VesselActivityLongline#1464000000000#0.01\u0027, 0, \u00272018-12-12\u0027, \u0027WAITING\u0027, 1, null, \u0027Waiting\u0027, \u0027En attente\u0027, \u0027Waiting #TODO\u0027, null, null, null, null, null, \u0027f\u0027, \u00272018-12-12 17:00:00\u0027);\r\nINSERT INTO observe_longline.vesselactivity(topiaid, topiaversion, topiacreatedate, code, status, \"uri\", label1, label2, label3, label4, label5, label6, label7, label8, needcomment, lastupdatedate) VALUES (\u0027fr.ird.observe.entities.referentiel.longline.VesselActivityLongline#1464000000000#0.02\u0027, 0, \u00272018-12-12\u0027, \u0027SEINE_BACKDOWN\u0027, 1, null, \u0027Seine overturn\u0027, \u0027Chavirage de poche\u0027, \u0027Seine overturn #TODO\u0027, null, null, null, null, null, \u0027f\u0027, \u00272018-12-12 17:00:00\u0027);\r\nINSERT INTO observe_longline.vesselactivity(topiaid, topiaversion, topiacreatedate, code, status, \"uri\", label1, label2, label3, label4, label5, label6, label7, label8, needcomment, lastupdatedate) VALUES (\u0027fr.ird.observe.entities.referentiel.longline.VesselActivityLongline#1464000000000#0.03\u0027, 0, \u00272018-12-12\u0027, \u0027HOVE\u0027, 1, null, \u0027Hoving toe\u0027, \u0027A la cape\u0027, \u0027Hoving toe #TODO\u0027, null, null, null, null, null, \u0027f\u0027, \u00272018-12-12 17:00:00\u0027);\r\nINSERT INTO observe_longline.vesselactivity(topiaid, topiaversion, topiacreatedate, code, status, \"uri\", label1, label2, label3, label4, label5, label6, label7, label8, needcomment, lastupdatedate) VALUES (\u0027fr.ird.observe.entities.referentiel.longline.VesselActivityLongline#1464000000000#0.04\u0027, 0, \u00272018-12-12\u0027, \u0027FO_NEGATIVE\u0027, 1, null, \u0027Null set\u0027, \u0027Calée -\u0027, \u0027Null set #TODO\u0027, null, null, null, null, null, \u0027f\u0027, \u00272018-12-12 17:00:00\u0027);\r\nINSERT INTO observe_longline.vesselactivity(topiaid, topiaversion, topiacreatedate, code, status, \"uri\", label1, label2, label3, label4, label5, label6, label7, label8, needcomment, lastupdatedate) VALUES (\u0027fr.ird.observe.entities.referentiel.longline.VesselActivityLongline#1464000000000#0.05\u0027, 0, \u00272018-12-12\u0027, \u0027FO_POSITIVE\u0027, 1, null, \u0027Positive set\u0027, \u0027Calée +\u0027, \u0027Positive set #TODO\u0027, null, null, null, null, null, \u0027f\u0027, \u00272018-12-12 17:00:00\u0027);\r\nINSERT INTO observe_longline.vesselactivity(topiaid, topiaversion, topiacreatedate, code, status, \"uri\", label1, label2, label3, label4, label5, label6, label7, label8, needcomment, lastupdatedate) VALUES (\u0027fr.ird.observe.entities.referentiel.longline.VesselActivityLongline#1464000000000#0.06\u0027, 0, \u00272018-12-12\u0027, \u0027FO_UNKNOWN\u0027, 1, null, \u0027Unknown set\u0027, \u0027Calée ?\u0027, \u0027Unknown #TODO\u0027, null, null, null, null, null, \u0027f\u0027, \u00272018-12-12 17:00:00\u0027);\r\nINSERT INTO observe_longline.vesselactivity(topiaid, topiaversion, topiacreatedate, code, status, \"uri\", label1, label2, label3, label4, label5, label6, label7, label8, needcomment, lastupdatedate) VALUES (\u0027fr.ird.observe.entities.referentiel.longline.VesselActivityLongline#1464000000000#0.07\u0027, 0, \u00272018-12-12\u0027, \u0027FOB_REMOVAL\u0027, 1, null, \u0027FOB removal\u0027, \u0027Retrait FOB\u0027, \u0027FOB removal #TODO\u0027, null, null, null, null, null, \u0027f\u0027, \u00272018-12-12 17:00:00\u0027);\r\nINSERT INTO observe_longline.vesselactivity(topiaid, topiaversion, topiacreatedate, code, status, \"uri\", label1, label2, label3, label4, label5, label6, label7, label8, needcomment, lastupdatedate) VALUES (\u0027fr.ird.observe.entities.referentiel.longline.VesselActivityLongline#1464000000000#0.08\u0027, 0, \u00272018-12-12\u0027, \u0027FOB_DEPLOYMENT\u0027, 1, null, \u0027FOB deployment\u0027, \u0027Déploiement FOB\u0027, \u0027FOB deployment #TODO\u0027, null, null, null, null, null, \u0027f\u0027, \u00272018-12-12 17:00:00\u0027);\r\nINSERT INTO observe_longline.vesselactivity(topiaid, topiaversion, topiacreatedate, code, status, \"uri\", label1, label2, label3, label4, label5, label6, label7, label8, needcomment, lastupdatedate) VALUES (\u0027fr.ird.observe.entities.referentiel.longline.VesselActivityLongline#1464000000000#0.09\u0027, 0, \u00272018-12-12\u0027, \u0027INACTIVE\u0027, 1, null, \u0027Inactive\u0027, \u0027Inconnue\u0027, \u0027Inactive #TODO\u0027, null, null, null, null, null, \u0027f\u0027, \u00272018-12-12 17:00:00\u0027);\r\nINSERT INTO observe_longline.vesselactivity(topiaid, topiaversion, topiacreatedate, code, status, \"uri\", label1, label2, label3, label4, label5, label6, label7, label8, needcomment, lastupdatedate) VALUES (\u0027fr.ird.observe.entities.referentiel.longline.VesselActivityLongline#1464000000000#0.10\u0027, 0, \u00272018-12-12\u0027, \u0027LANDING\u0027, 1, null, \u0027Landing\u0027, \u0027Débarquement\u0027, \u0027Landing #TODO\u0027, null, null, null, null, null, \u0027f\u0027, \u00272018-12-12 17:00:00\u0027);\r\nINSERT INTO observe_longline.vesselactivity(topiaid, topiaversion, topiacreatedate, code, status, \"uri\", label1, label2, label3, label4, label5, label6, label7, label8, needcomment, lastupdatedate) VALUES (\u0027fr.ird.observe.entities.referentiel.longline.VesselActivityLongline#1464000000000#0.11\u0027, 0, \u00272018-12-12\u0027, \u0027FO_HAULING\u0027, 1, null, \u0027Set hauling\u0027, \u0027Filage\u0027, \u0027Set hauling #TODO\u0027, null, null, null, null, null, \u0027f\u0027, \u00272018-12-12 17:00:00\u0027);\r\nINSERT INTO observe_longline.vesselactivity(topiaid, topiaversion, topiacreatedate, code, status, \"uri\", label1, label2, label3, label4, label5, label6, label7, label8, needcomment, lastupdatedate) VALUES (\u0027fr.ird.observe.entities.referentiel.longline.VesselActivityLongline#1464000000000#0.12\u0027, 0, \u00272018-12-12\u0027, \u0027ONEDAYTRIP\u0027, 1, null, \u0027One day day trip\u0027, \u0027Marée mono journée\u0027, \u0027One day day trip #TODO\u0027, null, null, null, null, null, \u0027f\u0027, \u00272018-12-12 17:00:00\u0027);\r\nINSERT INTO observe_longline.vesselactivity(topiaid, topiaversion, topiacreatedate, code, status, \"uri\", label1, label2, label3, label4, label5, label6, label7, label8, needcomment, lastupdatedate) VALUES (\u0027fr.ird.observe.entities.referentiel.longline.VesselActivityLongline#1464000000000#0.13\u0027, 0, \u00272018-12-12\u0027, \u0027OUT\u0027, 1, null, \u0027Vessel out fishing\u0027, \u0027Bateau en pêche\u0027, \u0027Vessel out fishing #TODO\u0027, null, null, null, null, null, \u0027f\u0027, \u00272018-12-12 17:00:00\u0027);\r\nINSERT INTO observe_longline.vesselactivity(topiaid, topiaversion, topiacreatedate, code, status, \"uri\", label1, label2, label3, label4, label5, label6, label7, label8, needcomment, lastupdatedate) VALUES (\u0027fr.ird.observe.entities.referentiel.longline.VesselActivityLongline#1464000000000#0.14\u0027, 0, \u00272018-12-12\u0027, \u0027SEARCH\u0027, 1, null, \u0027Search\u0027, \u0027Recherche\u0027, \u0027Search #TODO\u0027, null, null, null, null, null, \u0027f\u0027, \u00272018-12-12 17:00:00\u0027);\r\nINSERT INTO observe_longline.vesselactivity(topiaid, topiaversion, topiacreatedate, code, status, \"uri\", label1, label2, label3, label4, label5, label6, label7, label8, needcomment, lastupdatedate) VALUES (\u0027fr.ird.observe.entities.referentiel.longline.VesselActivityLongline#1464000000000#0.15\u0027, 0, \u00272018-12-12\u0027, \u0027TRANSIT\u0027, 1, null, \u0027Transit\u0027, \u0027Transit\u0027, \u0027Transit #TODO\u0027, null, null, null, null, null, \u0027f\u0027, \u00272018-12-12 17:00:00\u0027);\r\n\r\n```", + "labels": [ + "Evolution", + "IRD-2018-01-V8" + ], + "milestone": { + "id": 674086, + "iid": 128, + "projectId": 2722779, + "groupId": 0, + "title": "8.0-alpha-5", + "description": "", + "dueDate": "Nov 4, 2018 1:00:00 AM", + "startDate": "Oct 21, 2018 2:00:00 AM", + "state": "active" + }, + "assignee": { + "_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…" + }, + "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": "opened", + "updatedAt": "Dec 18, 2018 8:17:09 AM", + "createdAt": "Nov 30, 2018 12:34:38 PM" + }, + { + "id": 15852715, + "iid": 1172, + "projectId": 2722779, + "title": "Ajouter un générateur d\u0027id sur LL-Trip", + "description": "* Id Métier : Selon faisabilité. Ce champ est et doit rester alphanumérique. On aimerait toutefois rajouter à l\u0027extrémité droite un bouton qui permettre d\u0027auto générer, au besoin, un identifiant \"unique\" facilement lisible. L\u0027utilisation de ce bouton sera optionnel et il resterait possible d\u0027attribuer un id manuellement, alphanumérique. On pense :\n * aux générateurs d\u0027identifiants courts du type de ceux utilisés pour générer les URL abrégées : https://hashids.org/\n * aux générateurs utilisant un dictionnaire de nom et d\u0027adjectifs : https://www.npmjs.com/package/human-readable-ids", + "labels": [ + "Evolution", + "IRD-2018-01-V8", + "À facturer" + ], + "milestone": { + "id": 674086, + "iid": 128, + "projectId": 2722779, + "groupId": 0, + "title": "8.0-alpha-5", + "description": "", + "dueDate": "Nov 4, 2018 1:00:00 AM", + "startDate": "Oct 21, 2018 2:00:00 AM", + "state": "active" + }, + "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": 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…" + }, + "state": "closed", + "updatedAt": "Dec 28, 2018 11:27:24 AM", + "createdAt": "Nov 14, 2018 6:20:47 PM" + }, + { + "id": 14991298, + "iid": 1152, + "projectId": 2722779, + "title": "S\u0027assurer de la compatibilité de ObServe 8 avec Java 10", + "description": "S\u0027assurer de la compatibilité de ObServe 8 avec Java 10.\n\nEt/ou ajouter les paramètres de démarrage requis dans les scripts de lancement pour que ça marche.\n\nLiens utiles :\n* http://blog.invivoo.com/migration-vers-java-9/\n* https://blog.codefx.org/java/five-command-line-options-hack-java-module-sys…", + "labels": [ + "IRD-2018-01-V8" + ], + "milestone": { + "id": 674086, + "iid": 128, + "projectId": 2722779, + "groupId": 0, + "title": "8.0-alpha-5", + "description": "", + "dueDate": "Nov 4, 2018 1:00:00 AM", + "startDate": "Oct 21, 2018 2:00:00 AM", + "state": "active" + }, + "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": "opened", + "updatedAt": "Nov 13, 2018 2:01:54 PM", + "createdAt": "Oct 16, 2018 2:13:53 PM" + }, + { + "id": 14727820, + "iid": 1130, + "projectId": 2722779, + "title": "[LL] Créer une liste d\u0027affichage d\u0027espèces propre aux captures, débarquements et échantillons LL Logbooks", + "description": "Créer une liste d\u0027affichage d\u0027espèces qui sera propre aux captures, débarquements et échantillons LL Logbooks (différente de la liste existante dédiée aux LL Observations).\n\nJuliette doit fournir la liste d\u0027espèces à y faire figurer.", + "labels": [ + "Evolution", + "IRD-2018-01-V8", + "À facturer" + ], + "milestone": { + "id": 674086, + "iid": 128, + "projectId": 2722779, + "groupId": 0, + "title": "8.0-alpha-5", + "description": "", + "dueDate": "Nov 4, 2018 1:00:00 AM", + "startDate": "Oct 21, 2018 2:00:00 AM", + "state": "active" + }, + "assignee": { + "_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…" + }, + "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": "opened", + "updatedAt": "Dec 4, 2018 1:51:17 PM", + "createdAt": "Oct 5, 2018 9:28:31 PM" + }, + { + "id": 14727558, + "iid": 1127, + "projectId": 2722779, + "title": "[LL] La position d\u0027activité devrait-elle est optionnelle ?", + "description": "Ce pourrait être nécessaires pour les activités hors ZEE, pour lesquelles les bateaux ne fournissent pas toujours les positions.\n\nCas en cours d\u0027investigation...", + "labels": [ + "IRD-2018-01-V8" + ], + "milestone": { + "id": 674086, + "iid": 128, + "projectId": 2722779, + "groupId": 0, + "title": "8.0-alpha-5", + "description": "", + "dueDate": "Nov 4, 2018 1:00:00 AM", + "startDate": "Oct 21, 2018 2:00:00 AM", + "state": "active" + }, + "assignee": { + "_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…" + }, + "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": "opened", + "updatedAt": "Dec 4, 2018 1:51:16 PM", + "createdAt": "Oct 5, 2018 9:08:48 PM" + }, + { + "id": 14715026, + "iid": 1122, + "projectId": 2722779, + "title": "[LL] Fournir le contenu de la table LL Compagnies destinataires des débarquements", + "description": "", + "labels": [ + "IRD-2018-01-V8" + ], + "milestone": { + "id": 674086, + "iid": 128, + "projectId": 2722779, + "groupId": 0, + "title": "8.0-alpha-5", + "description": "", + "dueDate": "Nov 4, 2018 1:00:00 AM", + "startDate": "Oct 21, 2018 2:00:00 AM", + "state": "active" + }, + "assignee": { + "_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…" + }, + "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": "opened", + "updatedAt": "Dec 4, 2018 1:51:16 PM", + "createdAt": "Oct 5, 2018 1:31:54 PM" + }, + { + "id": 12729061, + "iid": 1031, + "projectId": 2722779, + "title": "Création de nouvelles icônes de navigation", + "description": "", + "labels": [ + "IRD-2018-01-V8", + "Tâche" + ], + "milestone": { + "id": 674086, + "iid": 128, + "projectId": 2722779, + "groupId": 0, + "title": "8.0-alpha-5", + "description": "", + "dueDate": "Nov 4, 2018 1:00:00 AM", + "startDate": "Oct 21, 2018 2:00:00 AM", + "state": "active" + }, + "assignee": { + "_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…" + }, + "author": { + "_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…" + }, + "state": "opened", + "updatedAt": "Oct 15, 2018 1:45:10 AM", + "createdAt": "Jul 13, 2018 2:18:33 PM" + }, + { + "id": 11953555, + "iid": 970, + "projectId": 2722779, + "title": "Mutualiser les topiaid t3 et ObServe", + "description": "On souhaiterait pouvoir ré utiliser des topiaid entre t3 et ObServe (notamment sur les références).\n\nActuellement c\u0027est impossible du fait du lien fort entre syntaxe du topiaid et classes des logiciels.\n\nJe vois deux options possibles :\n* permettre que le préfixe des topiaid soit indépendant des noms de classes de l\u0027application\n* utiliser un package Java commun pour les classes des deux logiciels", + "labels": [ + "Evolution", + "IRD-2018-01-V8", + "À facturer" + ], + "milestone": { + "id": 674086, + "iid": 128, + "projectId": 2722779, + "groupId": 0, + "title": "8.0-alpha-5", + "description": "", + "dueDate": "Nov 4, 2018 1:00:00 AM", + "startDate": "Oct 21, 2018 2:00:00 AM", + "state": "active" + }, + "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": "Dec 16, 2018 1:03:10 PM", + "createdAt": "Jun 12, 2018 1:55:13 PM" + }, + { + "id": 9963535, + "iid": 918, + "projectId": 2722779, + "title": "Déplacement de groupes de données", + "description": "Comme cela a été évoqué précédemment dans ce document, il faut permettre, par clic droit, de\ndéplacer les groupes « données d’observation », « logbooks », « échantillons » d’une marée à l’autre.\n\nExactement comme l’on peut, actuellement, déplacer une marée de programme par le menu contextuel. \n\nCeci entraînera nécessairement la perte des appariements entre activités d’observation et\nlogbooks s’il y en avait. Par contre on fera suivre si possible les champs de la table Activité relatifs à\nces groupes (données des onglets Caractéristiques d’observation et Caractéristiques logbooks).\n\nLes déplacements possibles seront :\n * Déplacer le logbook d’une marée vers une autre\n * Déplacer les débarquements d’une marée vers une autre\n * Déplacer les échantillons :\n * de la racine de la marée vers une opération de pêche (de la même marée ou d’une autre)\n * d’une opération de pêche vers la racine de la marée (ou d’une autre marée)\n * d’une opération de pêche vers une autre opération de pêche (de la même marée ou d’un autre)", + "labels": [ + "Evolution", + "IRD-2018-01-V8" + ], + "milestone": { + "id": 674086, + "iid": 128, + "projectId": 2722779, + "groupId": 0, + "title": "8.0-alpha-5", + "description": "", + "dueDate": "Nov 4, 2018 1:00:00 AM", + "startDate": "Oct 21, 2018 2:00:00 AM", + "state": "active" + }, + "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": 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…" + }, + "state": "opened", + "updatedAt": "Dec 4, 2018 2:46:10 PM", + "createdAt": "Mar 27, 2018 3:49:17 PM" + }, + { + "id": 9962937, + "iid": 915, + "projectId": 2722779, + "title": "Ajout de règles de validation de niveau 1", + "description": "On trouve des éléments de démarrage pour ce sujet dans :\n * Dans le manuel Industrial Fishery de FINNS version allégée SFA, p73+, la liste des contrôles\nactuellement assurés par FINNS et par les requêtes propres à la SFA sur les données LL\nindustrielles.\n * Dans le manuel Semi Industrial Fishery de FINNS version allégée SFA, p26+, la liste des\ncontrôles actuellement assurés par FINNS et par les requêtes propres à la SFA sur les données\nLL semi industrielles.\n\n# Liste des nouveaux contrôles à implanter :\n * *[Erreur]* Check that Departure Date is earlier than Arrival Date of the trip and that both dates are earlier than today.\n * *[Erreur]* Check that trip departure/arrival dates do not overlap with another trip for the same vessel (à implanter sur tous les types de marées).\n * *[Erreur]* Check that the Event Start Date is less than the Event End Date (A implanter sur le formulaire opération de pêche (qui recèle 4 dates/heures) : il faut date début filage \u003c fin filage \u003c début virage \u003c fin virage)\n * *[Erreur]* Check that dates for the event (activity) are inside the start/end date/ time of the trip\n * *[Warning]* Check for Null positions, for latitude that is exactly 0 or 90 and for longitude that is exactly 0 or 180\n * *[Erreur]* Si elles sont renseignées, position d’activité et première position de pêche (début du filage) doivent être identiques\n * *[Erreur]* Check for number of hooks \u003c500 and number of hooks\u003e 5500\n * *[Warning]* Check if the SST is \u003c15\n * *[Erreur]* Check if the SST is \u003e35\n * *[Erreur]* Check whereas the fish is either too big or too small for a given species (Utiliser les bornes définies dans le référentiel Species)\n\n# Liste des contrôles demandés mais déjà implantés :\n * *[Erreur]* Check that the trip type is valid for current gears of the vessel. That is the vessel to which a longline trip is being added has its gear type set to industrial longliners.\n\nLa liste des bateaux proposés sur les formulaires est filtrée selon leur type. Pas d’erreur possible\n\n * *[Erreur]* Check for negative values in catch, discard, lost or retained weights and pieces\n\nOn interdit déjà les valeurs négatives.\n\n * *[Erreur]* Check that new trip type selected is associated with longline data\n\nLe type de marée est piloté par le programme dans lequel elle est créée, de même que la nature des formulaires (PS ou LL). Pas d’erreur possible.\n\n * *[Erreur]* If species have been classified, check that selected species in trip catches is either a target or a bycatch class\n\nLa liste d’espèces proposée dans le formulaire capture est déjà filtrée et ne propose que les espèces pertinentes. Pas d’erreur possible.\n\n * *[Erreur]* If species have been classified, check that selected species is a bait class for species recorded as bait.\n\nLa liste d’espèces proposées comme appât provient de la table appâts et ne propose que les espèces pertinentes. Pas d’erreur possible.\n\n * *[Erreur]* Check that the event is valid for the trip type (only if the trip type has definition of allowed events\n\nLa liste des activités dans ObServe est propre à un type d’engin. Pas d’erreur possible.\n\n * *[Erreur]* If new event is not a fishing activity, then it makes sure that there are no catches associated to this record, e.g. in port event\n\nL’UI d’ObServe n’autorisera la saisie de captures que sur le type opération de pêche. Pas d’erreur possible.\n\n * *[Erreur]* Check for negative values in oceanography\n\nOn interdit déjà les valeurs négatives.\n\n * *[Erreur]* Check that the total percentage of the lost catch is not greater than 100.00\n\nContrôle déjà actif.", + "labels": [ + "Evolution", + "IRD-2018-01-V8" + ], + "milestone": { + "id": 674086, + "iid": 128, + "projectId": 2722779, + "groupId": 0, + "title": "8.0-alpha-5", + "description": "", + "dueDate": "Nov 4, 2018 1:00:00 AM", + "startDate": "Oct 21, 2018 2:00:00 AM", + "state": "active" + }, + "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": 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…" + }, + "state": "opened", + "updatedAt": "Dec 4, 2018 1:50:50 PM", + "createdAt": "Mar 27, 2018 3:13:54 PM" + } +] \ No newline at end of file ===================================== .mvn/gitlab-cache/milestones/674086.json ===================================== @@ -5,7 +5,7 @@ "groupId": 0, "title": "8.0-alpha-5", "description": "", - "dueDate": "Oct 31, 2018 1:00:00 AM", - "startDate": "Oct 15, 2018 2:00:00 AM", + "dueDate": "Nov 4, 2018 1:00:00 AM", + "startDate": "Oct 21, 2018 2:00:00 AM", "state": "active" } \ No newline at end of file ===================================== .mvn/gitlab-cache/milestones/720842-artifacts.json ===================================== @@ -0,0 +1,12 @@ +[ + { + "name": "Application", + "filename": "observe-7.0.1.zip", + "url": "http://repo1.maven.org/maven2/fr/ird/observe/observe/7.0.1/observe-7.0.1.zip" + }, + { + "name": "Serveur", + "filename": "observe-7.0.1.war", + "url": "http://repo1.maven.org/maven2/fr/ird/observe/observe/7.0.1/observe-7.0.1.war" + } +] \ No newline at end of file ===================================== .mvn/gitlab-cache/milestones/720842-issues.json ===================================== @@ -0,0 +1,299 @@ +[ + { + "id": 16626755, + "iid": 1187, + "projectId": 2722779, + "title": "[PS] Marées non visibles dans l\u0027arbre après insertion", + "description": "Après insertion de certaines marées PS, on ne les voit pas dans l\u0027arbre : \n\nExemples :\n* [OI_20180908-20180910_RAKOTOMIRAHO_SAP_MANAPANY_Base.sql.gz](/uploads/24ff6a429525845fa8be4e571f36c0ff/OI_20180908-20180910_RAKOTOMIRAHO_SAP_MANAPANY_Base.sql.gz)\n* [OI_20180721-20180811_LABROSSE_SAP_BERNICA_Base.sql.gz](/uploads/d8833d37355a88b512ef8450a254c7da/OI_20180721-20180811_LABROSSE_SAP_BERNICA_Base.sql.gz)\n\nPourtant, elle sont bien dans la base, dans le programme OCUP.\n\nConcernant la première :\n![image](/uploads/226629eb579dc227e98db6ae746a31fa/image.png)\n\nConcernant la seconde :\n![image](/uploads/7fa332b1b0bafdb57d07870b1516bd0c/image.png)\n\nSe pourrait-il qu\u0027il y ait un problème d\u0027affichage ?\n\n(test réalisé sur 2 bases centrales différentes, sur 2 serveurs différents)", + "labels": [ + "Anomalie", + "Contrat AZTI-2017", + "Contrat Code Lutin-2016", + "Immédiat" + ], + "milestone": { + "id": 720842, + "iid": 131, + "projectId": 2722779, + "groupId": 0, + "title": "7.0.1", + "description": "", + "dueDate": "Jan 2, 2019 1:00:00 AM", + "startDate": "Nov 26, 2018 1: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": "Jan 2, 2019 3:45:29 PM", + "createdAt": "Dec 13, 2018 11:08:19 AM" + }, + { + "id": 16627456, + "iid": 1188, + "projectId": 2722779, + "title": "Un type d\u0027objet flottant (28) n\u0027est pas pris en compte par la migration", + "description": "Un type d\u0027objet flottant (28) n\u0027est pas pris en compte par la migration.\n\nC\u0027est normal, sa migration n\u0027avait pas été spécifiée. Je m\u0027occupe de corriger la base de prod, et de rajouter ses règles de migration dans le référentiel, pour qu\u0027il soit pris en compte par la version 7.0.1.", + "labels": [ + "Contrat AZTI-2017", + "Evolution", + "Haut" + ], + "milestone": { + "id": 720842, + "iid": 131, + "projectId": 2722779, + "groupId": 0, + "title": "7.0.1", + "description": "", + "dueDate": "Jan 2, 2019 1:00:00 AM", + "startDate": "Nov 26, 2018 1: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": "Dec 21, 2018 2:10:46 PM", + "createdAt": "Dec 13, 2018 11:30:26 AM" + }, + { + "id": 16631092, + "iid": 1191, + "projectId": 2722779, + "title": "Conformité des topiaid de floatingobjectpart", + "description": "Les topiaid de floatingobjectpart ont un format inhabituel :\n\n![image](/uploads/77f5c3eba948de651e8bfdaf9737b605/image.png)\n\nEst-ce voulu ?", + "labels": [ + "Contrat AZTI-2017" + ], + "milestone": { + "id": 720842, + "iid": 131, + "projectId": 2722779, + "groupId": 0, + "title": "7.0.1", + "description": "", + "dueDate": "Jan 2, 2019 1:00:00 AM", + "startDate": "Nov 26, 2018 1: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": "Dec 21, 2018 5:35:52 AM", + "createdAt": "Dec 13, 2018 1:36:19 PM" + }, + { + "id": 16630679, + "iid": 1190, + "projectId": 2722779, + "title": "[PS][FOB] Champs whenarriving/whenleaving", + "description": "Les champs whenarriving/whenleaving sont curieusement des varchar(255) :\n\n![image](/uploads/7fcb6d77f14f70f70b0b7c6aaa61adc5/image.png)\n\nAlors qu\u0027ils contiennent une information booléenne :\n\n![image](/uploads/0bacbbcfaead624e98d1e07aaff1a19b/image.png)\n\nBizarre non ?", + "labels": [ + "Contrat AZTI-2017", + "Tâche" + ], + "milestone": { + "id": 720842, + "iid": 131, + "projectId": 2722779, + "groupId": 0, + "title": "7.0.1", + "description": "", + "dueDate": "Jan 2, 2019 1:00:00 AM", + "startDate": "Nov 26, 2018 1: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": "Dec 14, 2018 11:36:48 AM", + "createdAt": "Dec 13, 2018 1:19:50 PM" + }, + { + "id": 16627932, + "iid": 1189, + "projectId": 2722779, + "title": "Déplacement de marée intempestif dans l\u0027arbre", + "description": "Lorsque pour une marée donnée j’ai modifié le champ « qualité de la donnée » et quelques autres (du formulaire marée uniquement), ça a déplacé la marée vers le haut c’est-à-dire à une position qui ne respectait plus la chronologie des marées les unes par rapport aux autres (dans l\u0027arbre). Après redémarrage de l’application, la marée reprend sa place correcte.\n\nCe ticket est a priori distinct de #1187.", + "labels": [ + "Anomalie", + "Contrat AZTI-2017" + ], + "milestone": { + "id": 720842, + "iid": 131, + "projectId": 2722779, + "groupId": 0, + "title": "7.0.1", + "description": "", + "dueDate": "Jan 2, 2019 1:00:00 AM", + "startDate": "Nov 26, 2018 1: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": "Jan 2, 2019 3:45:29 PM", + "createdAt": "Dec 13, 2018 11:49:53 AM" + }, + { + "id": 16626494, + "iid": 1186, + "projectId": 2722779, + "title": "Les informations sur la source de données ne peuvent pa être affichées", + "description": "Mode serveur distant.\n\nEn cliquant ici :\n![image](/uploads/67cdd231d3d6c0b432bd66b7571d06eb/image.png)\n\n\nLes informations n\u0027apparaissent pas et l\u0027exception suivante se produite (visible dans la console mais pas dans le log) :\n\n```\nException in thread \"AWT-EventQueue-0\" fr.ird.observe.client.ObserveSwingTechnicalException: Impossible de générer à partir du patron dataSourceInformation.ftl\n at fr.ird.observe.client.ObserveTextGenerator.generateHtml(ObserveTextGenerator.java:145)\n at fr.ird.observe.client.ObserveTextGenerator.generateHtml(ObserveTextGenerator.java:122)\n at fr.ird.observe.client.ObserveTextGenerator.getDataSourceInfo(ObserveTextGenerator.java:106)\n at fr.ird.observe.client.ui.actions.main.menu.storage.ShowStorageInfoAction.doActionPerformed(ShowStorageInfoAction.java:70)\n at fr.ird.observe.client.ui.actions.main.menu.MenuActionSupport.actionPerformed(MenuActionSupport.java:62)\n at javax.swing.AbstractButton.fireActionPerformed(Unknown Source)\n at javax.swing.AbstractButton$Handler.actionPerformed(Unknown Source)\n at javax.swing.DefaultButtonModel.fireActionPerformed(Unknown Source)\n at javax.swing.DefaultButtonModel.setPressed(Unknown Source)\n at javax.swing.AbstractButton.doClick(Unknown Source)\n at javax.swing.plaf.basic.BasicMenuItemUI.doClick(Unknown Source)\n at javax.swing.plaf.basic.BasicMenuItemUI$Handler.mouseReleased(Unknown Source)\n at java.awt.Component.processMouseEvent(Unknown Source)\n at javax.swing.JComponent.processMouseEvent(Unknown Source)\n at java.awt.Component.processEvent(Unknown Source)\n at java.awt.Container.processEvent(Unknown Source)\n at java.awt.Component.dispatchEventImpl(Unknown Source)\n at java.awt.Container.dispatchEventImpl(Unknown Source)\n at java.awt.Component.dispatchEvent(Unknown Source)\n at java.awt.LightweightDispatcher.retargetMouseEvent(Unknown Source)\n at java.awt.LightweightDispatcher.processMouseEvent(Unknown Source)\n at java.awt.LightweightDispatcher.dispatchEvent(Unknown Source)\n at java.awt.Container.dispatchEventImpl(Unknown Source)\n at java.awt.Window.dispatchEventImpl(Unknown Source)\n at java.awt.Component.dispatchEvent(Unknown Source)\n at java.awt.EventQueue.dispatchEventImpl(Unknown Source)\n at java.awt.EventQueue.access$500(Unknown Source)\n at java.awt.EventQueue$3.run(Unknown Source)\n at java.awt.EventQueue$3.run(Unknown Source)\n at java.security.AccessController.doPrivileged(Native Method)\n at java.security.ProtectionDomain$JavaSecurityAccessImpl.doIntersectionPrivilege(Unknown Source)\n at java.security.ProtectionDomain$JavaSecurityAccessImpl.doIntersectionPrivilege(Unknown Source)\n at java.awt.EventQueue$4.run(Unknown Source)\n at java.awt.EventQueue$4.run(Unknown Source)\n at java.security.AccessController.doPrivileged(Native Method)\n at java.security.ProtectionDomain$JavaSecurityAccessImpl.doIntersectionPrivilege(Unknown Source)\n at java.awt.EventQueue.dispatchEvent(Unknown Source)\n at java.awt.EventDispatchThread.pumpOneEventForFilters(Unknown Source)\n at java.awt.EventDispatchThread.pumpEventsForFilter(Unknown Source)\n at java.awt.EventDispatchThread.pumpEventsForHierarchy(Unknown Source)\n at java.awt.EventDispatchThread.pumpEvents(Unknown Source)\n at java.awt.EventDispatchThread.pumpEvents(Unknown Source)\n at java.awt.EventDispatchThread.run(Unknown Source)\nCaused by: freemarker.core._TemplateModelException: Java method \"Optional.get()\" threw an exception when invoked on Optional object \"Optional.empty\"; see cause\nexception in the Java stack trace.\n\n----\nFTL stack trace (\"~\" means nesting-related):\n - Failed at: ${configuration.optionalDatabaseName... [in template \"dataSourceInformation_fr_FR.ftl\" at line 40, column 49]\n----\n at freemarker.ext.beans._MethodUtil.newInvocationTemplateModelException(_MethodUtil.java:289)\n at freemarker.ext.beans._MethodUtil.newInvocationTemplateModelException(_MethodUtil.java:252)\n at freemarker.ext.beans.SimpleMethodModel.exec(SimpleMethodModel.java:77)\n at freemarker.core.MethodCall._eval(MethodCall.java:65)\n at freemarker.core.Expression.eval(Expression.java:83)\n at freemarker.core.DollarVariable.calculateInterpolatedStringOrMarkup(DollarVariable.java:100)\n at freemarker.core.DollarVariable.accept(DollarVariable.java:63)\n at freemarker.core.Environment.visit(Environment.java:330)\n at freemarker.core.Environment.visit(Environment.java:336)\n at freemarker.core.Environment.visit(Environment.java:336)\n at freemarker.core.Environment.visit(Environment.java:336)\n at freemarker.core.Environment.visit(Environment.java:336)\n at freemarker.core.Environment.process(Environment.java:309)\n at freemarker.template.Template.process(Template.java:384)\n at fr.ird.observe.client.ObserveTextGenerator.generateHtml(ObserveTextGenerator.java:137)\n ... 42 more\nCaused by: java.util.NoSuchElementException: No value present\n at java.util.Optional.get(Unknown Source)\n at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)\n at sun.reflect.NativeMethodAccessorImpl.invoke(Unknown Source)\n at sun.reflect.DelegatingMethodAccessorImpl.invoke(Unknown Source)\n at java.lang.reflect.Method.invoke(Unknown Source)\n at freemarker.ext.beans.BeansWrapper.invokeMethod(BeansWrapper.java:1505)\n at freemarker.ext.beans.SimpleMethodModel.exec(SimpleMethodModel.java:72)\n ... 54 more\n```", + "labels": [ + "Anomalie", + "Contrat AZTI-2017", + "Contrat Code Lutin-2016" + ], + "milestone": { + "id": 720842, + "iid": 131, + "projectId": 2722779, + "groupId": 0, + "title": "7.0.1", + "description": "", + "dueDate": "Jan 2, 2019 1:00:00 AM", + "startDate": "Nov 26, 2018 1: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": "Jan 2, 2019 3:45:29 PM", + "createdAt": "Dec 13, 2018 10:57:16 AM" + } +] \ No newline at end of file ===================================== .mvn/gitlab-cache/milestones/720842.json ===================================== @@ -0,0 +1,11 @@ +{ + "id": 720842, + "iid": 131, + "projectId": 2722779, + "groupId": 0, + "title": "7.0.1", + "description": "", + "dueDate": "Jan 2, 2019 1:00:00 AM", + "startDate": "Nov 26, 2018 1: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-12-04 16:45. + * Last generated at 2019-01-02 15:53. ## Version [8.0-alpha-4](https://gitlab.com/ultreiaio/ird-observe/milestones/115) Seconde partie du troisième lot du contrat IRD-2018-01-V8.
contient fonctionnalités avancées. @@ -113,6 +113,21 @@ 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.1](https://gitlab.com/ultreiaio/ird-observe/milestones/131) + +**Closed at 2019-01-02.** + +### Download +* [Application (observe-7.0.1.zip)](http://repo1.maven.org/maven2/fr/ird/observe/observe/7.…) +* [Serveur (observe-7.0.1.war)](http://repo1.maven.org/maven2/fr/ird/observe/observe/7.…) + +### Issues + * [[Anomalie 1186]](https://gitlab.com/ultreiaio/ird-observe/issues/1186) **Les informations sur la source de données ne peuvent pa être affichées** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Anomalie 1187]](https://gitlab.com/ultreiaio/ird-observe/issues/1187) **[PS] Marées non visibles dans l'arbre après insertion** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Anomalie 1189]](https://gitlab.com/ultreiaio/ird-observe/issues/1189) **Déplacement de marée intempestif dans l'arbre** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Evolution 1188]](https://gitlab.com/ultreiaio/ird-observe/issues/1188) **Un type d'objet flottant (28) n'est pas pris en compte par la migration** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Tâche 1190]](https://gitlab.com/ultreiaio/ird-observe/issues/1190) **[PS][FOB] Champs whenarriving/whenleaving** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + ## Version [7.0.0](https://gitlab.com/ultreiaio/ird-observe/milestones/130) **Closed at 2018-11-26.** View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/2ff1a1440176695d79c75ac056c… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/2ff1a1440176695d79c75ac056c… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-7.x] Happy new year commit
by Tony CHEMIT 02 Jan '19

02 Jan '19

Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: f321a966 by tchemit at 2019-01-02T14:51:32Z Happy new year commit - - - - - 30 changed files: - client-configuration/pom.xml - client-configuration/src/main/java/fr/ird/observe/client/configuration/ClientConfig.java - client-configuration/src/main/java/fr/ird/observe/client/configuration/NavigationTreeConfig.java - client-configuration/src/main/java/fr/ird/observe/client/configuration/NavigationTreeConfigBean.java - client-configuration/src/main/java/fr/ird/observe/client/configuration/SeineBycatchObservedSystemConfigConverter.java - client-configuration/src/main/resources/log4j2.xml - client-configuration/src/main/resources/observe-log4j2.xml - client-configuration/src/test/java/fr/ird/observe/client/configuration/ClientConfigTest.java - client-core/pom.xml - client-core/src/main/assembly/map.xml - client-core/src/main/filtered-resources/observe-application.properties - client-core/src/main/i18n/templates/about_en_GB.ftl - client-core/src/main/i18n/templates/about_es_ES.ftl - client-core/src/main/i18n/templates/about_fr_FR.ftl - client-core/src/main/i18n/templates/connexionTestResult_en_GB.ftl - client-core/src/main/i18n/templates/connexionTestResult_es_ES.ftl - client-core/src/main/i18n/templates/connexionTestResult_fr_FR.ftl - client-core/src/main/i18n/templates/dataSourceConnectionReport_en_GB.ftl - client-core/src/main/i18n/templates/dataSourceConnectionReport_es_ES.ftl - client-core/src/main/i18n/templates/dataSourceConnectionReport_fr_FR.ftl - client-core/src/main/i18n/templates/dataSourceInformation_en_GB.ftl - client-core/src/main/i18n/templates/dataSourceInformation_es_ES.ftl - client-core/src/main/i18n/templates/dataSourceInformation_fr_FR.ftl - client-core/src/main/i18n/templates/dataSourcePolicy_en_GB.ftl - client-core/src/main/i18n/templates/dataSourcePolicy_es_ES.ftl - client-core/src/main/i18n/templates/dataSourcePolicy_fr_FR.ftl - client-core/src/main/i18n/templates/dataSourceSelectModeResume_en_GB.ftl - client-core/src/main/i18n/templates/dataSourceSelectModeResume_es_ES.ftl - client-core/src/main/i18n/templates/dataSourceSelectModeResume_fr_FR.ftl - client-core/src/main/i18n/templates/initStorage_en_GB.ftl The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/f321a9664ea4917af607e51ff5a… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/f321a9664ea4917af607e51ff5a… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 3 commits: Les informations sur la source de données ne peuvent pa être affichées - Closes #1186
by Tony CHEMIT 02 Jan '19

02 Jan '19

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: cde737d5 by tchemit at 2019-01-02T14:41:00Z Les informations sur la source de données ne peuvent pa être affichées - Closes #1186 - - - - - d0cd3c4b by tchemit at 2019-01-02T14:42:59Z [PS] Marées non visibles dans l'arbre après insertion - Closes #1187 - - - - - ef398d0a by tchemit at 2019-01-02T14:45:12Z Déplacement de marée intempestif dans l'arbre - Closes #1189 - - - - - 7 changed files: - client-core/src/main/i18n/templates/dataSourceInformation_en_GB.ftl - client-core/src/main/i18n/templates/dataSourceInformation_es_ES.ftl - client-core/src/main/i18n/templates/dataSourceInformation_fr_FR.ftl - dto/src/main/java/fr/ird/observe/dto/data/ll/common/TripLonglineHelper.java - dto/src/main/java/fr/ird/observe/dto/data/ps/common/TripSeineHelper.java - persistence/src/main/java/fr/ird/observe/entities/data/ll/common/TripLonglineTopiaDao.java - persistence/src/main/java/fr/ird/observe/entities/data/ps/common/TripSeineTopiaDao.java Changes: ===================================== client-core/src/main/i18n/templates/dataSourceInformation_en_GB.ftl ===================================== @@ -36,7 +36,7 @@ <#else> <li>Web service url: ${configuration.serverUrl}</li> <li>User: ${configuration.login}</li> - <#if configuration.optionalDatabaseName.present??> + <#if configuration.withDatabaseName()> <li>Database alias: ${configuration.optionalDatabaseName.get()}</li> </#if> </#if> ===================================== client-core/src/main/i18n/templates/dataSourceInformation_es_ES.ftl ===================================== @@ -36,7 +36,7 @@ <#else> <li>URL del servicio web: ${configuration.serverUrl}</li> <li>Usuario: ${configuration.login}</li> - <#if configuration.optionalDatabaseName.present??> + <#if configuration.withDatabaseName()> <li>Alias de la base: ${configuration.optionalDatabaseName.get()}</li> </#if> </#if> ===================================== client-core/src/main/i18n/templates/dataSourceInformation_fr_FR.ftl ===================================== @@ -36,7 +36,7 @@ <#else> <li>URL du service web : ${configuration.serverUrl}</li> <li>Utilisateur : ${configuration.login}</li> - <#if configuration.optionalDatabaseName.present??> + <#if configuration.withDatabaseName()> <li>Alias de la base : ${configuration.optionalDatabaseName.get()}</li> </#if> </#if> ===================================== dto/src/main/java/fr/ird/observe/dto/data/ll/common/TripLonglineHelper.java ===================================== @@ -22,21 +22,21 @@ package fr.ird.observe.dto.data.ll.common; * #L% */ -import java.util.ArrayList; +import java.util.Comparator; import java.util.Date; import java.util.List; -import java.util.Map; -import java.util.TreeMap; import java.util.concurrent.TimeUnit; +import java.util.stream.Collectors; public class TripLonglineHelper extends GeneratedTripLonglineHelper { public static List<TripLonglineReference> sort(List<TripLonglineReference> data) { - Map<Object, TripLonglineReference> map = new TreeMap<>(); - for (TripLonglineReference datum : data) { - map.put(datum.getStartDate(), datum); - } - return new ArrayList<>(map.values()); + return data + .stream() + .sorted(Comparator.comparing(TripLonglineReference::getStartDate) + .thenComparing(TripLonglineReference::getEndDate) + .thenComparing(TripLonglineReference::getVesselLabel)) + .collect(Collectors.toList()); } public static int createNoOfDay(Date startDate, Date endDate) { ===================================== dto/src/main/java/fr/ird/observe/dto/data/ps/common/TripSeineHelper.java ===================================== @@ -22,18 +22,18 @@ package fr.ird.observe.dto.data.ps.common; * #L% */ -import java.util.ArrayList; +import java.util.Comparator; import java.util.List; -import java.util.Map; -import java.util.TreeMap; +import java.util.stream.Collectors; public class TripSeineHelper extends GeneratedTripSeineHelper { public static List<TripSeineReference> sort(List<TripSeineReference> data) { - Map<Object, TripSeineReference> map = new TreeMap<>(); - for (TripSeineReference datum : data) { - map.put(datum.getStartDate(), datum); - } - return new ArrayList<>(map.values()); + return data + .stream() + .sorted(Comparator.comparing(TripSeineReference::getStartDate) + .thenComparing(TripSeineReference::getEndDate) + .thenComparing(TripSeineReference::getVesselLabel)) + .collect(Collectors.toList()); } } ===================================== persistence/src/main/java/fr/ird/observe/entities/data/ll/common/TripLonglineTopiaDao.java ===================================== @@ -26,7 +26,6 @@ import com.google.common.collect.Lists; import fr.ird.observe.dto.data.TripMapPoint; import fr.ird.observe.dto.data.TripMapPointType; import fr.ird.observe.entities.referential.common.Harbour; -import fr.ird.observe.entities.referential.common.Program; import org.nuiton.topia.persistence.support.TopiaSqlQuery; import org.nuiton.topia.persistence.support.TopiaSqlSupport; import org.nuiton.util.DateUtil; @@ -50,21 +49,6 @@ public class TripLonglineTopiaDao extends AbstractTripLonglineTopiaDao<TripLongl //FIXME-PROTECTED-ID public static final String ACTIVITY_LOGBOOK_STATION_ID= "fr.ird.referential.ll.common.VesselActivityLongline#1239832686138#0.3"; - public int findPositionByProgramId(String programId, String tripId) { - int result = 0; - //FIXME Bien vérifier que cela fonctionne - List<TripLongline> list = forProgramEquals(topiaDaoSupplier.getDao(Program.class).forTopiaIdEquals(programId).findUnique()).findAll(); - for (TripLongline e : list) { - if (tripId.equals(e.getTopiaId())) { - return result; - } - result++; - } - - // not found - return -1; - } - public LinkedHashSet<TripMapPoint> extractTripMapActivityPoints(String tripId, boolean addObservation, boolean addLogbook) { TripLongline tripLongline = forTopiaIdEquals(tripId).findUnique(); ===================================== persistence/src/main/java/fr/ird/observe/entities/data/ps/common/TripSeineTopiaDao.java ===================================== @@ -25,7 +25,6 @@ import fr.ird.observe.dto.data.TripMapPoint; import fr.ird.observe.dto.data.TripMapPointType; import fr.ird.observe.dto.data.ps.SchoolType; import fr.ird.observe.entities.referential.common.Harbour; -import fr.ird.observe.entities.referential.common.Program; import org.nuiton.topia.persistence.support.TopiaSqlQuery; import org.nuiton.topia.persistence.support.TopiaSqlSupport; import org.nuiton.util.DateUtil; @@ -36,7 +35,6 @@ import java.sql.ResultSet; import java.sql.SQLException; import java.util.Date; import java.util.LinkedHashSet; -import java.util.List; /** * Add some user methods. @@ -48,21 +46,6 @@ public class TripSeineTopiaDao extends AbstractTripSeineTopiaDao<TripSeine> { //FIXME-PROTECTED-ID public static final String ACTIVITY_HARBOUR_ID= "fr.ird.referential.ps.common.VesselActivitySeine#1239832675349#0.363119635949572"; - public int findPositionByProgramId(String programId, String tripId) { - int result = 0; - //FIXME Bien vérifier que cela fonctionne - List<TripSeine> list = forProgramEquals(topiaDaoSupplier.getDao(Program.class).forTopiaIdEquals(programId).findUnique()).findAll(); - for (TripSeine e : list) { - if (tripId.equals(e.getTopiaId())) { - return result; - } - result++; - } - - // not found - return -1; - } - public LinkedHashSet<TripMapPoint> extractTripMapActivityPoints(String tripId) { TripSeine tripSeine = forTopiaIdEquals(tripId).findUnique(); View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/5d0a76c839ce922e82c31279f3… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/5d0a76c839ce922e82c31279f3… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-7.x] [PS] Marées non visibles dans l'arbre après insertion - Closes #1187
by Tony CHEMIT 02 Jan '19

02 Jan '19

Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: 3655d085 by tchemit at 2019-01-02T14:37:30Z [PS] Marées non visibles dans l'arbre après insertion - Closes #1187 - - - - - 2 changed files: - dto/src/main/java/fr/ird/observe/dto/data/longline/TripLonglineHelper.java - dto/src/main/java/fr/ird/observe/dto/data/seine/TripSeineHelper.java Changes: ===================================== dto/src/main/java/fr/ird/observe/dto/data/longline/TripLonglineHelper.java ===================================== @@ -22,19 +22,18 @@ package fr.ird.observe.dto.data.longline; * #L% */ -import java.util.ArrayList; +import java.util.Comparator; import java.util.List; -import java.util.Map; -import java.util.TreeMap; +import java.util.stream.Collectors; public class TripLonglineHelper extends GeneratedTripLonglineHelper { public static List<TripLonglineReference> sort(List<TripLonglineReference> data) { - Map<Object, TripLonglineReference> map = new TreeMap<>(); - for (TripLonglineReference datum : data) { - map.put(datum.getStartDate(), datum); - } - return new ArrayList<>(map.values()); + return data + .stream() + .sorted(Comparator.comparing(TripLonglineReference::getStartDate) + .thenComparing(TripLonglineReference::getEndDate) + .thenComparing(TripLonglineReference::getVesselLabel)) + .collect(Collectors.toList()); } - } ===================================== dto/src/main/java/fr/ird/observe/dto/data/seine/TripSeineHelper.java ===================================== @@ -22,18 +22,18 @@ package fr.ird.observe.dto.data.seine; * #L% */ -import java.util.ArrayList; +import java.util.Comparator; import java.util.List; -import java.util.Map; -import java.util.TreeMap; +import java.util.stream.Collectors; public class TripSeineHelper extends GeneratedTripSeineHelper { public static List<TripSeineReference> sort(List<TripSeineReference> data) { - Map<Object, TripSeineReference> map = new TreeMap<>(); - for (TripSeineReference datum : data) { - map.put(datum.getStartDate(), datum); - } - return new ArrayList<>(map.values()); + return data + .stream() + .sorted(Comparator.comparing(TripSeineReference::getStartDate) + .thenComparing(TripSeineReference::getEndDate) + .thenComparing(TripSeineReference::getVesselLabel)) + .collect(Collectors.toList()); } } View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/3655d08559f1fdb6b84d102b1bf… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/3655d08559f1fdb6b84d102b1bf… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-7.x] 2 commits: Les informations sur la source de données ne peuvent pa être affichées - Closes #1186
by Tony CHEMIT 31 Dec '18

31 Dec '18

Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: 5492b59e by tchemit at 2018-12-31T20:52:40Z Les informations sur la source de données ne peuvent pa être affichées - Closes #1186 - - - - - defa2ca0 by tchemit at 2018-12-31T21:22:19Z Déplacement de marée intempestif dans l'arbre - Closes #1189 - - - - - 5 changed files: - client-core/src/main/i18n/templates/dataSourceInformation_en_GB.ftl - client-core/src/main/i18n/templates/dataSourceInformation_es_ES.ftl - client-core/src/main/i18n/templates/dataSourceInformation_fr_FR.ftl - persistence/src/main/java/fr/ird/observe/entities/longline/TripLonglineTopiaDao.java - persistence/src/main/java/fr/ird/observe/entities/seine/TripSeineTopiaDao.java Changes: ===================================== client-core/src/main/i18n/templates/dataSourceInformation_en_GB.ftl ===================================== @@ -36,7 +36,7 @@ <#else> <li>Web service url: ${configuration.serverUrl}</li> <li>User: ${configuration.login}</li> - <#if configuration.optionalDatabaseName.present??> + <#if configuration.withDatabaseName()> <li>Database alias: ${configuration.optionalDatabaseName.get()}</li> </#if> </#if> ===================================== client-core/src/main/i18n/templates/dataSourceInformation_es_ES.ftl ===================================== @@ -36,7 +36,7 @@ <#else> <li>URL del servicio web: ${configuration.serverUrl}</li> <li>Usuario: ${configuration.login}</li> - <#if configuration.optionalDatabaseName.present??> + <#if configuration.withDatabaseName()> <li>Alias de la base: ${configuration.optionalDatabaseName.get()}</li> </#if> </#if> ===================================== client-core/src/main/i18n/templates/dataSourceInformation_fr_FR.ftl ===================================== @@ -36,7 +36,7 @@ <#else> <li>URL du service web : ${configuration.serverUrl}</li> <li>Utilisateur : ${configuration.login}</li> - <#if configuration.optionalDatabaseName.present??> + <#if configuration.withDatabaseName()> <li>Alias de la base : ${configuration.optionalDatabaseName.get()}</li> </#if> </#if> ===================================== persistence/src/main/java/fr/ird/observe/entities/longline/TripLonglineTopiaDao.java ===================================== @@ -48,8 +48,9 @@ public class TripLonglineTopiaDao extends AbstractTripLonglineTopiaDao<TripLongl public int findPositionByProgramId(String programId, String tripId) { int result = 0; - //FIXME Bien vérifier que cela fonctionne - List<TripLongline> list = forProgramEquals(topiaDaoSupplier.getDao(Program.class).forTopiaIdEquals(programId).findUnique()).findAll(); + List<TripLongline> list = forProgramEquals(topiaDaoSupplier.getDao(Program.class).forTopiaIdEquals(programId).findUnique()) + .setOrderByArguments(TripLongline.PROPERTY_START_DATE + " ASC") + .findAll(); for (TripLongline e : list) { if (tripId.equals(e.getTopiaId())) { return result; ===================================== persistence/src/main/java/fr/ird/observe/entities/seine/TripSeineTopiaDao.java ===================================== @@ -50,8 +50,9 @@ public class TripSeineTopiaDao extends AbstractTripSeineTopiaDao<TripSeine> { public int findPositionByProgramId(String programId, String tripId) { int result = 0; - //FIXME Bien vérifier que cela fonctionne - List<TripSeine> list = forProgramEquals(topiaDaoSupplier.getDao(Program.class).forTopiaIdEquals(programId).findUnique()).findAll(); + List<TripSeine> list = forProgramEquals(topiaDaoSupplier.getDao(Program.class).forTopiaIdEquals(programId).findUnique()) + .setOrderByArguments(TripSeine.PROPERTY_START_DATE + " ASC") + .findAll(); for (TripSeine e : list) { if (tripId.equals(e.getTopiaId())) { return result; View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/9171243371ca8f725b03ed3cc8… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/9171243371ca8f725b03ed3cc8… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] [V8][DATA MODEL] Ajout de champs - Closes #1185
by Tony CHEMIT 30 Dec '18

30 Dec '18

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 5d0a76c8 by tchemit at 2018-12-30T10:35:36Z [V8][DATA MODEL] Ajout de champs - Closes #1185 - - - - - 30 changed files: - client-core/src/main/i18n/getters/java.getter - client-core/src/main/i18n/getters/jaxx.getter - client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ll/add/AddActivityLonglineLogbookSampleUIAction.java - client-core/src/main/java/fr/ird/observe/client/ui/content/data/ll/logbook/ActivityLonglineLogbookUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/content/data/ll/logbook/ActivityLonglineLogbookUI.jcss - client-core/src/main/java/fr/ird/observe/client/ui/content/data/ll/logbook/ActivityLonglineLogbookUIHandler.java - client-core/src/main/java/fr/ird/observe/client/ui/content/data/ll/logbook/ActivityLonglineLogbookUIModel.java - dto/src/main/java/fr/ird/observe/dto/data/ll/logbook/ActivityLonglineLogbookDto.java - dto/src/main/java/fr/ird/observe/dto/data/ll/logbook/ActivityLonglineLogbookReference.java - dto/src/main/java/fr/ird/observe/dto/decoration/DecoratorService.java - dto/src/main/models/Observe-31-data-ll-logbook.model - observe-i18n/src/main/i18n/translations/observe_en_GB.properties - observe-i18n/src/main/i18n/translations/observe_es_ES.properties - observe-i18n/src/main/i18n/translations/observe_fr_FR.properties - persistence/src/main/java/fr/ird/observe/binder/data/ll/logbook/ActivityLonglineLogbookEntityDtoBinder.java - persistence/src/main/java/fr/ird/observe/binder/data/ll/logbook/ActivityLonglineLogbookStubEntityDtoBinder.java - persistence/src/main/java/fr/ird/observe/entities/data/ll/logbook/ActivityLonglineLogbookImpl.java - persistence/src/main/java/fr/ird/observe/entities/data/ll/logbook/ActivityLonglineLogbookTopiaDao.java - persistence/src/main/java/fr/ird/observe/entities/data/ll/logbook/ActivityLonglineLogbooks.java - persistence/src/main/java/fr/ird/observe/entities/migration/DataSourceMigrationForVersion_7_2.java - persistence/src/main/models/Observe-00-common.model - persistence/src/main/models/Observe-01-referential-common.model - persistence/src/main/models/Observe-30-data-ll-observation.model - persistence/src/main/models/Observe-31-data-ll-logbook.model - persistence/src/main/models/Observe-35-data-ll-common.model - + persistence/src/main/resources/db/migration/7.2/10_add_home_id-common.sql - + persistence/src/main/resources/db/migration/7.2/11_alter_ll_logbook_activity-H2.sql - + persistence/src/main/resources/db/migration/7.2/11_alter_ll_logbook_activity-PG.sql - server-core/src/main/filtered-resources/mapping - services-local/src/main/java/fr/ird/observe/services/local/service/data/ll/logbook/ActivityLonglineLogbookSampleServiceLocal.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/5d0a76c839ce922e82c31279f38… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/5d0a76c839ce922e82c31279f38… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 5 commits: update db tests
by Tony CHEMIT 28 Dec '18

28 Dec '18

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 7a656883 by tchemit at 2018-12-23T11:55:38Z update db tests - - - - - 0b5002e7 by tchemit at 2018-12-23T11:56:26Z V8- réusinage des pauqetages de services - - - - - ffcb5feb by tchemit at 2018-12-23T12:50:22Z update pom - - - - - e8cea52f by tchemit at 2018-12-23T14:27:35Z TODO Report add ObjectMaterial - - - - - 223bcc9e by tchemit at 2018-12-23T14:30:19Z Ajouter un générateur d'id sur LL-Trip - Closes #1172 - - - - - 30 changed files: - client-configuration/src/main/java/fr/ird/observe/client/configuration/ClientConfig.java - client-core/src/main/i18n/getters/java.getter - client-core/src/main/java/fr/ird/observe/client/db/ObserveSwingDataSource.java - client-core/src/main/java/fr/ird/observe/client/ui/ObserveKeyStrokes.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/admin/longline/pairing/ActivityLonglinePairingModel.java - client-core/src/main/java/fr/ird/observe/client/ui/admin/longline/pairing/ActivityLonglinePairingUIHandler.java - client-core/src/main/java/fr/ird/observe/client/ui/admin/longline/pairing/tree/ActivityLonglinePairingTreeTable.java - client-core/src/main/java/fr/ird/observe/client/ui/admin/longline/pairing/tree/node/ActivityLonglinePairingActivityNode.java - client-core/src/main/java/fr/ird/observe/client/ui/admin/longline/pairing/tree/node/ActivityLonglinePairingTripNode.java - client-core/src/main/java/fr/ird/observe/client/ui/content/api/ContentUIHandler.java - client-core/src/main/java/fr/ird/observe/client/ui/content/data/ll/common/TripLonglineUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/content/data/ll/common/TripLonglineUI.jcss - client-core/src/main/java/fr/ird/observe/client/ui/content/data/ll/logbook/ActivityLonglineLogbookUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/content/data/ll/observation/LonglineDetailCompositionObsUIHandler.java - client-core/src/main/java/fr/ird/observe/client/ui/util/tripMap/TripMapContentBuilder.java - 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 - pom.xml - server-core/src/main/filtered-resources/mapping - services-client/src/test/java/fr/ird/observe/services/client/service/seine/TripSeineGearUseServiceClientTest.java → services-client/src/test/java/fr/ird/observe/services/client/service/data/ps/common/TripSeineGearUseServiceClientTest.java - services-client/src/test/java/fr/ird/observe/services/client/service/seine/TripSeineServiceClientTest.java → services-client/src/test/java/fr/ird/observe/services/client/service/data/ps/common/TripSeineServiceClientTest.java - services-client/src/test/java/fr/ird/observe/services/client/service/ReferenceValuesSetServiceClientTest.java → services-client/src/test/java/fr/ird/observe/services/client/service/referential/ReferenceValuesSetServiceClientTest.java - services-client/src/test/java/fr/ird/observe/services/client/service/ReferentialServiceClientTest.java → services-client/src/test/java/fr/ird/observe/services/client/service/referential/ReferentialServiceClientTest.java - services-local/pom.xml - services-local/src/main/java/fr/ird/observe/services/local/service/data/NavigationServiceLocal.java - services-local/src/main/java/fr/ird/observe/services/local/service/data/TripManagementServiceLocal.java - services-local/src/main/java/fr/ird/observe/services/local/service/data/TripMapDtoFactory.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/2db9b951092df7c01bfeda8663… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/2db9b951092df7c01bfeda8663… You're receiving this email because of your account on gitlab.com.

1 0